removing Java2 mapping

1 files changed, 21 insertions, 20 deletions

diff --git a/java/src/ant/SliceTask.java b/java/src/ant/SliceTask.java
index a778eb6c13a..e2ed37ea8b6 100644
--- a/java/src/ant/SliceTask.java
+++ b/java/src/ant/SliceTask.java
@@ -96,7 +96,7 @@ public class SliceTask extends org.apache.tools.ant.Task
     public Path
     createIncludePath()
     {
-        if(_includePath == null) 
+        if(_includePath == null)
         {
             _includePath = new Path(getProject());
         }
@@ -114,7 +114,7 @@ public class SliceTask extends org.apache.tools.ant.Task
     {
         if(_includePath == null)
         {
-            _includePath = includePath;  
+            _includePath = includePath;
         }
         else
         {
@@ -129,7 +129,7 @@ public class SliceTask extends org.apache.tools.ant.Task
         _fileSets.add(fileset);
 
         return fileset;
-    }    
+    }
 
     public void
     addConfiguredDefine(SliceDefine define)
@@ -155,7 +155,8 @@ public class SliceTask extends org.apache.tools.ant.Task
     //
     // Read the dependency file.
     //
-    protected java.util.HashMap
+    @SuppressWarnings("unchecked")
+    protected java.util.HashMap<String, SliceDependency>
     readDependencies()
     {
         if(_dependencyFile == null)
@@ -173,7 +174,8 @@ public class SliceTask extends org.apache.tools.ant.Task
         try
         {
             java.io.ObjectInputStream in = new java.io.ObjectInputStream(new java.io.FileInputStream(_dependencyFile));
-            java.util.HashMap dependencies = (java.util.HashMap)in.readObject();
+            java.util.HashMap<String, SliceDependency> dependencies =
+                (java.util.HashMap<String, SliceDependency>)in.readObject();
             in.close();
             return dependencies;
         }
@@ -183,12 +185,12 @@ public class SliceTask extends org.apache.tools.ant.Task
         catch(java.lang.ClassNotFoundException ex)
         {
         }
-        
+
         return new java.util.HashMap();
     }
 
     protected void
-    writeDependencies(java.util.HashMap dependencies)
+    writeDependencies(java.util.HashMap<String, SliceDependency> dependencies)
     {
         try
         {
@@ -206,10 +208,10 @@ public class SliceTask extends org.apache.tools.ant.Task
     // Parse dependencies returned by the slice translator (Makefile
     // dependencies).
     //
-    protected java.util.List
+    protected java.util.List<SliceDependency>
     parseDependencies(String allDependencies)
     {
-        java.util.List dependencies = new java.util.LinkedList();
+        java.util.List<SliceDependency> dependencies = new java.util.LinkedList<SliceDependency>();
         try
         {
             BufferedReader in = new BufferedReader(new StringReader(allDependencies));
@@ -260,7 +262,7 @@ public class SliceTask extends org.apache.tools.ant.Task
                     // spaces are escaped and the initial file may have escaped colons
                     // (e.g., "C\:/Program\ Files/...").
                     //
-                    java.util.ArrayList l = new java.util.ArrayList();
+                    java.util.ArrayList<String> l = new java.util.ArrayList<String>();
                     StringBuilder file = new StringBuilder(128);
                     pos = 0;
                     while(pos < chars.length)
@@ -309,9 +311,8 @@ public class SliceTask extends org.apache.tools.ant.Task
         {
             throw new BuildException("Unable to read dependencies from slice translator: " + ex);
         }
-        
-        return dependencies;
 
+        return dependencies;
     }
 
     protected String
@@ -369,7 +370,7 @@ public class SliceTask extends org.apache.tools.ant.Task
             else if(os.startsWith("Windows"))
             {
                 //
-                // No need to change the PATH environment variable on Windows, the DLLs should be found 
+                // No need to change the PATH environment variable on Windows, the DLLs should be found
                 // in the translator local directory.
                 //
                 //ldLibPathEnv = "PATH";
@@ -461,7 +462,7 @@ public class SliceTask extends org.apache.tools.ant.Task
             {
                 _iceHome = (String)getProject().getProperties().get("ice.home");
             }
-            else 
+            else
             {
                 _iceHome = getEnvironment("ICE_HOME");
             }
@@ -490,7 +491,7 @@ public class SliceTask extends org.apache.tools.ant.Task
             out.writeLong(_timeStamp);
         }
 
-        private void readObject(java.io.ObjectInputStream in) 
+        private void readObject(java.io.ObjectInputStream in)
             throws java.io.IOException, java.lang.ClassNotFoundException
         {
             _dependencies = (String[])in.readObject();
@@ -500,9 +501,9 @@ public class SliceTask extends org.apache.tools.ant.Task
         public boolean
         isUpToDate()
         {
-            for(int i = 0; i < _dependencies.length; ++i)
+            for(String d : _dependencies)
             {
-                File dep = new File(_dependencies[i]);
+                File dep = new File(d);
                 if(!dep.exists() || _timeStamp < dep.lastModified())
                 {
                     return false;
@@ -538,8 +539,8 @@ public class SliceTask extends org.apache.tools.ant.Task
     protected boolean _caseSensitive;
     protected boolean _ice;
     protected Path _includePath;
-    protected java.util.List _fileSets = new java.util.LinkedList();
-    protected java.util.List _defines = new java.util.LinkedList();
-    protected java.util.List _meta = new java.util.LinkedList();
+    protected java.util.List<FileSet> _fileSets = new java.util.LinkedList<FileSet>();
+    protected java.util.List<SliceDefine> _defines = new java.util.LinkedList<SliceDefine>();
+    protected java.util.List<SliceMeta> _meta = new java.util.LinkedList<SliceMeta>();
     private String _iceHome;
 }