Generics changes for o.a.c.ant

Fix various Eclipse warnings (use of deprecated code etc)

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@729655 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/ant/AbstractCatalinaTask.java b/java/org/apache/catalina/ant/AbstractCatalinaTask.java
index fa579c1..c44bf6c 100644 (file)
--- a/java/org/apache/catalina/ant/AbstractCatalinaTask.java
+++ b/java/org/apache/catalina/ant/AbstractCatalinaTask.java
@@ -269,7 +269,7 @@ public abstract class AbstractCatalinaTask extends BaseRedirectorHelperTask {
                 try {
                     reader.close();
                 } catch (Throwable u) {
-                    ;
+                    // Ignore
                 }
                 reader = null;
             }
@@ -277,7 +277,7 @@ public abstract class AbstractCatalinaTask extends BaseRedirectorHelperTask {
                 try {
                     istream.close();
                 } catch (Throwable u) {
-                    ;
+                    // Ignore
                 }
                 istream = null;
             }

diff --git a/java/org/apache/catalina/ant/ValidatorTask.java b/java/org/apache/catalina/ant/ValidatorTask.java
index ae9a3ba..c8e6563 100644 (file)
--- a/java/org/apache/catalina/ant/ValidatorTask.java
+++ b/java/org/apache/catalina/ant/ValidatorTask.java
@@ -94,7 +94,8 @@ public class ValidatorTask extends BaseRedirectorHelperTask {
             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");

diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java b/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
index 78861a0..c773980 100644 (file)
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
@@ -63,7 +63,7 @@ public class JMXAccessorCreateTask extends JMXAccessorTask {
 
     private String className;
     private String classLoader;
-    private List args=new ArrayList();
+    private List<Arg> args=new ArrayList<Arg>();
 
     // ----------------------------------------------------- Instance Info
 
@@ -121,13 +121,13 @@ public class JMXAccessorCreateTask extends JMXAccessorTask {
     /**
      * @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 @@ public class JMXAccessorCreateTask extends JMXAccessorTask {
            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();

diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java b/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java
index 277753d..f5fa9a0 100644 (file)
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java
@@ -97,7 +97,7 @@ public class JMXAccessorInvokeTask extends JMXAccessorTask {
     // ----------------------------------------------------- Instance Variables
 
     private String operation ;
-    private List args=new ArrayList();
+    private List<Arg> args=new ArrayList<Arg>();
 
     // ----------------------------------------------------- Instance Info
 
@@ -139,13 +139,13 @@ public class JMXAccessorInvokeTask extends JMXAccessorTask {
     /**
      * @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 @@ public class JMXAccessorInvokeTask extends JMXAccessorTask {
             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();

diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java b/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
index 1c292bb..b6666d5 100644 (file)
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
@@ -132,7 +132,7 @@ public class JMXAccessorQueryTask extends JMXAccessorTask {
     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 @@ public class JMXAccessorQueryTask extends JMXAccessorTask {
         }
 
         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());

diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java b/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
index a6d560d..3f118a7 100644 (file)
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
@@ -374,12 +374,12 @@ public class JMXAccessorTask extends BaseRedirectorHelperTask {
         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 @@ public class JMXAccessorTask extends BaseRedirectorHelperTask {
         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 @@ public class JMXAccessorTask extends BaseRedirectorHelperTask {
             }
         } 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");