changeset 1711:932e9384cfe0

tools -> java 1.4+
author bachmann
date Fri, 18 Mar 2011 04:51:50 +0000
parents 4a2db6ae2125
children 17d97948ff34
files make/tools/src/build/tools/buildmetaindex/BuildMetaIndex.java make/tools/src/build/tools/charsetmapping/CharsetMapping.java make/tools/src/build/tools/charsetmapping/GenerateDBCS.java make/tools/src/build/tools/charsetmapping/GenerateEUC_TW.java make/tools/src/build/tools/charsetmapping/GenerateMapping.java make/tools/src/build/tools/charsetmapping/GenerateSBCS.java make/tools/src/build/tools/compileproperties/CompileProperties.java make/tools/src/build/tools/jarsplit/JarSplit.java make/tools/src/build/tools/javazic/DayOfWeek.java make/tools/src/build/tools/javazic/Gen.java make/tools/src/build/tools/javazic/GenDoc.java make/tools/src/build/tools/javazic/Main.java make/tools/src/build/tools/javazic/Mappings.java make/tools/src/build/tools/javazic/Month.java make/tools/src/build/tools/javazic/Rule.java make/tools/src/build/tools/javazic/RuleDay.java make/tools/src/build/tools/javazic/Simple.java make/tools/src/build/tools/javazic/Time.java make/tools/src/build/tools/javazic/Timezone.java make/tools/src/build/tools/javazic/Zone.java make/tools/src/build/tools/javazic/Zoneinfo.java make/tools/src/build/tools/jdwpgen/AbstractSimpleNode.java make/tools/src/build/tools/jdwpgen/CommandNode.java make/tools/src/build/tools/jdwpgen/ConstantNode.java make/tools/src/build/tools/jdwpgen/ConstantSetNode.java make/tools/src/build/tools/jdwpgen/ErrorNode.java make/tools/src/build/tools/jdwpgen/Node.java make/tools/src/build/tools/jdwpgen/OutNode.java make/tools/src/build/tools/jdwpgen/Parse.java make/tools/src/build/tools/jdwpgen/RepeatNode.java make/tools/src/build/tools/jdwpgen/ReplyNode.java make/tools/src/build/tools/spp/Spp.java make/tools/src/build/tools/stripproperties/StripProperties.java
diffstat 33 files changed, 408 insertions(+), 368 deletions(-) [+]
line wrap: on
line diff
--- a/make/tools/src/build/tools/buildmetaindex/BuildMetaIndex.java	Mon Apr 12 07:09:57 2010 +0000
+++ b/make/tools/src/build/tools/buildmetaindex/BuildMetaIndex.java	Fri Mar 18 04:51:50 2011 +0000
@@ -94,7 +94,7 @@
             for (int i = 2; i < args.length; i++) {
                 String filename = args[i];
                 JarMetaIndex jmi = new JarMetaIndex(filename);
-                HashSet<String> index = jmi.getMetaIndex();
+                HashSet index = jmi.getMetaIndex();
                 if (index == null) {
                     continue;
                 }
@@ -114,7 +114,7 @@
                  */
 
                 out.println(jmi.getJarFileKind().getMarkerChar() + " " + filename);
-                for (Iterator<String> iter = index.iterator(); iter.hasNext(); ) {
+                for (Iterator iter = index.iterator(); iter.hasNext(); ) {
                     out.println(iter.next());
                 }
 
@@ -138,11 +138,11 @@
     }
 }
 
