Merge GNU Classpath libgcj-snapshot-20090102.

2009-01-06  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	Import GNU Classpath (libgcj-snapshot-20090102).

	* libjava/classpath/lib/java/text/RuleBasedCollator$CollationSorter.class,
	* libjava/classpath/lib/java/text/MessageFormat$MessageFormatElement.class,
	* libjava/classpath/lib/java/text/MessageFormat.class,
	* libjava/classpath/lib/java/text/SimpleDateFormat.class,
	* libjava/classpath/lib/java/text/NumberFormat.class,
	* libjava/classpath/lib/java/text/RuleBasedCollator$CollationElement.class,
	* libjava/classpath/lib/java/text/MessageFormat$Field.class,
	* libjava/classpath/lib/java/text/RuleBasedCollator.class,
	* libjava/classpath/lib/java/text/NumberFormat$Field.class,
	* libjava/classpath/lib/gnu/xml/transform/Bindings.class,
	* libjava/classpath/lib/gnu/java/locale/LocaleData.class,
	* libjava/classpath/lib/gnu/java/awt/peer/gtk/FreetypeGlyphVector.class,
	* libjava/classpath/lib/gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.class,
	* libjava/gnu/java/awt/peer/gtk/FreetypeGlyphVector.h,
	* libjava/java/text/MessageFormat.h,
	* libjava/java/text/RuleBasedCollator$CollationSorter.h,
	* libjava/java/text/RuleBasedCollator.h,
	* libjava/java/text/SimpleDateFormat.h:
	Regenerated.

2009-01-02  Andrew John Hughes  <gnu_andrew@member.fsf.org>

       * ChangeLog-2008: New file.

2009-01-02  Andrew John Hughes  <gnu_andrew@member.fsf.org>

       * java/text/MessageFormat.java:
       (setLocale(Locale)): Integer format should use
       NumberFormat.getIntegerInstance.

libjava/classpath/ChangeLog-2008

2008-12-31  Andrew John Hughes  <gnu_andrew@member.fsf.org>

       * java/text/MessageFormat.java:
       (parse(String,ParsePosition)): Emulate behaviour
       of Vector's setSize() which was being implicitly relied on.

2008-12-31  Andrew John Hughes  <gnu_andrew@member.fsf.org>

       * java/text/SimpleDateFormat.java:
       Remove superfluous empty line introduced
       in last commit.

2008-12-31  Andrew John Hughes  <gnu_andrew@member.fsf.org>

       * java/text/MessageFormat.java:
       Convert variables to use generic types, use
       CPStringBuilder in place of StringBuilder.
       (Field()): Suppress warning due to only being used by
       deserialization.
       (scanFormat(String,int,CPStringBuilder,List,Locale)):
       Use ArrayList instead of Vector as no synchronisation needed.
       (parse(String,ParsePosition)): Likewise.
       * java/text/NumberFormat.java:
       (Field()): Suppress warning due to only being used by
       deserialization.
       * java/text/RuleBasedCollator.java:
       Convert variables to use generic types.
       (CollationElement): Make fields final.
       (CollationSorter): Likewise.
       (CollationSorter(int,String,int,boolean)): New constructor.
       * java/text/SimpleDateFormat.java,
       Convert variables to use generic types.
       (applyPattern(String)): Clear list rather than creating a new instance.

2008-12-30  Andrew John Hughes  <gnu_andrew@member.fsf.org>

       * java/text/SimpleDateFormat.java:
       (standardChars): Use standard characters from CLDR.
       (RFC822_TIMEZONE_FIELD): Fixed to match new standard
       characters.

2008-12-22  Andrew John Hughes  <gnu_andrew@member.fsf.org>

       * java/lang/String.java:
       (byte[],int,int,String): Call new Charset method.
       (stringToCharset(String)): Private method added to
       handle exception conversion.
       (byte[],int,int,Charset): Implemented.
       (byte[], Charset): Likewise.
       (getBytes(String)): Call new Charset method.
       (getBytes(Charset)): Implemented.

2008-12-18  Andrew John Hughes  <gnu_andrew@member.fsf.org>

       * native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c:
       Include '\0' in the string.

2008-12-09  Andrew John Hughes  <gnu_andrew@member.fsf.org>

       PR classpath/38473:
       * native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c:
       (Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getGlyphOutlineNative):
       Check that the glyph is an outline before calling
       FT_Outline_Decompose.

2008-11-16  Andrew John Hughes  <gnu_andrew@member.fsf.org>

       * gnu/xml/transform/Bindings.java:
       Add generics to collections.

2008-11-16  Andrew John Hughes  <gnu_andrew@member.fsf.org>

       * gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.java:
       (init(int,SecureRandom)): Improve exception message.

2008-11-06  Mark Wielaard  <mark@klomp.org>

       * native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c
       (getKerning): Removed unused cls, method, values.

