X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=security%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fusermgt%2FInMemoryUserSet.java;h=e048849d81f0bdacc06f4df080f335208a2a1c92;hb=f7fc25fbfd96a245bb09e14242107ed633d86dd8;hp=380d92c9fd9163470fd8cc1970e5aa0e970ad1d4;hpb=81fe8784a2182e25f92a7591ec5b0fba00afb828;p=utils diff --git a/security/src/main/java/org/wamblee/usermgt/InMemoryUserSet.java b/security/src/main/java/org/wamblee/usermgt/InMemoryUserSet.java index 380d92c9..e048849d 100644 --- a/security/src/main/java/org/wamblee/usermgt/InMemoryUserSet.java +++ b/security/src/main/java/org/wamblee/usermgt/InMemoryUserSet.java @@ -1,5 +1,5 @@ /* - * Copyright 2005 the original author or authors. + * Copyright 2005-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,31 +12,31 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - */ - + */ package org.wamblee.usermgt; +import org.wamblee.security.encryption.MessageDigester; + import java.util.Set; import java.util.TreeSet; -import org.wamblee.security.encryption.MessageDigester; - /** * In-memory user set. - * + * * @author Erik Brakkee */ public class InMemoryUserSet extends AbstractUserSet { - /** - * Users. All users in this set have their password validator and encoder set. + * Users. All users in this set have their password validator and encoder + * set. */ private Set users; /** * Constructs an empty user set. */ - public InMemoryUserSet(NameValidator aPasswordValidator, MessageDigester aPasswordEncoder) { + public InMemoryUserSet(NameValidator aPasswordValidator, + MessageDigester aPasswordEncoder) { super(aPasswordValidator, aPasswordEncoder); users = new TreeSet(); } @@ -48,7 +48,7 @@ public class InMemoryUserSet extends AbstractUserSet { */ public void userModified(User aUser) { users.remove(aUser); - setPasswordInfo(aUser); + setPasswordInfo(aUser); users.add(aUser); } @@ -63,6 +63,7 @@ public class InMemoryUserSet extends AbstractUserSet { return new User(user); } } + return null; } @@ -73,6 +74,7 @@ public class InMemoryUserSet extends AbstractUserSet { */ public boolean add(User aUser) { setPasswordInfo(aUser); + return users.add(aUser); } @@ -101,9 +103,11 @@ public class InMemoryUserSet extends AbstractUserSet { */ public Set list() { Set list = new TreeSet(); + for (User user : users) { list.add(new User(user)); } + return list; } @@ -114,19 +118,22 @@ public class InMemoryUserSet extends AbstractUserSet { */ public Set list(Group aGroup) { Set result = new TreeSet(); + for (User user : users) { if (user.getGroups().contains(aGroup)) { result.add(new User(user)); } } + return result; } - - /* (non-Javadoc) + + /* + * (non-Javadoc) + * * @see org.wamblee.usermgt.UserSet#size() */ public int size() { - return users.size(); + return users.size(); } - }