[jboss-cvs] jboss-seam/src/main/org/jboss/seam/security ...

[Gavin King]

  User: gavin   
  Date: 07/01/30 20:08:55

  Modified:    src/main/org/jboss/seam/security  Identity.java
  Log:
  more consistent
  
  Revision  Changes    Path
  1.32      +9 -11     jboss-seam/src/main/org/jboss/seam/security/Identity.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Identity.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/security/Identity.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -b -r1.31 -r1.32
  --- Identity.java	31 Jan 2007 01:04:02 -0000	1.31
  +++ Identity.java	31 Jan 2007 01:08:55 -0000	1.32
  @@ -199,7 +199,7 @@
      {
         return new LoginContext(DEFAULT_JAAS_CONFIG_NAME, 
               subject, 
  -            createCallbackHandler(username, password), 
  +            getCallbackHandler(username, password), 
               getConfiguration()
            );
      }
  @@ -248,21 +248,21 @@
   
         handles.add(securityContext.assertObject(check));
   
  -      if (arg != null && securityContext.getFactHandle(arg) == null)
  +      if (arg!=null && securityContext.getFactHandle(arg) == null)
         {
            if (arg instanceof Collection)
            {
  -            for (Object value : ((Collection) arg))
  +            for (Object value : (Collection) arg)
               {
                  if (securityContext.getFactHandle(value) == null)
                  {
  -                  handles.add(securityContext.assertObject(value));
  +                  handles.add( securityContext.assertObject(value) );
                  }
               }
            }
            else
            {
  -            handles.add(securityContext.assertObject(arg));
  +            handles.add( securityContext.assertObject(arg) );
            }
         }      
   
  @@ -282,15 +282,14 @@
       * @param username The username to provide for a NameCallback
       * @param password The password to provide for a PasswordCallback
       */
  -   protected CallbackHandler createCallbackHandler(final String username, 
  -         final String password)
  +   protected CallbackHandler getCallbackHandler(final String username, final String password)
      {
         return new CallbackHandler() 
         {
            public void handle(Callback[] callbacks) 
               throws IOException, UnsupportedCallbackException 
            {
  -            for (int i = 0; i < callbacks.length; i++)
  +            for (int i=0; i<callbacks.length; i++)
               {
                  if (callbacks[i] instanceof NameCallback)
                  {
  @@ -314,13 +313,12 @@
      {
         if (defaultConfig == null)
         {
  -         createDefaultConfig();
  +         initDefaultConfig();
         }
  -      
         return defaultConfig;
      }
      
  -   private synchronized void createDefaultConfig()
  +   private synchronized void initDefaultConfig()
      {
         if (defaultConfig == null)
         {