[MMBASE SCM] r41277 - CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib

[fpunt]

Author: fpunt
Date: 2010-03-05 15:04:53 +0100 (Fri, 05 Mar 2010)
New Revision: 41277

Modified:
   
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/ListGroupsTag.java
   
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/ListLDAPGroupsTag.java
Log:
CMSC-1649 The list of LDAP groups is now sorted

Modified: 
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/ListGroupsTag.java
===================================================================
--- 
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/ListGroupsTag.java
    2010-03-05 12:57:41 UTC (rev 41276)
+++ 
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/ListGroupsTag.java
    2010-03-05 14:04:53 UTC (rev 41277)
@@ -1,6 +1,9 @@
 package com.finalist.cmsc.community.taglib;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
@@ -20,7 +23,12 @@
       HttpServletRequest req = (HttpServletRequest) ctx.getRequest();
 
       AuthorityService as = getAuthorityService();
-      Set < String > list = as.getAuthorityNames();
+      ArrayList<String> list = new ArrayList<String>(as.getAuthorityNames());
+      Collections.sort(list, new Comparator<String>() {
+         public int compare(String o1, String o2) {
+                 return o1.compareToIgnoreCase(o2);
+         }
+      });
 
       if (var != null) {
          if (list != null) {

Modified: 
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/ListLDAPGroupsTag.java
===================================================================
--- 
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/ListLDAPGroupsTag.java
        2010-03-05 12:57:41 UTC (rev 41276)
+++ 
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/ListLDAPGroupsTag.java
        2010-03-05 14:04:53 UTC (rev 41277)
@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
@@ -37,7 +38,11 @@
 
       AuthorityService as = getAuthorityLDAPService();
       ArrayList<String> list = new ArrayList<String>(as.getAuthorityNames());
-      Collections.sort(list);
+      Collections.sort(list, new Comparator<String>() {
+         public int compare(String o1, String o2) {
+                 return o1.compareToIgnoreCase(o2);
+         }
+      });
 
       if (var != null) {
          if (list != null) {

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs