changeset 1712:17d97948ff34

more 1.4+ changes
author bachmann
date Fri, 18 Mar 2011 07:27:43 +0000
parents 932e9384cfe0
children 1b1bec45c3bf
files make/tools/src/build/tools/charsetmapping/GenerateDBCS.java make/tools/src/build/tools/charsetmapping/GenerateEUC_TW.java make/tools/src/build/tools/charsetmapping/GenerateSBCS.java make/tools/src/build/tools/charsetmapping/Main.java make/tools/src/build/tools/compilefontconfig/CompileFontConfig.java make/tools/src/build/tools/compileproperties/CompileProperties.java make/tools/src/build/tools/generatenimbus/Generator.java make/tools/src/build/tools/generatenimbus/Paint.java make/tools/src/build/tools/generatenimbus/PainterGenerator.java make/tools/src/build/tools/generatenimbus/SynthModel.java make/tools/src/build/tools/generatenimbus/UIStyle.java make/tools/src/build/tools/generatenimbus/Utils.java make/tools/src/build/tools/javazic/GenDoc.java make/tools/src/build/tools/javazic/Mappings.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/jdwpgen/Node.java make/tools/src/build/tools/stripproperties/StripProperties.java
diffstat 19 files changed, 72 insertions(+), 70 deletions(-) [+]
line wrap: on
line diff
--- a/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java	Fri Mar 18 04:51:50 2011 +0000
+++ b/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java	Fri Mar 18 07:27:43 2011 +0000
@@ -27,7 +27,6 @@
 import java.io.*;
 import java.util.Arrays;
 import java.util.ArrayList;
-import java.util.Scanner;
 import java.util.Formatter;
 import java.util.regex.*;
 import java.nio.charset.*;
@@ -72,9 +71,9 @@
 
     private static int toInteger(String s) {
         if (s.startsWith("0x") || s.startsWith("0X"))
-            return Integer.valueOf(s.substring(2), 16).intValue();
+            return new Integer(s.substring(2), 16).intValue();
         else
-            return Integer.valueOf(s).intValue();
+            return new Integer(s).intValue();
     }
 
     private static void outString(Formatter out,
@@ -105,7 +104,7 @@
                 case '\\':
                     out.format("\\\\", new Object[] { }); break;
                 default:
-                    out.format("\\u%04X", new Object[] { Integer.valueOf(c & 0xffff) });
+                    out.format("\\u%04X", new Object[] { new Integer(c & 0xffff) });
                 }
             }
             if (off == end)
@@ -141,9 +140,9 @@
         throws Exception
     {
 
-        StringBuilder b2cSB = new StringBuilder();
-        StringBuilder b2cNRSB = new StringBuilder();
-        StringBuilder c2bNRSB = new StringBuilder();
+        StringBuffer b2cSB = new StringBuffer();
+        StringBuffer b2cNRSB = new StringBuffer();
+        StringBuffer c2bNRSB = new StringBuffer();
 
         char[] db = new char[0x10000];
         char[] c2bIndex = new char[0x100];
@@ -191,7 +190,7 @@
         // (2)now parse the .nr file which includes "b->c" non-roundtrip entries
         File f = new File(srcDir, clzName + ".nr");
         if (f.exists()) {
-            StringBuilder sb = new StringBuilder();
+            StringBuffer sb = new StringBuffer();
             in = new FileInputStream(f);
             p = new CharsetMapping.Parser(in, mPattern);
             e = null;
@@ -212,7 +211,7 @@
         // (3)finally the .c2b file which includes c->b non-roundtrip entries
         f = new File(srcDir, clzName + ".c2b");
         if (f.exists()) {
-            StringBuilder sb = new StringBuilder();
+            StringBuffer sb = new StringBuffer();
             in = new FileInputStream(f);
             p = new CharsetMapping.Parser(in, mPattern);
             e = null;
--- a/make/tools/src/build/tools/charsetmapping/GenerateEUC_TW.java	Fri Mar 18 04:51:50 2011 +0000
+++ b/make/tools/src/build/tools/charsetmapping/GenerateEUC_TW.java	Fri Mar 18 07:27:43 2011 +0000
@@ -27,7 +27,6 @@
 
 import java.io.*;
 import java.util.ArrayList;
-import java.util.Scanner;
 import java.util.Formatter;
 import java.util.regex.*;
 import java.nio.charset.*;
@@ -42,7 +41,7 @@
 
     private static String getCopyright(File f) throws IOException {
         Scanner s = new Scanner(f, "ISO-8859-1");
-        StringBuilder sb = new StringBuilder();
+        StringBuffer sb = new StringBuffer();
         while (s.hasNextLine()) {
             String ln = s.nextLine();
             sb.append(ln + "\n");
@@ -87,7 +86,7 @@
         case '\\':
             out.format("\\\\", new Object[] { }); break;
         default:
-            out.format(fmt, new Object[] { Integer.valueOf(c & 0xffff) });
+            out.format(fmt, new Object[] { new Integer(c & 0xffff) });
         }
     }
 
@@ -188,7 +187,7 @@
                 }
             }
 
-            StringBuilder out = new StringBuilder();
+            StringBuffer out = new StringBuffer();
             Formatter fm = new Formatter(out);
 
             fm.format(copyright, new Object[] { });
@@ -197,15 +196,15 @@
             fm.format("class EUC_TWMapping {%n%n", new Object[] { });
 
             // boundaries
-            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) });
+            fm.format("    final static int b1Min = 0x%x;%n", new Object[] { new Integer(b1Min) });
+            fm.format("    final static int b1Max = 0x%x;%n", new Object[] { new Integer(b1Max) });
+            fm.format("    final static int b2Min = 0x%x;%n", new Object[] { new Integer(b2Min) });
+            fm.format("    final static int b2Max = 0x%x;%n", new Object[] { new Integer(b2Max) });
 
             // b2c tables
             fm.format("%n    final static String[] b2c = {%n", new Object[] { });
             for (int plane = 0; plane < 8; plane++) {
-                fm.format("        // Plane %d%n", new Object[] { Integer.valueOf(plane) });
+                fm.format("        // Plane %d%n", new Object[] { new Integer(plane) });
                 toString(fm, toCharArray(db[plane], b1Min, b1Max, b2Min, b2Max),
                          ",");
                 fm.format("%n", new Object[] { });
@@ -214,14 +213,14 @@
 
             // c2bIndex
             fm.format("%n    static final int C2BSIZE = 0x%x;%n",
-                      new Object[] { Integer.valueOf(initC2BIndex(indexC2B)) } );
+                      new Object[] { new Integer(initC2BIndex(indexC2B)) } );
             fm.format("%n    static char[] c2bIndex = new char[] {%n", new Object[] { });
             toCharArray(fm, indexC2B);
             fm.format("    };%n", new Object[] { });
 
             // c2bIndexSupp
             fm.format("%n    static final int C2BSUPPSIZE = 0x%x;%n",
-                      new Object[] { Integer.valueOf(initC2BIndex(indexC2BSupp)) });
+                      new Object[] { new Integer(initC2BIndex(indexC2BSupp)) });
             fm.format("%n    static char[] c2bSuppIndex = new char[] {%n", new Object[] { });
             toCharArray(fm, indexC2BSupp);
             fm.format("    };%n", new Object[] { });
--- a/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java	Fri Mar 18 04:51:50 2011 +0000
+++ b/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java	Fri Mar 18 07:27:43 2011 +0000
@@ -28,7 +28,6 @@
 import java.io.*;
 import java.util.Arrays;
 import java.util.ArrayList;
-import java.util.Scanner;
 import java.util.Formatter;
 import java.util.regex.*;
 import java.nio.charset.*;
