* tools/gnu/classpath/tools/serialver/SerialVer.java (addFileURL):

	Genericized.
	(getClassLoader): Likewise.
	(classes): Likewise.
	* tools/gnu/classpath/tools/native2ascii/Native2ASCII.java (main):
	Removed unused variable.
	* tools/gnu/classpath/tools/jar/WorkSet.java (allItems): Genericize.
	(initSet): Likewise.
	* tools/gnu/classpath/tools/jar/Main.java (entries): Genericize.
	* tools/gnu/classpath/tools/jar/Indexer.java (indexJarFile):
	Genericized.
	* tools/gnu/classpath/tools/jar/Creator.java (writeFile): Close the
	input stream.
	(writtenItems): Genericize.
	(addEntries): Likewise.
	(getAllEntries): Likewise.

6 files changed, 14 insertions, 15 deletions

diff --git a/tools/gnu/classpath/tools/jar/Creator.java b/tools/gnu/classpath/tools/jar/Creator.java
index 294549327..c1660b725 100644
--- a/tools/gnu/classpath/tools/jar/Creator.java
+++ b/tools/gnu/classpath/tools/jar/Creator.java
@@ -60,7 +60,7 @@ public class Creator
     extends Action
 {
   JarOutputStream outputStream;
-  HashSet writtenItems = new HashSet();
+  HashSet<String> writtenItems = new HashSet<String>();
   // The manifest to use, or null if we don't want a manifest.
   Manifest manifest;
 
@@ -150,13 +150,13 @@ public class Creator
       }
     else
       {
-	InputStream inputStream = new FileInputStream(file);
-	writeFile(isDirectory, inputStream, filename, verbose);
-	inputStream.close();
+        InputStream inputStream = new FileInputStream(file);
+        writeFile(isDirectory, inputStream, filename, verbose);
+        inputStream.close();
       }
   }
 
-  private void addEntries(ArrayList result, Entry entry)
+  private void addEntries(ArrayList<Entry> result, Entry entry)
   {
     if (entry.file.isDirectory())
       {
@@ -176,10 +176,10 @@ public class Creator
       result.add(entry);
   }
 
-  private ArrayList getAllEntries(Main parameters)
+  private ArrayList<Entry> getAllEntries(Main parameters)
   {
     Iterator it = parameters.entries.iterator();
-    ArrayList allEntries = new ArrayList();
+    ArrayList<Entry> allEntries = new ArrayList<Entry>();
     while (it.hasNext())
       {
         Entry entry = (Entry) it.next();
diff --git a/tools/gnu/classpath/tools/jar/Indexer.java b/tools/gnu/classpath/tools/jar/Indexer.java
index aae25f821..401c6fb6a 100644
--- a/tools/gnu/classpath/tools/jar/Indexer.java
+++ b/tools/gnu/classpath/tools/jar/Indexer.java
@@ -72,7 +72,7 @@ public class Indexer
     // Index the files in this jar.
     // The results look a little better if we keep them
     // in insertion order.
-    LinkedHashSet entries = new LinkedHashSet();
+    LinkedHashSet<String> entries = new LinkedHashSet<String>();
     Enumeration e = jf.entries();
     while (e.hasMoreElements())
       {
diff --git a/tools/gnu/classpath/tools/jar/Main.java b/tools/gnu/classpath/tools/jar/Main.java
index 34f637204..533258777 100644
--- a/tools/gnu/classpath/tools/jar/Main.java
+++ b/tools/gnu/classpath/tools/jar/Main.java
@@ -78,7 +78,7 @@ public class Main
   File manifestFile;
 
   /** A list of Entry objects, each describing a file to write.  */
-  ArrayList entries = new ArrayList();
+  ArrayList<Entry> entries = new ArrayList<Entry>();
 
   /** Used only while parsing, holds the first argument for -C.  */
   String changedDirectory;
diff --git a/tools/gnu/classpath/tools/jar/WorkSet.java b/tools/gnu/classpath/tools/jar/WorkSet.java
index ff0b48786..c085516c6 100644
--- a/tools/gnu/classpath/tools/jar/WorkSet.java
+++ b/tools/gnu/classpath/tools/jar/WorkSet.java
@@ -44,13 +44,13 @@ import java.util.Iterator;
 
 public class WorkSet
 {
-  private HashSet allItems;
+  private HashSet<String> allItems;
 
   private void initSet(ArrayList entries)
   {
     if (entries == null || entries.isEmpty())
       return;
-    allItems = new HashSet();
+    allItems = new HashSet<String>();
     Iterator it = entries.iterator();
     while (it.hasNext())
       {
diff --git a/tools/gnu/classpath/tools/native2ascii/Native2ASCII.java b/tools/gnu/classpath/tools/native2ascii/Native2ASCII.java
index 622de6056..dfa364c4e 100644
--- a/tools/gnu/classpath/tools/native2ascii/Native2ASCII.java
+++ b/tools/gnu/classpath/tools/native2ascii/Native2ASCII.java
@@ -180,6 +180,5 @@ public class Native2ASCII
   public static void main(String[] args)
   {
     new Native2ASCII().run(args);
-    String encoding = System.getProperty("file.encoding"); //$NON-NLS-1$
   }
 }
diff --git a/tools/gnu/classpath/tools/serialver/SerialVer.java b/tools/gnu/classpath/tools/serialver/SerialVer.java
index 21e0a805a..a8c526c82 100644
--- a/tools/gnu/classpath/tools/serialver/SerialVer.java
+++ b/tools/gnu/classpath/tools/serialver/SerialVer.java
@@ -45,12 +45,12 @@ import java.util.StringTokenizer;
 public class SerialVer
 {
   // List of classes to load.
-  ArrayList classes = new ArrayList();
+  ArrayList<String> classes = new ArrayList<String>();
   // The class path to use.
   String classpath;
 
   // FIXME: taken from ClassLoader, should share it.
-  private static void addFileURL(ArrayList list, String file)
+  private static void addFileURL(ArrayList<URL> list, String file)
   {
     try
       {
@@ -72,7 +72,7 @@ public class SerialVer
       {
         StringTokenizer tok = new StringTokenizer(classpath,
                                                   File.pathSeparator, true);
-        ArrayList list = new ArrayList();
+        ArrayList<URL> list = new ArrayList<URL>();
         while (tok.hasMoreTokens())
           {
             String s = tok.nextToken();