Author: markt
Date: Sat Dec 27 10:47:38 2008
New Revision: 729655
URL: http://svn.apache.org/viewvc?rev=729655&view=rev
Log:
Generics changes for o.a.c.ant
Fix various Eclipse warnings (use of deprecated code etc)
Modified:
tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
Modified: tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java?rev=729655&r1=729654&r2=729655&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java Sat Dec
27 10:47:38 2008
@@ -269,7 +269,7 @@
try {
reader.close();
} catch (Throwable u) {
- ;
+ // Ignore
}
reader = null;
}
@@ -277,7 +277,7 @@
try {
istream.close();
} catch (Throwable u) {
- ;
+ // Ignore
}
istream = null;
}
Modified: tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java?rev=729655&r1=729654&r2=729655&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java Sat Dec 27
10:47:38 2008
@@ -94,7 +94,8 @@
file = file.getCanonicalFile();
InputStream stream =
new BufferedInputStream(new FileInputStream(file));
- InputSource is = new InputSource(file.toURL().toExternalForm());
+ InputSource is =
+ new InputSource(file.toURI().toURL().toExternalForm());
is.setByteStream(stream);
digester.parse(is);
handleOutput("web.xml validated");
Modified:
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java?rev=729655&r1=729654&r2=729655&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
Sat Dec 27 10:47:38 2008
@@ -63,7 +63,7 @@
private String className;
private String classLoader;
- private List args=new ArrayList();
+ private List<Arg> args=new ArrayList<Arg>();
// ----------------------------------------------------- Instance Info
@@ -121,13 +121,13 @@
/**
* @return Returns the args.
*/
- public List getArgs() {
+ public List<Arg> getArgs() {
return args;
}
/**
* @param args The args to set.
*/
- public void setArgs(List args) {
+ public void setArgs(List<Arg> args) {
this.args = args;
}
@@ -170,7 +170,7 @@
argsA = new Object[ args.size()];
sigA = new String[args.size()];
for( int i=0; i<args.size(); i++ ) {
- Arg arg=(Arg)args.get(i);
+ Arg arg=args.get(i);
if( arg.type==null) {
arg.type="java.lang.String";
sigA[i]=arg.getType();
Modified:
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java?rev=729655&r1=729654&r2=729655&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java
Sat Dec 27 10:47:38 2008
@@ -97,7 +97,7 @@
// ----------------------------------------------------- Instance Variables
private String operation ;
- private List args=new ArrayList();
+ private List<Arg> args=new ArrayList<Arg>();
// ----------------------------------------------------- Instance Info
@@ -139,13 +139,13 @@
/**
* @return Returns the args.
*/
- public List getArgs() {
+ public List<Arg> getArgs() {
return args;
}
/**
* @param args The args to set.
*/
- public void setArgs(List args) {
+ public void setArgs(List<Arg> args) {
this.args = args;
}
@@ -185,7 +185,7 @@
Object argsA[]=new Object[ args.size()];
String sigA[]=new String[args.size()];
for( int i=0; i<args.size(); i++ ) {
- Arg arg=(Arg)args.get(i);
+ Arg arg=args.get(i);
if( arg.type==null) {
arg.type="java.lang.String";
sigA[i]=arg.getType();
Modified:
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java?rev=729655&r1=729654&r2=729655&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java Sat
Dec 27 10:47:38 2008
@@ -132,7 +132,7 @@
protected String jmxQuery(MBeanServerConnection jmxServerConnection,
String qry) {
String isError = null;
- Set names = null;
+ Set<ObjectName> names = null;
String resultproperty = getResultproperty();
try {
names = jmxServerConnection.queryNames(new ObjectName(qry), null);
@@ -146,11 +146,11 @@
}
if (resultproperty != null) {
- Iterator it = names.iterator();
+ Iterator<ObjectName> it = names.iterator();
int oindex = 0;
String pname = null;
while (it.hasNext()) {
- ObjectName oname = (ObjectName) it.next();
+ ObjectName oname = it.next();
pname = resultproperty + "." + Integer.toString(oindex) + ".";
oindex++;
setProperty(pname + "Name", oname.toString());
Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java?rev=729655&r1=729654&r2=729655&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java Sat Dec
27 10:47:38 2008
@@ -374,12 +374,12 @@
else
urlForJMX = JMX_SERVICE_PREFIX + host + ":" + port
+ JMX_SERVICE_SUFFIX;
- Map environment = null;
+ Map<String, String[]> environment = null;
if (username != null && password != null) {
String[] credentials = new String[2];
credentials[0] = username;
credentials[1] = password;
- environment = new HashMap();
+ environment = new HashMap<String, String[]>();
environment.put(JMXConnector.CREDENTIALS, credentials);
}
return JMXConnectorFactory.connect(new JMXServiceURL(urlForJMX),
@@ -617,9 +617,9 @@
if (result instanceof CompositeDataSupport) {
CompositeDataSupport data = (CompositeDataSupport) result;
CompositeType compositeType = data.getCompositeType();
- Set keys = compositeType.keySet();
- for (Iterator iter = keys.iterator(); iter.hasNext();) {
- String key = (String) iter.next();
+ Set<String> keys = compositeType.keySet();
+ for (Iterator<String> iter = keys.iterator(); iter.hasNext();) {
+ String key = iter.next();
Object value = data.get(key);
OpenType type = compositeType.getType(key);
if (type instanceof SimpleType) {
@@ -630,9 +630,9 @@
}
} else if (result instanceof TabularDataSupport) {
TabularDataSupport data = (TabularDataSupport) result;
- for (Iterator iter = data.keySet().iterator(); iter.hasNext();) {
+ for (Iterator<Object> iter = data.keySet().iterator();
iter.hasNext();) {
Object key = iter.next();
- for (Iterator iter1 = ((List) key).iterator();
iter1.hasNext();) {
+ for (Iterator<Object> iter1 = ((List<Object>) key).iterator();
iter1.hasNext();) {
Object key1 = iter1.next();
CompositeData valuedata = data.get(new Object[] { key1 });
Object value = valuedata.get("value");
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