@@ -87,16 +86,16 @@
                 case '\\':
                     out.format("\\\\", new Object[] { }); break;
                 default:
-                    out.format("\\u%04X", new Object[] { Integer.valueOf(c & 0xffff) });
+                    out.format("\\u%04X", new Object[] { new Integer(c & 0xffff) });
                 }
             }
             if (comment) {
                 if (off == end)
                     out.format("\" %s      // 0x%02x - 0x%02x%n",
-                               new Object[] { closure, Integer.valueOf(off-8), Integer.valueOf(off-1) });
+                               new Object[] { closure, new Integer(off-8), new Integer(off-1) });
                 else
                     out.format("\" +      // 0x%02x - 0x%02x%n",
-                               new Object[] { Integer.valueOf(off-8), Integer.valueOf(off-1) });
+                               new Object[] { new Integer(off-8), new Integer(off-1) });
             } else {
                 if (off == end)
                     out.format("\"%s%n", new Object[] { closure });
@@ -117,9 +116,9 @@
                                  boolean isASCII)
         throws Exception
     {
-        StringBuilder b2cSB = new StringBuilder();
-        StringBuilder b2cNRSB = new StringBuilder();
-        StringBuilder c2bNRSB = new StringBuilder();
+        StringBuffer b2cSB = new StringBuffer();
+        StringBuffer b2cNRSB = new StringBuffer();
+        StringBuffer c2bNRSB = new StringBuffer();
 
         char[] sb = new char[0x100];
         char[] c2bIndex = new char[0x100];
@@ -162,7 +161,7 @@
             fm.format("        b2cMap = b2cTable.toCharArray();%n", new Object[] { });
             while ((e = p.next()) != null) {
                 fm.format("        b2cMap[%d] = CharsetMapping.UNMAPPABLE_DECODING;%n",
-                          new Object[] { Integer.valueOf((e.bs>=0x80)?(e.bs-0x80):(e.bs+0x80)) });
+                          new Object[] { new Integer((e.bs>=0x80)?(e.bs-0x80):(e.bs+0x80)) });
             }
             fm.close();
         }
