Author: thomas.heute(a)jboss.com Date: 2007-08-15 07:02:36 -0400 (Wed, 15 Aug 2007) New Revision: 7931 Modified: modules/common/trunk/common/src/main/org/jboss/portal/common/util/Tools.java Log: Return ordered Set of users and roles when searching on database Modified: modules/common/trunk/common/src/main/org/jboss/portal/common/util/Tools.java =================================================================== --- modules/common/trunk/common/src/main/org/jboss/portal/common/util/Tools.java 2007-08-15 11:01:57 UTC (rev 7930) +++ modules/common/trunk/common/src/main/org/jboss/portal/common/util/Tools.java 2007-08-15 11:02:36 UTC (rev 7931) @@ -41,6 +41,7 @@ import java.util.Enumeration; import java.util.HashSet; import java.util.Iterator; +import java.util.LinkedHashSet; import java.util.List; import java.util.NoSuchElementException; import java.util.ResourceBundle; @@ -239,9 +240,35 @@ return set; } + /** + * Transforms an iterator into an unordered Set + * + * @param iterator The iterator to transform + * @return A HashSet + */ public static Set toSet(Iterator iterator) { - HashSet set = new HashSet(); + return toSet(iterator, false); + } + + /** + * Transforms an iterator into a Set + * + * @param iterator The iterator to transform + * @param ordered true if the set must respect the ordering of the iterator + * @return a LinkedHashSet if ordered is true, a HashSet otherwise + */ + public static Set toSet(Iterator iterator, boolean ordered) + { + Set set = null; + if (ordered) + { + set = new LinkedHashSet(); + } + else + { + set = new HashSet(); + } while (iterator.hasNext()) { set.add(iterator.next());