cd6d4007aa
libjava/ChangeLog: 2008-10-21 Andrew John Hughes <gnu_andrew@member.fsf.org> * sources.am, Makfile.in: Regenerate. 2008-10-17 Matthias Klose <doko@ubuntu.com> * configure.ac: Fix bashisms. * configure: Regenerate. 2008-10-15 Matthias Klose <doko@ubuntu.com> * configure.ac: Disable build of gjdoc, if configured without --with-antlr-jar or if no antlr.jar found. * configure: Regenerate. 2008-10-09 Andrew John Hughes <gnu_andrew@member.fsf.org> * classpath/configure.ac, * classpath/m4/ac_prog_antlr.m4, * classpath/m4/ac_prog_java.m4, * classpath/tools/Makefile.am: Ported --regen-gjdoc-parser patch and cantlr support from GNU Classpath. 2008-10-06 Andrew Haley <aph@redhat.com> * java/lang/Thread.java (Thread): Always create the ThreadLocalMap when creating a thread. (getThreadLocals) Don't lazily create the ThreadLocalMap. 2008-09-28 Andrew John Hughes <gnu_andrew@member.fsf.org> * classpath/java/lang/ThreadLocalMap.java, * java/lang/ThreadLocalMap$Entry.h, * java/lang/ThreadLocalMap.h, * lib/java/lang/ThreadLocalMap.class, * lib/java/lang/ThreadLocalMap$Entry.class: Add the new files for the ThreadLocal patch. 2008-09-28 Andrew John Hughes <gnu_andrew@member.fsf.org> * classpath/ChangeLog, * classpath/java/lang/InheritableThreadLocal.java, * classpath/java/lang/Thread.java, * classpath/java/lang/ThreadLocal.java: Merge Daniel Frampton's ThreadLocal patch. * gcj/javaprims.h: Updated. * java/lang/Thread.h: Regenerated. * java/lang/Thread.java: Replace WeakIdentityHashMap with ThreadLocalMap. (getThreadLocals()): Likewise. * java/lang/ThreadLocal.h: Regenerated. * java/lang/ThreadLocal.java: (computeNextHash()): New method. (ThreadLocal()): Initialise fastHash. (internalGet()): Updated to match Classpath's get(). (internalSet(Object)): Likewise for set(Object). (internalRemove()): Likewise for remove(). 2008-09-25 Andrew John Hughes <gnu_andrew@member.fsf.org> * classpath/configure, * classpath/configure.ac: Resynchronise with Classpath's configure. * classpath/examples/Makefile.in: Add equivalent support for building as in tools/Makefile.in. * classpath/java/nio/Buffer.java, * classpath/java/nio/ByteBuffer.java, * classpath/java/nio/ByteBufferImpl.java, * classpath/java/nio/CharBuffer.java, * classpath/java/nio/CharBufferImpl.java, * classpath/java/nio/CharSequenceBuffer.java, * classpath/java/nio/CharViewBufferImpl.java, * classpath/java/nio/DirectByteBufferImpl.java, * classpath/java/nio/DoubleBuffer.java, * classpath/java/nio/DoubleBufferImpl.java, * classpath/java/nio/DoubleViewBufferImpl.java, * classpath/java/nio/FloatBuffer.java, * classpath/java/nio/FloatBufferImpl.java, * classpath/java/nio/FloatViewBufferImpl.java, * classpath/java/nio/IntBuffer.java, * classpath/java/nio/IntBufferImpl.java, * classpath/java/nio/IntViewBufferImpl.java, * classpath/java/nio/LongBuffer.java, * classpath/java/nio/LongBufferImpl.java, * classpath/java/nio/LongViewBufferImpl.java, * classpath/java/nio/MappedByteBuffer.java, * classpath/java/nio/MappedByteBufferImpl.java, * classpath/java/nio/ShortBuffer.java, * classpath/java/nio/ShortBufferImpl.java, * classpath/java/nio/ShortViewBufferImpl.java: Replace use of gnu.classpath.Pointer with gnu.gcj.RawData, and fix some formatting issues. * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.java, * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.smap, * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.java, * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.smap, * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.java, * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.txt: Regenerated (later version of antlr). * java/nio/Buffer.h: Regenerated. * java/nio/Buffer.java: Ported changes from Classpath. * java/nio/ByteBuffer.h, * java/nio/CharBuffer.h: Regenerated. * java/nio/DirectByteBufferImpl.java: Ported changes from Classpath. * java/nio/DoubleBuffer.h, * java/nio/FloatBuffer.h, * java/nio/IntBuffer.h, * java/nio/LongBuffer.h, * java/nio/MappedByteBuffer.h, * java/nio/MappedByteBufferImpl.h: Regenerated. * java/nio/MappedByteBufferImpl.java: Ported changes from Classpath. * java/nio/ShortBuffer.h: Regenerated. 2008-09-24 Matthias Klose <doko@ubuntu.com> * configure.ac: Search for antlr.jar, if not configured. * configure: Regenerate. 2008-09-24 Matthias Klose <doko@ubuntu.com> * Makefile.am: Build a gjdoc binary, if enabled. * configure.ac: Add options --disable-gjdoc, --with-antlr-jar=file. * Makefile.in, */Makefile.in, configure: Regenerate. 2008-09-22 Andrew Haley <aph@redhat.com> * java/lang/String.java (toString(char[], int, int)): New method. 2008-09-14 Matthias Klose <doko@ubuntu.com> Import GNU Classpath (libgcj-import-20080914). * Regenerate class and header files. * Regenerate auto* files. * configure.ac: Don't pass --disable-gjdoc to classpath. * sources.am: Regenerated. * HACKING: Mention to build gjdoc in maintainer builds. * gnu/classpath/Configuration.java: Update classpath version. * gcj/javaprims.h: Update. 2008-09-08 Andrew John Hughes <gnu_andrew@member.fsf.org> * Makefile.am: Replace natStringBuffer.cc and natStringBuilder.cc with natAbstractStringBuffer.cc. * Makefile.in: Regenerated. * java/lang/AbstractStringBuffer.java: (append(int)): Made native. (regionMatches(int,String)): Likewise. * java/lang/StringBuffer.h: Regenerated. * java/lang/StringBuffer.java: Remerged with GNU Classpath. * java/lang/StringBuilder.h: Regenerated. * java/lang/StringBuilder.java: Remerged with GNU Classpath. * java/lang/natAbstractStringBuffer.cc: Provide common native methods for StringBuffer and StringBuilder. * java/lang/natStringBuffer.cc, * java/lang/natStringBuilder.cc: Removed. 2008-09-04 Andrew John Hughes <gnu_andrew@member.fsf.org> * Makefile.in, * classpath/configure: Regenerated. * gnu/gcj/util/natDebug.cc, * gnu/gcj/xlib/natColormap.cc, * gnu/gcj/xlib/natDisplay.cc, * gnu/gcj/xlib/natDrawable.cc, * gnu/gcj/xlib/natFont.cc, * gnu/gcj/xlib/natWMSizeHints.cc, * gnu/gcj/xlib/natWindow.cc, * gnu/gcj/xlib/natXImage.cc: Add :: prefix to namespaces. * java/io/CharArrayWriter.h, * java/lang/StringBuffer.h: Regenerated using patched gjavah. * java/lang/natStringBuffer.cc: Fix naming of append(jint). * java/sql/Timestamp.h: Regenerated using patched gjavah. * jni.cc: Rename p to functions to match change in GNU Classpath. * scripts/makemake.tcl: Switch gnu.java.math to BC compilation. * sources.am: Regenerated. 2008-08-21 Andrew John Hughes <gnu_andrew@member.fsf.org> * Makefile.in: Updated location of Configuration.java. * classpath/lib/gnu/java/locale/LocaleData.class: Regenerated. 2008-08-18 Andrew John Hughes <gnu_andrew@member.fsf.org> * Makefile.in: Updated with new Java files. * classpath/configure: Regenerated. * classpath/tools/Makefile.am: Add missing use of GJDOC_EX so --disable-gjdoc works. * classpath/tools/Makefile.in: Regenerated. 2008-08-15 Matthias Klose <doko@ubuntu.com> Import GNU Classpath (libgcj-import-20080811). * Regenerate class and header files. * Regenerate auto* files. * configure.ac: Don't pass --with-fastjar to classpath, substitute new dummy value in classpath/gnu/classpath/Configuration.java.in, pass --disable-gjdoc to classpath. * scripts/makemake.tcl: * sources.am: Regenerated. * java/lang/AbstractStringBuffer.java, gnu/java/lang/VMCPStringBuilder.java: New, copied from classpath, use System instead of VMSystem. * java/lang/StringBuffer.java: Merge from classpath. * java/lang/ClassLoader.java: Merge from classpath. * gcj/javaprims.h: Update class definitions, remove _Jv_jobjectRefType, jobjectRefType definitions. libjava/classpath/ChangeLog.gcj: 2008-10-21 Matthias Klose <doko@ubuntu.com> * classpath/tools/gnu/classpath/tools/gjdoc/expr/Java*: Move from ... * classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/ ... here. * Update .class files. 2008-10-21 Andrew John Hughes <gnu_andrew@member.fsf.org> * tools/Makefile.am: Always generate parser in the srcdir. 2008-10-21 Matthias Klose <doko@ubuntu.com> * doc/Makefile.am (MAINTAINERCLEANFILES): Add gjdoc.1. * doc/Makefile.in: Regenerate. 2008-10-20 Matthias Klose <doko@ubuntu.com> * configure.ac: Don't check for working java, if not configured with --enable-java-maintainer-mode. * configure: Regenerate. 2008-10-19 Matthias Klose <doko@ubuntu.com> * m4/ac_prog_java.m4: Revert previous change. * m4/ac_prog_javac.m4: Apply it here. * configure: Regenerate. 2008-10-19 Matthias Klose <doko@ubuntu.com> * m4/ac_prog_javac.m4: Don't check for working javac, if not configured with --enable-java-maintainer-mode. * configure: Regenerate. * Makefile.in, */Makefile.in: Regenerate. 2008-09-30 Matthias Klose <doko@ubuntu.com> * m4/ac_prog_antlr.m4: Check for cantlr binary as well. 2008-09-29 Matthias Klose <doko@ubuntu.com> * m4/ac_prog_antlr.m4: Check for antlr binary as well. 2008-09-28 Matthias Klose <doko@ubuntu.com> * PR libgcj/37636. Revert: 2008-02-20 Matthias Klose <doko@ubuntu.com> * tools/Makefile.am ($(TOOLS_ZIP)): Revert part of previous change, Do copy resource files in JAVA_MAINTAINER_MODE only. * tools/Makefile.in: Regenerate. 2008-09-14 Matthias Klose <doko@ubuntu.com> * m4/ac_prog_javac_works.m4, m4/ac_prog_javac.m4, m4/acinclude.m4: Revert local changes. * m4/ac_prog_antlr.m4: Check for an runantlr binary. * tools/Makefile.am, lib/Makefile.am: Revert local changes (JCOMPILER). * tools/Makefile.am: Remove USE_JAVAC_FLAGS, pass ANTLR_JAR in GLIBJ_CLASSPATH. 2008-09-14 Matthias Klose <doko@ubuntu.com> Revert: Daniel Frampton <zyridium at zyridium.net> * AUTHORS: Added. * java/lang/InheritableThreadLocal.java, * java/lang/Thread.java, * java/lang/ThreadLocal.java: Modified to use java.lang.ThreadLocalMap. * java/lang/ThreadLocalMap.java: New cheaper ThreadLocal-specific WeakHashMap. 2008-08-15 Matthias Klose <doko@ubuntu.com> * m4/acinclude.m4 (CLASSPATH_JAVAC_MEM_CHECK): Remove unknown args for javac. libjava/classpath/ChangeLog: 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-15 Andrew John Hughes <gnu_andrew@member.fsf.org> * configure.ac: Remove superfluous AC_PROG_JAVA call. 2008-10-06 Andrew John Hughes <gnu_andrew@member.fsf.org> * m4/ac_prog_antlr: Check for cantlr as well. * tools/Makefile.am: Only build GJDoc parser when both CREATE_GJDOC and CREATE_GJDOC_PARSER are on. 2008-10-02 Andrew John Hughes <gnu_andrew@member.fsf.org> * configure.ac: Add regen-gjdoc-parser option, and separate antlr tests. * m4/ac_prog_antlr.m4: Turn single test into AC_LIB_ANTLR and AC_PROG_ANTLR. * m4/ac_prog_java.m4: Quote tests. * tools/Makefile.am: Support CREATE_GJDOC_PARSER option. 2008-09-14 Andrew John Hughes <gnu_andrew@member.fsf.org> * examples/Makefile.am: Check lib directly as well as glibj.zip for boot classes. * m4/acinclude.m4: Only require the class files to be built to allow the tools and examples to be built, not the installation of glibj.zip. * tools/Makefile.am: Check lib directly as well as glibj.zip for boot classes. 2008-09-13 Andrew John Hughes <gnu_andrew@member.fsf.org> * examples/Makefile.am, * lib/Makefile.am: Add GCJ rules. * m4/ac_prog_javac.m4: Check whether JAVAC is gcj. * m4/ac_prog_javac_works.m4: Add GCJ rules. * m4/acinclude.m4: Don't bother checking for -J if using GCJ. * tools/Makefile.am: Add GCJ rules. 2007-08-23 Daniel Frampton <zyridium@zyridium.net> * AUTHORS: Added. * java/lang/InheritableThreadLocal.java, * java/lang/Thread.java, * java/lang/ThreadLocal.java: Modified to use java.lang.ThreadLocalMap. * java/lang/ThreadLocalMap.java: New cheaper ThreadLocal-specific WeakHashMap. 2008-02-07 Ian Rogers <ian.rogers@manchester.ac.uk> * java/util/zip/ZipEntry.java: Use byte fields instead of integer fields, store the time as well as the DOS time and don't retain a global Calendar instance. (setDOSTime(int)): Set KNOWN_DOSTIME instead of KNOWN_TIME, and unset KNOWN_TIME. (getDOSTime()): Compute DOS time from UNIX time only when needed. (clone()): Provide cloning via the ZipEntry constructor where possible. (setTime(long)): Don't compute DOS time at this point. (getCalendar()): Removed. 2008-09-09 Andrew John Hughes <gnu_andrew@member.fsf.org> * tools/gnu/classpath/tools/getopt/Parser.java: (setHeader(String)): Make synchronized. (setFooter(String)): Likewise. * tools/gnu/classpath/tools/rmic/SourceGiopRmicCompiler.java, (reset()): Make synchronized. (name(Class)): Likewise. 2008-09-04 Robert Schuster <robertschuster@fsfe.org> * gnu/java/nio/charset/ByteDecodeLoopHelper: (arrayDecodeLoop): Added new break label, escape to that label. * gnu/java/nio/charset/ByteEncodeLoopHelper: (arrayDecodeLoop): Added new break label, escape to that label. 2008-09-04 Robert Schuster <robertschuster@fsfe.org> * java/text/DecimalFormat.java: (scanFix): Use 'i + 1' when looking at following character. (scanNegativePattern): Dito. 2008-09-02 Andrew John Hughes <gnu_andrew@member.fsf.org> * tools/gnu/classpath/tools/javah/ClassWrapper.java: (makeVtable()): Populate methodNameMap. (printMethods(CniPrintStream)): Always use pre-populated methodNameMap for bridge targets. 2008-09-01 Mario Torre <neugens@aicas.com> * gnu/java/awt/peer/x/XImage.java (XImageProducer): remove @Override annotation to allow compilation on javac < 1.6 and ecj < 3.4. 2008-09-01 Mario Torre <neugens@aicas.com> * gnu/java/awt/peer/x/XGraphicsDevice.java (getDisplay): fix to support new Escher API. * gnu/java/awt/peer/x/XImage.java (getSource): method implemented. * gnu/java/awt/peer/x/XImage.java (XImageProducer): implement ImageProducer for getSource. 2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org> * gnu/java/util/regex/BacktrackStack.java, * gnu/java/util/regex/CharIndexed.java, * gnu/java/util/regex/CharIndexedCharArray.java, * gnu/java/util/regex/CharIndexedCharSequence.java, * gnu/java/util/regex/CharIndexedInputStream.java, * gnu/java/util/regex/CharIndexedString.java, * gnu/java/util/regex/CharIndexedStringBuffer.java, * gnu/java/util/regex/RE.java, * gnu/java/util/regex/REException.java, * gnu/java/util/regex/REFilterInputStream.java, * gnu/java/util/regex/REMatch.java, * gnu/java/util/regex/REMatchEnumeration.java, * gnu/java/util/regex/RESyntax.java, * gnu/java/util/regex/REToken.java, * gnu/java/util/regex/RETokenAny.java, * gnu/java/util/regex/RETokenBackRef.java, * gnu/java/util/regex/RETokenChar.java, * gnu/java/util/regex/RETokenEnd.java, * gnu/java/util/regex/RETokenEndOfPreviousMatch.java, * gnu/java/util/regex/RETokenEndSub.java, * gnu/java/util/regex/RETokenIndependent.java, * gnu/java/util/regex/RETokenLookAhead.java, * gnu/java/util/regex/RETokenLookBehind.java, * gnu/java/util/regex/RETokenNamedProperty.java, * gnu/java/util/regex/RETokenOneOf.java, * gnu/java/util/regex/RETokenPOSIX.java, * gnu/java/util/regex/RETokenRange.java, * gnu/java/util/regex/RETokenRepeated.java, * gnu/java/util/regex/RETokenStart.java, * gnu/java/util/regex/RETokenWordBoundary.java, * gnu/java/util/regex/UncheckedRE.java: Fix indentation. 2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org> * gnu/java/util/regex/RETokenStart.java: (getMaximumLength()): Add Override annotation. (matchThis(CharIndexed, REMatch)): Likewise. (returnsFixedLengthMatches()): Renamed from returnsFixedLengthmatches and added Override annotation. (findFixedLengthMatches(CharIndexed,REMatch,int)): Add Override annotation. (dump(CPStringBuilder)): Likewise. * gnu/javax/print/ipp/IppRequest.java: (RequestWriter.writeOperationAttributes(AttributeSet)): Throw exception, don't just create and drop it. * javax/management/MBeanServerPermission.java: (MBeanServerPermissionCollection.add(Permission)): Compare against individual Strings not the entire array, and store the result of replace. * javax/swing/text/html/StyleSheet.java: (setBaseFontSize(size)): Store result of trim(). 2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org> * javax/tools/FileObject.java: (openReader(boolean)): Document new parameter. 2008-03-27 Michael Franz <mvfranz@gmail.com> PR classpath/35690: * javax/tools/FileObject.java: (toUri()): Fix case from toURI. (openReader(boolean)): Add missing boolean argument. 2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org> PR classpath/35487: * gnu/javax/management/Server.java: (beans): Change to ConcurrentHashMap. (defaultDomain): Make final. (outer): Likewise. (LazyListenersHolder): Added to wrap listeners, also now a ConcurrentHashMap, providing lazy initialisation safely. (sequenceNumber): Documented. (getBean(ObjectName)): Remove redundant cast. (addNotificationListener(ObjectName,NotificationListener, NotificationFilter,Object)): Remove map initialisation and use holder. (getObjectInstance(ObjectName)): Remove redundant cast. (registerMBean(Object,ObjectName)): Add bean atomically. (removeNotificationListener(ObjectName,NotificationListener)): Simplified. (removeNotificationListener(ObjectName,NotificationListener, NotificationFilter,Object)): Likewise. (notify(ObjectName,String)): Documented. 2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org> * gnu/javax/management/Server.java: Genericised. 2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org> * gnu/javax/management/Translator.java: Genericised. 2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org> * javax/management/DefaultLoaderRepository.java, * javax/management/JMX.java, * javax/management/MBeanAttributeInfo.java, * javax/management/MBeanConstructorInfo.java, * javax/management/MBeanOperationInfo.java, * javax/management/MBeanServerDelegate.java: Fix warnings due to generics. 2008-08-25 Andrew John Hughes <gnu_andrew@member.fsf.org> * javax/management/MBeanPermission.java, * javax/management/MBeanServerDelegate.java, * javax/management/MBeanServerFactory.java, * javax/management/MBeanServerInvocationHandler.java, * javax/management/MBeanServerPermission.java: Fix warnings due to use of non-generic collections. 2008-08-25 Mario Torre <neugens@aicas.com> * gnu/javax/rmi/CORBA/RmiUtilities.java (readValue): check if sender is null to avoid NPE. 2008-08-22 Mario Torre <neugens@aicas.com> * gnu/CORBA/OrbFunctional.java (set_parameters): Fix NullPointerException checking when param is null. 2008-08-23 Andrew John Hughes <gnu_andrew@member.fsf.org> * java/util/regex/Matcher.java: (reset()): Reset append position so we don't try and append to the end of the old input. 2008-08-22 Andrew John Hughes <gnu_andrew@member.fsf.org> PR classpath/32028: * m4/acinclude.m4: Also allow versions of GJDoc from 0.8* on, as CVS is 0.8.0-pre. 2008-08-21 Andrew John Hughes <gnu_andrew@member.fsf.org> PR classpath/32028: * m4/acinclude.m4: (CLASSPATH_WITH_GJDOC): Ensure version 0.7.9 is being used. 2008-08-20 Andrew John Hughes <gnu_andrew@member.fsf.org> * tools/Makefile.am: Add taglets subdirectory to list of excluded paths when GJDoc is not compiled. 2008-08-19 David P Grove <groved@us.ibm.com> * scripts/check_jni_methods.sh.in: Fix build issue on AIX by splitting generation of method list. 2008-08-18 Andrew John Hughes <gnu_andrew@member.fsf.org> * native/jni/gstreamer-peer/gst_native_pipeline.c: (get_free_space(int)): Use #else not #elif when there is no condition. 2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org> PR classpath/31895: * java/text/DecimalFormat.java: (setCurrency(Currency)): Update prefixes and suffixes when currency changes. * java/text/DecimalFormatSymbols.java: (DecimalFormatSymbols(Locale)): Set locale earlier so it can be used by setCurrency(Currency). (setCurrency(Currency)): Set the symbol correctly using the locale of the instance. * java/util/Currency.java: Throw error instead of just printing a message. 2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org> * javax/activation/ActivationDataFlavor.java: Suppress warnings from public API. (mimeType): Made final. (representationClass): Added generic type and made final. (normalizeMimeTypeParameter(String,String)): Use CPStringBuilder. * javax/activation/CommandInfo.java: (verb): Made final. (className): Made final. * javax/activation/DataHandler.java: (dataSource): Made final. * javax/activation/FileDataSource.java: (file): Made final. * javax/activation/MailcapCommandMap.java: Use generics on collections and CPStringBuilder instead of StringBuffer. * javax/activation/MimeType.java: (toString()): Use CPStringBuilder. (getBaseType()): Likewise. * javax/activation/MimeTypeParameterList.java: Use generics on collections and CPStringBuilder instead of StringBuffer. * javax/activation/MimeTypeParseException.java: (MimeTypeParseException(String,String)): Use CPStringBuilder. * javax/activation/MimetypesFileTypeMap.java: Use generics on collections and CPStringBuilder instead of StringBuffer. * javax/activation/URLDataSource.java: (url): Made final. 2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org> * gnu/javax/activation/viewers/ImageViewer.java, * gnu/javax/activation/viewers/TextEditor.java, * gnu/javax/activation/viewers/TextViewer.java, * javax/activation/ActivationDataFlavor.java, * javax/activation/CommandInfo.java, * javax/activation/CommandMap.java, * javax/activation/CommandObject.java, * javax/activation/DataContentHandler.java, * javax/activation/DataContentHandlerFactory.java, * javax/activation/DataHandler.java, * javax/activation/DataHandlerDataSource.java, * javax/activation/DataSource.java, * javax/activation/DataSourceDataContentHandler.java, * javax/activation/FileDataSource.java, * javax/activation/FileTypeMap.java, * javax/activation/MailcapCommandMap.java, * javax/activation/MimeType.java, * javax/activation/MimeTypeParameterList.java, * javax/activation/MimeTypeParseException.java, * javax/activation/MimetypesFileTypeMap.java, * javax/activation/ObjectDataContentHandler.java, * javax/activation/URLDataSource.java, * javax/activation/UnsupportedDataTypeException.java, * javax/activation/package.html, * resource/META-INF/mailcap.default, * resource/META-INF/mimetypes.default: Import GNU JAF CVS as of 17/08/2008. 2006-04-25 Archit Shah <ashah@redhat.com> * javax/activation/MimeTypeParameterList.java: Insert ';' separator before parameter list. 2005-06-29 Xavier Poinsard <xpoinsard@openpricer.com> * javax/activation/ObjectDataContentHandler.java: Fixed typo. 2005-05-28 Chris Burdess <dog@bluezoo.org> * javax/activation/CommandMap.java, * javax/activation/MailcapCommandMap.java: Updated to JAF 1.1. 2004-06-09 Chris Burdess <dog@bluezoo.org> * javax/activation/MailcapCommandMap.java: Fixed bug whereby x-java prefix was not attempted. 2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org> * AUTHORS: Added Laszlo. 2008-04-20 Andrew John Hughes <gnu_andrew@member.fsf.org> PR classpath/30436: * java/util/Scanner.java: Fix package to be java.util and correct indentation. 2007-07-25 Laszlo Andras Hernadi <e0327023@student.tuwien.ac.at> PR classpath/30436: * java/util/Scanner.java: Initial implementation. 2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org> * java/util/regex/Matcher.java: (toMatchResult()): Implemented. 2008-08-13 Joshua Sumali <jsumali@redhat.com> * doc/Makefile.am (gjdoc.pod): Generate gjdoc pod from cp-tools.texinfo instead of invoke.texi. Remove invoke.texi from EXTRA_DIST. * doc/invoke.texi: Removed and merged into ... * doc/cp-tools.texinfo: Here 2008-08-12 Robert Schuster <robertschuster@fsfe.org> * native/jni/java-net/local.c (local_bind): Removed fprintf call, fixed access outside of array bounds. From-SVN: r141271
426 lines
14 KiB
Java
426 lines
14 KiB
Java
/* Collator.java -- Perform locale dependent String comparisons.
|
|
Copyright (C) 1998, 1999, 2000, 2001, 2004, 2005 Free Software Foundation, Inc.
|
|
|
|
This file is part of GNU Classpath.
|
|
|
|
GNU Classpath is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
GNU Classpath is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Classpath; see the file COPYING. If not, write to the
|
|
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
02110-1301 USA.
|
|
|
|
Linking this library statically or dynamically with other modules is
|
|
making a combined work based on this library. Thus, the terms and
|
|
conditions of the GNU General Public License cover the whole
|
|
combination.
|
|
|
|
As a special exception, the copyright holders of this library give you
|
|
permission to link this library with independent modules to produce an
|
|
executable, regardless of the license terms of these independent
|
|
modules, and to copy and distribute the resulting executable under
|
|
terms of your choice, provided that you also meet, for each linked
|
|
independent module, the terms and conditions of the license of that
|
|
module. An independent module is a module which is not derived from
|
|
or based on this library. If you modify this library, you may extend
|
|
this exception to your version of the library, but you are not
|
|
obligated to do so. If you do not wish to do so, delete this
|
|
exception statement from your version. */
|
|
|
|
|
|
package java.text;
|
|
|
|
import gnu.java.locale.LocaleHelper;
|
|
|
|
import java.text.spi.CollatorProvider;
|
|
|
|
import java.util.Comparator;
|
|
import java.util.Locale;
|
|
import java.util.MissingResourceException;
|
|
import java.util.ResourceBundle;
|
|
import java.util.ServiceLoader;
|
|
|
|
/**
|
|
* This class is the abstract superclass of classes which perform
|
|
* locale dependent <code>String</code> comparisons. A caller requests
|
|
* an instance of <code>Collator</code> for a particular locale using
|
|
* the <code>getInstance()</code> static method in this class. That method
|
|
* will return a locale specific subclass of <code>Collator</code> which
|
|
* can be used to perform <code>String</code> comparisons for that locale.
|
|
* If a subclass of <code>Collator</code> cannot be located for a particular
|
|
* locale, a default instance for the current locale will be returned.
|
|
*
|
|
* In addition to setting the correct locale, there are two additional
|
|
* settings that can be adjusted to affect <code>String</code> comparisons:
|
|
* strength and decomposition. The strength value determines the level
|
|
* of signficance of character differences required for them to sort
|
|
* differently. (For example, whether or not capital letters are considered
|
|
* different from lower case letters). The decomposition value affects how
|
|
* variants of the same character are treated for sorting purposes. (For
|
|
* example, whether or not an accent is signficant or not). These settings
|
|
* are described in detail in the documentation for the methods and values
|
|
* that are related to them.
|
|
*
|
|
* @author Tom Tromey (tromey@cygnus.com)
|
|
* @author Aaron M. Renn (arenn@urbanophile.com)
|
|
* @date March 18, 1999
|
|
*/
|
|
public abstract class Collator implements Comparator<Object>, Cloneable
|
|
{
|
|
/**
|
|
* This constant is a strength value which indicates that only primary
|
|
* differences between characters will be considered signficant. As an
|
|
* example, two completely different English letters such as 'a' and 'b'
|
|
* are considered to have a primary difference.
|
|
*/
|
|
public static final int PRIMARY = 0;
|
|
|
|
/**
|
|
* This constant is a strength value which indicates that only secondary
|
|
* or primary differences between characters will be considered
|
|
* significant. An example of a secondary difference between characters
|
|
* are instances of the same letter with different accented forms.
|
|
*/
|
|
public static final int SECONDARY = 1;
|
|
|
|
/**
|
|
* This constant is a strength value which indicates that tertiary,
|
|
* secondary, and primary differences will be considered during sorting.
|
|
* An example of a tertiary difference is capitalization of a given letter.
|
|
* This is the default value for the strength setting.
|
|
*/
|
|
public static final int TERTIARY = 2;
|
|
|
|
/**
|
|
* This constant is a strength value which indicates that any difference
|
|
* at all between character values are considered significant.
|
|
*/
|
|
public static final int IDENTICAL = 3;
|
|
|
|
/**
|
|
* This constant indicates that accented characters won't be decomposed
|
|
* when performing comparisons. This will yield the fastest results, but
|
|
* will only work correctly in call cases for languages which do not
|
|
* use accents such as English.
|
|
*/
|
|
public static final int NO_DECOMPOSITION = 0;
|
|
|
|
/**
|
|
* This constant indicates that only characters which are canonical variants
|
|
* in Unicode 2.0 will be decomposed prior to performing comparisons. This
|
|
* will cause accented languages to be sorted correctly. This is the
|
|
* default decomposition value.
|
|
*/
|
|
public static final int CANONICAL_DECOMPOSITION = 1;
|
|
|
|
/**
|
|
* This constant indicates that both canonical variants and compatibility
|
|
* variants in Unicode 2.0 will be decomposed prior to performing
|
|
* comparisons. This is the slowest mode, but is required to get the
|
|
* correct sorting for certain languages with certain special formats.
|
|
*/
|
|
public static final int FULL_DECOMPOSITION = 2;
|
|
|
|
/**
|
|
* This method initializes a new instance of <code>Collator</code> to have
|
|
* the default strength (TERTIARY) and decomposition
|
|
* (CANONICAL_DECOMPOSITION) settings. This constructor is protected and
|
|
* is for use by subclasses only. Non-subclass callers should use the
|
|
* static <code>getInstance()</code> methods of this class to instantiate
|
|
* <code>Collation</code> objects for the desired locale.
|
|
*/
|
|
protected Collator ()
|
|
{
|
|
strength = TERTIARY;
|
|
decmp = CANONICAL_DECOMPOSITION;
|
|
}
|
|
|
|
/**
|
|
* This method compares the two <code>String</code>'s and returns an
|
|
* integer indicating whether or not the first argument is less than,
|
|
* equal to, or greater than the second argument. The comparison is
|
|
* performed according to the rules of the locale for this
|
|
* <code>Collator</code> and the strength and decomposition rules in
|
|
* effect.
|
|
*
|
|
* @param source The first object to compare
|
|
* @param target The second object to compare
|
|
*
|
|
* @return A negative integer if str1 < str2, 0 if str1 == str2, or
|
|
* a positive integer if str1 > str2.
|
|
*/
|
|
public abstract int compare (String source, String target);
|
|
|
|
/**
|
|
* This method compares the two <code>Object</code>'s and returns an
|
|
* integer indicating whether or not the first argument is less than,
|
|
* equal to, or greater than the second argument. These two objects
|
|
* must be <code>String</code>'s or an exception will be thrown.
|
|
*
|
|
* @param o1 The first object to compare
|
|
* @param o2 The second object to compare
|
|
*
|
|
* @return A negative integer if obj1 < obj2, 0 if obj1 == obj2, or
|
|
* a positive integer if obj1 > obj2.
|
|
*
|
|
* @exception ClassCastException If the arguments are not instances
|
|
* of <code>String</code>.
|
|
*/
|
|
public int compare (Object o1, Object o2)
|
|
{
|
|
return compare ((String) o1, (String) o2);
|
|
}
|
|
|
|
/**
|
|
* This method tests the specified object for equality against this
|
|
* object. This will be true if and only if the following conditions are
|
|
* met:
|
|
* <ul>
|
|
* <li>The specified object is not <code>null</code>.</li>
|
|
* <li>The specified object is an instance of <code>Collator</code>.</li>
|
|
* <li>The specified object has the same strength and decomposition
|
|
* settings as this object.</li>
|
|
* </ul>
|
|
*
|
|
* @param obj The <code>Object</code> to test for equality against
|
|
* this object.
|
|
*
|
|
* @return <code>true</code> if the specified object is equal to
|
|
* this one, <code>false</code> otherwise.
|
|
*/
|
|
public boolean equals (Object obj)
|
|
{
|
|
if (! (obj instanceof Collator))
|
|
return false;
|
|
Collator c = (Collator) obj;
|
|
return decmp == c.decmp && strength == c.strength;
|
|
}
|
|
|
|
/**
|
|
* This method tests whether the specified <code>String</code>'s are equal
|
|
* according to the collation rules for the locale of this object and
|
|
* the current strength and decomposition settings.
|
|
*
|
|
* @param source The first <code>String</code> to compare
|
|
* @param target The second <code>String</code> to compare
|
|
*
|
|
* @return <code>true</code> if the two strings are equal,
|
|
* <code>false</code> otherwise.
|
|
*/
|
|
public boolean equals (String source, String target)
|
|
{
|
|
return compare (source, target) == 0;
|
|
}
|
|
|
|
/**
|
|
* This method returns a copy of this <code>Collator</code> object.
|
|
*
|
|
* @return A duplicate of this object.
|
|
*/
|
|
public Object clone ()
|
|
{
|
|
try
|
|
{
|
|
return super.clone ();
|
|
}
|
|
catch (CloneNotSupportedException _)
|
|
{
|
|
return null;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This method returns an array of <code>Locale</code> objects which is
|
|
* the list of locales for which <code>Collator</code> objects exist.
|
|
*
|
|
* @return The list of locales for which <code>Collator</code>'s exist.
|
|
*/
|
|
public static synchronized Locale[] getAvailableLocales ()
|
|
{
|
|
return LocaleHelper.getCollatorLocales();
|
|
}
|
|
|
|
/**
|
|
* This method transforms the specified <code>String</code> into a
|
|
* <code>CollationKey</code> for faster comparisons. This is useful when
|
|
* comparisons against a string might be performed multiple times, such
|
|
* as during a sort operation.
|
|
*
|
|
* @param source The <code>String</code> to convert.
|
|
*
|
|
* @return A <code>CollationKey</code> for the specified <code>String</code>.
|
|
*/
|
|
public abstract CollationKey getCollationKey (String source);
|
|
|
|
/**
|
|
* This method returns the current decomposition setting for this
|
|
* object. This * will be one of NO_DECOMPOSITION,
|
|
* CANONICAL_DECOMPOSITION, or * FULL_DECOMPOSITION. See the
|
|
* documentation for those constants for an * explanation of this
|
|
* setting.
|
|
*
|
|
* @return The current decomposition setting.
|
|
*/
|
|
public synchronized int getDecomposition ()
|
|
{
|
|
return decmp;
|
|
}
|
|
|
|
/**
|
|
* This method returns an instance of <code>Collator</code> for the
|
|
* default locale.
|
|
*
|
|
* @return A <code>Collator</code> for the default locale.
|
|
*/
|
|
public static Collator getInstance ()
|
|
{
|
|
return getInstance (Locale.getDefault());
|
|
}
|
|
|
|
/**
|
|
* This method returns an instance of <code>Collator</code> for the
|
|
* specified locale. If no <code>Collator</code> exists for the desired
|
|
* locale, the fallback procedure described in
|
|
* {@link java.util.spi.LocaleServiceProvider} is invoked.
|
|
*
|
|
* @param loc The desired locale to load a <code>Collator</code> for.
|
|
*
|
|
* @return A <code>Collator</code> for the requested locale
|
|
*/
|
|
public static Collator getInstance (Locale loc)
|
|
{
|
|
String pattern;
|
|
try
|
|
{
|
|
ResourceBundle res =
|
|
ResourceBundle.getBundle("gnu.java.locale.LocaleInformation",
|
|
loc, ClassLoader.getSystemClassLoader());
|
|
return new RuleBasedCollator(res.getString("collation_rules"));
|
|
}
|
|
catch (MissingResourceException x)
|
|
{
|
|
/* This means runtime support for the locale
|
|
* is not available, so we check providers. */
|
|
}
|
|
catch (ParseException x)
|
|
{
|
|
throw (InternalError)new InternalError().initCause(x);
|
|
}
|
|
for (CollatorProvider p : ServiceLoader.load(CollatorProvider.class))
|
|
{
|
|
for (Locale l : p.getAvailableLocales())
|
|
{
|
|
if (l.equals(loc))
|
|
{
|
|
Collator c = p.getInstance(loc);
|
|
if (c != null)
|
|
return c;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
if (loc.equals(Locale.ROOT))
|
|
{
|
|
try
|
|
{
|
|
return new RuleBasedCollator("<0<1<2<3<4<5<6<7<8<9<A,a<b,B<c," +
|
|
"C<d,D<e,E<f,F<g,G<h,H<i,I<j,J<k,K" +
|
|
"<l,L<m,M<n,N<o,O<p,P<q,Q<r,R<s,S<t,"+
|
|
"T<u,U<v,V<w,W<x,X<y,Y<z,Z");
|
|
}
|
|
catch (ParseException x)
|
|
{
|
|
throw (InternalError)new InternalError().initCause(x);
|
|
}
|
|
}
|
|
return getInstance(LocaleHelper.getFallbackLocale(loc));
|
|
}
|
|
|
|
/**
|
|
* This method returns the current strength setting for this object. This
|
|
* will be one of PRIMARY, SECONDARY, TERTIARY, or IDENTICAL. See the
|
|
* documentation for those constants for an explanation of this setting.
|
|
*
|
|
* @return The current strength setting.
|
|
*/
|
|
public synchronized int getStrength ()
|
|
{
|
|
return strength;
|
|
}
|
|
|
|
/**
|
|
* This method returns a hash code value for this object.
|
|
*
|
|
* @return A hash value for this object.
|
|
*/
|
|
public abstract int hashCode ();
|
|
|
|
/**
|
|
* This method sets the decomposition setting for this object to the
|
|
* specified value. This must be one of NO_DECOMPOSITION,
|
|
* CANONICAL_DECOMPOSITION, or FULL_DECOMPOSITION. Otherwise an
|
|
* exception will be thrown. See the documentation for those
|
|
* contants for an explanation of this setting.
|
|
*
|
|
* @param mode The new decomposition setting.
|
|
*
|
|
* @exception IllegalArgumentException If the requested
|
|
* decomposition setting is not valid.
|
|
*/
|
|
public synchronized void setDecomposition (int mode)
|
|
{
|
|
if (mode != NO_DECOMPOSITION
|
|
&& mode != CANONICAL_DECOMPOSITION
|
|
&& mode != FULL_DECOMPOSITION)
|
|
throw new IllegalArgumentException ();
|
|
decmp = mode;
|
|
}
|
|
|
|
/**
|
|
* This method sets the strength setting for this object to the specified
|
|
* value. This must be one of PRIMARY, SECONDARY, TERTIARY, or IDENTICAL.
|
|
* Otherwise an exception is thrown. See the documentation for these
|
|
* constants for an explanation of this setting.
|
|
*
|
|
* @param strength The new strength setting.
|
|
*
|
|
* @exception IllegalArgumentException If the requested strength
|
|
* setting value is not valid.
|
|
*/
|
|
public synchronized void setStrength (int strength)
|
|
{
|
|
if (strength != PRIMARY && strength != SECONDARY
|
|
&& strength != TERTIARY && strength != IDENTICAL)
|
|
throw new IllegalArgumentException ();
|
|
this.strength = strength;
|
|
}
|
|
|
|
// Decompose a single character and append results to the buffer.
|
|
// FIXME: for libgcj this is a native method which handles
|
|
// decomposition. For Classpath, for now, it does nothing.
|
|
/*
|
|
final void decomposeCharacter (char c, StringBuffer buf)
|
|
{
|
|
buf.append (c);
|
|
}
|
|
*/
|
|
|
|
/**
|
|
* This is the current collation decomposition setting.
|
|
*/
|
|
int decmp;
|
|
|
|
/**
|
|
* This is the current collation strength setting.
|
|
*/
|
|
int strength;
|
|
}
|