Author: coheigea Date: Mon Mar 4 14:20:25 2013 New Revision: 1452320 URL: http://svn.apache.org/r1452320 Log: Sort Entitlements in the Console when adding a new Role
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RolePanel.java Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RolePanel.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RolePanel.java?rev=1452320&r1=1452319&r2=1452320&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RolePanel.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RolePanel.java Mon Mar 4 14:20:25 2013 @@ -18,6 +18,9 @@ */ package org.apache.syncope.console.pages.panels; +import java.util.Collections; +import java.util.List; + import org.apache.syncope.common.to.RoleTO; import org.apache.syncope.console.commons.SelectChoiceRenderer; import org.apache.syncope.console.pages.RoleModalPage; @@ -94,7 +97,11 @@ public class RolePanel extends Panel { ListModel<String> selectedEntitlements = new ListModel<String>(roleTO.getEntitlements()); - ListModel<String> availableEntitlements = new ListModel<String>(entitlementRestClient.getAllEntitlements()); + List<String> allEntitlements = entitlementRestClient.getAllEntitlements(); + if (allEntitlements != null && !allEntitlements.isEmpty()) { + Collections.sort(allEntitlements); + } + ListModel<String> availableEntitlements = new ListModel<String>(allEntitlements); entitlementsPalette = new Palette<String>("entitlementsPalette", selectedEntitlements, availableEntitlements, new SelectChoiceRenderer(), 20, false);