Return-Path: 
 <jspwiki-commits-return-447-apmail-incubator-jspwiki-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-jspwiki-commits-archive@locus.apache.org
Received: (qmail 91866 invoked from network); 23 May 2008 03:52:26 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 23 May 2008 03:52:26 -0000
Received: (qmail 65229 invoked by uid 500); 23 May 2008 03:52:28 -0000
Delivered-To: apmail-incubator-jspwiki-commits-archive@incubator.apache.org
Received: (qmail 65217 invoked by uid 500); 23 May 2008 03:52:28 -0000
Mailing-List: contact jspwiki-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:jspwiki-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:jspwiki-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:jspwiki-commits@incubator.apache.org>
List-Id: <jspwiki-commits.incubator.apache.org>
Reply-To: jspwiki-dev@incubator.apache.org
Delivered-To: mailing list jspwiki-commits@incubator.apache.org
Received: (qmail 65208 invoked by uid 99); 23 May 2008 03:52:28 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 May 2008 20:52:28 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 May 2008 03:51:41 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 0FE0423889FA; Thu, 22 May 2008 20:52:03 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r659398 -
 /incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiSession.java
Date: Fri, 23 May 2008 03:52:02 -0000
To: jspwiki-commits@incubator.apache.org
From: ajaquith@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080523035203.0FE0423889FA@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: ajaquith
Date: Thu May 22 20:52:01 2008
New Revision: 659398

URL: http://svn.apache.org/viewvc?rev=659398&view=rev
Log:
Miscellaneous and varied Java 5 enhancements (such as for-loops).

