X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=security%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fusermgt%2FAbstractUserSet.java;h=cb9602a4cd2f7f4fe520e2ab8c1f5da8838068e1;hb=17775e14ecfb286e59f67117e5cee7e21e95ab1f;hp=1a3096f75383f5b7585eb60cdc8ba414382cf57a;hpb=162af365e45e54e5e8d656be276914df2005eaec;p=utils

diff --git a/security/src/main/java/org/wamblee/usermgt/AbstractUserSet.java b/security/src/main/java/org/wamblee/usermgt/AbstractUserSet.java
index 1a3096f7..cb9602a4 100644
--- a/security/src/main/java/org/wamblee/usermgt/AbstractUserSet.java
+++ b/security/src/main/java/org/wamblee/usermgt/AbstractUserSet.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.
@@ -13,53 +13,63 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-
 package org.wamblee.usermgt;
 
-import static org.wamblee.usermgt.UserMgtException.Reason.DUPLICATE_USER;
-
 import org.wamblee.security.encryption.MessageDigester;
+import static org.wamblee.usermgt.UserMgtException.Reason.DUPLICATE_USER;
 
 /**
- * User set base class. 
+ * User set base class.
  */
 public abstract class AbstractUserSet implements UserSet {
-    
     /**
-     * Password validator. 
+     * Password validator.
      */
-    private NameValidator _passwordValidator; 
-    
+    private NameValidator passwordValidator;
+
     /**
-     * Password encoder. 
+     * Password encoder.
      */
-    private MessageDigester _passwordEncoder; 
+    private MessageDigester passwordEncoder;
 
-    
-    protected AbstractUserSet(NameValidator aPasswordValidator, 
-            MessageDigester aPasswordEncoder) { 
-        _passwordValidator = aPasswordValidator;
-        _passwordEncoder = aPasswordEncoder;
+    /**
+     * Creates a new AbstractUserSet object.
+     * 
+     */
+    protected AbstractUserSet(NameValidator aPasswordValidator,
+        MessageDigester aPasswordEncoder) {
+        passwordValidator = aPasswordValidator;
+        passwordEncoder = aPasswordEncoder;
     }
-    
+
     /**
-     * Sets the password validtor and encoder in the user. 
-     * @param aUser User. 
+     * Sets the password validtor and encoder in the user.
+     * 
+     * @param aUser
+     *            User.
      */
-    protected void setPasswordInfo(User aUser) { 
-        aUser.setPasswordValidator(_passwordValidator);
-        aUser.setPasswordEncoder(_passwordEncoder);
+    protected void setPasswordInfo(User aUser) {
+        aUser.setPasswordValidator(passwordValidator);
+        aUser.setPasswordEncoder(passwordEncoder);
     }
 
-    /* (non-Javadoc)
-     * @see org.wamblee.usermgt.UserSet#createUser(java.lang.String, java.lang.String, org.wamblee.usermgt.Group)
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.wamblee.usermgt.UserSet#createUser(java.lang.String,
+     * java.lang.String, org.wamblee.usermgt.Group)
      */
-    public User createUser(String aUsername, String aPassword, Group aGroup) throws UserMgtException {
-        User user = new User(aUsername, aPassword, aGroup, _passwordValidator, _passwordEncoder);
+    public User createUser(String aUsername, String aPassword, Group aGroup)
+        throws UserMgtException {
+        User user = new User(aUsername, aPassword, aGroup, passwordValidator,
+            passwordEncoder);
+
         if (contains(user)) {
             throw new UserMgtException(DUPLICATE_USER, user);
         }
+
         add(user);
+
         return user;
     }
 }