Author: markt
Date: Tue Aug 7 19:59:00 2012
New Revision: 1370479
URL: http://svn.apache.org/viewvc?rev=1370479&view=rev
Log:
Code clean-up for o.a.catalina.users
- Add final prompted by UCDetector
- Java 7 use of <>
Modified:
tomcat/trunk/java/org/apache/catalina/users/MemoryGroup.java
tomcat/trunk/java/org/apache/catalina/users/MemoryRole.java
tomcat/trunk/java/org/apache/catalina/users/MemoryUser.java
tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
Modified: tomcat/trunk/java/org/apache/catalina/users/MemoryGroup.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/MemoryGroup.java?rev=1370479&r1=1370478&r2=1370479&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/users/MemoryGroup.java (original)
+++ tomcat/trunk/java/org/apache/catalina/users/MemoryGroup.java Tue Aug 7
19:59:00 2012
@@ -67,13 +67,13 @@ public class MemoryGroup extends Abstrac
/**
* The {@link MemoryUserDatabase} that owns this group.
*/
- protected MemoryUserDatabase database = null;
+ protected final MemoryUserDatabase database;
/**
* The set of {@link Role}s associated with this group.
*/
- protected ArrayList<Role> roles = new ArrayList<Role>();
+ protected final ArrayList<Role> roles = new ArrayList<>();
// ------------------------------------------------------------- Properties
@@ -109,7 +109,7 @@ public class MemoryGroup extends Abstrac
@Override
public Iterator<User> getUsers() {
- ArrayList<User> results = new ArrayList<User>();
+ ArrayList<User> results = new ArrayList<>();
Iterator<User> users = database.getUsers();
while (users.hasNext()) {
User user = users.next();
Modified: tomcat/trunk/java/org/apache/catalina/users/MemoryRole.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/MemoryRole.java?rev=1370479&r1=1370478&r2=1370479&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/users/MemoryRole.java (original)
+++ tomcat/trunk/java/org/apache/catalina/users/MemoryRole.java Tue Aug 7
19:59:00 2012
@@ -62,7 +62,7 @@ public class MemoryRole extends Abstract
/**
* The {@link MemoryUserDatabase} that owns this role.
*/
- protected MemoryUserDatabase database = null;
+ protected final MemoryUserDatabase database;
// ------------------------------------------------------------- Properties
Modified: tomcat/trunk/java/org/apache/catalina/users/MemoryUser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/MemoryUser.java?rev=1370479&r1=1370478&r2=1370479&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/users/MemoryUser.java (original)
+++ tomcat/trunk/java/org/apache/catalina/users/MemoryUser.java Tue Aug 7
19:59:00 2012
@@ -69,19 +69,19 @@ public class MemoryUser extends Abstract
/**
* The {@link MemoryUserDatabase} that owns this user.
*/
- protected MemoryUserDatabase database = null;
+ protected final MemoryUserDatabase database;
/**
* The set of {@link Group}s that this user is a member of.
*/
- protected ArrayList<Group> groups = new ArrayList<Group>();
+ protected final ArrayList<Group> groups = new ArrayList<>();
/**
* The set of {@link Role}s associated with this user.
*/
- protected ArrayList<Role> roles = new ArrayList<Role>();
+ protected final ArrayList<Role> roles = new ArrayList<>();
// ------------------------------------------------------------- Properties
Modified: tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java?rev=1370479&r1=1370478&r2=1370479&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java Tue Aug
7 19:59:00 2012
@@ -79,7 +79,7 @@ public class MemoryUserDatabase implemen
* The set of {@link Group}s defined in this database, keyed by
* group name.
*/
- protected final HashMap<String,Group> groups = new HashMap<String,Group>();
+ protected final HashMap<String,Group> groups = new HashMap<>();
/**
@@ -118,7 +118,7 @@ public class MemoryUserDatabase implemen
* The set of {@link Role}s defined in this database, keyed by
* role name.
*/
- protected final HashMap<String,Role> roles = new HashMap<String,Role>();
+ protected final HashMap<String,Role> roles = new HashMap<>();
/**
@@ -132,7 +132,7 @@ public class MemoryUserDatabase implemen
* The set of {@link User}s defined in this database, keyed by
* user name.
*/
- protected final HashMap<String,User> users = new HashMap<String,User>();
+ protected final HashMap<String,User> users = new HashMap<>();
// ------------------------------------------------------------- Properties
@@ -647,23 +647,7 @@ public class MemoryUserDatabase implemen
sb.append(this.users.size());
sb.append("]");
return (sb.toString());
-
- }
-
-
- // -------------------------------------------------------- Package Methods
-
-
- /**
- * Return the <code>StringManager</code> for use in looking up messages.
- */
- StringManager getStringManager() {
-
- return (sm);
-
}
-
-
}
@@ -709,7 +693,7 @@ class MemoryGroupCreationFactory extends
return (group);
}
- private MemoryUserDatabase database = null;
+ private final MemoryUserDatabase database;
}
@@ -733,7 +717,7 @@ class MemoryRoleCreationFactory extends
return (role);
}
- private MemoryUserDatabase database = null;
+ private final MemoryUserDatabase database;
}
@@ -803,5 +787,5 @@ class MemoryUserCreationFactory extends
return (user);
}
- private MemoryUserDatabase database = null;
+ private final MemoryUserDatabase database;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
