Anonymous sessions appear now first than non-anonymous sessions in the session summary page.

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@8729 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/openfire/SessionResultFilter.java

@@ -10,7 +10,7 @@
 
 package org.jivesoftware.openfire;
 
-import org.jivesoftware.openfire.session.Session;
+import org.jivesoftware.openfire.session.ClientSession;
 
 import java.util.Comparator;
 import java.util.Date;
@@ -196,7 +196,7 @@ public class SessionResultFilter {
      *
      * @return a comparator that sorts Sessions matching the sort order for this filter.
      */
-    public Comparator<Session> getSortComparator() {
+    public Comparator<ClientSession> getSortComparator() {
         return new SessionComparator();
     }
 
@@ -205,11 +205,9 @@ public class SessionResultFilter {
      *
      * @author Iain Shigeoka
      */
-    private class SessionComparator implements Comparator {
+    private class SessionComparator implements Comparator<ClientSession> {
 
-        public int compare(Object o1, Object o2) {
-            Session lhs = (Session)o1;
-            Session rhs = (Session)o2;
+        public int compare(ClientSession lhs, ClientSession rhs) {
             int comparison;
             switch (sortField) {
                 case SessionResultFilter.SORT_CREATION_DATE:
@@ -226,8 +224,9 @@ public class SessionResultFilter {
                     break;
                 case SessionResultFilter.SORT_USER:
                     // sort first by name, then by resource
-                    comparison = compareString(lhs.getAddress().getNode(),
-                            rhs.getAddress().getNode());
+                    String lUsername = lhs.isAnonymousUser() ? "" : lhs.getAddress().getNode();
+                    String rUsername = rhs.isAnonymousUser() ? "" : rhs.getAddress().getNode();
+                    comparison = compareString(lUsername, rUsername);
                     if (comparison == 0) {
                         comparison = compareString(lhs.getAddress().getResource(),
                                 rhs.getAddress().getResource());

src/java/org/jivesoftware/openfire/session/ClientSession.java

@@ -64,6 +64,15 @@ public interface ClientSession extends Session {
      */
     public String getUsername() throws UserNotFoundException;
 
+    /**
+     * Returns true if the authetnicated user is an anonymous user or if
+     * the use has not authenticated yet.
+     *
+     * @return true if the authetnicated user is an anonymous user or if
+     * the use has not authenticated yet.
+     */
+    boolean isAnonymousUser();
+
     /**
      * Flag indicating if this session has been initialized once coming
      * online. Session initialization occurs after the session receives

src/java/org/jivesoftware/openfire/session/LocalClientSession.java

@@ -536,6 +536,10 @@ public class LocalClientSession extends LocalSession implements ClientSession {
         return authToken;
     }
 
+    public boolean isAnonymousUser() {
+        return authToken == null || authToken.isAnonymous();
+    }
+
     /**
      * Flag indicating if this session has been initialized once coming
      * online. Session initialization occurs after the session receives