@@ -184,11 +183,11 @@
             }
             fm.format("// non-roundtrip c2b only entries%n", new Object[] { });
             if (es.size() < 100) {
-                fm.format("        c2bNR = new char[%d];%n", new Object[] { Integer.valueOf(es.size() * 2) });
+                fm.format("        c2bNR = new char[%d];%n", new Object[] { new Integer(es.size() * 2) });
                 int i = 0;
                 for (CharsetMapping.Entry entry: es) {
                     fm.format("        c2bNR[%d] = 0x%x; c2bNR[%d] = 0x%x;%n",
-                              new Object[] { Integer.valueOf(i++), Integer.valueOf(entry.bs), Integer.valueOf(i++), Integer.valueOf(entry.cp) });
+                              new Object[] { new Integer(i++), new Integer(entry.bs), new Integer(i++), new Integer(entry.cp) });
                 }
             } else {
                 char[] cc = new char[es.size() * 2];
--- a/make/tools/src/build/tools/charsetmapping/Main.java	Fri Mar 18 04:51:50 2011 +0000
+++ b/make/tools/src/build/tools/charsetmapping/Main.java	Fri Mar 18 07:27:43 2011 +0000
@@ -26,7 +26,6 @@
 package build.tools.charsetmapping;
 
 import java.io.*;
-import java.util.Scanner;
 
 public class Main {
 
--- a/make/tools/src/build/tools/compilefontconfig/CompileFontConfig.java	Fri Mar 18 04:51:50 2011 +0000
+++ b/make/tools/src/build/tools/compilefontconfig/CompileFontConfig.java	Fri Mar 18 07:27:43 2011 +0000
@@ -29,7 +29,6 @@
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import sun.awt.FontConfiguration;
 
 public class CompileFontConfig {
     public static void main(String[] argv) {
--- a/make/tools/src/build/tools/compileproperties/CompileProperties.java	Fri Mar 18 04:51:50 2011 +0000
+++ b/make/tools/src/build/tools/compileproperties/CompileProperties.java	Fri Mar 18 07:27:43 2011 +0000
@@ -224,7 +224,9 @@
             String packageName = inferPackageName(propertiesPath, outputPath);
             System.out.println("inferred package name: " + packageName);
             List sortedKeys = new ArrayList();
-            for ( Object key : p.keySet() ) {
+            Iterator iter = p.keySet().iterator();
+            while (iter.hasNext()) {
+            	Object key = iter.next();
                 sortedKeys.add((String)key);
             }
             Collections.sort(sortedKeys);
--- a/make/tools/src/build/tools/generatenimbus/Generator.java	Fri Mar 18 04:51:50 2011 +0000
+++ b/make/tools/src/build/tools/generatenimbus/Generator.java	Fri Mar 18 07:27:43 2011 +0000
@@ -201,8 +201,8 @@
         }
         //next, populate the first set of ui defaults based on what is in the
         //various palettes of the synth model
-        StringBuilder defBuffer = new StringBuilder();
-        StringBuilder styleBuffer = new StringBuilder();
+        StringBuffer defBuffer = new StringBuffer();
+        StringBuffer styleBuffer = new StringBuffer();
         model.write(defBuffer, styleBuffer, packageNamePrefix);
 
         Map<String, String> vars = getVariables();
--- a/make/tools/src/build/tools/generatenimbus/Paint.java	Fri Mar 18 04:51:50 2011 +0000
+++ b/make/tools/src/build/tools/generatenimbus/Paint.java	Fri Mar 18 07:27:43 2011 +0000
@@ -144,7 +144,7 @@
         return hash;
     }
 
-    public void write(StringBuilder sb) {
+    public void write(StringBuffer sb) {
         sb.append("                     getComponentColor(c, \"").
            append(propertyName).append("\", ").
            append(defaultColorVariableName).append(", ").
--- a/make/tools/src/build/tools/generatenimbus/PainterGenerator.java	Fri Mar 18 04:51:50 2011 +0000
+++ b/make/tools/src/build/tools/generatenimbus/PainterGenerator.java	Fri Mar 18 07:27:43 2011 +0000
@@ -81,27 +81,27 @@
     /**
      * The source code in this variable will be used to define the various state types
      */
-    private StringBuilder stateTypeCode = new StringBuilder();
+    private StringBuffer stateTypeCode = new StringBuffer();
     /**
      * The source code in this variable will be used to define the switch statement for painting
      */
-    private StringBuilder switchCode = new StringBuilder();
+    private StringBuffer switchCode = new StringBuffer();
     /**
      * The source code in this variable will be used to define the methods for painting each state
      */
-    private StringBuilder paintingCode = new StringBuilder();
+    private StringBuffer paintingCode = new StringBuffer();
     /**
      * The source code in this variable will be used to add getExtendedCacheKeys
      * implementation if needed.
      */
-    private StringBuilder getExtendedCacheKeysCode = new StringBuilder();
+    private StringBuffer getExtendedCacheKeysCode = new StringBuffer();
     /**
      * The source code in this variable will be used to define the methods for decoding gradients
      * and shapes.
      */
-    private StringBuilder gradientsCode = new StringBuilder();
-    private StringBuilder colorCode = new StringBuilder();
-    private StringBuilder shapesCode = new StringBuilder();
+    private StringBuffer gradientsCode = new StringBuffer();
+    private StringBuffer colorCode = new StringBuffer();
+    private StringBuffer shapesCode = new StringBuffer();
     /**
      * Map of component colors keyed by state constant name
      */
@@ -266,7 +266,7 @@
                     List<Point> controlPoints = pshape.getControlPoints();
                     Point first, last;
                     first = last = controlPoints.get(0);
-                    StringBuilder buffer = new StringBuilder();
+                    StringBuffer buffer = new StringBuffer();
                     buffer.append("        path.reset();\n");
                     buffer.append("        path.moveTo(" + writeDecodeX(encode((float)first.getX(), a, b, width)) + ", " + writeDecodeY(encode((float)first.getY(), c, d, height)) + ");\n");
                     for (int j=1; j<controlPoints.size(); j++) {
@@ -454,7 +454,7 @@
     }
 
     private String encodeGradient(Shape ps, Gradient g) {
-        StringBuilder b = new StringBuilder();
+        StringBuffer b = new StringBuffer();
         float x1 = (float)ps.getPaintX1();
         float y1 = (float)ps.getPaintY1();
         float x2 = (float)ps.getPaintX2();
@@ -495,10 +495,10 @@
      *
      * @param g The abstract gradient to get stops from
      * @param b Append code string of the form "new float[]{...},
-     *          new Color[]{...}" to this StringBuilder
+     *          new Color[]{...}" to this StringBuffer
      */
     private void encodeGradientColorsAndFractions(AbstractGradient g,
-                                                    StringBuilder b) {
+                                                    StringBuffer b) {
         List<GradientStop> stops = g.getStops();
         // there are stops.size() number of main stops. Between each is a
         // fractional stop. Thus, there are: stops.size() + stops.size() - 1
@@ -575,7 +575,7 @@
         float x2 = (float)ps.getPaintX2();
         float y2 = (float)ps.getPaintY2();
         float radius = (float)Point2D.distance(centerX1, centerY1, x2, y2);
-        StringBuilder b = new StringBuilder();
+        StringBuffer b = new StringBuffer();
 
         b.append("        return decodeRadialGradient((");
         b.append(centerX1);
--- a/make/tools/src/build/tools/generatenimbus/SynthModel.java	Fri Mar 18 04:51:50 2011 +0000
+++ b/make/tools/src/build/tools/generatenimbus/SynthModel.java	Fri Mar 18 07:27:43 2011 +0000
@@ -53,7 +53,7 @@
         }
     }
 
-    public void write(StringBuilder defBuffer, StringBuilder styleBuffer, String packageName) {
+    public void write(StringBuffer defBuffer, StringBuffer styleBuffer, String packageName) {
         defBuffer.append("        //Color palette\n");
         for (UIColor c: colors) defBuffer.append(c.write());
         defBuffer.append('\n');
--- a/make/tools/src/build/tools/generatenimbus/UIStyle.java	Fri Mar 18 04:51:50 2011 +0000
+++ b/make/tools/src/build/tools/generatenimbus/UIStyle.java	Fri Mar 18 07:27:43 2011 +0000
@@ -96,7 +96,7 @@
     }
 
     public String write(String prefix) {
-        StringBuilder sb = new StringBuilder();
+        StringBuffer sb = new StringBuffer();
         if (! textForegroundInherited) {
             sb.append(String.format("        addColor(d, \"%s%s\", %s);\n",
                     prefix, "textForeground", textForeground.getValue().write()));
@@ -185,7 +185,7 @@
         return false;
     }
 
-    public void write(StringBuilder sb, StringBuilder styleBuffer,
+    public void write(StringBuffer sb, StringBuffer styleBuffer,
                       UIComponent comp, String prefix, String pkg) {
         // write content margins
         sb.append(String.format("        d.put(\"%s.contentMargins\", %s);\n",
@@ -284,7 +284,7 @@
 class UIIconRegion extends UIRegion {
     @XmlAttribute private String basicKey;
 
-    @Override public void write(StringBuilder sb, StringBuilder styleBuffer, UIComponent comp, String prefix, String pkg) {
+    @Override public void write(StringBuffer sb, StringBuffer styleBuffer, UIComponent comp, String prefix, String pkg) {
         Dimension size = null;
         String fileNamePrefix = Utils.normalize(prefix) + "Painter";
         // write states ui defaults
@@ -353,7 +353,7 @@
 
     public String getName() {
         if (cachedName == null) {
-            StringBuilder buf = new StringBuilder();
+            StringBuffer buf = new StringBuffer();
             List<String> keys = stringToKeys(stateKeys);
             Collections.sort(keys);
             for (Iterator<String> iter = keys.iterator(); iter.hasNext();) {
@@ -367,7 +367,7 @@
         return cachedName;
     }
 
-    public void write(StringBuilder sb, String prefix, String pkg, String fileNamePrefix, String painterPrefix) {
+    public void write(StringBuffer sb, String prefix, String pkg, String fileNamePrefix, String painterPrefix) {
         String statePrefix = prefix + "[" + getName() + "]";
         // write state style
         sb.append(style.write(statePrefix + '.'));
@@ -377,7 +377,7 @@
         }
     }
 
-    private void writeLazyPainter(StringBuilder sb, String statePrefix, String packageNamePrefix, String fileNamePrefix, String painterPrefix) {
+    private void writeLazyPainter(StringBuffer sb, String statePrefix, String packageNamePrefix, String fileNamePrefix, String painterPrefix) {
         String cacheModeString = "AbstractRegionPainter.PaintContext.CacheMode." + style.getCacheMode();
         String stateConstant = Utils.statesToConstantName(painterPrefix + "_" + stateKeys);
         sb.append(String.format(
--- a/make/tools/src/build/tools/generatenimbus/Utils.java	Fri Mar 18 04:51:50 2011 +0000
+++ b/make/tools/src/build/tools/generatenimbus/Utils.java	Fri Mar 18 07:27:43 2011 +0000
@@ -37,7 +37,7 @@
 
     public static String normalize(String s) {
         char[] src = s.toCharArray();
-        StringBuilder buf = new StringBuilder();
+        StringBuffer buf = new StringBuffer();
         List<String> parts = new ArrayList<String>();
         boolean capitalize = false;
 
--- a/make/tools/src/build/tools/javazic/GenDoc.java	Fri Mar 18 04:51:50 2011 +0000
+++ b/make/tools/src/build/tools/javazic/GenDoc.java	Fri Mar 18 07:27:43 2011 +0000
@@ -132,10 +132,10 @@
             // Populate zonesByOffset. (Zones that will change their
             // GMT offsets are also added to zonesByOffset here.)
             int lastKnownOffset = tz.getRawOffset();
-            Set set = (Set)zonesByOffset.get(Integer.valueOf(lastKnownOffset));
+            Set set = (Set)zonesByOffset.get(new Integer(lastKnownOffset));
             if (set == null) {
                 set = new TreeSet();
-                zonesByOffset.put(Integer.valueOf(lastKnownOffset), set);
+                zonesByOffset.put(new Integer(lastKnownOffset), set);
             }
             set.add(zonename);
 
--- a/make/tools/src/build/tools/javazic/Mappings.java	Fri Mar 18 04:51:50 2011 +0000
+++ b/make/tools/src/build/tools/javazic/Mappings.java	Fri Mar 18 07:27:43 2011 +0000
@@ -100,7 +100,7 @@
                         break;
                     }
                 }
-                rawOffsetsIndex.add(i, Integer.valueOf(rawOffset));
+                rawOffsetsIndex.add(i, new Integer(rawOffset));
 
                 Set perRawOffset = new TreeSet();
                 if (!isExcluded) {
--- a/make/tools/src/build/tools/javazic/Simple.java	Fri Mar 18 04:51:50 2011 +0000
+++ b/make/tools/src/build/tools/javazic/Simple.java	Fri Mar 18 07:27:43 2011 +0000
@@ -84,10 +84,10 @@
         // Populate zonesByOffset. (Zones that will change their
         // GMT offsets are also added to zonesByOffset here.)
         int lastKnownOffset = tz.getRawOffset();
-        Set set = (Set)zonesByOffset.get(Integer.valueOf(lastKnownOffset));
+        Set set = (Set)zonesByOffset.get(new Integer(lastKnownOffset));
         if (set == null) {
             set = new TreeSet();
-            zonesByOffset.put(Integer.valueOf(lastKnownOffset), set);
+            zonesByOffset.put(new Integer(lastKnownOffset), set);
         }
         set.add(zonename);
 
--- a/make/tools/src/build/tools/javazic/Time.java	Fri Mar 18 04:51:50 2011 +0000
+++ b/make/tools/src/build/tools/javazic/Time.java	Fri Mar 18 07:27:43 2011 +0000
@@ -297,7 +297,7 @@
         }
         return String.format((Locale)null, "%c%02d:%02d",
                    new Object[] { 
-                             (Object)("" + sign), (Object)Long.valueOf(sec/3600), (Object)Long.valueOf((sec%3600)/60)
+                             (Object)("" + sign), (Object)new Long(sec/3600), (Object)new Long((sec%3600)/60)
                              
                    });
     }
@@ -309,7 +309,7 @@
      * @return the string in a human readable form
      */
     static String toFormedString(int ms) {
-        StringBuilder s = new StringBuilder();
+        StringBuffer s = new StringBuffer();
         boolean minus = false;
 
         if (ms < 0) {
--- a/make/tools/src/build/tools/javazic/Timezone.java	Fri Mar 18 04:51:50 2011 +0000
+++ b/make/tools/src/build/tools/javazic/Timezone.java	Fri Mar 18 07:27:43 2011 +0000
@@ -245,9 +245,9 @@
             offsets = new ArrayList();
             dstOffsets = new ArrayList();
         }
-        transitions.add(Long.valueOf(time));
-        offsets.add(Integer.valueOf(offset));
-        dstOffsets.add(Integer.valueOf(dstOffset));
+        transitions.add(new Long(time));
+        offsets.add(new Integer(offset));
+        dstOffsets.add(new Integer(dstOffset));
     }
 
     /**
@@ -446,9 +446,9 @@
             }
         }
         if (gmtOffsets.size() < index) {
-            gmtOffsets.add(Integer.valueOf(0));
+            gmtOffsets.add(new Integer(0));
         }
-        gmtOffsets.add(Integer.valueOf(offset));
+        gmtOffsets.add(new Integer(offset));
         return gmtOffsets.size() - 1;
     }
 }
--- a/make/tools/src/build/tools/jdwpgen/Node.java	Fri Mar 18 04:51:50 2011 +0000
+++ b/make/tools/src/build/tools/jdwpgen/Node.java	Fri Mar 18 07:27:43 2011 +0000
@@ -99,7 +99,9 @@
 
     String comment() {
         StringBuffer comment = new StringBuffer();
-        for (String st : commentList) {
+        Iterator iter = commentList.iterator();
+        while (iter.hasNext()) {
+        	String st = (String)iter.next();
             comment.append(st);
         }
         return comment.toString();
--- a/make/tools/src/build/tools/stripproperties/StripProperties.java	Fri Mar 18 04:51:50 2011 +0000
+++ b/make/tools/src/build/tools/stripproperties/StripProperties.java	Fri Mar 18 07:27:43 2011 +0000
@@ -38,6 +38,7 @@
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Properties;
+import java.util.Iterator;
 
 /**
  * Reads a properties file from standard input and writes an equivalent
@@ -110,7 +111,9 @@
 
     private static boolean stripFiles(List files) {
         boolean ok = true;
-        for ( String file : files ) {
+        Iterator iter = files.iterator();
+        while (iter.hasNext()) {
+        	String file = (String)iter.next();
 
             Properties prop = new Properties();
             InputStream in = null;