svn commit: r1759620 - in /turbine/core/trunk/src/java/org/apache/turbine/services/security: DefaultUserManager.java SecurityService.java

[tv]

Author: tv
Date: Wed Sep  7 14:31:58 2016
New Revision: 1759620

URL: http://svn.apache.org/viewvc?rev=1759620&view=rev
Log:
Fix imports and formatting

Modified:
    
turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultUserManager.java
    
turbine/core/trunk/src/java/org/apache/turbine/services/security/SecurityService.java

Modified: 
turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultUserManager.java
URL: 
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultUserManager.java?rev=1759620&r1=1759619&r2=1759620&view=diff
==============================================================================
--- 
turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultUserManager.java
 (original)
+++ 
turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultUserManager.java
 Wed Sep  7 14:31:58 2016
@@ -31,13 +31,11 @@ import org.apache.fulcrum.factory.Factor
 import org.apache.fulcrum.security.acl.AccessControlList;
 import org.apache.fulcrum.security.model.turbine.TurbineUserManager;
 import org.apache.fulcrum.security.model.turbine.entity.TurbineUser;
-import org.apache.fulcrum.security.model.turbine.entity.impl.TurbineUserImpl;
 import org.apache.fulcrum.security.util.DataBackendException;
 import org.apache.fulcrum.security.util.EntityExistsException;
 import org.apache.fulcrum.security.util.PasswordMismatchException;
 import org.apache.fulcrum.security.util.UnknownEntityException;
 import org.apache.fulcrum.security.util.UserSet;
-import org.apache.turbine.om.security.DefaultUserImpl;
 import org.apache.turbine.om.security.TurbineUserDelegate;
 import org.apache.turbine.om.security.User;
 import org.apache.turbine.services.InitializationException;
@@ -89,24 +87,28 @@ public class DefaultUserManager implemen
      * @return instance extending {@link User}
      */
     @SuppressWarnings("unchecked")
-       public <U extends User> U getUserWrapper(TurbineUser user) {
-               try {
-            Object params[] = new Object[1];
-            params[0] = user;
-            String signature[] = new String[1];
-            signature[0] = TurbineUser.class.getName();
+       public <U extends User> U getUserWrapper(TurbineUser user) 
+    {
+               try 
+               {
+            Object params[] = new Object[] { user };
+            String signature[] = new String[] { TurbineUser.class.getName() };
             return (U) factoryService.getInstance(getUserWrapperClass(), 
params, signature);
-               } catch (Exception e) {
+               } 
+               catch (Exception e) 
+               {
                        log.error("after init/late instantiation exception", e);
                        return null; // (U)new DefaultUserImpl(user);
                } 
        }
 
-    public String getUserWrapperClass() {
+    public String getUserWrapperClass() 
+    {
                return userWrapperClass;
        }
     
-    public void setUserWrapperClass(String userWrapperClass2) {
+    public void setUserWrapperClass(String userWrapperClass2) 
+    {
                userWrapperClass = userWrapperClass2;           
        }
 
@@ -129,9 +131,8 @@ public class DefaultUserManager implemen
 //                SecurityService.USER_KEY,
 //                SecurityService.USER_DEFAULT);
         
-        
-        try {
-               
+        try 
+        {
                factoryService = 
(FactoryService)manager.getService(FactoryService.ROLE);
              
             //  check instantiation 
@@ -139,15 +140,13 @@ public class DefaultUserManager implemen
                // should provide default constructor
                TurbineUser turbineUser = umDelegate.getUserInstance();
                                //(TurbineUser) 
factoryService.getInstance(userClass); 
-            Object params[] = new Object[1];
-            params[0] = turbineUser;
-            String signature[] = new String[1];
-            signature[0] = TurbineUser.class.getName();
+            Object params[] = new Object[] { turbineUser };
+            String signature[] = new String[] { TurbineUser.class.getName() };
             User uc = (User) factoryService.getInstance(userWrapperClass, 
params, signature);
             
             this.setUserWrapperClass(userWrapperClass);
-            
-        } catch (Exception e)
+        } 
+        catch (Exception e)
            {
               throw new InitializationException("Failed to instantiate user 
wrapper class", e);
            }

Modified: 
turbine/core/trunk/src/java/org/apache/turbine/services/security/SecurityService.java
URL: 
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/security/SecurityService.java?rev=1759620&r1=1759619&r2=1759620&view=diff
==============================================================================
--- 
turbine/core/trunk/src/java/org/apache/turbine/services/security/SecurityService.java
 (original)
+++ 
turbine/core/trunk/src/java/org/apache/turbine/services/security/SecurityService.java
 Wed Sep  7 14:31:58 2016
@@ -25,8 +25,6 @@ import org.apache.fulcrum.security.acl.A
 import org.apache.fulcrum.security.entity.Group;
 import org.apache.fulcrum.security.entity.Permission;
 import org.apache.fulcrum.security.entity.Role;
-import org.apache.fulcrum.security.model.turbine.entity.TurbineUser;
-import org.apache.fulcrum.security.model.turbine.entity.impl.TurbineUserImpl;
 import org.apache.fulcrum.security.util.DataBackendException;
 import org.apache.fulcrum.security.util.EntityExistsException;
 import org.apache.fulcrum.security.util.GroupSet;