Author: markt
Date: Mon Apr 18 16:59:26 2011
New Revision: 1094650
URL: http://svn.apache.org/viewvc?rev=1094650&view=rev
Log:
Add missing @Override
Modified:
tomcat/trunk/java/org/apache/catalina/users/AbstractGroup.java
tomcat/trunk/java/org/apache/catalina/users/AbstractRole.java
tomcat/trunk/java/org/apache/catalina/users/AbstractUser.java
tomcat/trunk/java/org/apache/catalina/users/MemoryUser.java
tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java
Modified: tomcat/trunk/java/org/apache/catalina/users/AbstractGroup.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/AbstractGroup.java?rev=1094650&r1=1094649&r2=1094650&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/users/AbstractGroup.java (original)
+++ tomcat/trunk/java/org/apache/catalina/users/AbstractGroup.java Mon Apr 18
16:59:26 2011
@@ -59,6 +59,7 @@ public abstract class AbstractGroup impl
/**
* Return the description of this group.
*/
+ @Override
public String getDescription() {
return (this.description);
@@ -71,6 +72,7 @@ public abstract class AbstractGroup impl
*
* @param description The new description
*/
+ @Override
public void setDescription(String description) {
this.description = description;
@@ -82,6 +84,7 @@ public abstract class AbstractGroup impl
* Return the group name of this group, which must be unique
* within the scope of a {@link UserDatabase}.
*/
+ @Override
public String getGroupname() {
return (this.groupname);
@@ -95,6 +98,7 @@ public abstract class AbstractGroup impl
*
* @param groupname The new group name
*/
+ @Override
public void setGroupname(String groupname) {
this.groupname = groupname;
@@ -105,12 +109,14 @@ public abstract class AbstractGroup impl
/**
* Return the set of {@link Role}s assigned specifically to this group.
*/
+ @Override
public abstract Iterator<Role> getRoles();
/**
* Return the {@link UserDatabase} within which this Group is defined.
*/
+ @Override
public abstract UserDatabase getUserDatabase();
@@ -118,6 +124,7 @@ public abstract class AbstractGroup impl
* Return an Iterator over the set of {@link org.apache.catalina.User}s
that
* are members of this group.
*/
+ @Override
public abstract Iterator<User> getUsers();
@@ -129,6 +136,7 @@ public abstract class AbstractGroup impl
*
* @param role The new role
*/
+ @Override
public abstract void addRole(Role role);
@@ -137,6 +145,7 @@ public abstract class AbstractGroup impl
*
* @param role The role to check
*/
+ @Override
public abstract boolean isInRole(Role role);
@@ -145,12 +154,14 @@ public abstract class AbstractGroup impl
*
* @param role The old role
*/
+ @Override
public abstract void removeRole(Role role);
/**
* Remove all {@link Role}s from those assigned to this group.
*/
+ @Override
public abstract void removeRoles();
@@ -160,6 +171,7 @@ public abstract class AbstractGroup impl
/**
* Make the principal name the same as the group name.
*/
+ @Override
public String getName() {
return (getGroupname());
Modified: tomcat/trunk/java/org/apache/catalina/users/AbstractRole.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/AbstractRole.java?rev=1094650&r1=1094649&r2=1094650&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/users/AbstractRole.java (original)
+++ tomcat/trunk/java/org/apache/catalina/users/AbstractRole.java Mon Apr 18
16:59:26 2011
@@ -55,6 +55,7 @@ public abstract class AbstractRole imple
/**
* Return the description of this role.
*/
+ @Override
public String getDescription() {
return (this.description);
@@ -67,6 +68,7 @@ public abstract class AbstractRole imple
*
* @param description The new description
*/
+ @Override
public void setDescription(String description) {
this.description = description;
@@ -78,6 +80,7 @@ public abstract class AbstractRole imple
* Return the role name of this role, which must be unique
* within the scope of a {@link UserDatabase}.
*/
+ @Override
public String getRolename() {
return (this.rolename);
@@ -91,6 +94,7 @@ public abstract class AbstractRole imple
*
* @param rolename The new role name
*/
+ @Override
public void setRolename(String rolename) {
this.rolename = rolename;
@@ -101,6 +105,7 @@ public abstract class AbstractRole imple
/**
* Return the {@link UserDatabase} within which this Role is defined.
*/
+ @Override
public abstract UserDatabase getUserDatabase();
@@ -113,6 +118,7 @@ public abstract class AbstractRole imple
/**
* Make the principal name the same as the role name.
*/
+ @Override
public String getName() {
return (getRolename());
Modified: tomcat/trunk/java/org/apache/catalina/users/AbstractUser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/AbstractUser.java?rev=1094650&r1=1094649&r2=1094650&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/users/AbstractUser.java (original)
+++ tomcat/trunk/java/org/apache/catalina/users/AbstractUser.java Mon Apr 18
16:59:26 2011
@@ -64,6 +64,7 @@ public abstract class AbstractUser imple
/**
* Return the full name of this user.
*/
+ @Override
public String getFullName() {
return (this.fullName);
@@ -76,6 +77,7 @@ public abstract class AbstractUser imple
*
* @param fullName The new full name
*/
+ @Override
public void setFullName(String fullName) {
this.fullName = fullName;
@@ -86,6 +88,7 @@ public abstract class AbstractUser imple
/**
* Return the set of {@link Group}s to which this user belongs.
*/
+ @Override
public abstract Iterator<Group> getGroups();
@@ -94,6 +97,7 @@ public abstract class AbstractUser imple
* identifier of an encoding scheme surrounded by curly braces, such as
* <code>{md5}xxxxx</code>.
*/
+ @Override
public String getPassword() {
return (this.password);
@@ -108,6 +112,7 @@ public abstract class AbstractUser imple
*
* @param password The new logon password
*/
+ @Override
public void setPassword(String password) {
this.password = password;
@@ -118,6 +123,7 @@ public abstract class AbstractUser imple
/**
* Return the set of {@link Role}s assigned specifically to this user.
*/
+ @Override
public abstract Iterator<Role> getRoles();
@@ -125,6 +131,7 @@ public abstract class AbstractUser imple
* Return the logon username of this user, which must be unique
* within the scope of a {@link org.apache.catalina.UserDatabase}.
*/
+ @Override
public String getUsername() {
return (this.username);
@@ -138,6 +145,7 @@ public abstract class AbstractUser imple
*
* @param username The new logon username
*/
+ @Override
public void setUsername(String username) {
this.username = username;
@@ -153,6 +161,7 @@ public abstract class AbstractUser imple
*
* @param group The new group
*/
+ @Override
public abstract void addGroup(Group group);
@@ -161,6 +170,7 @@ public abstract class AbstractUser imple
*
* @param role The new role
*/
+ @Override
public abstract void addRole(Role role);
@@ -169,6 +179,7 @@ public abstract class AbstractUser imple
*
* @param group The group to check
*/
+ @Override
public abstract boolean isInGroup(Group group);
@@ -179,6 +190,7 @@ public abstract class AbstractUser imple
*
* @param role The role to check
*/
+ @Override
public abstract boolean isInRole(Role role);
@@ -187,12 +199,14 @@ public abstract class AbstractUser imple
*
* @param group The old group
*/
+ @Override
public abstract void removeGroup(Group group);
/**
* Remove all {@link Group}s from those this user belongs to.
*/
+ @Override
public abstract void removeGroups();
@@ -201,12 +215,14 @@ public abstract class AbstractUser imple
*
* @param role The old role
*/
+ @Override
public abstract void removeRole(Role role);
/**
* Remove all {@link Role}s from those assigned to this user.
*/
+ @Override
public abstract void removeRoles();
@@ -216,6 +232,7 @@ public abstract class AbstractUser imple
/**
* Make the principal name the same as the group name.
*/
+ @Override
public String getName() {
return (getUsername());
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=1094650&r1=1094649&r2=1094650&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/users/MemoryUser.java (original)
+++ tomcat/trunk/java/org/apache/catalina/users/MemoryUser.java Mon Apr 18
16:59:26 2011
@@ -116,6 +116,7 @@ public class MemoryUser extends Abstract
/**
* Return the {@link UserDatabase} within which this User is defined.
*/
+ @Override
public UserDatabase getUserDatabase() {
return (this.database);
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=1094650&r1=1094649&r2=1094650&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java Mon Apr
18 16:59:26 2011
@@ -152,6 +152,7 @@ public class MemoryUserDatabase implemen
/**
* Return the set of {@link Group}s defined in this user database.
*/
+ @Override
public Iterator<Group> getGroups() {
synchronized (groups) {
@@ -164,6 +165,7 @@ public class MemoryUserDatabase implemen
/**
* Return the unique global identifier of this user database.
*/
+ @Override
public String getId() {
return (this.id);
@@ -220,6 +222,7 @@ public class MemoryUserDatabase implemen
/**
* Return the set of {@link Role}s defined in this user database.
*/
+ @Override
public Iterator<Role> getRoles() {
synchronized (roles) {
@@ -232,6 +235,7 @@ public class MemoryUserDatabase implemen
/**
* Return the set of {@link User}s defined in this user database.
*/
+ @Override
public Iterator<User> getUsers() {
synchronized (users) {
@@ -250,6 +254,7 @@ public class MemoryUserDatabase implemen
*
* @exception Exception if any exception is thrown during closing
*/
+ @Override
public void close() throws Exception {
save();
@@ -270,6 +275,7 @@ public class MemoryUserDatabase implemen
* @param groupname The group name of the new group (must be unique)
* @param description The description of this group
*/
+ @Override
public Group createGroup(String groupname, String description) {
if (groupname == null || groupname.length() == 0) {
@@ -293,6 +299,7 @@ public class MemoryUserDatabase implemen
* @param rolename The role name of the new group (must be unique)
* @param description The description of this group
*/
+ @Override
public Role createRole(String rolename, String description) {
if (rolename == null || rolename.length() == 0) {
@@ -317,6 +324,7 @@ public class MemoryUserDatabase implemen
* @param password The logon password of the new user
* @param fullName The full name of the new user
*/
+ @Override
public User createUser(String username, String password,
String fullName) {
@@ -340,6 +348,7 @@ public class MemoryUserDatabase implemen
*
* @param groupname Name of the group to return
*/
+ @Override
public Group findGroup(String groupname) {
synchronized (groups) {
@@ -355,6 +364,7 @@ public class MemoryUserDatabase implemen
*
* @param rolename Name of the role to return
*/
+ @Override
public Role findRole(String rolename) {
synchronized (roles) {
@@ -370,6 +380,7 @@ public class MemoryUserDatabase implemen
*
* @param username Name of the user to return
*/
+ @Override
public User findUser(String username) {
synchronized (users) {
@@ -384,6 +395,7 @@ public class MemoryUserDatabase implemen
*
* @exception Exception if any exception is thrown during opening
*/
+ @Override
public void open() throws Exception {
synchronized (groups) {
@@ -448,6 +460,7 @@ public class MemoryUserDatabase implemen
*
* @param group The group to be removed
*/
+ @Override
public void removeGroup(Group group) {
synchronized (groups) {
@@ -467,6 +480,7 @@ public class MemoryUserDatabase implemen
*
* @param role The role to be removed
*/
+ @Override
public void removeRole(Role role) {
synchronized (roles) {
@@ -491,6 +505,7 @@ public class MemoryUserDatabase implemen
*
* @param user The user to be removed
*/
+ @Override
public void removeUser(User user) {
synchronized (users) {
@@ -524,6 +539,7 @@ public class MemoryUserDatabase implemen
*
* @exception Exception if any exception is thrown during saving
*/
+ @Override
public void save() throws Exception {
if (getReadonly()) {
@@ -673,6 +689,7 @@ class MemoryGroupCreationFactory impleme
this.database = database;
}
+ @Override
public Object createObject(Attributes attributes) {
String groupname = attributes.getValue("groupname");
if (groupname == null) {
@@ -708,10 +725,12 @@ class MemoryGroupCreationFactory impleme
private Digester digester = null;
+ @Override
public Digester getDigester() {
return (this.digester);
}
+ @Override
public void setDigester(Digester digester) {
this.digester = digester;
}
@@ -728,6 +747,7 @@ class MemoryRoleCreationFactory implemen
this.database = database;
}
+ @Override
public Object createObject(Attributes attributes) {
String rolename = attributes.getValue("rolename");
if (rolename == null) {
@@ -742,10 +762,12 @@ class MemoryRoleCreationFactory implemen
private Digester digester = null;
+ @Override
public Digester getDigester() {
return (this.digester);
}
+ @Override
public void setDigester(Digester digester) {
this.digester = digester;
}
@@ -762,6 +784,7 @@ class MemoryUserCreationFactory implemen
this.database = database;
}
+ @Override
public Object createObject(Attributes attributes) {
String username = attributes.getValue("username");
if (username == null) {
@@ -822,10 +845,12 @@ class MemoryUserCreationFactory implemen
private Digester digester = null;
+ @Override
public Digester getDigester() {
return (this.digester);
}
+ @Override
public void setDigester(Digester digester) {
this.digester = digester;
}
Modified:
tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java?rev=1094650&r1=1094649&r2=1094650&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java
Mon Apr 18 16:59:26 2011
@@ -70,6 +70,7 @@ public class MemoryUserDatabaseFactory i
* @param environment The possibly null environment that is used in
* creating this object
*/
+ @Override
public Object getObjectInstance(Object obj, Name name, Context nameCtx,
Hashtable<?,?> environment)
throws Exception {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
