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
507 lines
15 KiB
Java
507 lines
15 KiB
Java
/* ChoiceFormat.java -- Format over a range of numbers
|
|
Copyright (C) 1998, 1999, 2000, 2001, 2002, 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.lang.CPStringBuilder;
|
|
|
|
import java.util.Vector;
|
|
|
|
/**
|
|
* This class allows a format to be specified based on a range of numbers.
|
|
* To use this class, first specify two lists of formats and range terminators.
|
|
* These lists must be arrays of equal length. The format of index
|
|
* <code>i</code> will be selected for value <code>X</code> if
|
|
* <code>terminator[i] <= X < limit[i + 1]</code>. If the value X is not
|
|
* included in any range, then either the first or last format will be
|
|
* used depending on whether the value X falls outside the range.
|
|
* <p>
|
|
* This sounds complicated, but that is because I did a poor job of
|
|
* explaining it. Consider the following example:
|
|
* <p>
|
|
*
|
|
<pre>terminators = { 1, ChoiceFormat.nextDouble(1) }
|
|
formats = { "file", "files" }</pre>
|
|
*
|
|
* <p>
|
|
* In this case if the actual number tested is one or less, then the word
|
|
* "file" is used as the format value. If the number tested is greater than
|
|
* one, then "files" is used. This allows plurals to be handled
|
|
* gracefully. Note the use of the method <code>nextDouble</code>. This
|
|
* method selects the next highest double number than its argument. This
|
|
* effectively makes any double greater than 1.0 cause the "files" string
|
|
* to be selected. (Note that all terminator values are specified as
|
|
* doubles.
|
|
* <p>
|
|
* Note that in order for this class to work properly, the range terminator
|
|
* array must be sorted in ascending order and the format string array
|
|
* must be the same length as the terminator array.
|
|
*
|
|
* @author Tom Tromey (tromey@cygnus.com)
|
|
* @author Aaron M. Renn (arenn@urbanophile.com)
|
|
* @date March 9, 1999
|
|
*/
|
|
/* 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 1.1.
|
|
*/
|
|
public class ChoiceFormat extends NumberFormat
|
|
{
|
|
/**
|
|
* This method sets new range terminators and format strings for this
|
|
* object based on the specified pattern. This pattern is of the form
|
|
* "term#string|term#string...". For example "1#Sunday|2#Monday|#Tuesday".
|
|
*
|
|
* @param newPattern The pattern of terminators and format strings.
|
|
*
|
|
* @exception IllegalArgumentException If the pattern is not valid
|
|
*/
|
|
public void applyPattern (String newPattern)
|
|
{
|
|
// Note: we assume the same kind of quoting rules apply here.
|
|
// This isn't explicitly documented. But for instance we accept
|
|
// '#' as a literal hash in a format string.
|
|
int index = 0, max = newPattern.length();
|
|
Vector stringVec = new Vector ();
|
|
Vector limitVec = new Vector ();
|
|
final CPStringBuilder buf = new CPStringBuilder ();
|
|
|
|
while (true)
|
|
{
|
|
// Find end of double.
|
|
int dstart = index;
|
|
while (index < max)
|
|
{
|
|
char c = newPattern.charAt(index);
|
|
if (c == '#' || c == '\u2064' || c == '<')
|
|
break;
|
|
++index;
|
|
}
|
|
|
|
if (index == max)
|
|
throw new IllegalArgumentException ("unexpected end of text");
|
|
Double d = Double.valueOf (newPattern.substring(dstart, index));
|
|
|
|
if (newPattern.charAt(index) == '<')
|
|
d = Double.valueOf (nextDouble (d.doubleValue()));
|
|
|
|
limitVec.addElement(d);
|
|
|
|
// Scan text.
|
|
++index;
|
|
buf.setLength(0);
|
|
while (index < max)
|
|
{
|
|
char c = newPattern.charAt(index);
|
|
if (c == '\'' && index < max + 1
|
|
&& newPattern.charAt(index + 1) == '\'')
|
|
{
|
|
buf.append(c);
|
|
++index;
|
|
}
|
|
else if (c == '\'' && index < max + 2)
|
|
{
|
|
buf.append(newPattern.charAt(index + 1));
|
|
index += 2;
|
|
}
|
|
else if (c == '|')
|
|
break;
|
|
else
|
|
buf.append(c);
|
|
++index;
|
|
}
|
|
|
|
stringVec.addElement(buf.toString());
|
|
if (index == max)
|
|
break;
|
|
++index;
|
|
}
|
|
|
|
choiceFormats = new String[stringVec.size()];
|
|
stringVec.copyInto(choiceFormats);
|
|
|
|
choiceLimits = new double[limitVec.size()];
|
|
for (int i = 0; i < choiceLimits.length; ++i)
|
|
{
|
|
Double d = (Double) limitVec.elementAt(i);
|
|
choiceLimits[i] = d.doubleValue();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This method initializes a new instance of <code>ChoiceFormat</code> that
|
|
* generates its range terminator and format string arrays from the
|
|
* specified pattern. This pattern is of the form
|
|
* "term#string|term#string...". For example "1#Sunday|2#Monday|#Tuesday".
|
|
* This is the same pattern type used by the <code>applyPattern</code>
|
|
* method.
|
|
*
|
|
* @param newPattern The pattern of terminators and format strings.
|
|
*
|
|
* @exception IllegalArgumentException If the pattern is not valid
|
|
*/
|
|
public ChoiceFormat (String newPattern)
|
|
{
|
|
super ();
|
|
applyPattern (newPattern);
|
|
}
|
|
|
|
/**
|
|
* This method initializes a new instance of <code>ChoiceFormat</code> that
|
|
* will use the specified range terminators and format strings.
|
|
*
|
|
* @param choiceLimits The array of range terminators
|
|
* @param choiceFormats The array of format strings
|
|
*/
|
|
public ChoiceFormat (double[] choiceLimits, String[] choiceFormats)
|
|
{
|
|
super ();
|
|
setChoices (choiceLimits, choiceFormats);
|
|
}
|
|
|
|
/**
|
|
* This method tests this object for equality with the specified
|
|
* object. This will be true if and only if:
|
|
* <ul>
|
|
* <li>The specified object is not <code>null</code>.</li>
|
|
* <li>The specified object is an instance of <code>ChoiceFormat</code>.</li>
|
|
* <li>The termination ranges and format strings are identical to
|
|
* this object's. </li>
|
|
* </ul>
|
|
*
|
|
* @param obj The object to test for equality against.
|
|
*
|
|
* @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 ChoiceFormat))
|
|
return false;
|
|
ChoiceFormat cf = (ChoiceFormat) obj;
|
|
if (choiceLimits.length != cf.choiceLimits.length)
|
|
return false;
|
|
for (int i = choiceLimits.length - 1; i >= 0; --i)
|
|
{
|
|
if (choiceLimits[i] != cf.choiceLimits[i]
|
|
|| !choiceFormats[i].equals(cf.choiceFormats[i]))
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* This method appends the appropriate format string to the specified
|
|
* <code>StringBuffer</code> based on the supplied <code>long</code>
|
|
* argument.
|
|
*
|
|
* @param num The number used for determine (based on the range
|
|
* terminators) which format string to append.
|
|
* @param appendBuf The <code>StringBuffer</code> to append the format string
|
|
* to.
|
|
* @param pos Unused.
|
|
*
|
|
* @return The <code>StringBuffer</code> with the format string appended.
|
|
*/
|
|
public StringBuffer format (long num, StringBuffer appendBuf,
|
|
FieldPosition pos)
|
|
{
|
|
return format ((double) num, appendBuf, pos);
|
|
}
|
|
|
|
/**
|
|
* This method appends the appropriate format string to the specified
|
|
* <code>StringBuffer</code> based on the supplied <code>double</code>
|
|
* argument.
|
|
*
|
|
* @param num The number used for determine (based on the range
|
|
* terminators) which format string to append.
|
|
* @param appendBuf The <code>StringBuffer</code> to append the format string to.
|
|
* @param pos Unused.
|
|
*
|
|
* @return The <code>StringBuffer</code> with the format string appended.
|
|
*/
|
|
public StringBuffer format (double num, StringBuffer appendBuf,
|
|
FieldPosition pos)
|
|
{
|
|
if (choiceLimits.length == 0)
|
|
return appendBuf;
|
|
|
|
int index = 0;
|
|
if (! Double.isNaN(num) && num >= choiceLimits[0])
|
|
{
|
|
for (; index < choiceLimits.length - 1; ++index)
|
|
{
|
|
if (choiceLimits[index] <= num && num < choiceLimits[index + 1])
|
|
break;
|
|
}
|
|
}
|
|
|
|
return appendBuf.append(choiceFormats[index]);
|
|
}
|
|
|
|
/**
|
|
* This method returns the list of format strings in use.
|
|
*
|
|
* @return The list of format objects.
|
|
*/
|
|
public Object[] getFormats ()
|
|
{
|
|
return (Object[]) choiceFormats.clone();
|
|
}
|
|
|
|
/**
|
|
* This method returns the list of range terminators in use.
|
|
*
|
|
* @return The list of range terminators.
|
|
*/
|
|
public double[] getLimits ()
|
|
{
|
|
return (double[]) choiceLimits.clone();
|
|
}
|
|
|
|
/**
|
|
* This method returns a hash value for this object
|
|
*
|
|
* @return A hash value for this object.
|
|
*/
|
|
public int hashCode ()
|
|
{
|
|
int hash = 0;
|
|
for (int i = 0; i < choiceLimits.length; ++i)
|
|
{
|
|
long v = Double.doubleToLongBits(choiceLimits[i]);
|
|
hash ^= (v ^ (v >>> 32));
|
|
hash ^= choiceFormats[i].hashCode();
|
|
}
|
|
return hash;
|
|
}
|
|
|
|
/**
|
|
* This method returns the lowest possible double greater than the
|
|
* specified double. If the specified double value is equal to
|
|
* <code>Double.NaN</code> then that is the value returned.
|
|
*
|
|
* @param d The specified double
|
|
*
|
|
* @return The lowest double value greater than the specified double.
|
|
*/
|
|
public static final double nextDouble (double d)
|
|
{
|
|
return nextDouble (d, true);
|
|
}
|
|
|
|
/**
|
|
* This method returns a double that is either the next highest double
|
|
* or next lowest double compared to the specified double depending on the
|
|
* value of the passed boolean parameter. If the boolean parameter is
|
|
* <code>true</code>, then the lowest possible double greater than the
|
|
* specified double will be returned. Otherwise the highest possible
|
|
* double less than the specified double will be returned.
|
|
*
|
|
* @param d The specified double
|
|
* @param next <code>true</code> to return the next highest
|
|
* double, <code>false</code> otherwise.
|
|
*
|
|
* @return The next highest or lowest double value.
|
|
*/
|
|
public static double nextDouble (double d, boolean next)
|
|
{
|
|
if (Double.isInfinite(d) || Double.isNaN(d))
|
|
return d;
|
|
|
|
long bits = Double.doubleToLongBits(d);
|
|
|
|
long mantMask = (1L << mantissaBits) - 1;
|
|
long mantissa = bits & mantMask;
|
|
|
|
long expMask = (1L << exponentBits) - 1;
|
|
long exponent = (bits >>> mantissaBits) & expMask;
|
|
|
|
if (next ^ (bits < 0)) // Increment magnitude
|
|
{
|
|
if (mantissa == (1L << mantissaBits) - 1)
|
|
{
|
|
mantissa = 0L;
|
|
exponent++;
|
|
|
|
// Check for absolute overflow.
|
|
if (exponent >= (1L << mantissaBits))
|
|
return (bits > 0) ? Double.POSITIVE_INFINITY
|
|
: Double.NEGATIVE_INFINITY;
|
|
}
|
|
else
|
|
mantissa++;
|
|
}
|
|
else // Decrement magnitude
|
|
{
|
|
if (exponent == 0L && mantissa == 0L)
|
|
{
|
|
// The only case where there is a change of sign
|
|
return next ? Double.MIN_VALUE : -Double.MIN_VALUE;
|
|
}
|
|
else
|
|
{
|
|
if (mantissa == 0L)
|
|
{
|
|
mantissa = (1L << mantissaBits) - 1;
|
|
exponent--;
|
|
}
|
|
else
|
|
mantissa--;
|
|
}
|
|
}
|
|
|
|
long result = bits < 0 ? 1 : 0;
|
|
result = (result << exponentBits) | exponent;
|
|
result = (result << mantissaBits) | mantissa;
|
|
return Double.longBitsToDouble(result);
|
|
}
|
|
|
|
/**
|
|
* I'm not sure what this method is really supposed to do, as it is
|
|
* not documented.
|
|
*/
|
|
public Number parse (String sourceStr, ParsePosition pos)
|
|
{
|
|
int index = pos.getIndex();
|
|
for (int i = 0; i < choiceLimits.length; ++i)
|
|
{
|
|
if (sourceStr.startsWith(choiceFormats[i], index))
|
|
{
|
|
pos.setIndex(index + choiceFormats[i].length());
|
|
return Double.valueOf (choiceLimits[i]);
|
|
}
|
|
}
|
|
pos.setErrorIndex(index);
|
|
return Double.valueOf (Double.NaN);
|
|
}
|
|
|
|
/**
|
|
* This method returns the highest possible double less than the
|
|
* specified double. If the specified double value is equal to
|
|
* <code>Double.NaN</code> then that is the value returned.
|
|
*
|
|
* @param d The specified double
|
|
*
|
|
* @return The highest double value less than the specified double.
|
|
*/
|
|
public static final double previousDouble (double d)
|
|
{
|
|
return nextDouble (d, false);
|
|
}
|
|
|
|
/**
|
|
* This method sets new range terminators and format strings for this
|
|
* object.
|
|
*
|
|
* @param choiceLimits The new range terminators
|
|
* @param choiceFormats The new choice formats
|
|
*/
|
|
public void setChoices (double[] choiceLimits, String[] choiceFormats)
|
|
{
|
|
if (choiceLimits == null || choiceFormats == null)
|
|
throw new NullPointerException ();
|
|
if (choiceLimits.length != choiceFormats.length)
|
|
throw new IllegalArgumentException ();
|
|
this.choiceFormats = (String[]) choiceFormats.clone();
|
|
this.choiceLimits = (double[]) choiceLimits.clone();
|
|
}
|
|
|
|
private void quoteString (CPStringBuilder dest, String text)
|
|
{
|
|
int max = text.length();
|
|
for (int i = 0; i < max; ++i)
|
|
{
|
|
char c = text.charAt(i);
|
|
if (c == '\'')
|
|
{
|
|
dest.append(c);
|
|
dest.append(c);
|
|
}
|
|
else if (c == '#' || c == '|' || c == '\u2064' || c == '<')
|
|
{
|
|
dest.append('\'');
|
|
dest.append(c);
|
|
dest.append('\'');
|
|
}
|
|
else
|
|
dest.append(c);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This method returns the range terminator list and format string list
|
|
* as a <code>String</code> suitable for using with the
|
|
* <code>applyPattern</code> method.
|
|
*
|
|
* @return A pattern string for this object
|
|
*/
|
|
public String toPattern ()
|
|
{
|
|
CPStringBuilder result = new CPStringBuilder ();
|
|
for (int i = 0; i < choiceLimits.length; ++i)
|
|
{
|
|
result.append(choiceLimits[i]);
|
|
result.append('#');
|
|
quoteString (result, choiceFormats[i]);
|
|
}
|
|
return result.toString();
|
|
}
|
|
|
|
/**
|
|
* This is the list of format strings. Note that this variable is
|
|
* specified by the serialization spec of this class.
|
|
*/
|
|
private String[] choiceFormats;
|
|
|
|
/**
|
|
* This is the list of range terminator values. Note that this variable is
|
|
* specified by the serialization spec of this class.
|
|
*/
|
|
private double[] choiceLimits;
|
|
|
|
// Number of mantissa bits in double.
|
|
private static final int mantissaBits = 52;
|
|
// Number of exponent bits in a double.
|
|
private static final int exponentBits = 11;
|
|
|
|
private static final long serialVersionUID = 1795184449645032964L;
|
|
}
|