-enum JarFileKind {
+class JarFileKind {
 
-    CLASSONLY ('!'),
-    RESOURCEONLY ('@'),
-    MIXED ('#');
+    public static final JarFileKind CLASSONLY = new JarFileKind('!');
+    public static final JarFileKind RESOURCEONLY = new JarFileKind('@');
+    public static final JarFileKind MIXED = new JarFileKind('#');
 
     private char markerChar;
 
@@ -165,14 +165,14 @@
  */
 class JarMetaIndex {
     private JarFile jar;
-    private volatile HashSet<String> indexSet;
+    private volatile HashSet indexSet;
 
     /*
      * A hashmap contains a mapping from the prefix string to
      * a hashset which contains a set of the second level of prefix string.
      */
-    private HashMap<String, HashSet<String>> knownPrefixMap = new
-        HashMap<String, HashSet<String>>();
+    private HashMap knownPrefixMap = new
+        HashMap();
 
     /*
      * We add maximum 5 second level entries to "sun", "java" and
@@ -185,17 +185,17 @@
 
     JarMetaIndex(String fileName) throws IOException {
         jar = new JarFile(fileName);
-        knownPrefixMap.put("sun", new HashSet<String>());
-        knownPrefixMap.put("java", new HashSet<String>());
-        knownPrefixMap.put("javax", new HashSet<String>());
+        knownPrefixMap.put("sun", new HashSet());
+        knownPrefixMap.put("java", new HashSet());
+        knownPrefixMap.put("javax", new HashSet());
     }
 
     /* Returns a HashSet contains the meta index string. */
-    HashSet<String> getMetaIndex() {
+    HashSet getMetaIndex() {
         if (indexSet == null) {
             synchronized(this) {
                 if (indexSet == null) {
-                    indexSet = new HashSet<String>();
+                    indexSet = new HashSet();
                     Enumeration entries = jar.entries();
                     boolean containsOnlyClass = true;
                     boolean containsOnlyResource = true;
@@ -306,7 +306,7 @@
         }
 
         String firstPkgElement = name.substring(0, firstSlashIndex);
-        HashSet<String> pkgSet = knownPrefixMap.get(firstPkgElement);
+        HashSet pkgSet = (HashSet)knownPrefixMap.get(firstPkgElement);
 
         /* The name does not starts with "sun", "java" or "javax". */
         if (pkgSet == null) {
@@ -338,10 +338,10 @@
         /* Iterate through the hash map, add the second level package names
          * to the indexSet if has any.
          */
-        for (Iterator<String> keysIterator = knownPrefixMap.keySet().iterator();
+        for (Iterator keysIterator = knownPrefixMap.keySet().iterator();
              keysIterator.hasNext();) {
-            String key = keysIterator.next();
-            HashSet<String> pkgSetStartsWithKey = knownPrefixMap.get(key);
+            String key = (String)keysIterator.next();
+            HashSet pkgSetStartsWithKey = (HashSet)knownPrefixMap.get(key);
             int setSize = pkgSetStartsWithKey.size();
 
             if (setSize == 0) {
@@ -353,7 +353,7 @@
                 /* If the set contains less than MAX_PKGS_WITH_KNOWN_PREFIX, add
                  * them to the indexSet of the MetaIndex object.
                  */
-                for (Iterator<String> secondPkgElements = pkgSetStartsWithKey.iterator();
+                for (Iterator secondPkgElements = pkgSetStartsWithKey.iterator();
                      secondPkgElements.hasNext();) {
                     indexSet.add(key + "/" + secondPkgElements.next());
                 }
--- a/make/tools/src/build/tools/charsetmapping/CharsetMapping.java	Mon Apr 12 07:09:57 2010 +0000
+++ b/make/tools/src/build/tools/charsetmapping/CharsetMapping.java	Fri Mar 18 04:51:50 2011 +0000
@@ -51,9 +51,11 @@
         }
     }
 
-    static Comparator<Entry> comparatorCP =
-        new Comparator<Entry>() {
-            public int compare(Entry m1, Entry m2) {
+    static Comparator comparatorCP =
+        new Comparator() {
+            public int compare(Object o1, Object o2) {
+            	Entry m1 = (Entry) o1;
+            	Entry m2 = (Entry) o2;
                 return m1.cp - m2.cp;
             }
             public boolean equals(Object obj) {
--- a/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java	Mon Apr 12 07:09:57 2010 +0000
+++ b/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java	Fri Mar 18 04:51:50 2011 +0000
@@ -31,7 +31,6 @@
 import java.util.Formatter;
 import java.util.regex.*;
 import java.nio.charset.*;
-import static build.tools.charsetmapping.CharsetMapping.*;
 
 public class GenerateDBCS {
     // pattern used by this class to read in mapping table
@@ -57,12 +56,13 @@
             else
                 type = "_" + type;
             String pkgName  = fields[4];
-            boolean isASCII = Boolean.valueOf(fields[5]);
+            boolean isASCII = Boolean.valueOf(fields[5]).booleanValue();
             int    b1Min = toInteger(fields[6]);
             int    b1Max = toInteger(fields[7]);
             int    b2Min    = toInteger(fields[8]);
             int    b2Max    = toInteger(fields[9]);
-            System.out.printf("%s,%s,%s,%b,%s%n", clzName, csName, hisName, isASCII, pkgName);
+            System.out.printf("%s,%s,%s,%b,%s%n", 
+                    new Object[] { clzName, csName, hisName, Boolean.valueOf(isASCII), pkgName });
             genClass(args[0], args[1], "DoubleByte-X.java",
                     clzName, csName, hisName, pkgName,
                     isASCII, type,
@@ -72,9 +72,9 @@
 
     private static int toInteger(String s) {
         if (s.startsWith("0x") || s.startsWith("0X"))
-            return Integer.valueOf(s.substring(2), 16);
+            return Integer.valueOf(s.substring(2), 16).intValue();
         else
-            return Integer.valueOf(s);
+            return Integer.valueOf(s).intValue();
     }
 
     private static void outString(Formatter out,
@@ -82,36 +82,36 @@
                                   String closure)
     {
         while (off < end) {
-            out.format("        \"");
+            out.format("        \"", new Object[] { });
             for (int j = 0; j < 8; j++) {
                 if (off == end)
                     break;
                 char c = cc[off++];
                 switch (c) {
                 case '\b':
-                    out.format("\\b"); break;
+                    out.format("\\b", new Object[] { }); break;
                 case '\t':
-                    out.format("\\t"); break;
+                    out.format("\\t", new Object[] { }); break;
                 case '\n':
-                    out.format("\\n"); break;
+                    out.format("\\n", new Object[] { }); break;
                 case '\f':
-                    out.format("\\f"); break;
+                    out.format("\\f", new Object[] { }); break;
                 case '\r':
-                    out.format("\\r"); break;
+                    out.format("\\r", new Object[] { }); break;
                 case '\"':
-                    out.format("\\\""); break;
+                    out.format("\\\"", new Object[] { }); break;
                 case '\'':
-                    out.format("\\'"); break;
+                    out.format("\\'", new Object[] { }); break;
                 case '\\':
-                    out.format("\\\\"); break;
+                    out.format("\\\\", new Object[] { }); break;
                 default:
-                    out.format("\\u%04X", c & 0xffff);
+                    out.format("\\u%04X", new Object[] { Integer.valueOf(c & 0xffff) });
                 }
             }
             if (off == end)
-                out.format("\" %s%n", closure);
+                out.format("\" %s%n", new Object[] { closure });
             else
-                out.format("\" + %n");
+                out.format("\" + %n", new Object[] { } );
         }
     }
 
@@ -149,43 +149,43 @@
         char[] c2bIndex = new char[0x100];
         int c2bOff = 0x100;    // first 0x100 for unmappable segs
 
-        Arrays.fill(db, UNMAPPABLE_DECODING);
-        Arrays.fill(c2bIndex, UNMAPPABLE_DECODING);
+        Arrays.fill(db, CharsetMapping.UNMAPPABLE_DECODING);
+        Arrays.fill(c2bIndex, CharsetMapping.UNMAPPABLE_DECODING);
 
         char[] b2cIndex = new char[0x100];
-        Arrays.fill(b2cIndex, UNMAPPABLE_DECODING);
+        Arrays.fill(b2cIndex, CharsetMapping.UNMAPPABLE_DECODING);
 
         // (1)read in .map to parse all b->c entries
         FileInputStream in = new FileInputStream(new File(srcDir, clzName + ".map"));
-        Parser p = new Parser(in, mPattern);
-        Entry  e = null;
+        CharsetMapping.Parser p = new CharsetMapping.Parser(in, mPattern);
+        CharsetMapping.Entry  e = null;
         while ((e = p.next()) != null) {
             db[e.bs] = (char)e.cp;
 
             if (e.bs > 0x100 &&    // db
-                b2cIndex[e.bs>>8] == UNMAPPABLE_DECODING) {
+                b2cIndex[e.bs>>8] == CharsetMapping.UNMAPPABLE_DECODING) {
                 b2cIndex[e.bs>>8] = 1;
             }
 
-            if (c2bIndex[e.cp>>8] == UNMAPPABLE_DECODING) {
+            if (c2bIndex[e.cp>>8] == CharsetMapping.UNMAPPABLE_DECODING) {
                 c2bOff += 0x100;
                 c2bIndex[e.cp>>8] = 1;
             }
         }
         Formatter fm = new Formatter(b2cSB);
-        fm.format("%n    static final String b2cSBStr =%n");
+        fm.format("%n    static final String b2cSBStr =%n", new Object[] { });
         outString(fm, db, 0x00, 0x100,  ";");
 
-        fm.format("%n        static final String[] b2cStr = {%n");
+        fm.format("%n        static final String[] b2cStr = {%n", new Object[] { });
         for (int i = 0; i < 0x100; i++) {
-            if (b2cIndex[i] == UNMAPPABLE_DECODING) {
-                fm.format("            null,%n");  //unmappable segments
+            if (b2cIndex[i] == CharsetMapping.UNMAPPABLE_DECODING) {
+                fm.format("            null,%n", new Object[] { });  //unmappable segments
             } else {
                 outString(fm, db, i, b2Min, b2Max, ",");
             }
         }
 
-        fm.format("        };%n");
+        fm.format("        };%n", new Object[] { });
         fm.close();
 
         // (2)now parse the .nr file which includes "b->c" non-roundtrip entries
@@ -193,7 +193,7 @@
         if (f.exists()) {
             StringBuilder sb = new StringBuilder();
             in = new FileInputStream(f);
-            p = new Parser(in, mPattern);
+            p = new CharsetMapping.Parser(in, mPattern);
             e = null;
             while ((e = p.next()) != null) {
                 // A <b,c> pair
@@ -202,7 +202,7 @@
             }
             char[] nr = sb.toString().toCharArray();
             fm = new Formatter(b2cNRSB);
-            fm.format("String b2cNR =%n");
+            fm.format("String b2cNR =%n", new Object[] { });
             outString(fm, nr, 0, nr.length,  ";");
             fm.close();
         } else {
@@ -214,11 +214,11 @@
         if (f.exists()) {
             StringBuilder sb = new StringBuilder();
             in = new FileInputStream(f);
-            p = new Parser(in, mPattern);
+            p = new CharsetMapping.Parser(in, mPattern);
             e = null;
             while ((e = p.next()) != null) {
                 // A <b,c> pair
-                if (c2bIndex[e.cp>>8] == UNMAPPABLE_DECODING) {
+                if (c2bIndex[e.cp>>8] == CharsetMapping.UNMAPPABLE_DECODING) {
                     c2bOff += 0x100;
                     c2bIndex[e.cp>>8] = 1;
                 }
@@ -227,7 +227,7 @@
             }
             char[] nr = sb.toString().toCharArray();
             fm = new Formatter(c2bNRSB);
-            fm.format("String c2bNR =%n");
+            fm.format("String c2bNR =%n", new Object[] { });
             outString(fm, nr, 0, nr.length,  ";");
             fm.close();
         } else {
--- a/make/tools/src/build/tools/charsetmapping/GenerateEUC_TW.java	Mon Apr 12 07:09:57 2010 +0000
+++ b/make/tools/src/build/tools/charsetmapping/GenerateEUC_TW.java	Fri Mar 18 04:51:50 2011 +0000
@@ -31,7 +31,6 @@
 import java.util.Formatter;
 import java.util.regex.*;
 import java.nio.charset.*;
-import static build.tools.charsetmapping.CharsetMapping.*;
 
 public class GenerateEUC_TW {
 
@@ -72,23 +71,23 @@
     private static void toChar(Formatter out, String fmt, char c) {
         switch (c) {
         case '\b':
-            out.format("\\b"); break;
+            out.format("\\b", new Object[] { }); break;
         case '\t':
-            out.format("\\t"); break;
+            out.format("\\t", new Object[] { }); break;
         case '\n':
-            out.format("\\n"); break;
+            out.format("\\n", new Object[] { }); break;
         case '\f':
-            out.format("\\f"); break;
+            out.format("\\f", new Object[] { }); break;
         case '\r':
-            out.format("\\r"); break;
+            out.format("\\r", new Object[] { }); break;
         case '\"':
-            out.format("\\\""); break;
+            out.format("\\\"", new Object[] { }); break;
         case '\'':
-            out.format("\\'"); break;
+            out.format("\\'", new Object[] { }); break;
         case '\\':
-            out.format("\\\\"); break;
+            out.format("\\\\", new Object[] { }); break;
         default:
-            out.format(fmt, c & 0xffff);
+            out.format(fmt, new Object[] { Integer.valueOf(c & 0xffff) });
         }
     }
 
@@ -97,14 +96,14 @@
         int off = 0;
         int end = date.length;
         while (off < end) {
-            out.format("        \"");
+            out.format("        \"", new Object[] { });
             for (int j = 0; j < 8 && off < end; j++) {
                 toChar(out, "\\u%04X", date[off++]);
             }
             if (off == end)
-               out.format("\"%s%n", endStr);
+               out.format("\"%s%n", new Object[] { endStr });
             else
-               out.format("\" +%n");
+               out.format("\" +%n", new Object[] { });
         }
     }
 
@@ -128,11 +127,11 @@
         int off = 0;
         int end = date.length;
         while (off < end) {
-            out.format("        ");
+            out.format("        ", new Object[] { });
             for (int j = 0; j < 8 && off < end; j++) {
                 toChar(out, "'\\u%04X',", date[off++]);
             }
-            out.format("%n");
+            out.format("%n", new Object[] { });
         }
     }
 
@@ -192,49 +191,48 @@
             StringBuilder out = new StringBuilder();
             Formatter fm = new Formatter(out);
 
-            fm.format(copyright);
-            fm.format("%n// -- This file was mechanically generated: Do not edit! -- //%n");
-            fm.format("package sun.nio.cs.ext;%n%n");
-            fm.format("class EUC_TWMapping {%n%n");
+            fm.format(copyright, new Object[] { });
+            fm.format("%n// -- This file was mechanically generated: Do not edit! -- //%n", new Object[] { });
+            fm.format("package sun.nio.cs.ext;%n%n", new Object[] { });
+            fm.format("class EUC_TWMapping {%n%n", new Object[] { });
 
             // boundaries
-            fm.format("    final static int b1Min = 0x%x;%n", b1Min);
-            fm.format("    final static int b1Max = 0x%x;%n", b1Max);
-            fm.format("    final static int b2Min = 0x%x;%n", b2Min);
-            fm.format("    final static int b2Max = 0x%x;%n", b2Max);
+            fm.format("    final static int b1Min = 0x%x;%n", new Object[] { Integer.valueOf(b1Min) });
+            fm.format("    final static int b1Max = 0x%x;%n", new Object[] { Integer.valueOf(b1Max) });
+            fm.format("    final static int b2Min = 0x%x;%n", new Object[] { Integer.valueOf(b2Min) });
+            fm.format("    final static int b2Max = 0x%x;%n", new Object[] { Integer.valueOf(b2Max) });
 
             // b2c tables
-            fm.format("%n    final static String[] b2c = {%n");
+            fm.format("%n    final static String[] b2c = {%n", new Object[] { });
             for (int plane = 0; plane < 8; plane++) {
-                fm.format("        // Plane %d%n", plane);
-                toString(fm, toCharArray(db[plane],
-                                         b1Min, b1Max, b2Min, b2Max),
+                fm.format("        // Plane %d%n", new Object[] { Integer.valueOf(plane) });
+                toString(fm, toCharArray(db[plane], b1Min, b1Max, b2Min, b2Max),
                          ",");
-                fm.format("%n");
+                fm.format("%n", new Object[] { });
             }
-            fm.format("    };%n");
+            fm.format("    };%n", new Object[] { });
 
             // c2bIndex
             fm.format("%n    static final int C2BSIZE = 0x%x;%n",
-                      initC2BIndex(indexC2B));
-            fm.format("%n    static char[] c2bIndex = new char[] {%n");
+                      new Object[] { Integer.valueOf(initC2BIndex(indexC2B)) } );
+            fm.format("%n    static char[] c2bIndex = new char[] {%n", new Object[] { });
             toCharArray(fm, indexC2B);
-            fm.format("    };%n");
+            fm.format("    };%n", new Object[] { });
 
             // c2bIndexSupp
             fm.format("%n    static final int C2BSUPPSIZE = 0x%x;%n",
-                      initC2BIndex(indexC2BSupp));
-            fm.format("%n    static char[] c2bSuppIndex = new char[] {%n");
+                      new Object[] { Integer.valueOf(initC2BIndex(indexC2BSupp)) });
+            fm.format("%n    static char[] c2bSuppIndex = new char[] {%n", new Object[] { });
             toCharArray(fm, indexC2BSupp);
-            fm.format("    };%n");
+            fm.format("    };%n", new Object[] { });
 
             // suppFlags
-            fm.format("%n    static String b2cIsSuppStr =%n");
+            fm.format("%n    static String b2cIsSuppStr =%n", new Object[] { });
             toString(fm, toCharArray(suppFlag,
                                      b1Min, b1Max, b2Min, b2Max),
                      ";");
 
-            fm.format("}");
+            fm.format("}", new Object[] { });
             fm.close();
 
             ps.println(out.toString());
--- a/make/tools/src/build/tools/charsetmapping/GenerateMapping.java	Mon Apr 12 07:09:57 2010 +0000
+++ b/make/tools/src/build/tools/charsetmapping/GenerateMapping.java	Fri Mar 18 04:51:50 2011 +0000
@@ -27,7 +27,6 @@
 
 import java.io.*;
 import java.util.regex.*;
-import static build.tools.charsetmapping.CharsetMapping.*;
 
 public class GenerateMapping {
 
@@ -43,8 +42,8 @@
         int[] sb = new int[0x100];                         // singlebyte
         int[] db = new int[0x10000];                       // doublebyte
         int[] indexC2B = new int[256];
-        Entry[] supp = new Entry[0x10000];
-        Entry[] comp = new Entry[0x100];
+        CharsetMapping.Entry[] supp = new CharsetMapping.Entry[0x10000];
+        CharsetMapping.Entry[] comp = new CharsetMapping.Entry[0x100];
         int suppTotal = 0;
         int compTotal = 0;
 
@@ -57,11 +56,11 @@
 
         //init
         for (int i = 0; i < 0x80; i++) sb[i] = i;
-        for (int i = 0x80; i < 0x100; i++) sb[i] = UNMAPPABLE_DECODING;
-        for (int i = 0; i < 0x10000; i++) db[i] = UNMAPPABLE_DECODING;
+        for (int i = 0x80; i < 0x100; i++) sb[i] = CharsetMapping.UNMAPPABLE_DECODING;
+        for (int i = 0; i < 0x10000; i++) db[i] = CharsetMapping.UNMAPPABLE_DECODING;
         try {
-            Parser p = new Parser(in, sjis0213);
-            Entry  e = null;
+            CharsetMapping.Parser p = new CharsetMapping.Parser(in, sjis0213);
+            CharsetMapping.Entry  e = null;
             while ((e = p.next()) != null) {
                 if (e.cp2 != 0) {
                     comp[compTotal++] = e;
@@ -79,13 +78,13 @@
             }
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
             // c2b Index Table, always the first one
-            writeINDEXC2B(baos, indexC2B);
-            writeSINGLEBYTE(baos, sb);
-            writeDOUBLEBYTE1(baos, db, b1Min1, b1Max1, b2Min, b2Max);
-            writeDOUBLEBYTE2(baos, db, b1Min2, b1Max2, b2Min, b2Max);
-            writeSUPPLEMENT(baos, supp, suppTotal);
-            writeCOMPOSITE(baos, comp, compTotal);
-            writeSIZE(out, baos.size());
+            CharsetMapping.writeINDEXC2B(baos, indexC2B);
+            CharsetMapping.writeSINGLEBYTE(baos, sb);
+            CharsetMapping.writeDOUBLEBYTE1(baos, db, b1Min1, b1Max1, b2Min, b2Max);
+            CharsetMapping.writeDOUBLEBYTE2(baos, db, b1Min2, b1Max2, b2Min, b2Max);
+            CharsetMapping.writeSUPPLEMENT(baos, supp, suppTotal);
+            CharsetMapping.writeCOMPOSITE(baos, comp, compTotal);
+            CharsetMapping.writeSIZE(out, baos.size());
             baos.writeTo(out);
             out.close();
         } catch (Exception x) {
--- a/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java	Mon Apr 12 07:09:57 2010 +0000
+++ b/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java	Fri Mar 18 04:51:50 2011 +0000
@@ -32,7 +32,6 @@
 import java.util.Formatter;
 import java.util.regex.*;
 import java.nio.charset.*;
-import static build.tools.charsetmapping.CharsetMapping.*;
 
 public class GenerateSBCS {
 
@@ -51,9 +50,10 @@
             String clzName = fields[0];
             String csName  = fields[1];
             String hisName = fields[2];
-            boolean isASCII = Boolean.valueOf(fields[3]);
+            boolean isASCII = Boolean.valueOf(fields[3]).booleanValue();
             String pkgName  = fields[4];
-            System.out.printf("%s,%s,%s,%b,%s%n", clzName, csName, hisName, isASCII, pkgName);
+            System.out.printf("%s,%s,%s,%b,%s%n", 
+                              new Object[] { clzName, csName, hisName, Boolean.valueOf(isASCII), pkgName });
 
             genClass(args[0], args[1], "SingleByte-X.java",
                      clzName, csName, hisName, pkgName, isASCII);
@@ -64,44 +64,44 @@
                                  Formatter out, String closure,
                                  boolean comment) {
         while (off < end) {
-            out.format("        \"");
+            out.format("        \"", new Object[] { });
             for (int j = 0; j < 8; j++) {
                 if (off == end)
                     break;
                 char c = sb[off++];
                 switch (c) {
                 case '\b':
-                    out.format("\\b"); break;
+                    out.format("\\b", new Object[] { }); break;
                 case '\t':
-                    out.format("\\t"); break;
+                    out.format("\\t", new Object[] { }); break;
                 case '\n':
-                    out.format("\\n"); break;
+                    out.format("\\n", new Object[] { }); break;
                 case '\f':
-                    out.format("\\f"); break;
+                    out.format("\\f", new Object[] { }); break;
                 case '\r':
-                    out.format("\\r"); break;
+                    out.format("\\r", new Object[] { }); break;
                 case '\"':
-                    out.format("\\\""); break;
+                    out.format("\\\"", new Object[] { }); break;
                 case '\'':
-                    out.format("\\'"); break;
+                    out.format("\\'", new Object[] { }); break;
                 case '\\':
-                    out.format("\\\\"); break;
+                    out.format("\\\\", new Object[] { }); break;
                 default:
-                    out.format("\\u%04X", c & 0xffff);
+                    out.format("\\u%04X", new Object[] { Integer.valueOf(c & 0xffff) });
                 }
             }
             if (comment) {
                 if (off == end)
                     out.format("\" %s      // 0x%02x - 0x%02x%n",
-                               closure, off-8, off-1);
+                               new Object[] { closure, Integer.valueOf(off-8), Integer.valueOf(off-1) });
                 else
                     out.format("\" +      // 0x%02x - 0x%02x%n",
-                               off-8, off-1);
+                               new Object[] { Integer.valueOf(off-8), Integer.valueOf(off-1) });
             } else {
                 if (off == end)
-                    out.format("\"%s%n", closure);
+                    out.format("\"%s%n", new Object[] { closure });
                 else
-                    out.format("\" +%n");
+                    out.format("\" +%n", new Object[] { });
             }
         }
     }
@@ -124,25 +124,25 @@
         char[] sb = new char[0x100];
         char[] c2bIndex = new char[0x100];
         int    c2bOff = 0;
-        Arrays.fill(sb, UNMAPPABLE_DECODING);
-        Arrays.fill(c2bIndex, UNMAPPABLE_DECODING);
+        Arrays.fill(sb, CharsetMapping.UNMAPPABLE_DECODING);
+        Arrays.fill(c2bIndex, CharsetMapping.UNMAPPABLE_DECODING);
 
         // (1)read in .map to parse all b->c entries
         FileInputStream in = new FileInputStream(
                                  new File(srcDir, clzName + ".map"));
-        Parser p = new Parser(in, sbmap);
-        Entry  e = null;
+        CharsetMapping.Parser p = new CharsetMapping.Parser(in, sbmap);
+        CharsetMapping.Entry  e = null;
 
         while ((e = p.next()) != null) {
             sb[e.bs] = (char)e.cp;
-            if (c2bIndex[e.cp>>8] == UNMAPPABLE_DECODING) {
+            if (c2bIndex[e.cp>>8] == CharsetMapping.UNMAPPABLE_DECODING) {
                 c2bOff += 0x100;
                 c2bIndex[e.cp>>8] = 1;
             }
         }
 
         Formatter fm = new Formatter(b2cSB);
-        fm.format("%n");
+        fm.format("%n", new Object[] { });
 
         // vm -server shows cc[byte + 128] access is much faster than
         // cc[byte&0xff] so we output the upper segment first
@@ -155,14 +155,14 @@
         if (f.exists()) {
             in = new FileInputStream(f);
             fm = new Formatter(b2cNRSB);
-            p = new Parser(in, sbmap);
+            p = new CharsetMapping.Parser(in, sbmap);
             e = null;
 
-            fm.format("// remove non-roundtrip entries%n");
-            fm.format("        b2cMap = b2cTable.toCharArray();%n");
+            fm.format("// remove non-roundtrip entries%n", new Object[] { });
+            fm.format("        b2cMap = b2cTable.toCharArray();%n", new Object[] { });
             while ((e = p.next()) != null) {
-                fm.format("        b2cMap[%d] = UNMAPPABLE_DECODING;%n",
-                          (e.bs>=0x80)?(e.bs-0x80):(e.bs+0x80));
+                fm.format("        b2cMap[%d] = CharsetMapping.UNMAPPABLE_DECODING;%n",
+                          new Object[] { Integer.valueOf((e.bs>=0x80)?(e.bs-0x80):(e.bs+0x80)) });
             }
             fm.close();
         }
@@ -172,32 +172,32 @@
         if (f.exists()) {
             in = new FileInputStream(f);
             fm = new Formatter(c2bNRSB);
-            p = new Parser(in, sbmap);
+            p = new CharsetMapping.Parser(in, sbmap);
             e = null;
-            ArrayList<Entry> es = new ArrayList<Entry>();
+            ArrayList es = new ArrayList();
             while ((e = p.next()) != null) {
-                if (c2bIndex[e.cp>>8] == UNMAPPABLE_DECODING) {
+                if (c2bIndex[e.cp>>8] == CharsetMapping.UNMAPPABLE_DECODING) {
                     c2bOff += 0x100;
                     c2bIndex[e.cp>>8] = 1;
                 }
                 es.add(e);
             }
-            fm.format("// non-roundtrip c2b only entries%n");
+            fm.format("// non-roundtrip c2b only entries%n", new Object[] { });
             if (es.size() < 100) {
-                fm.format("        c2bNR = new char[%d];%n", es.size() * 2);
+                fm.format("        c2bNR = new char[%d];%n", new Object[] { Integer.valueOf(es.size() * 2) });
                 int i = 0;
-                for (Entry entry: es) {
+                for (CharsetMapping.Entry entry: es) {
                     fm.format("        c2bNR[%d] = 0x%x; c2bNR[%d] = 0x%x;%n",
-                              i++, entry.bs, i++, entry.cp);
+                              new Object[] { Integer.valueOf(i++), Integer.valueOf(entry.bs), Integer.valueOf(i++), Integer.valueOf(entry.cp) });
                 }
             } else {
                 char[] cc = new char[es.size() * 2];
                 int i = 0;
-                for (Entry entry: es) {
+                for (CharsetMapping.Entry entry: es) {
                     cc[i++] = (char)entry.bs;
                     cc[i++] = (char)entry.cp;
                 }
-                fm.format("        c2bNR = (%n");
+                fm.format("        c2bNR = (%n", new Object[] { });
                 toString(cc, 0, i,  fm, ").toCharArray();", false);
             }
             fm.close();
--- a/make/tools/src/build/tools/compileproperties/CompileProperties.java	Mon Apr 12 07:09:57 2010 +0000
+++ b/make/tools/src/build/tools/compileproperties/CompileProperties.java	Fri Mar 18 04:51:50 2011 +0000
@@ -223,7 +223,7 @@
         if ( ok ) {
             String packageName = inferPackageName(propertiesPath, outputPath);
             System.out.println("inferred package name: " + packageName);
-            List<String> sortedKeys = new ArrayList<String>();
+            List sortedKeys = new ArrayList();
             for ( Object key : p.keySet() ) {
                 sortedKeys.add((String)key);
             }
--- a/make/tools/src/build/tools/jarsplit/JarSplit.java	Mon Apr 12 07:09:57 2010 +0000
+++ b/make/tools/src/build/tools/jarsplit/JarSplit.java	Fri Mar 18 04:51:50 2011 +0000
@@ -43,7 +43,7 @@
     /* classlist[0] contains class file list
      * classlist[1] contains non-class file list
      */
-    private static Vector<String>[] classlist = (Vector<String>[])(new Vector[2]);
+    private static Vector[] classlist = (Vector[])(new Vector[2]);
 
     /* The 2 class list name passed as arguments. */
     private static String[] fileNamelist = new String[2];
@@ -70,7 +70,7 @@
 
         for (int i = 0; i < 2; i++) {
             fileNamelist[i] = args[i + 2];
-            classlist[i] = new Vector<String>();
+            classlist[i] = new Vector();
         }
 
         if (generateClassLists(args[0]) == true) {
--- a/make/tools/src/build/tools/javazic/DayOfWeek.java	Mon Apr 12 07:09:57 2010 +0000
+++ b/make/tools/src/build/tools/javazic/DayOfWeek.java	Fri Mar 18 04:51:50 2011 +0000
@@ -25,25 +25,42 @@
 
 package build.tools.javazic;
 
+import java.util.List;
+import java.util.ArrayList;
+
 /**
  * Day of week enum.
  *
  * @since 1.6
  */
 
-enum DayOfWeek {
-    SUNDAY("Sun"),
-    MONDAY("Mon"),
-    TUESDAY("Tue"),
-    WEDNESDAY("Wed"),
-    THURSDAY("Thu"),
-    FRIDAY("Fri"),
-    SATURDAY("Sat");
+public class DayOfWeek {
+    public static final DayOfWeek SUNDAY = new DayOfWeek("Sun", 0);
+    public static final DayOfWeek MONDAY = new DayOfWeek("Mon", 1);
+    public static final DayOfWeek TUESDAY = new DayOfWeek("Tue", 2);
+    public static final DayOfWeek WEDNESDAY = new DayOfWeek("Wed", 3);
+    public static final DayOfWeek THURSDAY = new DayOfWeek("Thu", 4);
+    public static final DayOfWeek FRIDAY = new DayOfWeek("Fri", 5);
+    public static final DayOfWeek SATURDAY = new DayOfWeek("Sat", 6);
+
+    public static List values() {
+    	List list = new ArrayList();
+    	list.add(SUNDAY);
+    	list.add(MONDAY);
+    	list.add(TUESDAY);
+    	list.add(WEDNESDAY);
+    	list.add(THURSDAY);
+    	list.add(FRIDAY);
+    	list.add(SATURDAY);
+    	return list;
+    }
 
     private final String abbr;
+    private final int ordinal;
 
-    private DayOfWeek(String abbr) {
+    private DayOfWeek(String abbr, int ordinal) {
         this.abbr = abbr;
+        this.ordinal = ordinal;
     }
 
     String getAbbr() {
@@ -51,6 +68,6 @@
     }
 
     int value() {
-        return ordinal() + 1;
+        return ordinal + 1;
     }
 }
--- a/make/tools/src/build/tools/javazic/Gen.java	Mon Apr 12 07:09:57 2010 +0000
+++ b/make/tools/src/build/tools/javazic/Gen.java	Fri Mar 18 04:51:50 2011 +0000
@@ -85,10 +85,10 @@
             /* Output Version of ZoneInfoFile */
             dos.writeByte(ZoneInfoFile.JAVAZI_VERSION);
 
-            List<Long> transitions = tz.getTransitions();
+            List transitions = tz.getTransitions();
             if (transitions != null) {
-                List<Integer> dstOffsets = tz.getDstOffsets();
-                List<Integer> offsets = tz.getOffsets();
+                List dstOffsets = tz.getDstOffsets();
+                List offsets = tz.getOffsets();
 
                 if ((dstOffsets == null && offsets != null) ||
                     (dstOffsets != null && offsets == null)) {
@@ -117,23 +117,23 @@
                 }
 
                 /* Output data for GMTOffset */
-                List<Integer> gmtoffset = tz.getGmtOffsets();
+                List gmtoffset = tz.getGmtOffsets();
                 dos.writeByte(ZoneInfoFile.TAG_Offset);
                 size = gmtoffset.size();
                 dos.writeShort((size * 4) & 0xFFFF);
                 for (int i = 0; i < size; i++) {
-                    dos.writeInt(gmtoffset.get(i));
+                    dos.writeInt(((Integer)gmtoffset.get(i)).intValue());
                 }
             }
 
             /* Output data for SimpleTimeZone */
-            List<RuleRec> stz = tz.getLastRules();
+            List stz = tz.getLastRules();
             if (stz != null) {
                 RuleRec[] rr = new RuleRec[2];
                 boolean wall = true;
 
-                rr[0] = stz.get(0);
-                rr[1] = stz.get(1);
+                rr[0] = (RuleRec)stz.get(0);
+                rr[1] = (RuleRec)stz.get(1);
 
                 dos.writeByte(ZoneInfoFile.TAG_SimpleTimeZone);
                 wall = rr[0].getTime().isWall() && rr[1].getTime().isWall();
@@ -214,7 +214,7 @@
                 new RandomAccessFile(outputDir + ZoneInfoFile.JAVAZM_FILE_NAME, "rw");
 
             /* Whether rawOffsetIndex list exists or not. */
-            List<Integer> roi = map.getRawOffsetsIndex();
+            List roi = map.getRawOffsetsIndex();
             if (roi == null) {
                 Main.panic("Data not exist. (rawOffsetsIndex)");
                 return 1;
@@ -222,7 +222,7 @@
             roi_size = roi.size();
 
             /* Whether rawOffsetIndexTable list exists or not. */
-            List<Set<String>> roit = map.getRawOffsetsIndexTable();
+            List roit = map.getRawOffsetsIndexTable();
             if (roit == null || roit.size() != roi_size) {
                 Main.panic("Data not exist. (rawOffsetsIndexTable) Otherwise, Invalid size");
                 return 1;
@@ -252,7 +252,7 @@
             short nID = 0;
             raf.writeShort(nID & 0xFFFF);
             for (int i = 0; i < roi_size; i++) {
-                for (String key : roit.get(i)) {
+                for (String key : (java.lang.Iterable)roit.get(i)) {
                     byte size = (byte)key.getBytes("UTF-8").length;
                     raf.writeByte(size & 0xFF);
                     raf.write(key.getBytes("UTF-8"), 0, size);
@@ -282,7 +282,7 @@
             raf.writeShort(block_size & 0xFFFF);
             int num;
             for (int i = 0; i < roi_size; i++) {
-                num = roit.get(i).size();
+                num = ((Set)roit.get(i)).size();
                 block_size += num;
                 for (int j = 0; j < num; j++) {
                     raf.writeByte(i);
@@ -294,7 +294,7 @@
             raf.seek(fp);
 
             /* Whether alias list exists or not. */
-            Map<String,String> a = map.getAliases();
+            Map a = map.getAliases();
             if (a == null) {
                 Main.panic("Data not exist. (aliases)");
                 return 0;
@@ -307,7 +307,7 @@
             raf.writeShort(block_size & 0xFFFF);
             raf.writeShort(a.size() & 0xFFFF);
             for (String key : a.keySet()) {
-                String alias = a.get(key);
+                String alias = (String)a.get(key);
                 byte key_size = (byte)key.length();
                 byte alias_size = (byte)alias.length();
                 raf.writeByte(key_size & 0xFF);
@@ -322,7 +322,7 @@
             raf.seek(fp);
 
             /* Output the exclude list if it exists. */
-            List<String> excludedZones = map.getExcludeList();
+            List excludedZones = map.getExcludeList();
             if (excludedZones != null) {
                 raf.writeByte(ZoneInfoFile.TAG_ExcludedZones);
                 index += 3 + block_size;
--- a/make/tools/src/build/tools/javazic/GenDoc.java	Mon Apr 12 07:09:57 2010 +0000
+++ b/make/tools/src/build/tools/javazic/GenDoc.java	Fri Mar 18 04:51:50 2011 +0000
@@ -83,7 +83,7 @@
     //      key (String)       : value (String)
     //      "America/Denver"   : "America/Denver.html" (real time zone)
     //      "America/Shiprock" : "America/Denver"      (alias)
-    TreeMap<String,String> timezoneList = new TreeMap<String,String>();
+    TreeMap timezoneList = new TreeMap();
 
     // list of time zone's display name and time zone name
     //   e.g.
@@ -91,14 +91,14 @@
     //      "Tokyo, Asia"               : "Asia/Tokyo"
     //      "Marengo, Indiana, America" : "America/Indiana/Marengo"
     //          (aliases included)
-    TreeMap<String,String> displayNameList = new TreeMap<String,String>();
+    TreeMap displayNameList = new TreeMap();
 
     // list of top level regions
     //   e.g.
     //      key (String) : value (String)
     //      "America"    : "America.html"
     //          (including entries in America/Indiana/, America/Kentucky/, ...)
-    TreeMap<String,String> regionList = new TreeMap<String,String>();
+    TreeMap regionList = new TreeMap();
 
     // mapping list from zone name to latitude & longitude
     //   This list is generated from zone.tab.
@@ -106,12 +106,12 @@
     //      key (String) : value (LatitudeAndLongitude object)
     //      "Asia/Tokyo" : latitude=35.3916, longitude=13.9444
     //          (aliases not included)
-    HashMap<String,LatitudeAndLongitude> mapList = null;
+    HashMap mapList = null;
 
     // SortedMap of zone IDs sorted by their GMT offsets. If zone's GMT
     // offset will change in the future, its last known offset is
     // used.
-    SortedMap<Integer, Set<String>> zonesByOffset = new TreeMap<Integer, Set<String>>();
+    SortedMap zonesByOffset = new TreeMap();
 
     /**
      * Generates HTML document for each zone.
@@ -125,17 +125,17 @@
             String outputDir = Main.getOutputDir();
             String zonename = tz.getName();
             String zonefile = ZoneInfoFile.getFileName(zonename) + ".html";
-            List<RuleRec> stz = tz.getLastRules();
+            List stz = tz.getLastRules();
             timezoneList.put(zonename, zonefile);
             displayNameList.put(transform(zonename), zonename);
 
             // Populate zonesByOffset. (Zones that will change their
             // GMT offsets are also added to zonesByOffset here.)
             int lastKnownOffset = tz.getRawOffset();
-            Set<String> set = zonesByOffset.get(lastKnownOffset);
+            Set set = (Set)zonesByOffset.get(Integer.valueOf(lastKnownOffset));
             if (set == null) {
-                set = new TreeSet<String>();
-                zonesByOffset.put(lastKnownOffset, set);
+                set = new TreeSet();
+                zonesByOffset.put(Integer.valueOf(lastKnownOffset), set);
             }
             set.add(zonename);
 
@@ -166,7 +166,7 @@
             if ((mapList == null) && (Main.getMapFile() != null)) {
                 FileReader fr = new FileReader(Main.getMapFile());
                 BufferedReader in = new BufferedReader(fr);
-                mapList = new HashMap<String,LatitudeAndLongitude>();
+                mapList = new HashMap();
                 String line;
                 while ((line = in.readLine()) != null) {
                     // skip blank and comment lines
@@ -225,8 +225,8 @@
             }
             out.write("\n<P>\n");
 
-            List<ZoneRec> zone = tz.getZones();
-            List<RuleRec> rule = tz.getRules();
+            List zone = tz.getZones();
+            List rule = tz.getRules();
             if (rule != null && zone != null) {
                 out.write("<TABLE BORDER=\"0\" WIDTH=\"100%\" CELLPADDING=\"1\" CELLSPACING=\"0\">\n" +
                           "<TR>\n" +
@@ -249,7 +249,7 @@
                           "<TD>LETTER/S</TD><TD>NOTES</TD>\n</TR>\n");
                 for (int i = 0; i < size; i++) {
                     out.write("<TR BGCOLOR=\"#FFFFFF\">\n");
-                    StringTokenizer st = new StringTokenizer(rule.get(i).getLine());
+                    StringTokenizer st = new StringTokenizer(((RuleRec)rule.get(i)).getLine());
                     String s;
                     if (st.hasMoreTokens()) {   /* RULE - truncated */
                         st.nextToken();
@@ -312,7 +312,7 @@
                           "<TD>NOTES</TD>\n</TR>\n");
                 for (int i = 0; i < size; i++) {
                     out.write("<TR>\n");
-                    StringTokenizer st = new StringTokenizer(zone.get(i).getLine());
+                    StringTokenizer st = new StringTokenizer(((ZoneRec)zone.get(i)).getLine());
                     String s = st.nextToken();
                     if (s.equals("Zone")) {     /* NAME */
                         s = st.nextToken();
@@ -397,7 +397,7 @@
             BufferedWriter out1, out2;
 
             /* Whether alias list exists or not. */
-            Map<String,String> a = map.getAliases();
+            Map a = map.getAliases();
             if (a == null) {
                 Main.panic("Data not exist. (aliases)");
                 return 1;
@@ -521,16 +521,16 @@
                        "<BR>\n\n" + "<TABLE BORDER=\"0\" WIDTH=\"100%\">\n" +
                        "<TR>\n<TD NOWRAP>\n");
 
-            List<Integer> roi = map.getRawOffsetsIndex();
-            List<Set<String>> roit = map.getRawOffsetsIndexTable();
+            List roi = map.getRawOffsetsIndex();
+            List roit = map.getRawOffsetsIndexTable();
 
             int index = 0;
             for (Integer offset : zonesByOffset.keySet()) {
-                int off = roi.get(index);
-                Set<String> perRO = zonesByOffset.get(offset);
-                if (offset == off) {
+                int off = ((Integer)roi.get(index)).intValue();
+                Set perRO = (Set)zonesByOffset.get(offset);
+                if (offset.intValue() == off) {
                     // Merge aliases into zonesByOffset
-                    perRO.addAll(roit.get(index));
+                    perRO.addAll((java.util.Collection)roit.get(index));
                 }
                 index++;
 
--- a/make/tools/src/build/tools/javazic/Main.java	Mon Apr 12 07:09:57 2010 +0000
+++ b/make/tools/src/build/tools/javazic/Main.java	Fri Mar 18 04:51:50 2011 +0000
@@ -39,7 +39,7 @@
     private static boolean verbose = false;
     static boolean outputDoc = false;
 
-    private List<String> ziFiles = new ArrayList<String>();
+    private List ziFiles = new ArrayList();
     private static String zoneNamesFile = null;
     private static String versionName = "unknown";
     private static String outputDir = "zoneinfo";
@@ -111,7 +111,7 @@
         BackEnd backend = BackEnd.getBackEnd();
 
         for (int i = 0; i < nFiles; i++) {
-            Zoneinfo frontend = Zoneinfo.parse(ziFiles.get(i));
+            Zoneinfo frontend = Zoneinfo.parse((String)ziFiles.get(i));
 
             for (String key : frontend.getZones().keySet()) {
                 info(key);
--- a/make/tools/src/build/tools/javazic/Mappings.java	Mon Apr 12 07:09:57 2010 +0000
+++ b/make/tools/src/build/tools/javazic/Mappings.java	Fri Mar 18 04:51:50 2011 +0000
@@ -45,23 +45,23 @@
 class Mappings {
     // All aliases specified by Link statements. It's alias name to
     // real name mappings.
-    private Map<String,String> aliases;
+    private Map aliases;
 
-    private List<Integer> rawOffsetsIndex;
+    private List rawOffsetsIndex;
 
-    private List<Set<String>> rawOffsetsIndexTable;
+    private List rawOffsetsIndexTable;
 
     // Zone names to be excluded from rawOffset table. Those have GMT
     // offsets to change some future time.
-    private List<String> excludeList;
+    private List excludeList;
 
     /**
      * Constructor creates some necessary instances.
      */
     Mappings() {
-        aliases = new TreeMap<String,String>();
-        rawOffsetsIndex = new LinkedList<Integer>();
-        rawOffsetsIndexTable = new LinkedList<Set<String>>();
+        aliases = new TreeMap();
+        rawOffsetsIndex = new LinkedList();
+        rawOffsetsIndexTable = new LinkedList();
     }
 
     /**
@@ -69,11 +69,11 @@
      * @param zi a Zoneinfo containing Zones
      */
     void add(Zoneinfo zi) {
-        Map<String,Zone> zones = zi.getZones();
+        Map zones = zi.getZones();
 
         for (String zoneName : zones.keySet()) {
-            Zone zone = zones.get(zoneName);
-            String zonename = zone.getName();
+            Zone zone = (Zone)zones.get(zoneName);
+            String zonename = (String)zone.getName();
             int rawOffset = zone.get(zone.size()-1).getGmtOffset();
 
             // If the GMT offset of this Zone will change in some
@@ -84,7 +84,7 @@
                 if ((zrec.getGmtOffset() != rawOffset)
                     && (zrec.getUntilTime(0) > Time.getCurrentTime())) {
                     if (excludeList == null) {
-                        excludeList = new ArrayList<String>();
+                        excludeList = new ArrayList();
                     }
                     excludeList.add(zone.getName());
                     isExcluded = true;
@@ -96,30 +96,30 @@
                 int n = rawOffsetsIndex.size();
                 int i;
                 for (i = 0; i < n; i++) {
-                    if (rawOffsetsIndex.get(i) > rawOffset) {
+                    if (((Integer)rawOffsetsIndex.get(i)).intValue() > rawOffset) {
                         break;
                     }
                 }
-                rawOffsetsIndex.add(i, rawOffset);
+                rawOffsetsIndex.add(i, Integer.valueOf(rawOffset));
 
-                Set<String> perRawOffset = new TreeSet<String>();
+                Set perRawOffset = new TreeSet();
                 if (!isExcluded) {
                     perRawOffset.add(zonename);
                 }
                 rawOffsetsIndexTable.add(i, perRawOffset);
             } else if (!isExcluded) {
                 int i = rawOffsetsIndex.indexOf(new Integer(rawOffset));
-                Set<String> perRawOffset = rawOffsetsIndexTable.get(i);
+                Set perRawOffset = (Set)rawOffsetsIndexTable.get(i);
                 perRawOffset.add(zonename);
             }
         }
 
-        Map<String,String> a = zi.getAliases();
+        Map a = zi.getAliases();
         // If there are time zone names which refer to any of the
         // excluded zones, add those names to the excluded list.
         if (excludeList != null) {
             for (String zoneName : a.keySet()) {
-                String realname = a.get(zoneName);
+                String realname = (String)a.get(zoneName);
                 if (excludeList.contains(realname)) {
                     excludeList.add(zoneName);
                 }
@@ -135,11 +135,11 @@
      */
     void resolve() {
         int index = rawOffsetsIndexTable.size();
-        List<String> toBeRemoved = new ArrayList<String>();
+        List toBeRemoved = new ArrayList();
         for (String key : aliases.keySet()) {
             boolean validname = false;
             for (int j = 0; j < index; j++) {
-                Set<String> perRO = rawOffsetsIndexTable.get(j);
+                Set perRO = (Set)rawOffsetsIndexTable.get(j);
                 boolean isExcluded = (excludeList == null) ?
                                         false : excludeList.contains(key);
 
@@ -166,19 +166,19 @@
         }
     }
 
-    Map<String,String> getAliases() {
+    Map getAliases() {
         return(aliases);
     }
 
-    List<Integer> getRawOffsetsIndex() {
+    List getRawOffsetsIndex() {
         return(rawOffsetsIndex);
     }
 
-    List<Set<String>> getRawOffsetsIndexTable() {
+    List getRawOffsetsIndexTable() {
         return(rawOffsetsIndexTable);
     }
 
-    List<String> getExcludeList() {
+    List getExcludeList() {
         return excludeList;
     }
 }
--- a/make/tools/src/build/tools/javazic/Month.java	Mon Apr 12 07:09:57 2010 +0000
+++ b/make/tools/src/build/tools/javazic/Month.java	Fri Mar 18 04:51:50 2011 +0000
@@ -35,24 +35,42 @@
  *
  * @since 1.4
  */
-enum Month {
-    JANUARY("Jan"),
-    FEBRUARY("Feb"),
-    MARCH("Mar"),
-    APRIL("Apr"),
-    MAY("May"),
-    JUNE("Jun"),
-    JULY("Jul"),
-    AUGUST("Aug"),
-    SEPTEMBER("Sep"),
-    OCTOBER("Oct"),
-    NOVEMBER("Nov"),
-    DECEMBER("Dec");
+public class Month {
+    public static final Month JANUARY = new Month("Jan", 0);
+    public static final Month FEBRUARY = new Month("Feb", 1);
+    public static final Month MARCH = new Month("Mar", 2);
+    public static final Month APRIL = new Month("Apr", 3);
+    public static final Month MAY = new Month("May", 4);
+    public static final Month JUNE = new Month("Jun", 5);
+    public static final Month JULY = new Month("Jul", 6);
+    public static final Month AUGUST = new Month("Aug", 7);
+    public static final Month SEPTEMBER = new Month("Sep", 8);
+    public static final Month OCTOBER = new Month("Oct", 9);
+    public static final Month NOVEMBER = new Month("Nov", 10);
+    public static final Month DECEMBER = new Month("Dec", 11);
+
+    public static final List values() {
+    	List result = new ArrayList();
+    	result.add(JANUARY);
+    	result.add(FEBRUARY);
+    	result.add(MARCH);
+    	result.add(APRIL);
+    	result.add(MAY);
+    	result.add(JUNE);
+    	result.add(JULY);
+    	result.add(AUGUST);
+    	result.add(SEPTEMBER);
+    	result.add(OCTOBER);
+    	result.add(NOVEMBER);
+    	result.add(DECEMBER);
+    	return result;    	
+    }
 
     private final String abbr;
+    private final int ordinal;
 
-    private static final Map<String,Month> abbreviations
-                                = new HashMap<String,Month>(12);
+    private static final Map abbreviations
+                                = new HashMap(12);
 
     static {
         for (Month m : Month.values()) {
@@ -60,12 +78,13 @@
         }
     }
 
-    private Month(String abbr) {
+    private Month(String abbr, int ordinal) {
         this.abbr = abbr;
+        this.ordinal = ordinal;
     }
 
     int value() {
-        return ordinal() + 1;
+        return ordinal + 1;
     }
 
     /**
@@ -74,7 +93,7 @@
      * @return the Month value
      */
     static Month parse(String name) {
-        Month m = abbreviations.get(name);
+        Month m = (Month)abbreviations.get(name);
         if (m != null) {
             return m;
         }
@@ -87,7 +106,7 @@
      */
     static String toString(int month) {
         if (month >= JANUARY.value() && month <= DECEMBER.value()) {
-            return "Calendar." + Month.values()[month - 1];
+            return "Calendar." + Month.values().get(month - 1);
         }
         throw new IllegalArgumentException("wrong month number: " + month);
     }
--- a/make/tools/src/build/tools/javazic/Rule.java	Mon Apr 12 07:09:57 2010 +0000
+++ b/make/tools/src/build/tools/javazic/Rule.java	Fri Mar 18 04:51:50 2011 +0000
@@ -38,7 +38,7 @@
  */
 class Rule {
 
-    private List<RuleRec> list;
+    private List list;
     private String name;
 
     /**
@@ -48,7 +48,7 @@
      */
     Rule(String name) {
         this.name = name;
-        list = new ArrayList<RuleRec>();
+        list = new ArrayList();
     }
 
     /**
@@ -72,8 +72,8 @@
      * @return rules in List that are collated in time. If no rule is found, an empty
      * List is returned.
      */
-    List<RuleRec> getRules(int year) {
-        List<RuleRec> rules = new ArrayList<RuleRec>(3);
+    List getRules(int year) {
+        List rules = new ArrayList(3);
         for (RuleRec rec : list) {
             if (year >= rec.getFromYear() && year <= rec.getToYear()) {
                 if ((rec.isOdd() && year % 2 == 0) || (rec.isEven() && year % 2 == 1))
@@ -86,8 +86,8 @@
             return rules;
         }
         if (n == 2) {
-            RuleRec rec1 = rules.get(0);
-            RuleRec rec2 = rules.get(1);
+            RuleRec rec1 = (RuleRec)rules.get(0);
+            RuleRec rec2 = (RuleRec)rules.get(1);
             if (rec1.getMonthNum() > rec2.getMonthNum()) {
                 rules.set(0, rec2);
                 rules.set(1, rec1);
@@ -108,8 +108,10 @@
         final int y = year;
         RuleRec[] recs = new RuleRec[rules.size()];
         rules.toArray(recs);
-        Arrays.sort(recs, new Comparator<RuleRec>() {
-                public int compare(RuleRec r1, RuleRec r2) {
+        Arrays.sort(recs, new Comparator() {
+                public int compare(Object o1, Object o2) {
+                	RuleRec r1 = (RuleRec)o1;
+                	RuleRec r2 = (RuleRec)o2;
                     int n = r1.getMonthNum() - r2.getMonthNum();
                     if (n != 0) {
                         return n;
@@ -139,12 +141,12 @@
      * @return rules that contain last DST schedule. An empty
      * ArrayList is returned if no last rules are found.
      */
-    List<RuleRec> getLastRules() {
+    List getLastRules() {
         RuleRec start = null;
         RuleRec end = null;
 
         for (int i = 0; i < list.size(); i++) {
-            RuleRec rec = list.get(i);
+            RuleRec rec = (RuleRec)list.get(i);
             if (rec.isLastRule()) {
                 if (rec.getSave() > 0) {
                     start = rec;
@@ -156,7 +158,7 @@
         if (start == null || end == null) {
             int endYear = Zoneinfo.getEndYear();
             for (int i  = 0; i < list.size(); i++) {
-                RuleRec rec = list.get(i);
+                RuleRec rec = (RuleRec)list.get(i);
                 if (endYear >= rec.getFromYear() && endYear <= rec.getToYear()) {
                     if (start == null && rec.getSave() > 0) {
                         start = rec;
@@ -169,7 +171,7 @@
             }
         }
 
-        List<RuleRec> r = new ArrayList<RuleRec>(2);
+        List r = new ArrayList(2);
         if (start == null || end == null) {
             if (start != null || end != null) {
                 Main.warning("found last rules for "+name+" inconsistent.");
--- a/make/tools/src/build/tools/javazic/RuleDay.java	Mon Apr 12 07:09:57 2010 +0000
+++ b/make/tools/src/build/tools/javazic/RuleDay.java	Fri Mar 18 04:51:50 2011 +0000
@@ -38,7 +38,7 @@
  * @since 1.4
  */
 class RuleDay {
-    private static final Map<String,DayOfWeek> abbreviations = new HashMap<String,DayOfWeek>(7);
+    private static final Map abbreviations = new HashMap(7);
     static {
         for (DayOfWeek day : DayOfWeek.values()) {
             abbreviations.put(day.getAbbr(), day);
@@ -174,7 +174,7 @@
     }
 
     private static DayOfWeek getDOW(String abbr) {
-        return abbreviations.get(abbr);
+        return (DayOfWeek)abbreviations.get(abbr);
     }
 
     /**
@@ -186,7 +186,7 @@
      */
     static String toString(int dow) {
         if (dow >= DayOfWeek.SUNDAY.value() && dow <= DayOfWeek.SATURDAY.value()) {
-            return "Calendar." + DayOfWeek.values()[dow - 1];
+            return "Calendar." + DayOfWeek.values().get(dow - 1);
         }
         throw new IllegalArgumentException("wrong Day_of_Week number: " + dow);
     }
--- a/make/tools/src/build/tools/javazic/Simple.java	Mon Apr 12 07:09:57 2010 +0000
+++ b/make/tools/src/build/tools/javazic/Simple.java	Fri Mar 18 04:51:50 2011 +0000
@@ -51,22 +51,22 @@
     /**
      * Zone records which are applied for given year.
      */
-    private static Map<String,ZoneRec> lastZoneRecs
-        = new HashMap<String,ZoneRec>();
+    private static Map lastZoneRecs
+        = new HashMap();
 
     /**
      * Rule records which are applied for given year.
      */
-    private static Map<String,List<RuleRec>> lastRules
-        = new TreeMap<String,List<RuleRec>>();
+    private static Map lastRules
+        = new TreeMap();
 
     /**
      * zone IDs sorted by their GMT offsets. If zone's GMT
      * offset will change in the future, its last known offset is
      * used.
      */
-    private SortedMap<Integer, Set<String>> zonesByOffset
-        = new TreeMap<Integer,  Set<String>>();
+    private SortedMap zonesByOffset
+        = new TreeMap();
 
     /**
      * Sets last Rule records and Zone records for given timezone to
@@ -84,10 +84,10 @@
         // Populate zonesByOffset. (Zones that will change their
         // GMT offsets are also added to zonesByOffset here.)
         int lastKnownOffset = tz.getRawOffset();
-        Set<String> set = zonesByOffset.get(lastKnownOffset);
+        Set set = (Set)zonesByOffset.get(Integer.valueOf(lastKnownOffset));
         if (set == null) {
-            set = new TreeSet<String>();
-            zonesByOffset.put(lastKnownOffset, set);
+            set = new TreeSet();
+            zonesByOffset.put(Integer.valueOf(lastKnownOffset), set);
         }
         set.add(zonename);
 
@@ -116,40 +116,40 @@
             out.write("import java.util.SimpleTimeZone;\n\n");
             out.write("    static SimpleTimeZone zones[] = {\n");
 
-            Map<String,String> a = map.getAliases();
-            List<Integer> roi = map.getRawOffsetsIndex();
-            List<Set<String>> roit = map.getRawOffsetsIndexTable();
+            Map a = map.getAliases();
+            List roi = map.getRawOffsetsIndex();
+            List roit = map.getRawOffsetsIndexTable();
 
             int index = 0;
-            for (int offset : zonesByOffset.keySet()) {
-                int o = roi.get(index);
-                Set<String> set = zonesByOffset.get(offset);
-                if (offset == o) {
+            for (Integer offset : zonesByOffset.keySet()) {
+                int o = ((Integer)roi.get(index)).intValue();
+                Set set = (Set)zonesByOffset.get(offset);
+                if (offset.intValue() == o) {
                     // Merge aliases into zonesByOffset
-                    set.addAll(roit.get(index));
+                    set.addAll((java.util.Collection)roit.get(index));
                 }
                 index++;
 
                 for (String key : set) {
                     ZoneRec zrec;
                     String realname;
-                    List<RuleRec> stz;
-                    if ((realname = a.get(key)) != null) {
+                    List stz;
+                    if ((realname = (String)a.get(key)) != null) {
                         // if this alias is not targeted, ignore it.
                         if (!Zone.isTargetZone(key)) {
                             continue;
                         }
-                        stz = lastRules.get(realname);
-                        zrec = lastZoneRecs.get(realname);
+                        stz = (List)lastRules.get(realname);
+                        zrec = (ZoneRec)lastZoneRecs.get(realname);
                     } else {
-                        stz = lastRules.get(key);
-                        zrec = lastZoneRecs.get(key);
+                        stz = (List)lastRules.get(key);
+                        zrec = (ZoneRec)lastZoneRecs.get(key);
                     }
 
                     out.write("\t//--------------------------------------------------------------------\n");
-                    String s = Time.toFormedString(offset);
+                    String s = Time.toFormedString(offset.intValue());
                     out.write("\tnew SimpleTimeZone(" +
-                        Time.toFormedString(offset) + ", \"" + key + "\"");
+                        Time.toFormedString(offset.intValue()) + ", \"" + key + "\"");
                     if (realname != null) {
                         out.write(" /* " + realname + " */");
                     }
@@ -157,8 +157,8 @@
                     if (stz == null) {
                         out.write("),\n");
                     } else {
-                        RuleRec rr0 = stz.get(0);
-                        RuleRec rr1 = stz.get(1);
+                        RuleRec rr0 = (RuleRec)stz.get(0);
+                        RuleRec rr1 = (RuleRec)stz.get(1);
 
                         out.write(",\n\t  " + Month.toString(rr0.getMonthNum()) +
                                   ", " + rr0.getDay().getDayForSimpleTimeZone() + ", " +
--- a/make/tools/src/build/tools/javazic/Time.java	Mon Apr 12 07:09:57 2010 +0000
+++ b/make/tools/src/build/tools/javazic/Time.java	Fri Mar 18 04:51:50 2011 +0000
@@ -296,7 +296,10 @@
             sign = '+';
         }
         return String.format((Locale)null, "%c%02d:%02d",
-                             sign, sec/3600, (sec%3600)/60);
+                   new Object[] { 
+                             (Object)("" + sign), (Object)Long.valueOf(sec/3600), (Object)Long.valueOf((sec%3600)/60)
+                             
+                   });
     }
 
     /**
--- a/make/tools/src/build/tools/javazic/Timezone.java	Mon Apr 12 07:09:57 2010 +0000
+++ b/make/tools/src/build/tools/javazic/Timezone.java	Fri Mar 18 04:51:50 2011 +0000
@@ -43,35 +43,35 @@
     /**
      * transition time values in UTC (millisecond)
      */
-    private List<Long> transitions;
+    private List transitions;
 
     /**
      * All offset values in millisecond
      * @see sun.util.calendar.ZoneInfo
      */
-    private List<Integer> offsets;
+    private List offsets;
 
     /**
      * Indices of GMT offset values (both raw and raw+saving)
      * at transitions
      */
-    private List<Integer> gmtOffsets;
+    private List gmtOffsets;
 
     /**
      * Indices of regular or "direct" saving time values
      * at transitions
      */
-    private List<Integer> dstOffsets;
+    private List dstOffsets;
 
     /**
      * Zone records of this time zone
      */
-    private List<ZoneRec> usedZoneRecs;
+    private List usedZoneRecs;
 
     /**
      * Rule records referred to by this time zone
      */
-    private List<RuleRec> usedRuleRecs;
+    private List usedRuleRecs;
 
     /**
      * Type of DST rules in this time zone
@@ -102,7 +102,7 @@
      * The last DST rules. lastRules[0] is the DST start
      * rule. lastRules[1] is the DST end rules.
      */
-    private List<RuleRec> lastRules;
+    private List lastRules;
 
     /**
      * The amount of DST saving value (millisecond) in the last DST
@@ -146,7 +146,7 @@
      * by this time zone.
      * @return the rule records list
      */
-    List<RuleRec> getRules() {
+    List getRules() {
         return usedRuleRecs;
     }
 
@@ -155,35 +155,35 @@
      * by this time zone.
      * @return the zone records list
      */
-    List<ZoneRec> getZones() {
+    List getZones() {
         return usedZoneRecs;
     }
 
     /**
      * @return the transition table (list)
      */
-    List<Long> getTransitions() {
+    List getTransitions() {
         return transitions;
     }
 
     /**
      * @return the offsets list
      */
-    List<Integer> getOffsets() {
+    List getOffsets() {
         return offsets;
     }
 
     /**
      * @return the DST saving offsets list
      */
-    List<Integer> getDstOffsets() {
+    List getDstOffsets() {
         return dstOffsets;
     }
 
     /**
      * @return the GMT offsets list
      */
-    List<Integer> getGmtOffsets() {
+    List getGmtOffsets() {
         return gmtOffsets;
     }
 
@@ -241,13 +241,13 @@
      */
     void addTransition(long time, int offset, int dstOffset) {
         if (transitions == null) {
-            transitions = new ArrayList<Long>();
-            offsets = new ArrayList<Integer>();
-            dstOffsets = new ArrayList<Integer>();
+            transitions = new ArrayList();
+            offsets = new ArrayList();
+            dstOffsets = new ArrayList();
         }
-        transitions.add(time);
-        offsets.add(offset);
-        dstOffsets.add(dstOffset);
+        transitions.add(Long.valueOf(time));
+        offsets.add(Integer.valueOf(offset));
+        dstOffsets.add(Integer.valueOf(dstOffset));
     }
 
     /**
@@ -275,7 +275,7 @@
      */
     void addUsedRec(ZoneRec rec) {
         if (usedZoneRecs == null) {
-            usedZoneRecs = new ArrayList<ZoneRec>();
+            usedZoneRecs = new ArrayList();
         }
         usedZoneRecs.add(rec);
     }
@@ -286,7 +286,7 @@
      */
     void addUsedRec(RuleRec rec) {
         if (usedRuleRecs == null) {
-            usedRuleRecs = new ArrayList<RuleRec>();
+            usedRuleRecs = new ArrayList();
         }
         // if the last used rec is the same as the given rec, avoid
         // putting the same rule.
@@ -319,11 +319,11 @@
      * for generating SimpleTimeZone parameters.
      * @param rules the last rule records
      */
-    void setLastRules(List<RuleRec> rules) {
+    void setLastRules(List rules) {
         int n = rules.size();
         if (n > 0) {
             lastRules = rules;
-            RuleRec rec = rules.get(0);
+            RuleRec rec = (RuleRec)rules.get(0);
             int offset = rec.getSave();
             if (offset > 0) {
                 setLastDSTSaving(offset);
@@ -336,7 +336,7 @@
     /**
      * @return the last rule records for this time zone.
      */
-    List<RuleRec> getLastRules() {
+    List getLastRules() {
         return lastRules;
     }
 
@@ -366,11 +366,11 @@
         }
         Checksum sum = new Checksum();
         for (int i = 0; i < transitions.size(); i++) {
-            int offset = offsets.get(i);
+            int offset = ((Integer)offsets.get(i)).intValue();
             // adjust back to make the transition in local time
-            sum.update(transitions.get(i) + offset);
+            sum.update(((Integer)transitions.get(i)).intValue() + offset);
             sum.update(offset);
-            sum.update(dstOffsets.get(i));
+            sum.update(((Integer)dstOffsets.get(i)).intValue());
         }
         crc32 = (int)sum.getValue();
     }
@@ -438,17 +438,17 @@
 
     private int getOffsetIndex(int offset, int index) {
         if (gmtOffsets == null) {
-            gmtOffsets = new ArrayList<Integer>();
+            gmtOffsets = new ArrayList();
         }
         for (int i = index; i < gmtOffsets.size(); i++) {
-            if (offset == gmtOffsets.get(i)) {
+            if (offset == ((Integer)gmtOffsets.get(i)).intValue()) {
                 return i;
             }
         }
         if (gmtOffsets.size() < index) {
-            gmtOffsets.add(0);
+            gmtOffsets.add(Integer.valueOf(0));
         }
-        gmtOffsets.add(offset);
+        gmtOffsets.add(Integer.valueOf(offset));
         return gmtOffsets.size() - 1;
     }
 }
--- a/make/tools/src/build/tools/javazic/Zone.java	Mon Apr 12 07:09:57 2010 +0000
+++ b/make/tools/src/build/tools/javazic/Zone.java	Fri Mar 18 04:51:50 2011 +0000
@@ -48,10 +48,10 @@
     private String name;
 
     // zone records
-    private List<ZoneRec> list;
+    private List list;
 
     // target zone names for this compilation
-    private static Set<String> targetZones;
+    private static Set targetZones;
 
     /**
      * Constructs a Zone with the specified zone name.
@@ -59,7 +59,7 @@
      */
     Zone(String name) {
         this.name = name;
-        list = new ArrayList<ZoneRec>();
+        list = new ArrayList();
     }
 
     /**
@@ -81,7 +81,7 @@
         } catch (FileNotFoundException e) {
             Main.panic("can't open file: " + fileName);
         }
-        targetZones = new HashSet<String>();
+        targetZones = new HashSet();
         String line;
 
         try {
@@ -144,7 +144,7 @@
      * @return the zone record specified by the index.
      */
     ZoneRec get(int index) {
-        return list.get(index);
+        return (ZoneRec)list.get(index);
     }
 
     /**
@@ -161,7 +161,7 @@
      */
     void resolve(Zoneinfo zi) {
         for (int i = 0; i < list.size(); i++) {
-            ZoneRec rec = list.get(i);
+            ZoneRec rec = (ZoneRec)list.get(i);
             rec.resolve(zi);
         }
     }
--- a/make/tools/src/build/tools/javazic/Zoneinfo.java	Mon Apr 12 07:09:57 2010 +0000
+++ b/make/tools/src/build/tools/javazic/Zoneinfo.java	Fri Mar 18 04:51:50 2011 +0000
@@ -57,25 +57,25 @@
     /**
      * Zone name to Zone mappings
      */
-    private Map<String,Zone> zones;
+    private Map zones;
 
     /**
      * Rule name to Rule mappings
      */
-    private Map<String,Rule> rules;
+    private Map rules;
 
     /**
      * Alias name to real name mappings
      */
-    private Map<String,String> aliases;
+    private Map aliases;
 
     /**
      * Constracts a Zoneinfo.
      */
     Zoneinfo() {
-        zones = new HashMap<String,Zone>();
-        rules = new HashMap<String,Rule>();
-        aliases = new HashMap<String,String>();
+        zones = new HashMap();
+        rules = new HashMap();
+        aliases = new HashMap();
     }
 
     /**
@@ -173,14 +173,14 @@
     /**
      * @return the alias table
      */
-    Map<String,String> getAliases() {
+    Map getAliases() {
         return aliases;
     }
 
     /**
      * @return the Zone list
      */
-    Map<String,Zone> getZones() {
+    Map getZones() {
         return zones;
     }
 
@@ -189,7 +189,7 @@
      * @param name a zone name
      */
     Zone getZone(String name) {
-        return zones.get(name);
+        return (Zone)zones.get(name);
     }
 
     /**
@@ -197,7 +197,7 @@
      * @param name a rule name
      */
     Rule getRule(String name) {
-        return rules.get(name);
+        return (Rule)rules.get(name);
     }
 
     private static String line;
@@ -340,13 +340,13 @@
                  * This part assumes that the specified year is covered by
                  * the rules referred to by the last zone record.
                  */
-                List<RuleRec> rrecs = zrec.getRuleRef().getRules(startYear);
+                List rrecs = zrec.getRuleRef().getRules(startYear);
 
                 if (rrecs.size() == 2) {
                     // make sure that one is a start rule and the other is
                     // an end rule.
-                    RuleRec r0 = rrecs.get(0);
-                    RuleRec r1 = rrecs.get(1);
+                    RuleRec r0 = (RuleRec)rrecs.get(0);
+                    RuleRec r1 = (RuleRec)rrecs.get(1);
                     if (r0.getSave() == 0 && r1.getSave() > 0) {
                         rrecs.set(0, r1);
                         rrecs.set(1, r0);
@@ -431,10 +431,10 @@
                     if (zrec.hasUntil() && year > zrec.getUntilYear()) {
                         break;
                     }
-                    List<RuleRec> rules = rule.getRules(year);
+                    List rules = rule.getRules(year);
                     if (rules.size() > 0) {
                         for (int i = 0; i < rules.size(); i++) {
-                            RuleRec rrec = rules.get(i);
+                            RuleRec rrec = (RuleRec)rules.get(i);
                             long transition = rrec.getTransitionTime(year,
                                                                      gmtOffset,
                                                                      currentSave);
@@ -460,12 +460,12 @@
                                         // Europe/Riga in 1989)
 
                                         if (i > 0) {
-                                            prevsave = rules.get(i-1).getSave();
+                                            prevsave = ((RuleRec)rules.get(i-1)).getSave();
                                         } else {
-                                            List<RuleRec> prevrules = rule.getRules(year-1);
+                                            List prevrules = rule.getRules(year-1);
 
                                             if (prevrules.size() > 0) {
-                                                prevsave = prevrules.get(prevrules.size()-1).getSave();
+                                                prevsave = ((RuleRec)prevrules.get(prevrules.size()-1)).getSave();
                                             } else {
                                                 prevsave = 0;
                                             }
--- a/make/tools/src/build/tools/jdwpgen/AbstractSimpleNode.java	Mon Apr 12 07:09:57 2010 +0000
+++ b/make/tools/src/build/tools/jdwpgen/AbstractSimpleNode.java	Fri Mar 18 04:51:50 2011 +0000
@@ -32,7 +32,7 @@
 
     AbstractSimpleNode() {
         kind = "-simple-";
-        components = new ArrayList<Node>();
+        components = new ArrayList();
     }
 
     void document(PrintWriter writer) {
--- a/make/tools/src/build/tools/jdwpgen/CommandNode.java	Mon Apr 12 07:09:57 2010 +0000
+++ b/make/tools/src/build/tools/jdwpgen/CommandNode.java	Fri Mar 18 04:51:50 2011 +0000
@@ -32,9 +32,9 @@
 
     void constrain(Context ctx) {
         if (components.size() == 3) {
-            Node out   = components.get(0);
-            Node reply = components.get(1);
-            Node error = components.get(2);
+            Node out   = (Node)components.get(0);
+            Node reply = (Node)components.get(1);
+            Node error = (Node)components.get(2);
             if (!(out instanceof OutNode)) {
                 error("Expected 'Out' item, got: " + out);
             }
@@ -45,7 +45,7 @@
                 error("Expected 'ErrorSet' item, got: " + error);
             }
         } else if (components.size() == 1) {
-            Node evt = components.get(0);
+            Node evt = (Node)components.get(0);
             if (!(evt instanceof EventNode)) {
                 error("Expected 'Event' item, got: " + evt);
             }
--- a/make/tools/src/build/tools/jdwpgen/ConstantNode.java	Mon Apr 12 07:09:57 2010 +0000
+++ b/make/tools/src/build/tools/jdwpgen/ConstantNode.java	Fri Mar 18 04:51:50 2011 +0000
@@ -31,10 +31,10 @@
 class ConstantNode extends AbstractCommandNode {
 
     ConstantNode() {
-        this(new ArrayList<Node>());
+        this(new ArrayList());
     }
 
-    ConstantNode(List<Node> components) {
+    ConstantNode(List components) {
         this.kind = "Constant";
         this.components = components;
         this.lineno = 0;
--- a/make/tools/src/build/tools/jdwpgen/ConstantSetNode.java	Mon Apr 12 07:09:57 2010 +0000
+++ b/make/tools/src/build/tools/jdwpgen/ConstantSetNode.java	Fri Mar 18 04:51:50 2011 +0000
@@ -33,10 +33,10 @@
     /**
      * The mapping between a constant and its value.
      */
-    protected static final Map<String, String> constantMap = new HashMap<String, String>();
+    protected static final Map constantMap = new HashMap();
 
     void prune() {
-        List<Node> addons = new ArrayList<Node>();
+        List addons = new ArrayList();
 
         for (Iterator it = components.iterator(); it.hasNext(); ) {
             Node node = (Node)it.next();
@@ -89,7 +89,7 @@
     }
 
     public static String getConstant(String key){
-        String com = constantMap.get(key);
+        String com = (String)constantMap.get(key);
         if(com == null){
             return "";
         } else {
--- a/make/tools/src/build/tools/jdwpgen/ErrorNode.java	Mon Apr 12 07:09:57 2010 +0000
+++ b/make/tools/src/build/tools/jdwpgen/ErrorNode.java	Fri Mar 18 04:51:50 2011 +0000
@@ -33,10 +33,10 @@
     protected static final String NAME_OF_ERROR_TABLE = "Error";
 
     ErrorNode() {
-        this(new ArrayList<Node>());
+        this(new ArrayList());
     }
 
-    ErrorNode(List<Node> components) {
+    ErrorNode(List components) {
         this.kind = "Error";
         this.components = components;
         this.lineno = 0;
--- a/make/tools/src/build/tools/jdwpgen/Node.java	Mon Apr 12 07:09:57 2010 +0000
+++ b/make/tools/src/build/tools/jdwpgen/Node.java	Fri Mar 18 04:51:50 2011 +0000
@@ -32,9 +32,9 @@
 abstract class Node {
 
     String kind;
-    List<Node> components;
+    List components;
     int lineno;
-    List<String> commentList = new ArrayList<String>();
+    List commentList = new ArrayList();
     Node parent = null;
     Context context = null;
 
@@ -43,7 +43,7 @@
 
     abstract void document(PrintWriter writer);
 
-    void set(String kind, List<Node> components, int lineno) {
+    void set(String kind, List components, int lineno) {
         this.kind = kind;
         this.components = components;
         this.lineno = lineno;
--- a/make/tools/src/build/tools/jdwpgen/OutNode.java	Mon Apr 12 07:09:57 2010 +0000
+++ b/make/tools/src/build/tools/jdwpgen/OutNode.java	Fri Mar 18 04:51:50 2011 +0000
@@ -32,7 +32,7 @@
 
     String cmdName;
 
-    void set(String kind, List<Node> components, int lineno) {
+    void set(String kind, List components, int lineno) {
         super.set(kind, components, lineno);
         components.add(0, new NameNode("Out"));
     }
--- a/make/tools/src/build/tools/jdwpgen/Parse.java	Mon Apr 12 07:09:57 2010 +0000
+++ b/make/tools/src/build/tools/jdwpgen/Parse.java	Fri Mar 18 04:51:50 2011 +0000
@@ -31,7 +31,7 @@
 class Parse {
 
     final StreamTokenizer izer;
-    final Map<String, Node> kindMap = new HashMap<String, Node>();
+    final Map kindMap = new HashMap();
 
     Parse(Reader reader) {
         izer = new StreamTokenizer(new BufferedReader(reader));
@@ -90,7 +90,7 @@
     }
 
     RootNode items() throws IOException {
-        List<Node> list = new ArrayList<Node>();
+        List list = new ArrayList();
 
         while (izer.nextToken() != StreamTokenizer.TT_EOF) {
             izer.pushBack();
@@ -131,13 +131,13 @@
             case '(': {
                 if (izer.nextToken() == StreamTokenizer.TT_WORD) {
                     String kind = izer.sval;
-                    List<Node> list = new ArrayList<Node>();
+                    List list = new ArrayList();
 
                     while (izer.nextToken() != ')') {
                         izer.pushBack();
                         list.add(item());
                     }
-                    Node proto = kindMap.get(kind);
+                    Node proto = (Node)kindMap.get(kind);
                     if (proto == null) {
                         error("Invalid kind: " + kind);
                         return null;
--- a/make/tools/src/build/tools/jdwpgen/RepeatNode.java	Mon Apr 12 07:09:57 2010 +0000
+++ b/make/tools/src/build/tools/jdwpgen/RepeatNode.java	Fri Mar 18 04:51:50 2011 +0000
@@ -37,7 +37,7 @@
         if (components.size() != 1) {
             error("Repeat must have exactly one member, use Group for more");
         }
-        member = components.get(0);
+        member = (Node)components.get(0);
         if (!(member instanceof TypeNode)) {
             error("Repeat member must be type specifier");
         }
--- a/make/tools/src/build/tools/jdwpgen/ReplyNode.java	Mon Apr 12 07:09:57 2010 +0000
+++ b/make/tools/src/build/tools/jdwpgen/ReplyNode.java	Fri Mar 18 04:51:50 2011 +0000
@@ -32,7 +32,7 @@
 
     String cmdName;
 
-    void set(String kind, List<Node> components, int lineno) {
+    void set(String kind, List components, int lineno) {
         super.set(kind, components, lineno);
         components.add(0, new NameNode(kind));
     }
--- a/make/tools/src/build/tools/spp/Spp.java	Mon Apr 12 07:09:57 2010 +0000
+++ b/make/tools/src/build/tools/spp/Spp.java	Fri Mar 18 04:51:50 2011 +0000
@@ -64,8 +64,8 @@
 
 public class Spp {
     public static void main(String args[]) throws Exception {
-        Map<String, String> vars = new HashMap<String, String>();
-        Set<String> keys = new HashSet<String>();
+        Map vars = new HashMap();
+        Set keys = new HashSet();
         boolean be = false;
 
         for (String arg:args) {
@@ -108,12 +108,12 @@
     Matcher  vardef2 = Pattern.compile("\\$" + VAR + "\\$").matcher("");
 
     void append(StringBuffer buf, String ln,
-                Set<String> keys, Map<String, String> vars) {
+                Set keys, Map vars) {
         vardef.reset(ln);
         while (vardef.find()) {
             String repl = "";
             if (vardef.group(GN_VAR) != null)
-                repl = vars.get(vardef.group(GN_VAR));
+                repl = (String)vars.get(vardef.group(GN_VAR));
             else {
                 boolean test = keys.contains(vardef.group(GN_KEY));
                 if (vardef.group(GN_NOT) != null)
@@ -123,7 +123,7 @@
                     repl = "";
                 else {  // embedded $var$
                     while (vardef2.reset(repl).find()) {
-                        repl = vardef2.replaceFirst(vars.get(vardef2.group(1)));
+                        repl = vardef2.replaceFirst((String)vars.get(vardef2.group(1)));
                     }
                 }
             }
@@ -134,7 +134,7 @@
 
     // return true if #end[key], #end or EOF reached
     boolean spp(Scanner in, StringBuffer buf, String key,
-                Set<String> keys, Map<String, String> vars,
+                Set keys, Map vars,
                 boolean be, boolean skip) {
         while (in.hasNextLine()) {
             String ln = in.nextLine();
--- a/make/tools/src/build/tools/stripproperties/StripProperties.java	Mon Apr 12 07:09:57 2010 +0000
+++ b/make/tools/src/build/tools/stripproperties/StripProperties.java	Fri Mar 18 04:51:50 2011 +0000
@@ -53,8 +53,8 @@
         }
     }
 
-    private static List<String> parseOptions(String args[]) {
-        List<String> files = new ArrayList<String>();
+    private static List parseOptions(String args[]) {
+        List files = new ArrayList();
         for ( int i = 0; i < args.length ; i++ ) {
             if ( "-optionsfile".equals(args[i]) && i+1 < args.length ) {
                 String filename = args[++i];
@@ -89,7 +89,7 @@
                 if ( files != null && contents != null ) {
                     String tokens[] = (new String(contents)).split("\\s+");
                     if ( tokens.length > 0 ) {
-                        List<String> ofiles = parseOptions(tokens);
+                        List ofiles = parseOptions(tokens);
                         if ( ofiles != null ) {
                             files.addAll(ofiles);
                         } else {
@@ -108,7 +108,7 @@
         return files;
     }
 
-    private static boolean stripFiles(List<String> files) {
+    private static boolean stripFiles(List files) {
         boolean ok = true;
         for ( String file : files ) {
 
@@ -166,7 +166,7 @@
      * @param args Names of properties files to process and replace contents
      */
     public static void main(String args[]) {
-        List<String> files = parseOptions(args);
+        List files = parseOptions(args);
         if ( files == null || !stripFiles(files) ) {
             System.exit(1);
         }