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
491 lines
14 KiB
Java
491 lines
14 KiB
Java
/* CollationElementIterator.java -- Walks through collation elements
|
|
Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004 Free Software Foundation
|
|
|
|
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.lang.CPStringBuilder;
|
|
|
|
import java.util.ArrayList;
|
|
|
|
/* Written using "Java Class Libraries", 2nd edition, plus online
|
|
* API docs for JDK 1.2 from http://www.javasoft.com.
|
|
* Status: Believed complete and correct to JDK 1.1.
|
|
*/
|
|
|
|
/**
|
|
* This class walks through the character collation elements of a
|
|
* <code>String</code> as defined by the collation rules in an instance of
|
|
* <code>RuleBasedCollator</code>. There is no public constructor for
|
|
* this class. An instance is created by calling the
|
|
* <code>getCollationElementIterator</code> method on
|
|
* <code>RuleBasedCollator</code>.
|
|
*
|
|
* @author Aaron M. Renn (arenn@urbanophile.com)
|
|
* @author Tom Tromey (tromey@cygnus.com)
|
|
* @author Guilhem Lavaux (guilhem.lavaux@free.fr)
|
|
*/
|
|
public final class CollationElementIterator
|
|
{
|
|
/**
|
|
* This is a constant value that is returned to indicate that the end of
|
|
* the string was encountered.
|
|
*/
|
|
public static final int NULLORDER = -1;
|
|
|
|
/**
|
|
* This is the RuleBasedCollator this object was created from.
|
|
*/
|
|
RuleBasedCollator collator;
|
|
|
|
/**
|
|
* This is the String that is being iterated over.
|
|
*/
|
|
CharacterIterator text;
|
|
|
|
/**
|
|
* This is the index into the collation decomposition where we are currently scanning.
|
|
*/
|
|
int index;
|
|
|
|
/**
|
|
* This is the index into the String where we are currently scanning.
|
|
*/
|
|
int textIndex;
|
|
|
|
/**
|
|
* Array containing the collation decomposition of the
|
|
* text given to the constructor.
|
|
*/
|
|
private RuleBasedCollator.CollationElement[] text_decomposition;
|
|
|
|
/**
|
|
* Array containing the index of the specified block.
|
|
*/
|
|
private int[] text_indexes;
|
|
|
|
/**
|
|
* This method initializes a new instance of <code>CollationElementIterator</code>
|
|
* to iterate over the specified <code>String</code> using the rules in the
|
|
* specified <code>RuleBasedCollator</code>.
|
|
*
|
|
* @param collator The <code>RuleBasedCollation</code> used for calculating collation values
|
|
* @param text The <code>String</code> to iterate over.
|
|
*/
|
|
CollationElementIterator(RuleBasedCollator collator, String text)
|
|
{
|
|
this.collator = collator;
|
|
|
|
setText (text);
|
|
}
|
|
|
|
/**
|
|
* This method initializes a new instance of <code>CollationElementIterator</code>
|
|
* to iterate over the specified <code>String</code> using the rules in the
|
|
* specified <code>RuleBasedCollator</code>.
|
|
*
|
|
* @param collator The <code>RuleBasedCollation</code> used for calculating collation values
|
|
* @param text The character iterator to iterate over.
|
|
*/
|
|
CollationElementIterator(RuleBasedCollator collator, CharacterIterator text)
|
|
{
|
|
this.collator = collator;
|
|
|
|
setText (text);
|
|
}
|
|
|
|
RuleBasedCollator.CollationElement nextBlock()
|
|
{
|
|
if (index >= text_decomposition.length)
|
|
return null;
|
|
|
|
RuleBasedCollator.CollationElement e = text_decomposition[index];
|
|
|
|
textIndex = text_indexes[index+1];
|
|
|
|
index++;
|
|
|
|
return e;
|
|
}
|
|
|
|
RuleBasedCollator.CollationElement previousBlock()
|
|
{
|
|
if (index == 0)
|
|
return null;
|
|
|
|
index--;
|
|
RuleBasedCollator.CollationElement e = text_decomposition[index];
|
|
|
|
textIndex = text_indexes[index+1];
|
|
|
|
return e;
|
|
}
|
|
|
|
/**
|
|
* This method returns the collation ordering value of the next character sequence
|
|
* in the string (it may be an extended character following collation rules).
|
|
* This method will return <code>NULLORDER</code> if the
|
|
* end of the string was reached.
|
|
*
|
|
* @return The collation ordering value.
|
|
*/
|
|
public int next()
|
|
{
|
|
RuleBasedCollator.CollationElement e = nextBlock();
|
|
|
|
if (e == null)
|
|
return NULLORDER;
|
|
|
|
return e.getValue();
|
|
}
|
|
|
|
/**
|
|
* This method returns the collation ordering value of the previous character
|
|
* in the string. This method will return <code>NULLORDER</code> if the
|
|
* beginning of the string was reached.
|
|
*
|
|
* @return The collation ordering value.
|
|
*/
|
|
public int previous()
|
|
{
|
|
RuleBasedCollator.CollationElement e = previousBlock();
|
|
|
|
if (e == null)
|
|
return NULLORDER;
|
|
|
|
return e.getValue();
|
|
}
|
|
|
|
/**
|
|
* This method returns the primary order value for the given collation
|
|
* value.
|
|
*
|
|
* @param order The collation value returned from <code>next()</code> or
|
|
* <code>previous()</code>.
|
|
*
|
|
* @return The primary order value of the specified collation value. This is
|
|
* the high 16 bits.
|
|
*/
|
|
public static int primaryOrder(int order)
|
|
{
|
|
// From the JDK 1.2 spec.
|
|
return order >>> 16;
|
|
}
|
|
|
|
/**
|
|
* This method resets the internal position pointer to read from the
|
|
* beginning of the <code>String</code> again.
|
|
*/
|
|
public void reset()
|
|
{
|
|
index = 0;
|
|
textIndex = 0;
|
|
}
|
|
|
|
/**
|
|
* This method returns the secondary order value for the given collation
|
|
* value.
|
|
*
|
|
* @param order The collation value returned from <code>next()</code> or
|
|
* <code>previous()</code>.
|
|
*
|
|
* @return The secondary order value of the specified collation value. This
|
|
* is the bits 8-15.
|
|
*/
|
|
public static short secondaryOrder(int order)
|
|
{
|
|
// From the JDK 1.2 spec.
|
|
return (short) ((order >>> 8) & 255);
|
|
}
|
|
|
|
/**
|
|
* This method returns the tertiary order value for the given collation
|
|
* value.
|
|
*
|
|
* @param order The collation value returned from <code>next()</code> or
|
|
* <code>previous()</code>.
|
|
*
|
|
* @return The tertiary order value of the specified collation value. This
|
|
* is the low eight bits.
|
|
*/
|
|
public static short tertiaryOrder(int order)
|
|
{
|
|
// From the JDK 1.2 spec.
|
|
return (short) (order & 255);
|
|
}
|
|
|
|
/**
|
|
* This method sets the <code>String</code> that it is iterating over
|
|
* to the specified <code>String</code>.
|
|
*
|
|
* @param text The new <code>String</code> to iterate over.
|
|
*
|
|
* @since 1.2
|
|
*/
|
|
public void setText(String text)
|
|
{
|
|
int idx = 0;
|
|
int idx_idx = 0;
|
|
int alreadyExpanded = 0;
|
|
int idxToMove = 0;
|
|
|
|
this.text = new StringCharacterIterator(text);
|
|
this.index = 0;
|
|
|
|
String work_text = text.intern();
|
|
|
|
ArrayList a_element = new ArrayList();
|
|
ArrayList a_idx = new ArrayList();
|
|
|
|
// Build element collection ordered as they come in "text".
|
|
while (idx < work_text.length())
|
|
{
|
|
String key, key_old;
|
|
|
|
Object object = null;
|
|
int p = 1;
|
|
|
|
// IMPROVE: use a TreeMap with a prefix-ordering rule.
|
|
key_old = key = null;
|
|
do
|
|
{
|
|
if (object != null)
|
|
key_old = key;
|
|
key = work_text.substring (idx, idx+p);
|
|
object = collator.prefix_tree.get (key);
|
|
if (object != null && idx < alreadyExpanded)
|
|
{
|
|
RuleBasedCollator.CollationElement prefix = (RuleBasedCollator.CollationElement)object;
|
|
if (prefix.expansion != null &&
|
|
prefix.expansion.startsWith(work_text.substring(0, idx)))
|
|
{
|
|
object = null;
|
|
key = key_old;
|
|
}
|
|
}
|
|
p++;
|
|
}
|
|
while (idx+p <= work_text.length());
|
|
|
|
if (object == null)
|
|
key = key_old;
|
|
|
|
RuleBasedCollator.CollationElement prefix =
|
|
(RuleBasedCollator.CollationElement) collator.prefix_tree.get (key);
|
|
|
|
/*
|
|
* First case: There is no such sequence in the database.
|
|
* We will have to build one from the context.
|
|
*/
|
|
if (prefix == null)
|
|
{
|
|
/*
|
|
* We are dealing with sequences in an expansion. They
|
|
* are treated as accented characters (tertiary order).
|
|
*/
|
|
if (alreadyExpanded > 0)
|
|
{
|
|
RuleBasedCollator.CollationElement e =
|
|
collator.getDefaultAccentedElement (work_text.charAt (idx));
|
|
|
|
a_element.add (e);
|
|
a_idx.add (new Integer(idx_idx));
|
|
idx++;
|
|
alreadyExpanded--;
|
|
if (alreadyExpanded == 0)
|
|
{
|
|
/* There is not any characters left in the expansion set.
|
|
* We can increase the pointer in the source string.
|
|
*/
|
|
idx_idx += idxToMove;
|
|
idxToMove = 0;
|
|
}
|
|
else
|
|
idx_idx++;
|
|
}
|
|
else
|
|
{
|
|
/* This is a normal character. */
|
|
RuleBasedCollator.CollationElement e =
|
|
collator.getDefaultElement (work_text.charAt (idx));
|
|
Integer i_ref = new Integer(idx_idx);
|
|
|
|
/* Don't forget to mark it as a special sequence so the
|
|
* string can be ordered.
|
|
*/
|
|
a_element.add (RuleBasedCollator.SPECIAL_UNKNOWN_SEQ);
|
|
a_idx.add (i_ref);
|
|
a_element.add (e);
|
|
a_idx.add (i_ref);
|
|
idx_idx++;
|
|
idx++;
|
|
}
|
|
continue;
|
|
}
|
|
|
|
/*
|
|
* Second case: Here we have found a matching sequence.
|
|
* Here we have an expansion string prepend it to the "work text" and
|
|
* add the corresponding sorting element. We must also mark
|
|
*/
|
|
if (prefix.expansion != null)
|
|
{
|
|
work_text = prefix.expansion
|
|
+ work_text.substring (idx+prefix.key.length());
|
|
idx = 0;
|
|
a_element.add (prefix);
|
|
a_idx.add (new Integer(idx_idx));
|
|
if (alreadyExpanded == 0)
|
|
idxToMove = prefix.key.length();
|
|
alreadyExpanded += prefix.expansion.length()-prefix.key.length();
|
|
}
|
|
else
|
|
{
|
|
/* Third case: the simplest. We have got the prefix and it
|
|
* has not to be expanded.
|
|
*/
|
|
a_element.add (prefix);
|
|
a_idx.add (new Integer(idx_idx));
|
|
idx += prefix.key.length();
|
|
/* If the sequence is in an expansion, we must decrease the
|
|
* counter.
|
|
*/
|
|
if (alreadyExpanded > 0)
|
|
{
|
|
alreadyExpanded -= prefix.key.length();
|
|
if (alreadyExpanded == 0)
|
|
{
|
|
idx_idx += idxToMove;
|
|
idxToMove = 0;
|
|
}
|
|
}
|
|
else
|
|
idx_idx += prefix.key.length();
|
|
}
|
|
}
|
|
|
|
text_decomposition = (RuleBasedCollator.CollationElement[])
|
|
a_element.toArray(new RuleBasedCollator.CollationElement[a_element.size()]);
|
|
text_indexes = new int[a_idx.size()+1];
|
|
for (int i = 0; i < a_idx.size(); i++)
|
|
{
|
|
text_indexes[i] = ((Integer)a_idx.get(i)).intValue();
|
|
}
|
|
text_indexes[a_idx.size()] = text.length();
|
|
}
|
|
|
|
/**
|
|
* This method sets the <code>String</code> that it is iterating over
|
|
* to the <code>String</code> represented by the specified
|
|
* <code>CharacterIterator</code>.
|
|
*
|
|
* @param source The <code>CharacterIterator</code> containing the new
|
|
* <code>String</code> to iterate over.
|
|
*/
|
|
public void setText(CharacterIterator source)
|
|
{
|
|
CPStringBuilder expand = new CPStringBuilder();
|
|
|
|
// For now assume we read from the beginning of the string.
|
|
for (char c = source.first();
|
|
c != CharacterIterator.DONE;
|
|
c = source.next())
|
|
expand.append(c);
|
|
|
|
setText(expand.toString());
|
|
}
|
|
|
|
/**
|
|
* This method returns the current offset into the <code>String</code>
|
|
* that is being iterated over.
|
|
*
|
|
* @return The iteration index position.
|
|
*
|
|
* @since 1.2
|
|
*/
|
|
public int getOffset()
|
|
{
|
|
return textIndex;
|
|
}
|
|
|
|
/**
|
|
* This method sets the iteration index position into the current
|
|
* <code>String</code> to the specified value. This value must not
|
|
* be negative and must not be greater than the last index position
|
|
* in the <code>String</code>.
|
|
*
|
|
* @param offset The new iteration index position.
|
|
*
|
|
* @exception IllegalArgumentException If the new offset is not valid.
|
|
*/
|
|
public void setOffset(int offset)
|
|
{
|
|
if (offset < 0)
|
|
throw new IllegalArgumentException("Negative offset: " + offset);
|
|
|
|
if (offset > (text.getEndIndex() - 1))
|
|
throw new IllegalArgumentException("Offset too large: " + offset);
|
|
|
|
for (index = 0; index < text_decomposition.length; index++)
|
|
{
|
|
if (offset <= text_indexes[index])
|
|
break;
|
|
}
|
|
/*
|
|
* As text_indexes[0] == 0, we should not have to take care whether index is
|
|
* greater than 0. It is always.
|
|
*/
|
|
if (text_indexes[index] == offset)
|
|
textIndex = offset;
|
|
else
|
|
textIndex = text_indexes[index-1];
|
|
}
|
|
|
|
/**
|
|
* This method returns the maximum length of any expansion sequence that
|
|
* ends with the specified collation order value. (Whatever that means).
|
|
*
|
|
* @param value The collation order value
|
|
*
|
|
* @return The maximum length of an expansion sequence.
|
|
*/
|
|
public int getMaxExpansion(int value)
|
|
{
|
|
return 1;
|
|
}
|
|
}
|