2008-11-05  Andrew Haley  <aph@redhat.com>

       * gnu/java/awt/peer/gtk/FreetypeGlyphVector.java (getKerning):
       Return result in a float[], not a Point2D.
       (performDefaultLayout): Call getKerning with a float[].
       * native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c
       (getKerning): Return result in a float[], not a Point2D.

2008-11-05  Andrew Haley  <aph@redhat.com>

       * tools/Makefile.am (UPDATE_TOOLS_ZIP, CREATE_TOOLS_ZIP): Exclude
       .svn direcories.

2008-10-23  David Edelsohn  <edelsohn@gnu.org>

       * native/fdlibm/fdlibm.h: Undef hz.

2008-10-20  Andrew John Hughes  <gnu_andrew@member.fsf.org>

       * m4/ac_prog_antlr.m4:
       Remove redundant checks.
       * tools/Makefile.am:
       Use gjdoc_gendir when calling antlr.

2008-10-17  Robert Lougher  <rob.lougher@gmail.com>

       * native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
       (Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoDrawGlyphVector):
       Release 'fonts'.

2008-10-16  Tom Tromey  <tromey@redhat.com>

       * tools/gnu/classpath/tools/jar/WorkSet.java (initSet): Use
       foreach.  Change argument type.
       (WorkSet): Change argument type.
       * tools/gnu/classpath/tools/jar/Indexer.java (indexJarFile): Use
       foreach.
       * tools/gnu/classpath/tools/jar/Creator.java
       (writeCommandLineEntries): Use foreach.
       (getAllEntries): Likewise.

2008-10-15  Andrew John Hughes  <gnu_andrew@member.fsf.org>

       * configure.ac:
       Remove superfluous AC_PROG_JAVA call.

From-SVN: r143139

2 files changed, 38 insertions, 40 deletions

