svn commit: r659780 - in /incubator/jspwiki/trunk/src/com/ecyrd/jspwiki: auth/user/AbstractUserDatabase.java auth/user/DefaultUserProfile.java auth/user/JDBCUserDatabase.java util/CryptoUtil.java

[jalkanen]

Author: jalkanen
Date: Sat May 24 02:26:12 2008
New Revision: 659780

URL: http://svn.apache.org/viewvc?rev=659780&view=rev
Log:
Fixed a couple of checkstyle warnings.

Modified:
    
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/user/AbstractUserDatabase.java
    
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/user/DefaultUserProfile.java
    
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/user/JDBCUserDatabase.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/CryptoUtil.java

Modified: 
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/user/AbstractUserDatabase.java
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/user/AbstractUserDatabase.java?rev=659780&r1=659779&r2=659780&view=diff
==============================================================================
--- 
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/user/AbstractUserDatabase.java
 (original)
+++ 
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/user/AbstractUserDatabase.java
 Sat May 24 02:26:12 2008
@@ -270,7 +270,9 @@
         // Keep generating UUIDs until we find one that doesn't collide
         long uid;
         boolean collision;
-        do {
+        
+        do 
+        {
             uid = UUID.randomUUID().getLeastSignificantBits();
             collision = true;
             try
@@ -281,7 +283,8 @@
             {
                 collision = false;
             }
-        } while ( collision || uid == UID_NOT_SET );
+        } 
+        while ( collision || uid == UID_NOT_SET );
         return uid;
     }
     

Modified: 
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/user/DefaultUserProfile.java
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/user/DefaultUserProfile.java?rev=659780&r1=659779&r2=659780&view=diff
==============================================================================
--- 
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/user/DefaultUserProfile.java 
(original)
+++ 
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/user/DefaultUserProfile.java 
Sat May 24 02:26:12 2008
@@ -32,7 +32,7 @@
  * @since 2.3
  */
 
-public class DefaultUserProfile implements UserProfile
+public final class DefaultUserProfile implements UserProfile
 {
     private static final String EMPTY_STRING = "";
 
@@ -61,7 +61,7 @@
     /**
      * Private constructor to prevent direct instantiation.
      */
-    private DefaultUserProfile() { }
+    private DefaultUserProfile() {}
 
     /**
      * Static factory method that creates a new DefaultUserProfile
@@ -329,7 +329,8 @@
         boolean locked =  m_lockExpiry != null && System.currentTimeMillis() < 
m_lockExpiry.getTime();
 
         // Clear the lock if it's expired already
-        if ( !locked && m_lockExpiry != null ){
+        if ( !locked && m_lockExpiry != null )
+        {
             m_lockExpiry = null;
         }
         return locked;

Modified: 
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/user/JDBCUserDatabase.java
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/user/JDBCUserDatabase.java?rev=659780&r1=659779&r2=659780&view=diff
==============================================================================
--- 
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/user/JDBCUserDatabase.java 
(original)
+++ 
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/user/JDBCUserDatabase.java 
Sat May 24 02:26:12 2008
@@ -840,7 +840,8 @@
             {
                 ps.setLong( 1, ( (Long)index).longValue() );
             }
-            else {
+            else 
+            {
                 throw new IllegalArgumentException( "Index type not 
recognized!" );
             }
             

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/CryptoUtil.java
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/CryptoUtil.java?rev=659780&r1=659779&r2=659780&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/CryptoUtil.java 
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/CryptoUtil.java Sat May 
24 02:26:12 2008
@@ -12,7 +12,7 @@
  * Hashes and verifies salted SHA-1 passwords, which are compliant with RFC
  * 2307.
  */
-public class CryptoUtil
+public final class CryptoUtil
 {
 
     private static final String SSHA = "{SSHA}";