svn commit: r1458378 - /syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourcesPanel.java

[il...@apache.org]

Author: ilgrosso
Date: Tue Mar 19 16:15:35 2013
New Revision: 1458378

URL: http://svn.apache.org/r1458378
Log:
Sorting resources during selection (for users and roles)

Modified:
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourcesPanel.java

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourcesPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourcesPanel.java?rev=1458378&r1=1458377&r2=1458378&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourcesPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourcesPanel.java Tue Mar 19 16:15:35 2013
@@ -19,6 +19,7 @@
 package org.apache.syncope.console.pages.panels;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -69,6 +70,7 @@ public class ResourcesPanel extends Pane
         for (ResourceTO resourceTO : resourceRestClient.getAllResources()) {
             allResources.add(resourceTO.getName());
         }
+        Collections.sort(allResources);
     }
 
     public ResourcesPanel(final String id, final UserTO userTO, final StatusPanel statusPanel) {
@@ -83,9 +85,11 @@ public class ResourcesPanel extends Pane
     public ResourcesPanel(final String id, final RoleTO roleTO) {
         this(id, (AbstractAttributableTO) roleTO);
 
+        List<String> selectedResources = new ArrayList<String>(roleTO.getResources());
+        Collections.sort(selectedResources);
+
         final AjaxPalettePanel<String> resourcesPalette = new AjaxPalettePanel<String>("resourcesPalette",
-                new PropertyModel<List<String>>(roleTO, "resources"),
-                new ListModel<String>(allResources));
+                new ListModel<String>(selectedResources), new ListModel<String>(allResources));
         add(resourcesPalette);
     }