X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=security%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fusermgt%2FJaasUserAccessor.java;h=8cb6506568cd9ad9ae7b07e83059cc5628980666;hb=17775e14ecfb286e59f67117e5cee7e21e95ab1f;hp=aefe447adc0df6b3b04e95d9aafeac6f596cadea;hpb=ddd261f331280640c5b53c7128230b629ebcd268;p=utils

diff --git a/security/src/main/java/org/wamblee/usermgt/JaasUserAccessor.java b/security/src/main/java/org/wamblee/usermgt/JaasUserAccessor.java
index aefe447a..8cb65065 100644
--- a/security/src/main/java/org/wamblee/usermgt/JaasUserAccessor.java
+++ b/security/src/main/java/org/wamblee/usermgt/JaasUserAccessor.java
@@ -1,18 +1,18 @@
 /*
- * 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.
  * You may obtain a copy of the License at
- *
+ * 
  *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * 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 java.security.AccessController;
@@ -22,11 +22,10 @@ import java.util.Set;
 
 import javax.security.auth.Subject;
 
-
 /**
  * Implementation of the user accessor that retrieves user information from
  * JAAS.
- *
+ * 
  * @author Erik Brakkee
  */
 public class JaasUserAccessor implements UserAccessor {
@@ -40,10 +39,13 @@ public class JaasUserAccessor implements UserAccessor {
      */
     private Class userPrincipalClass;
 
-/**
-     * Constructs user accessor. 
-     * @param aAdmin User administration. 
-     * @param aUserClassName Class name of the user principal. 
+    /**
+     * Constructs user accessor.
+     * 
+     * @param aAdmin
+     *            User administration.
+     * @param aUserClassName
+     *            Class name of the user principal.
      */
     public JaasUserAccessor(UserAdministration aAdmin, String aUserClassName) {
         admin = aAdmin;
@@ -52,9 +54,9 @@ public class JaasUserAccessor implements UserAccessor {
             userPrincipalClass = Class.forName(aUserClassName);
 
             if (!Principal.class.isAssignableFrom(userPrincipalClass)) {
-                throw new IllegalArgumentException("Specified class '"
-                    + aUserClassName + "' is not a subclass of '"
-                    + Principal.class.getName());
+                throw new IllegalArgumentException("Specified class '" +
+                    aUserClassName + "' is not a subclass of '" +
+                    Principal.class.getName());
             }
         } catch (ClassNotFoundException e) {
             throw new RuntimeException(e);
@@ -63,14 +65,9 @@ public class JaasUserAccessor implements UserAccessor {
 
     /*
      * (non-Javadoc)
-     *
+     * 
      * @see org.wamblee.usermgt.UserAccessor#getCurrentUser()
      */
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
     public User getCurrentUser() {
         Subject subject = Subject.getSubject(AccessController.getContext());
 
@@ -85,24 +82,26 @@ public class JaasUserAccessor implements UserAccessor {
 
     /**
      * Gets the user principal from the subject.
-     *
-     * @param subject Subject.
-     *
+     * 
+     * @param subject
+     *            Subject.
+     * 
      * @return User principal.
-     *
-     * @throws IllegalArgumentException In case there is a duplicate principal
-     *         or the principal was not found.
+     * 
+     * @throws IllegalArgumentException
+     *             In case there is a duplicate principal or the principal was
+     *             not found.
      */
     private Principal getUserPrincipal(Subject subject) {
-        Set<Principal> principals    = subject.getPrincipals();
-        Principal      userPrincipal = null;
+        Set<Principal> principals = subject.getPrincipals();
+        Principal userPrincipal = null;
 
         for (Principal principal : principals) {
             if (principal.getClass().equals(userPrincipalClass)) {
                 if (userPrincipal != null) {
                     throw new IllegalArgumentException(
-                        "Multiple principals for class '" + userPrincipalClass
-                        + "', subject: " + subject);
+                        "Multiple principals for class '" + userPrincipalClass +
+                            "', subject: " + subject);
                 }
 
                 userPrincipal = principal;
@@ -111,8 +110,8 @@ public class JaasUserAccessor implements UserAccessor {
 
         if (userPrincipal == null) {
             throw new IllegalArgumentException(
-                "No user principal found for class '" + userPrincipalClass
-                + "', subject: " + subject);
+                "No user principal found for class '" + userPrincipalClass +
+                    "', subject: " + subject);
         }
 
         return userPrincipal;