c10bf728da
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
71 lines
2.4 KiB
C++
71 lines
2.4 KiB
C++
|
|
// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
|
|
|
|
#ifndef __java_text_RuleBasedCollator__
|
|
#define __java_text_RuleBasedCollator__
|
|
|
|
#pragma interface
|
|
|
|
#include <java/text/Collator.h>
|
|
#include <gcj/array.h>
|
|
|
|
extern "Java"
|
|
{
|
|
namespace java
|
|
{
|
|
namespace text
|
|
{
|
|
class CharacterIterator;
|
|
class CollationElementIterator;
|
|
class CollationKey;
|
|
class RuleBasedCollator;
|
|
class RuleBasedCollator$CollationElement;
|
|
}
|
|
}
|
|
}
|
|
|
|
class java::text::RuleBasedCollator : public ::java::text::Collator
|
|
{
|
|
|
|
public:
|
|
RuleBasedCollator(::java::lang::String *);
|
|
public: // actually package-private
|
|
static jint findPrefixLength(::java::lang::String *, ::java::lang::String *);
|
|
private:
|
|
void mergeRules(jint, ::java::lang::String *, ::java::util::ArrayList *, ::java::util::ArrayList *);
|
|
jint subParseString(jboolean, ::java::util::ArrayList *, jint, ::java::lang::String *);
|
|
public:
|
|
virtual ::java::lang::Object * clone();
|
|
private:
|
|
::java::util::ArrayList * parseString(::java::lang::String *);
|
|
void buildCollationVector(::java::util::ArrayList *);
|
|
void buildPrefixAccess();
|
|
public:
|
|
virtual jint compare(::java::lang::String *, ::java::lang::String *);
|
|
virtual jboolean equals(::java::lang::Object *);
|
|
public: // actually package-private
|
|
virtual ::java::text::RuleBasedCollator$CollationElement * getDefaultElement(jchar);
|
|
virtual ::java::text::RuleBasedCollator$CollationElement * getDefaultAccentedElement(jchar);
|
|
public:
|
|
virtual ::java::text::CollationElementIterator * getCollationElementIterator(::java::lang::String *);
|
|
virtual ::java::text::CollationElementIterator * getCollationElementIterator(::java::text::CharacterIterator *);
|
|
virtual ::java::text::CollationKey * getCollationKey(::java::lang::String *);
|
|
virtual ::java::lang::String * getRules();
|
|
virtual jint hashCode();
|
|
private:
|
|
::java::lang::String * __attribute__((aligned(__alignof__( ::java::text::Collator)))) rules;
|
|
JArray< ::java::text::RuleBasedCollator$CollationElement * > * ce_table;
|
|
public: // actually package-private
|
|
::java::util::HashMap * prefix_tree;
|
|
private:
|
|
jint last_primary_value;
|
|
jint last_tertiary_value;
|
|
jboolean inverseAccentComparison;
|
|
public: // actually package-private
|
|
static ::java::text::RuleBasedCollator$CollationElement * SPECIAL_UNKNOWN_SEQ;
|
|
public:
|
|
static ::java::lang::Class class$;
|
|
};
|
|
|
|
#endif // __java_text_RuleBasedCollator__
|