X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=security%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fusermgt%2FInMemoryUserSet.java;h=e048849d81f0bdacc06f4df080f335208a2a1c92;hb=17775e14ecfb286e59f67117e5cee7e21e95ab1f;hp=6d25dc11a6c1dbadcb20e815edfbb0b591bbe5f2;hpb=532f7219273021ef3652e0abe1326b7aeed1f30a;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 6d25dc11..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,33 +12,33 @@
  * 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<User> _users;
+    private Set<User> users;
 
     /**
      * Constructs an empty user set.
      */
-    public InMemoryUserSet(NameValidator aPasswordValidator, MessageDigester aPasswordEncoder) {
+    public InMemoryUserSet(NameValidator aPasswordValidator,
+        MessageDigester aPasswordEncoder) {
         super(aPasswordValidator, aPasswordEncoder);
-        _users = new TreeSet<User>();
+        users = new TreeSet<User>();
     }
 
     /*
@@ -47,9 +47,9 @@ public class InMemoryUserSet extends AbstractUserSet {
      * @see org.wamblee.usermgt.UserSet#userModified(org.wamblee.usermgt.User)
      */
     public void userModified(User aUser) {
-        _users.remove(aUser);
-       setPasswordInfo(aUser); 
-        _users.add(aUser);
+        users.remove(aUser);
+        setPasswordInfo(aUser);
+        users.add(aUser);
     }
 
     /*
@@ -58,11 +58,12 @@ public class InMemoryUserSet extends AbstractUserSet {
      * @see org.wamblee.usermgt.UserSet#find(java.lang.String)
      */
     public User find(String aName) {
-        for (User user : _users) {
+        for (User user : users) {
             if (user.getName().equals(aName)) {
                 return new User(user);
             }
         }
+
         return null;
     }
 
@@ -73,7 +74,8 @@ public class InMemoryUserSet extends AbstractUserSet {
      */
     public boolean add(User aUser) {
         setPasswordInfo(aUser);
-        return _users.add(aUser);
+
+        return users.add(aUser);
     }
 
     /*
@@ -82,7 +84,7 @@ public class InMemoryUserSet extends AbstractUserSet {
      * @see org.wamblee.usermgt.UserSet#contains(org.wamblee.usermgt.User)
      */
     public boolean contains(User aUser) {
-        return _users.contains(aUser);
+        return users.contains(aUser);
     }
 
     /*
@@ -91,7 +93,7 @@ public class InMemoryUserSet extends AbstractUserSet {
      * @see org.wamblee.usermgt.UserSet#remove(org.wamblee.usermgt.User)
      */
     public boolean remove(User aUser) {
-        return _users.remove(aUser);
+        return users.remove(aUser);
     }
 
     /*
@@ -101,9 +103,11 @@ public class InMemoryUserSet extends AbstractUserSet {
      */
     public Set<User> list() {
         Set<User> list = new TreeSet<User>();
-        for (User user : _users) {
+
+        for (User user : users) {
             list.add(new User(user));
         }
+
         return list;
     }
 
@@ -114,19 +118,22 @@ public class InMemoryUserSet extends AbstractUserSet {
      */
     public Set<User> list(Group aGroup) {
         Set<User> result = new TreeSet<User>();
-        for (User user : _users) {
+
+        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();
     }
-
 }