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

[gk]

Author: gk
Date: Mon Jan 15 08:11:20 2018
New Revision: 1821129

URL: http://svn.apache.org/viewvc?rev=1821129&view=rev
Log:
- renamed type name to a different names as in fulcrum user manager

Modified:
    
turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultUserManager.java
    
turbine/core/trunk/src/java/org/apache/turbine/services/security/UserManager.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=1821129&r1=1821128&r2=1821129&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
 Mon Jan 15 08:11:20 2018
@@ -459,7 +459,7 @@ public class DefaultUserManager implemen
      *             if the anonymous User object couldn't be constructed.
      */
     @Override
-    public <T extends User> T getAnonymousUser() throws UnknownEntityException
+    public <U extends User> U getAnonymousUser() throws UnknownEntityException
     {
         TurbineUser u = umDelegate.getAnonymousUser();
         return wrap(u);
@@ -491,7 +491,7 @@ public class DefaultUserManager implemen
      *             if the object could not be instantiated.
      */
     @Override
-    public <T extends User> T getUserInstance() throws DataBackendException
+    public <U extends User> U getUserInstance() throws DataBackendException
     {
         TurbineUser u = umDelegate.getUserInstance();
         return wrap(u);
@@ -511,7 +511,7 @@ public class DefaultUserManager implemen
      *             if the object could not be instantiated.
      */
     @Override
-    public <T extends User> T getUserInstance(String userName) throws 
DataBackendException
+    public <U extends User> U getUserInstance(String userName) throws 
DataBackendException
     {
         TurbineUser u = umDelegate.getUserInstance(userName);
         return wrap(u);
@@ -527,7 +527,7 @@ public class DefaultUserManager implemen
      *             determined, or does not exist.
      */
     @Override
-    public <T extends AccessControlList> T getACL(User user) throws 
UnknownEntityException
+    public <A extends AccessControlList> A getACL(User user) throws 
UnknownEntityException
     {
         if (user == null) {
             throw new UnknownEntityException("user is null");

Modified: 
turbine/core/trunk/src/java/org/apache/turbine/services/security/UserManager.java
URL: 
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/security/UserManager.java?rev=1821129&r1=1821128&r2=1821129&view=diff
==============================================================================
--- 
turbine/core/trunk/src/java/org/apache/turbine/services/security/UserManager.java
 (original)
+++ 
turbine/core/trunk/src/java/org/apache/turbine/services/security/UserManager.java
 Mon Jan 15 08:11:20 2018
@@ -240,7 +240,7 @@ public interface UserManager
      * @throws UnknownEntityException
      *             if the anonymous User object couldn't be constructed.
      */
-    <T extends User> T getAnonymousUser() throws UnknownEntityException;
+    <U extends User> U getAnonymousUser() throws UnknownEntityException;
 
     /**
      * Checks whether a passed user object matches the anonymous user pattern
@@ -263,7 +263,7 @@ public interface UserManager
      * @throws DataBackendException
      *             if the object could not be instantiated.
      */
-    <T extends User> T getUserInstance() throws DataBackendException;
+    <U extends User> U getUserInstance() throws DataBackendException;
 
     /**
      * Construct a blank User object.
@@ -278,7 +278,7 @@ public interface UserManager
      * @throws DataBackendException
      *             if the object could not be instantiated.
      */
-    <T extends User> T getUserInstance(String userName) throws 
DataBackendException;
+    <U extends User> U getUserInstance(String userName) throws 
DataBackendException;
 
     /**
      * Return a Class object representing the system's chosen implementation of
@@ -290,5 +290,5 @@ public interface UserManager
      *             if the implementation of ACL interface could not be
      *             determined, or does not exist.
      */
-    <T extends AccessControlList> T getACL(User user) throws 
UnknownEntityException;
+    <A extends AccessControlList> A getACL(User user) throws 
UnknownEntityException;
 }