diff --git a/libjava/classpath/gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.java b/libjava/classpath/gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.java
index 319b0ea..257c0a2 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.java
@@ -97,7 +97,8 @@ public class SecretKeyGeneratorImpl
   {
     keySize >>>= 3; // Use bytes.
     if (! keySizes.contains(Integer.valueOf(keySize)))
-      throw new InvalidParameterException("unsupported key size: " + keySize);
+      throw new InvalidParameterException("unsupported key size: " + keySize 
+					  + ", valid sizes are: " + keySizes);
     currentKeySize = keySize;
     this.random = random;
     init = true;
diff --git a/libjava/classpath/gnu/xml/transform/Bindings.java b/libjava/classpath/gnu/xml/transform/Bindings.java
index 0093213..ab79052 100644
--- a/libjava/classpath/gnu/xml/transform/Bindings.java
+++ b/libjava/classpath/gnu/xml/transform/Bindings.java
@@ -68,17 +68,17 @@ public class Bindings
   /**
    * Global variables.
    */
-  final LinkedList variables;
+  final LinkedList<Map<QName,Object>> variables;
 
   /**
    * Parameter value stack.
    */
-  final LinkedList parameters;
+  final LinkedList<Map<QName,Object>> parameters;
 
   /**
    * Argument (with-param) value stack.
    */
-  final LinkedList withParameters;
+  final LinkedList<Map<QName,Object>> withParameters;
 
   /**
    * Only search globals.
@@ -88,9 +88,9 @@ public class Bindings
   Bindings(Stylesheet stylesheet)
   {
     this.stylesheet = stylesheet;
-    variables = new LinkedList();
-    parameters = new LinkedList();
-    withParameters = new LinkedList();
+    variables = new LinkedList<Map<QName,Object>>();
+    parameters = new LinkedList<Map<QName,Object>>();
+    withParameters = new LinkedList<Map<QName,Object>>();
     for (int i = 0; i < 3; i++)
       {
         push(i);
@@ -114,13 +114,13 @@ public class Bindings
     switch (type)
       {
       case VARIABLE:
-        variables.addFirst(new HashMap());
+        variables.addFirst(new HashMap<QName,Object>());
         break;
       case PARAM:
-        parameters.addFirst(new HashMap());
+        parameters.addFirst(new HashMap<QName,Object>());
         break;
       case WITH_PARAM:
-        withParameters.addFirst(new HashMap());
+        withParameters.addFirst(new HashMap<QName,Object>());
         break;
       }
   }
@@ -145,11 +145,11 @@ public class Bindings
   {
     if (global)
       {
-        Map ctx1 = (Map) variables.getLast();
-        Map ctx2 = (Map) parameters.getLast();
+        Map<QName,Object> ctx1 = variables.getLast();
+        Map<QName,Object> ctx2 = parameters.getLast();
         return (ctx1.containsKey(name) || ctx2.containsKey(name));
       }
-    Iterator i = null;
+    Iterator<Map<QName,Object>> i = null;
     switch (type)
       {
       case VARIABLE:
@@ -159,14 +159,14 @@ public class Bindings
         i = parameters.iterator();
         break;
       case WITH_PARAM:
-        Map ctx = (Map) withParameters.getFirst();
+        Map<QName,Object> ctx = withParameters.getFirst();
         return ctx.containsKey(name);
       }
     if (i != null)
       {
         while (i.hasNext())
           {
-            Map ctx = (Map) i.next();
+            Map<QName,Object> ctx = i.next();
             if (ctx.containsKey(name))
               {
                 return true;
@@ -180,11 +180,11 @@ public class Bindings
   {
     if (global)
       {
-        Map ctx = (Map) variables.getLast();
+        Map<QName,Object> ctx = variables.getLast();
         Object ret = ctx.get(name);
         if (ret == null)
           {
-            ctx = (Map) parameters.getLast();
+            ctx = parameters.getLast();
             ret = ctx.get(name);
           }
         return ret;
@@ -195,24 +195,26 @@ public class Bindings
     //if (parameters.size() > 1 && containsKey(name, PARAM))
       // check that template defines parameter
       {
-        Map cwp = (Map) withParameters.getFirst();
+        Map<QName,Object> cwp = withParameters.getFirst();
         ret = cwp.get(name);
         //System.err.println("\twith-param: ret="+ret);
       }
     if (ret == null)
       {
-        for (Iterator i = variables.iterator(); i.hasNext() && ret == null; )
+        for (Iterator<Map<QName,Object>> i = variables.iterator();
+	     i.hasNext() && ret == null; )
           {
-            Map vctx = (Map) i.next();
+            Map<QName,Object> vctx = i.next();
             ret = vctx.get(name);
           }
         //System.err.println("\tvariable: ret="+ret);
       }
     if (ret == null)
       {
-        for (Iterator i = parameters.iterator(); i.hasNext() && ret == null; )
+        for (Iterator<Map<QName,Object>> i = parameters.iterator();
+	     i.hasNext() && ret == null; )
           {
-            Map pctx = (Map) i.next();
+            Map<QName,Object> pctx = i.next();
             ret = pctx.get(name);
           }
         //System.err.println("\tparam: ret="+ret);
@@ -239,15 +241,15 @@ public class Bindings
     switch (type)
       {
       case VARIABLE:
-        Map vctx = (Map) variables.getFirst();
+        Map<QName,Object> vctx = variables.getFirst();
         vctx.put(name, value);
         break;
       case PARAM:
-        Map pctx = (Map) parameters.getFirst();
+        Map<QName,Object> pctx = parameters.getFirst();
         pctx.put(name, value);
         break;
       case WITH_PARAM:
-        Map wctx = (Map) withParameters.getFirst();
+        Map<QName,Object> wctx = withParameters.getFirst();
         wctx.put(name, value);
         break;
       }
@@ -263,10 +265,10 @@ public class Bindings
   {
     CPStringBuilder buf = new CPStringBuilder();
     boolean next = false;
-    Collection seen = new HashSet();
-    Map wctx = (Map) withParameters.getFirst();
+    Collection<QName> seen = new HashSet<QName>();
+    Map<QName,Object> wctx = withParameters.getFirst();
     buf.append('(');
-    for (Iterator i = wctx.entrySet().iterator(); i.hasNext(); )
+    for (Map.Entry<QName,Object> entry : wctx.entrySet())
       {
         if (next)
           {
@@ -276,8 +278,7 @@ public class Bindings
           {
             next = true;
           }
-        Map.Entry entry = (Map.Entry) i.next();
-        Object key = entry.getKey();
+        QName key = entry.getKey();
         if (!seen.contains(key))
           {
             buf.append(key);
@@ -290,10 +291,9 @@ public class Bindings
     next = false;
     seen.clear();
     buf.append('{');
-    for (Iterator i = variables.iterator(); i.hasNext(); )
+    for (Map<QName,Object> ctx : variables)
       {
-        Map ctx = (Map) i.next();
-        for (Iterator j = ctx.entrySet().iterator(); j.hasNext(); )
+        for (Map.Entry<QName,Object> entry : ctx.entrySet())
           {
             if (next)
               {
@@ -303,8 +303,7 @@ public class Bindings
               {
                 next = true;
               }
-            Map.Entry entry = (Map.Entry) j.next();
-            Object key = entry.getKey();
+            QName key = entry.getKey();
             if (!seen.contains(key))
               {
                 buf.append(key);
@@ -318,10 +317,9 @@ public class Bindings
     next = false;
     seen.clear();
     buf.append('[');
-    for (Iterator i = parameters.iterator(); i.hasNext(); )
+    for (Map<QName,Object> ctx : parameters)
       {
-        Map ctx = (Map) i.next();
-        for (Iterator j = ctx.entrySet().iterator(); j.hasNext(); )
+        for (Map.Entry<QName,Object> entry : ctx.entrySet())
           {
             if (next)
               {
@@ -331,8 +329,7 @@ public class Bindings
               {
                 next = true;
               }
-            Map.Entry entry = (Map.Entry) j.next();
-            Object key = entry.getKey();
+            QName key = entry.getKey();
             if (!seen.contains(key))
               {
                 buf.append(key);