From 343e78c6c5fc8249964e03fc541bced6d6db3457 Mon Sep 17 00:00:00 2001 From: gandalf Date: Tue, 6 Jan 2009 22:44:05 +0000 Subject: Merge GNU Classpath libgcj-snapshot-20090102. 2009-01-06 Andrew John Hughes 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 * ChangeLog-2008: New file. 2009-01-02 Andrew John Hughes * java/text/MessageFormat.java: (setLocale(Locale)): Integer format should use NumberFormat.getIntegerInstance. libjava/classpath/ChangeLog-2008 2008-12-31 Andrew John Hughes * 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 * java/text/SimpleDateFormat.java: Remove superfluous empty line introduced in last commit. 2008-12-31 Andrew John Hughes * 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 * 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 * 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 * native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c: Include '\0' in the string. 2008-12-09 Andrew John Hughes 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/xml/transform/Bindings.java: Add generics to collections. 2008-11-16 Andrew John Hughes * gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.java: (init(int,SecureRandom)): Improve exception message. 2008-11-06 Mark Wielaard * native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c (getKerning): Removed unused cls, method, values. 2008-11-05 Andrew Haley * 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 * tools/Makefile.am (UPDATE_TOOLS_ZIP, CREATE_TOOLS_ZIP): Exclude .svn direcories. 2008-10-23 David Edelsohn * native/fdlibm/fdlibm.h: Undef hz. 2008-10-20 Andrew John Hughes * m4/ac_prog_antlr.m4: Remove redundant checks. * tools/Makefile.am: Use gjdoc_gendir when calling antlr. 2008-10-17 Robert Lougher * 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 * 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 * configure.ac: Remove superfluous AC_PROG_JAVA call. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@143139 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/text/MessageFormat.h | 10 +++++++--- libjava/java/text/RuleBasedCollator$CollationSorter.h | 3 ++- libjava/java/text/RuleBasedCollator.h | 2 +- libjava/java/text/SimpleDateFormat.h | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) (limited to 'libjava/java/text') diff --git a/libjava/java/text/MessageFormat.h b/libjava/java/text/MessageFormat.h index 01c6c359fea..961b0954146 100644 --- a/libjava/java/text/MessageFormat.h +++ b/libjava/java/text/MessageFormat.h @@ -15,6 +15,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace text { class FormatCharacterIterator; @@ -38,9 +42,9 @@ extern "Java" class java::text::MessageFormat : public ::java::text::Format { - static jint scanString(::java::lang::String *, jint, ::java::lang::StringBuilder *); - static jint scanFormatElement(::java::lang::String *, jint, ::java::lang::StringBuilder *, jchar); - static jint scanFormat(::java::lang::String *, jint, ::java::lang::StringBuilder *, ::java::util::Vector *, ::java::util::Locale *); + static jint scanString(::java::lang::String *, jint, ::gnu::java::lang::CPStringBuilder *); + static jint scanFormatElement(::java::lang::String *, jint, ::gnu::java::lang::CPStringBuilder *, jchar); + static jint scanFormat(::java::lang::String *, jint, ::gnu::java::lang::CPStringBuilder *, ::java::util::List *, ::java::util::Locale *); public: virtual void applyPattern(::java::lang::String *); virtual ::java::lang::Object * clone(); diff --git a/libjava/java/text/RuleBasedCollator$CollationSorter.h b/libjava/java/text/RuleBasedCollator$CollationSorter.h index 4436ec955bc..fb3d18895e4 100644 --- a/libjava/java/text/RuleBasedCollator$CollationSorter.h +++ b/libjava/java/text/RuleBasedCollator$CollationSorter.h @@ -21,8 +21,9 @@ extern "Java" class java::text::RuleBasedCollator$CollationSorter : public ::java::lang::Object { + RuleBasedCollator$CollationSorter(jint, ::java::lang::String *, jint, jboolean); public: // actually package-private - RuleBasedCollator$CollationSorter(); + RuleBasedCollator$CollationSorter(jint, ::java::lang::String *, jint, jboolean, ::java::text::RuleBasedCollator$CollationSorter *); static const jint GREATERP = 0; static const jint GREATERS = 1; static const jint GREATERT = 2; diff --git a/libjava/java/text/RuleBasedCollator.h b/libjava/java/text/RuleBasedCollator.h index 06803c8514a..74b5aa8ea39 100644 --- a/libjava/java/text/RuleBasedCollator.h +++ b/libjava/java/text/RuleBasedCollator.h @@ -54,7 +54,7 @@ public: virtual jint hashCode(); private: ::java::lang::String * __attribute__((aligned(__alignof__( ::java::text::Collator)))) rules; - JArray< ::java::lang::Object * > * ce_table; + JArray< ::java::text::RuleBasedCollator$CollationElement * > * ce_table; public: // actually package-private ::java::util::HashMap * prefix_tree; private: diff --git a/libjava/java/text/SimpleDateFormat.h b/libjava/java/text/SimpleDateFormat.h index 3e8a5d0597e..dbdb8169f23 100644 --- a/libjava/java/text/SimpleDateFormat.h +++ b/libjava/java/text/SimpleDateFormat.h @@ -80,7 +80,7 @@ private: jint serialVersionOnStream; static const jlong serialVersionUID = 4774881970558875024LL; static ::java::lang::String * standardChars; - static const jint RFC822_TIMEZONE_FIELD = 18; + static const jint RFC822_TIMEZONE_FIELD = 23; public: static ::java::lang::Class class$; }; -- cgit v1.2.3