You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2008/12/26 21:20:39 UTC
svn commit: r729531 - /tomcat/trunk/java/org/apache/catalina/mbeans/
Author: markt
Date: Fri Dec 26 12:20:38 2008
New Revision: 729531
URL: http://svn.apache.org/viewvc?rev=729531&view=rev
Log:
Generics changes for o.a.c.mbeans
Remove some unused code identified by Eclipse
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/ConnectorMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
tomcat/trunk/java/org/apache/catalina/mbeans/GroupMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
tomcat/trunk/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/NamingResourcesMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/StandardContextMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/StandardEngineMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/StandardServerMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/StandardServiceMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/UserMBean.java
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/ConnectorMBean.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/ConnectorMBean.java?rev=729531&r1=729530&r2=729531&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/ConnectorMBean.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/ConnectorMBean.java Fri Dec 26 12:20:38 2008
@@ -78,7 +78,6 @@
public Object getAttribute(String name) throws AttributeNotFoundException,
MBeanException, ReflectionException {
- Object attribute = null;
// Validate the input parameters
if (name == null)
throw new RuntimeOperationsException(new IllegalArgumentException(
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java?rev=729531&r1=729530&r2=729531&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java Fri Dec 26 12:20:38 2008
@@ -132,9 +132,9 @@
}
try {
- NamingEnumeration bindings = context.listBindings("");
+ NamingEnumeration<Binding> bindings = context.listBindings("");
while (bindings.hasMore()) {
- Binding binding = (Binding) bindings.next();
+ Binding binding = bindings.next();
String name = prefix + binding.getName();
Object value = context.lookup(binding.getName());
if (log.isDebugEnabled()) {
@@ -182,9 +182,9 @@
}
// Create the MBeans for each defined Role
- Iterator roles = database.getRoles();
+ Iterator<Role> roles = database.getRoles();
while (roles.hasNext()) {
- Role role = (Role) roles.next();
+ Role role = roles.next();
if (log.isDebugEnabled()) {
log.debug(" Creating Role MBean for role " + role);
}
@@ -195,9 +195,9 @@
}
// Create the MBeans for each defined Group
- Iterator groups = database.getGroups();
+ Iterator<Group> groups = database.getGroups();
while (groups.hasNext()) {
- Group group = (Group) groups.next();
+ Group group = groups.next();
if (log.isDebugEnabled()) {
log.debug(" Creating Group MBean for group " + group);
}
@@ -208,9 +208,9 @@
}
// Create the MBeans for each defined User
- Iterator users = database.getUsers();
+ Iterator<User> users = database.getUsers();
while (users.hasNext()) {
- User user = (User) users.next();
+ User user = users.next();
if (log.isDebugEnabled()) {
log.debug(" Creating User MBean for user " + user);
}
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/GroupMBean.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/GroupMBean.java?rev=729531&r1=729530&r2=729531&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/GroupMBean.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/GroupMBean.java Fri Dec 26 12:20:38 2008
@@ -96,12 +96,12 @@
public String[] getRoles() {
Group group = (Group) this.resource;
- ArrayList results = new ArrayList();
- Iterator roles = group.getRoles();
+ ArrayList<String> results = new ArrayList<String>();
+ Iterator<Role> roles = group.getRoles();
while (roles.hasNext()) {
Role role = null;
try {
- role = (Role) roles.next();
+ role = roles.next();
ObjectName oname =
MBeanUtils.createObjectName(managed.getDomain(), role);
results.add(oname.toString());
@@ -112,7 +112,7 @@
throw iae;
}
}
- return ((String[]) results.toArray(new String[results.size()]));
+ return results.toArray(new String[results.size()]);
}
@@ -123,12 +123,12 @@
public String[] getUsers() {
Group group = (Group) this.resource;
- ArrayList results = new ArrayList();
- Iterator users = group.getUsers();
+ ArrayList<String> results = new ArrayList<String>();
+ Iterator<User> users = group.getUsers();
while (users.hasNext()) {
User user = null;
try {
- user = (User) users.next();
+ user = users.next();
ObjectName oname =
MBeanUtils.createObjectName(managed.getDomain(), user);
results.add(oname.toString());
@@ -139,7 +139,7 @@
throw iae;
}
}
- return ((String[]) results.toArray(new String[results.size()]));
+ return results.toArray(new String[results.size()]);
}
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java?rev=729531&r1=729530&r2=729531&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java Fri Dec 26 12:20:38 2008
@@ -54,7 +54,6 @@
import org.apache.catalina.valves.RequestDumperValve;
import org.apache.catalina.valves.ValveBase;
import org.apache.tomcat.util.modeler.BaseModelMBean;
-import org.apache.tomcat.util.modeler.Registry;
/**
@@ -75,11 +74,6 @@
*/
private static MBeanServer mserver = MBeanUtils.createServer();
- /**
- * The configuration information registry for our managed beans.
- */
- private static Registry registry = MBeanUtils.createRegistry();
-
// ----------------------------------------------------------- Constructors
@@ -661,7 +655,7 @@
* @exception Exception if an MBean cannot be created or registered
*/
- public Vector createStandardEngineService(String parent,
+ public Vector<ObjectName> createStandardEngineService(String parent,
String engineName, String defaultHost, String serviceName)
throws Exception {
@@ -677,7 +671,7 @@
// Add the new instance to its parent component
Server server = ServerFactory.getServer();
server.addService(service);
- Vector onames = new Vector();
+ Vector<ObjectName> onames = new Vector<ObjectName>();
// FIXME service & engine.getObjectName
//ObjectName oname = engine.getObjectName();
ObjectName oname =
@@ -873,12 +867,11 @@
// Acquire a reference to the component to be removed
ObjectName oname = new ObjectName(name);
- Server server = ServerFactory.getServer();
Service service = getService(oname);
String port = oname.getKeyProperty("port");
//String address = oname.getKeyProperty("address");
- Connector conns[] = (Connector[]) service.findConnectors();
+ Connector conns[] = service.findConnectors();
for (int i = 0; i < conns.length; i++) {
String connAddress = String.valueOf(conns[i].getProperty("address"));
@@ -1063,8 +1056,7 @@
// Acquire a reference to the component to be removed
ObjectName oname = new ObjectName(name);
ContainerBase container = getParentContainerFromChild(oname);
- String sequence = oname.getKeyProperty("seq");
- Valve[] valves = (Valve[])container.getValves();
+ Valve[] valves = container.getValves();
for (int i = 0; i < valves.length; i++) {
ObjectName voname = ((ValveBase) valves[i]).getObjectName();
if (voname.equals(oname)) {
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java?rev=729531&r1=729530&r2=729531&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java Fri Dec 26 12:20:38 2008
@@ -740,10 +740,6 @@
IntrospectionUtils.getProperty(connector, "address");
Integer port = (Integer)
IntrospectionUtils.getProperty(connector, "port");
- Service service = connector.getService();
- String serviceName = null;
- if (service != null)
- serviceName = service.getName();
StringBuffer sb = new StringBuffer(domain);
sb.append(":type=Connector");
sb.append(",port=" + port);
@@ -779,7 +775,6 @@
ObjectName name = null;
Host host = (Host)context.getParent();
- Service service = ((Engine)host.getParent()).getService();
String path = context.getPath();
if (path.length() < 1)
path = "/";
@@ -817,8 +812,6 @@
if (path.length() < 1)
path = "/";
Host host = (Host) ((Context)container).getParent();
- Engine engine = (Engine) host.getParent();
- Service service = engine.getService();
name = new ObjectName(domain + ":type=Environment" +
",resourcetype=Context,path=" + path +
",host=" + host.getName() +
@@ -855,8 +848,6 @@
if (path.length() < 1)
path = "/";
Host host = (Host) ((Context)container).getParent();
- Engine engine = (Engine) host.getParent();
- Service service = engine.getService();
name = new ObjectName(domain + ":type=Resource" +
",resourcetype=Context,path=" + path +
",host=" + host.getName() +
@@ -896,8 +887,6 @@
if (path.length() < 1)
path = "/";
Host host = (Host) ((Context)container).getParent();
- Engine engine = (Engine) host.getParent();
- Service service = engine.getService();
name = new ObjectName(domain + ":type=ResourceLink" +
",resourcetype=Context,path=" + path +
",host=" + host.getName() +
@@ -966,8 +955,6 @@
throws MalformedObjectNameException {
ObjectName name = null;
- Engine engine = (Engine)host.getParent();
- Service service = engine.getService();
name = new ObjectName(domain + ":type=Host,host=" +
host.getName());
return (name);
@@ -992,11 +979,8 @@
Container container = loader.getContainer();
if (container instanceof Engine) {
- Service service = ((Engine)container).getService();
name = new ObjectName(domain + ":type=Loader");
} else if (container instanceof Host) {
- Engine engine = (Engine) container.getParent();
- Service service = engine.getService();
name = new ObjectName(domain + ":type=Loader,host=" +
container.getName());
} else if (container instanceof Context) {
@@ -1005,8 +989,6 @@
path = "/";
}
Host host = (Host) container.getParent();
- Engine engine = (Engine) host.getParent();
- Service service = engine.getService();
name = new ObjectName(domain + ":type=Loader,path=" + path +
",host=" + host.getName());
}
@@ -1033,11 +1015,8 @@
Container container = manager.getContainer();
if (container instanceof Engine) {
- Service service = ((Engine)container).getService();
name = new ObjectName(domain + ":type=Manager");
} else if (container instanceof Host) {
- Engine engine = (Engine) container.getParent();
- Service service = engine.getService();
name = new ObjectName(domain + ":type=Manager,host=" +
container.getName());
} else if (container instanceof Context) {
@@ -1046,8 +1025,6 @@
path = "/";
}
Host host = (Host) container.getParent();
- Engine engine = (Engine) host.getParent();
- Service service = engine.getService();
name = new ObjectName(domain + ":type=Manager,path=" + path +
",host=" + host.getName());
}
@@ -1080,8 +1057,6 @@
if (path.length() < 1)
path = "/";
Host host = (Host) ((Context)container).getParent();
- Engine engine = (Engine) host.getParent();
- Service service = engine.getService();
name = new ObjectName(domain + ":type=NamingResources" +
",resourcetype=Context,path=" + path +
",host=" + host.getName());
@@ -1129,11 +1104,8 @@
Container container = realm.getContainer();
if (container instanceof Engine) {
- Service service = ((Engine)container).getService();
name = new ObjectName(domain + ":type=Realm");
} else if (container instanceof Host) {
- Engine engine = (Engine) container.getParent();
- Service service = engine.getService();
name = new ObjectName(domain + ":type=Realm,host=" +
container.getName());
} else if (container instanceof Context) {
@@ -1142,8 +1114,6 @@
path = "/";
}
Host host = (Host) container.getParent();
- Engine engine = (Engine) host.getParent();
- Service service = engine.getService();
name = new ObjectName(domain + ":type=Realm,path=" + path +
",host=" + host.getName());
}
@@ -1292,7 +1262,6 @@
valve);
}
if (container instanceof Engine) {
- Service service = ((Engine)container).getService();
String local="";
int seq = getSeq(local);
String ext="";
@@ -1302,7 +1271,6 @@
name = new ObjectName(domain + ":type=Valve,name=" + className +
ext + local );
} else if (container instanceof Host) {
- Service service = ((Engine)container.getParent()).getService();
String local=",host=" +container.getName();
int seq = getSeq(local);
String ext="";
@@ -1317,7 +1285,6 @@
path = "/";
}
Host host = (Host) container.getParent();
- Service service = ((Engine) host.getParent()).getService();
String local=",path=" + path + ",host=" +
host.getName();
int seq = getSeq(local);
@@ -1333,9 +1300,9 @@
}
- static Hashtable seq=new Hashtable();
+ static Hashtable<String,int[]> seq = new Hashtable<String,int[]>();
static int getSeq( String key ) {
- int i[]=(int [])seq.get( key );
+ int i[]=seq.get( key );
if (i == null ) {
i=new int[1];
i[0]=0;
@@ -1862,7 +1829,7 @@
try {
((Contained)valve).setContainer(null);
} catch (Throwable t) {
- ;
+ // Ignore
}
if( mserver.isRegistered(oname) ) {
mserver.unregisterMBean(oname);
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java?rev=729531&r1=729530&r2=729531&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java Fri Dec 26 12:20:38 2008
@@ -118,13 +118,13 @@
public String[] getGroups() {
UserDatabase database = (UserDatabase) this.resource;
- ArrayList results = new ArrayList();
- Iterator groups = database.getGroups();
+ ArrayList<String> results = new ArrayList<String>();
+ Iterator<Group> groups = database.getGroups();
while (groups.hasNext()) {
- Group group = (Group) groups.next();
+ Group group = groups.next();
results.add(findGroup(group.getGroupname()));
}
- return ((String[]) results.toArray(new String[results.size()]));
+ return results.toArray(new String[results.size()]);
}
@@ -135,13 +135,13 @@
public String[] getRoles() {
UserDatabase database = (UserDatabase) this.resource;
- ArrayList results = new ArrayList();
- Iterator roles = database.getRoles();
+ ArrayList<String> results = new ArrayList<String>();
+ Iterator<Role> roles = database.getRoles();
while (roles.hasNext()) {
- Role role = (Role) roles.next();
+ Role role = roles.next();
results.add(findRole(role.getRolename()));
}
- return ((String[]) results.toArray(new String[results.size()]));
+ return results.toArray(new String[results.size()]);
}
@@ -152,13 +152,13 @@
public String[] getUsers() {
UserDatabase database = (UserDatabase) this.resource;
- ArrayList results = new ArrayList();
- Iterator users = database.getUsers();
+ ArrayList<String> results = new ArrayList<String>();
+ Iterator<User> users = database.getUsers();
while (users.hasNext()) {
- User user = (User) users.next();
+ User user = users.next();
results.add(findUser(user.getUsername()));
}
- return ((String[]) results.toArray(new String[results.size()]));
+ return results.toArray(new String[results.size()]);
}
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/NamingResourcesMBean.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/NamingResourcesMBean.java?rev=729531&r1=729530&r2=729531&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/NamingResourcesMBean.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/NamingResourcesMBean.java Fri Dec 26 12:20:38 2008
@@ -87,7 +87,7 @@
public String[] getEnvironments() {
ContextEnvironment[] envs =
((NamingResources)this.resource).findEnvironments();
- ArrayList results = new ArrayList();
+ ArrayList<String> results = new ArrayList<String>();
for (int i = 0; i < envs.length; i++) {
try {
ObjectName oname =
@@ -100,7 +100,7 @@
throw iae;
}
}
- return ((String[]) results.toArray(new String[results.size()]));
+ return results.toArray(new String[results.size()]);
}
@@ -113,7 +113,7 @@
ContextResource[] resources =
((NamingResources)this.resource).findResources();
- ArrayList results = new ArrayList();
+ ArrayList<String> results = new ArrayList<String>();
for (int i = 0; i < resources.length; i++) {
try {
ObjectName oname =
@@ -126,7 +126,7 @@
throw iae;
}
}
- return ((String[]) results.toArray(new String[results.size()]));
+ return results.toArray(new String[results.size()]);
}
@@ -139,7 +139,7 @@
ContextResourceLink[] resourceLinks =
((NamingResources)this.resource).findResourceLinks();
- ArrayList results = new ArrayList();
+ ArrayList<String> results = new ArrayList<String>();
for (int i = 0; i < resourceLinks.length; i++) {
try {
ObjectName oname =
@@ -152,7 +152,7 @@
throw iae;
}
}
- return ((String[]) results.toArray(new String[results.size()]));
+ return results.toArray(new String[results.size()]);
}
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/StandardContextMBean.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/StandardContextMBean.java?rev=729531&r1=729530&r2=729531&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/StandardContextMBean.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/StandardContextMBean.java Fri Dec 26 12:20:38 2008
@@ -107,7 +107,7 @@
*/
public String[] getEnvironments() {
ContextEnvironment[] envs = getNamingResources().findEnvironments();
- ArrayList results = new ArrayList();
+ ArrayList<String> results = new ArrayList<String>();
for (int i = 0; i < envs.length; i++) {
try {
ObjectName oname =
@@ -120,7 +120,7 @@
throw iae;
}
}
- return ((String[]) results.toArray(new String[results.size()]));
+ return results.toArray(new String[results.size()]);
}
@@ -132,7 +132,7 @@
public String[] getResources() {
ContextResource[] resources = getNamingResources().findResources();
- ArrayList results = new ArrayList();
+ ArrayList<String> results = new ArrayList<String>();
for (int i = 0; i < resources.length; i++) {
try {
ObjectName oname =
@@ -145,7 +145,7 @@
throw iae;
}
}
- return ((String[]) results.toArray(new String[results.size()]));
+ return results.toArray(new String[results.size()]);
}
@@ -157,7 +157,7 @@
public String[] getResourceLinks() {
ContextResourceLink[] links = getNamingResources().findResourceLinks();
- ArrayList results = new ArrayList();
+ ArrayList<String> results = new ArrayList<String>();
for (int i = 0; i < links.length; i++) {
try {
ObjectName oname =
@@ -170,7 +170,7 @@
throw iae;
}
}
- return ((String[]) results.toArray(new String[results.size()]));
+ return results.toArray(new String[results.size()]);
}
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/StandardEngineMBean.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/StandardEngineMBean.java?rev=729531&r1=729530&r2=729531&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/StandardEngineMBean.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/StandardEngineMBean.java Fri Dec 26 12:20:38 2008
@@ -19,7 +19,6 @@
import javax.management.MBeanException;
-import javax.management.MBeanServer;
import javax.management.RuntimeOperationsException;
import org.apache.tomcat.util.modeler.BaseModelMBean;
@@ -35,11 +34,6 @@
public class StandardEngineMBean extends BaseModelMBean {
- /**
- * The <code>MBeanServer</code> for this application.
- */
- private static MBeanServer mserver = MBeanUtils.createServer();
-
// ----------------------------------------------------------- Constructors
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/StandardServerMBean.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/StandardServerMBean.java?rev=729531&r1=729530&r2=729531&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/StandardServerMBean.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/StandardServerMBean.java Fri Dec 26 12:20:38 2008
@@ -20,7 +20,6 @@
import javax.management.InstanceNotFoundException;
import javax.management.MBeanException;
-import javax.management.MBeanServer;
import javax.management.RuntimeOperationsException;
import org.apache.catalina.Server;
import org.apache.catalina.ServerFactory;
@@ -39,15 +38,6 @@
public class StandardServerMBean extends BaseModelMBean {
- // ------------------------------------------------------- Static Variables
-
-
- /**
- * The <code>MBeanServer</code> for this application.
- */
- private static MBeanServer mserver = MBeanUtils.createServer();
-
-
// ----------------------------------------------------------- Constructors
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/StandardServiceMBean.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/StandardServiceMBean.java?rev=729531&r1=729530&r2=729531&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/StandardServiceMBean.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/StandardServiceMBean.java Fri Dec 26 12:20:38 2008
@@ -19,7 +19,6 @@
import javax.management.MBeanException;
-import javax.management.MBeanServer;
import javax.management.RuntimeOperationsException;
import org.apache.tomcat.util.modeler.BaseModelMBean;
@@ -35,11 +34,6 @@
public class StandardServiceMBean extends BaseModelMBean {
- /**
- * The <code>MBeanServer</code> for this application.
- */
- private static MBeanServer mserver = MBeanUtils.createServer();
-
// ----------------------------------------------------------- Constructors
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/UserMBean.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/UserMBean.java?rev=729531&r1=729530&r2=729531&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/UserMBean.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/UserMBean.java Fri Dec 26 12:20:38 2008
@@ -96,12 +96,12 @@
public String[] getGroups() {
User user = (User) this.resource;
- ArrayList results = new ArrayList();
- Iterator groups = user.getGroups();
+ ArrayList<String> results = new ArrayList<String>();
+ Iterator<Group> groups = user.getGroups();
while (groups.hasNext()) {
Group group = null;
try {
- group = (Group) groups.next();
+ group = groups.next();
ObjectName oname =
MBeanUtils.createObjectName(managed.getDomain(), group);
results.add(oname.toString());
@@ -112,7 +112,7 @@
throw iae;
}
}
- return ((String[]) results.toArray(new String[results.size()]));
+ return results.toArray(new String[results.size()]);
}
@@ -123,12 +123,12 @@
public String[] getRoles() {
User user = (User) this.resource;
- ArrayList results = new ArrayList();
- Iterator roles = user.getRoles();
+ ArrayList<String> results = new ArrayList<String>();
+ Iterator<Role> roles = user.getRoles();
while (roles.hasNext()) {
Role role = null;
try {
- role = (Role) roles.next();
+ role = roles.next();
ObjectName oname =
MBeanUtils.createObjectName(managed.getDomain(), role);
results.add(oname.toString());
@@ -139,7 +139,7 @@
throw iae;
}
}
- return ((String[]) results.toArray(new String[results.size()]));
+ return results.toArray(new String[results.size()]);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org