You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/11/27 04:42:00 UTC

svn commit: r1545917 - /archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java

Author: olamy
Date: Wed Nov 27 03:42:00 2013
New Revision: 1545917

URL: http://svn.apache.org/r1545917
Log:
[MRM-1765] #users > edit -- please sort effective roles

Modified:
    archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java

Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java?rev=1545917&r1=1545916&r2=1545917&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java Wed Nov 27 03:42:00 2013
@@ -54,6 +54,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -261,6 +262,9 @@ public class DefaultRoleManagementServic
             {
                 effectivelyAssignedRoles.add( new Role( r ) );
             }
+
+            Collections.sort( effectivelyAssignedRoles, RoleComparator.INSTANCE  );
+
             return effectivelyAssignedRoles;
         }
         catch ( RbacManagerException rme )
@@ -270,6 +274,17 @@ public class DefaultRoleManagementServic
         return new ArrayList<Role>( 0 );
     }
 
+    private static class RoleComparator implements Comparator<Role> {
+
+        private static RoleComparator INSTANCE = new RoleComparator();
+
+        @Override
+        public int compare( Role role, Role role2 )
+        {
+            return role.getName().compareTo( role2.getName() );
+        }
+    }
+
 
     public List<Application> getApplications( String username )
         throws RedbackServiceException