Index: build.xml
===================================================================
RCS file: /cvsroot/classpath/cp-tools/build.xml,v
retrieving revision 1.1
diff -u -r1.1 build.xml
--- build.xml	18 Dec 2002 05:53:39 -0000	1.1
+++ build.xml	27 Dec 2004 11:23:02 -0000
@@ -34,7 +34,7 @@
     <!-- =============================================================== -->
     <target name="compile" depends="init" description="Compiles source code">
         <mkdir dir="${build.classes.dir}"/>
-        <javac destdir="${build.classes.dir}" debug="on" deprecation="off" optimize="off" classpathref="base.path">
+        <javac source="1.4" destdir="${build.classes.dir}" debug="on" deprecation="off" optimize="off" classpathref="base.path">
             <src path="${src.dir}"/>
         </javac>
     </target>
Index: src/gnu/localegen/JavaGenerator.java
===================================================================
RCS file: /cvsroot/classpath/cp-tools/src/gnu/localegen/JavaGenerator.java,v
retrieving revision 1.16
diff -u -r1.16 JavaGenerator.java
--- src/gnu/localegen/JavaGenerator.java	23 Dec 2004 12:17:23 -0000	1.16
+++ src/gnu/localegen/JavaGenerator.java	27 Dec 2004 11:23:03 -0000
@@ -381,12 +381,10 @@
 
     public void generateContent(PrintWriter o)
     {
-      o.println("  private static final class Hashtable" + name + " extends java.util.Hashtable");
+      o.println("  private static final Hashtable " + name + " = new Hashtable();");
+      o.println("  static");
       o.println("  {");
-
-      o.println("    public Hashtable" + name + "()");
-      o.println("      {");
-      o.println("        super();");
+      o.println("    Hashtable h = " + name + ";");
 
       Enumeration keys = table.keys();
 
@@ -396,13 +394,10 @@
 
 	  key = (String)keys.nextElement();
 	  value = (String)table.get(key);
-	  o.println("        put(\"" + key + "\", \"" + convertToJavaString(value) + "\");");
+	  o.println("    h.put(\"" + key + "\", \"" + convertToJavaString(value) + "\");");
 	}
-      o.println("      }");
-
       o.println("  }");
       o.println();
-      o.println("  private static final Object " + name + " = new Hashtable" + name + "();");
     }
   }
 
@@ -641,6 +636,7 @@
     o.println();
     o.println("package " + inPackage + ';');
     o.println();
+    o.println("import java.util.Hashtable;");
     o.println("import java.util.ListResourceBundle;");
     o.println();
   }
@@ -670,7 +666,7 @@
   public void generateJavaClass(PrintWriter o)
   {
     String suffix = ("root".equals(locale)) ? "" : "_" + locale;
-    o.println("public class LocaleInformation" + suffix + " extends ListResourceBundle");
+    o.println("public final class LocaleInformation" + suffix + " extends ListResourceBundle");
     o.println("{");
 
     for (int i=0;i<localeContents.size();i++)