Modified:
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiSession.java

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiSession.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiSession.java?rev=659398&r1=659397&r2=659398&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiSession.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiSession.java Thu May 22 20:52:01 2008
@@ -132,10 +132,9 @@
      */
     protected final boolean isInGroup( Group group )
     {
-        Principal[] principals = getPrincipals();
-        for ( int i = 0; i < principals.length; i++ )
+        for ( Principal principal : getPrincipals() )
         {
-          if ( isAuthenticated() && group.isMember( principals[i] ) )
+          if ( isAuthenticated() && group.isMember( principal ) )
           {
               return true;
           }
@@ -208,7 +207,7 @@
      */
     public final boolean isAnonymous()
     {
-        Set principals = m_subject.getPrincipals();
+        Set<Principal> principals = m_subject.getPrincipals();
         return principals.contains( Role.ANONYMOUS ) ||
                  principals.contains( WikiPrincipal.GUEST ) ||
                  isIPV4Address( getUserPrincipal().getName() );
@@ -349,7 +348,7 @@
         {
             return new String[0];
         }
-        return (String[])messages.toArray( new String[messages.size()] );
+        return messages.toArray( new String[messages.size()] );
     }
 
     /**
@@ -372,7 +371,7 @@
             }
         }
 
-        return (Principal[]) principals.toArray( new Principal[principals.size()] );
+        return principals.toArray( new Principal[principals.size()] );
     }
 
     /**
@@ -399,7 +398,7 @@
         roles.addAll( m_subject.getPrincipals( GroupPrincipal.class ) );
 
         // Return a defensive copy
-        Principal[] roleArray = ( Principal[] )roles.toArray( new Principal[roles.size()] );
+        Principal[] roleArray = roles.toArray( new Principal[roles.size()] );
         Arrays.sort( roleArray, WikiPrincipal.COMPARATOR );
         return roleArray;
     }
@@ -482,8 +481,8 @@
                         WikiSession target = (WikiSession)e.getTarget();
                         if ( this.equals( target ) & m_status == AUTHENTICATED )
                         {
-                            Set principals = m_subject.getPrincipals();
-                            principals.add(e.getPrincipal());
+                            Set<Principal> principals = m_subject.getPrincipals();
+                            principals.add( (Principal)e.getPrincipal());
                         }
                         break;
                     }
@@ -495,15 +494,15 @@
                             m_status = ANONYMOUS;
                             
                             // Set the login/user principals and login status
-                            Set principals = m_subject.getPrincipals();
+                            Set<Principal> principals = m_subject.getPrincipals();
                             m_loginPrincipal = (Principal)e.getPrincipal();
                             m_userPrincipal = m_loginPrincipal;
                             
                             // Add the login principal to the Subject, and set the built-in roles
                             principals.clear();
-                            principals.add(m_loginPrincipal);
-                            principals.add(Role.ALL);
-                            principals.add(Role.ANONYMOUS);
+                            principals.add( m_loginPrincipal );
+                            principals.add( Role.ALL );
+                            principals.add( Role.ANONYMOUS );
                         }
                         break;
                     }
@@ -515,15 +514,15 @@
                             m_status = ASSERTED;
                             
                             // Set the login/user principals and login status
-                            Set principals = m_subject.getPrincipals();
+                            Set<Principal> principals = m_subject.getPrincipals();
                             m_loginPrincipal = (Principal)e.getPrincipal();
                             m_userPrincipal = m_loginPrincipal;
                             
                             // Add the login principal to the Subject, and set the built-in roles
                             principals.clear();
-                            principals.add(m_loginPrincipal);
-                            principals.add(Role.ALL);
-                            principals.add(Role.ASSERTED);
+                            principals.add( m_loginPrincipal );
+                            principals.add( Role.ALL );
+                            principals.add( Role.ASSERTED );
                         }
                         break;
                     }
@@ -535,15 +534,15 @@
                             m_status = AUTHENTICATED;
                             
                             // Set the login/user principals and login status
-                            Set principals = m_subject.getPrincipals();
+                            Set<Principal> principals = m_subject.getPrincipals();
                             m_loginPrincipal = (Principal)e.getPrincipal();
                             m_userPrincipal = m_loginPrincipal;
                             
                             // Add the login principal to the Subject, and set the built-in roles
                             principals.clear();
-                            principals.add(m_loginPrincipal);
-                            principals.add(Role.ALL);
-                            principals.add(Role.AUTHENTICATED);
+                            principals.add( m_loginPrincipal );
+                            principals.add( Role.ALL );
+                            principals.add( Role.AUTHENTICATED );
                             
                             // Add the user and group principals
                             injectUserProfilePrincipals();  // Add principals for the user profile
@@ -575,7 +574,7 @@
                                 throw new IllegalStateException( "User profile FullName cannot be null." );
                             }
                             
-                            Set principals = m_subject.getPrincipals();
+                            Set<Principal> principals = m_subject.getPrincipals();
                             m_loginPrincipal = new WikiPrincipal( newProfile.getLoginName() );
                             
                             // Add the login principal to the Subject, and set the built-in roles
@@ -629,16 +628,15 @@
     protected final void injectGroupPrincipals()
     {
         // Flush the existing GroupPrincipals
-        m_subject.getPrincipals().removeAll(m_subject.getPrincipals(GroupPrincipal.class));
+        m_subject.getPrincipals().removeAll( m_subject.getPrincipals(GroupPrincipal.class) );
         
         // Get the GroupManager and test for each Group
         GroupManager manager = m_engine.getGroupManager();
-        Principal[] groups = manager.getRoles();
-        for ( int i = 0; i < groups.length; i++ )
+        for ( Principal group : manager.getRoles() )
         {
-            if ( manager.isUserInRole( this, groups[i] ) )
+            if ( manager.isUserInRole( this, group ) )
             {
-                m_subject.getPrincipals().add( groups[i] );
+                m_subject.getPrincipals().add( group );
             }
         }
     }
@@ -671,19 +669,18 @@
         {
             UserProfile profile = database.find( searchId );
             Principal[] principals = database.getPrincipals( profile.getLoginName() );
-            for (int i = 0; i < principals.length; i++)
+            for ( Principal principal : principals )
             {
                 // Add the Principal to the Subject
-                Principal principal = principals[i];
                 m_subject.getPrincipals().add( principal );
                 
                 // Set the user principal if needed; we prefer FullName, but the WikiName will also work
-                boolean isFullNamePrincipal = (principal instanceof WikiPrincipal && ((WikiPrincipal)principal).getType() == WikiPrincipal.FULL_NAME);
-                if (isFullNamePrincipal)
+                boolean isFullNamePrincipal = ( principal instanceof WikiPrincipal && ((WikiPrincipal)principal).getType() == WikiPrincipal.FULL_NAME );
+                if ( isFullNamePrincipal )
                 {
                    m_userPrincipal = principal; 
                 }
-                else if (!(m_userPrincipal instanceof WikiPrincipal))
+                else if ( !( m_userPrincipal instanceof WikiPrincipal ) )
                 {
                     m_userPrincipal = principal; 
                 }
@@ -843,7 +840,7 @@
      * @throws java.security.AccessControlException if the action is not permitted
      * by the security policy
      */
-    public static final Object doPrivileged( WikiSession session, PrivilegedAction action ) throws AccessControlException
+    public static final Object doPrivileged( WikiSession session, PrivilegedAction<?> action ) throws AccessControlException
     {
         return Subject.doAsPrivileged( session.m_subject, action, null );
     }