
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
902 lines
28 KiB
Java
902 lines
28 KiB
Java
/* NumberFormat.java -- Formats and parses numbers
|
|
Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2007
|
|
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.io.IOException;
|
|
import java.io.InvalidObjectException;
|
|
import java.io.ObjectInputStream;
|
|
import java.io.ObjectOutputStream;
|
|
|
|
import java.text.spi.NumberFormatProvider;
|
|
|
|
import java.util.Currency;
|
|
import java.util.Locale;
|
|
import java.util.MissingResourceException;
|
|
import java.util.ResourceBundle;
|
|
import java.util.ServiceLoader;
|
|
|
|
/**
|
|
* This is the abstract superclass of all classes which format and
|
|
* parse numeric values such as decimal numbers, integers, currency values,
|
|
* and percentages. These classes perform their parsing and formatting
|
|
* in a locale specific manner, accounting for such items as differing
|
|
* currency symbols and thousands separators.
|
|
* <p>
|
|
* To create an instance of a concrete subclass of <code>NumberFormat</code>,
|
|
* do not call a class constructor directly. Instead, use one of the
|
|
* static factory methods in this class such as
|
|
* <code>getCurrencyInstance</code>.
|
|
*
|
|
* @author Tom Tromey (tromey@cygnus.com)
|
|
* @author Aaron M. Renn (arenn@urbanophile.com)
|
|
* @date March 4, 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.2, except getAvailableLocales.
|
|
*/
|
|
public abstract class NumberFormat extends Format implements Cloneable
|
|
{
|
|
/**
|
|
* This is a constant used to create a <code>FieldPosition</code> object
|
|
* that will return the integer portion of a formatted number.
|
|
*/
|
|
public static final int INTEGER_FIELD = 0;
|
|
|
|
/**
|
|
* This is a constant used to create a <code>FieldPosition</code> object
|
|
* that will return the fractional portion of a formatted number.
|
|
*/
|
|
public static final int FRACTION_FIELD = 1;
|
|
|
|
public static class Field extends Format.Field
|
|
{
|
|
static final long serialVersionUID = 7494728892700160890L;
|
|
|
|
/**
|
|
* Attribute set to all characters containing digits of the integer
|
|
* part.
|
|
*/
|
|
public static final NumberFormat.Field INTEGER
|
|
= new Field("integer");
|
|
|
|
/**
|
|
* Attribute set to all characters containing digits of the fractional
|
|
* part.
|
|
*/
|
|
public static final NumberFormat.Field FRACTION
|
|
= new Field("fraction");
|
|
|
|
/**
|
|
* Attribute set to all characters containing digits of the exponential
|
|
* part.
|
|
*/
|
|
public static final NumberFormat.Field EXPONENT
|
|
= new Field("exponent");
|
|
|
|
/**
|
|
* Attribute set to all characters containing a decimal separator.
|
|
*/
|
|
public static final NumberFormat.Field DECIMAL_SEPARATOR
|
|
= new Field("decimal separator");
|
|
|
|
/**
|
|
* Attribute set to all characters containing a sign (plus or minus).
|
|
*/
|
|
public static final NumberFormat.Field SIGN
|
|
= new Field("sign");
|
|
|
|
/**
|
|
* Attribute set to all characters containing a grouping separator (e.g.
|
|
* a comma, a white space,...).
|
|
*/
|
|
public static final NumberFormat.Field GROUPING_SEPARATOR
|
|
= new Field("grouping separator");
|
|
|
|
/**
|
|
* Attribute set to all characters containing an exponential symbol (e.g.
|
|
* 'E')
|
|
*/
|
|
public static final NumberFormat.Field EXPONENT_SYMBOL
|
|
= new Field("exponent symbol");
|
|
|
|
/**
|
|
* Attribute set to all characters containing a percent symbol (e.g. '%')
|
|
*/
|
|
public static final NumberFormat.Field PERCENT
|
|
= new Field("percent");
|
|
|
|
/**
|
|
* Attribute set to all characters containing a permille symbol.
|
|
*/
|
|
public static final NumberFormat.Field PERMILLE
|
|
= new Field("permille");
|
|
|
|
/**
|
|
* Attribute set to all characters containing the currency unit.
|
|
*/
|
|
public static final NumberFormat.Field CURRENCY
|
|
= new Field("currency");
|
|
|
|
/**
|
|
* Attribute set to all characters containing the exponent sign.
|
|
*/
|
|
public static final NumberFormat.Field EXPONENT_SIGN
|
|
= new Field("exponent sign");
|
|
|
|
/**
|
|
* Private fields to register all fields contained in this descriptor.
|
|
*/
|
|
private static final NumberFormat.Field[] allFields =
|
|
{
|
|
INTEGER, FRACTION, EXPONENT, DECIMAL_SEPARATOR, SIGN,
|
|
GROUPING_SEPARATOR, EXPONENT_SYMBOL, PERCENT,
|
|
PERMILLE, CURRENCY, EXPONENT_SIGN
|
|
};
|
|
|
|
/**
|
|
* This constructor is only used by the deserializer. Without it,
|
|
* it would fail to construct a valid object.
|
|
*/
|
|
private Field()
|
|
{
|
|
super("");
|
|
}
|
|
|
|
/**
|
|
* Create a Field instance with the specified field name.
|
|
*
|
|
* @param field_name Field name for the new Field instance.
|
|
*/
|
|
protected Field(String field_name)
|
|
{
|
|
super (field_name);
|
|
}
|
|
|
|
/**
|
|
* This function is used by the deserializer to know which object
|
|
* to use when it encounters an encoded NumberFormat.Field in a
|
|
* serialization stream. If the stream is valid it should return
|
|
* one of the above field. In the other case we throw an exception.
|
|
*
|
|
* @return a valid official NumberFormat.Field instance.
|
|
*
|
|
* @throws InvalidObjectException if the field name is invalid.
|
|
*/
|
|
protected Object readResolve() throws InvalidObjectException
|
|
{
|
|
String s = getName();
|
|
for (int i = 0; i < allFields.length; i++)
|
|
if (s.equals(allFields[i].getName()))
|
|
return allFields[i];
|
|
|
|
throw new InvalidObjectException("no such NumberFormat field called "
|
|
+ s);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This method is a specialization of the format method that performs
|
|
* a simple formatting of the specified <code>long</code> number.
|
|
*
|
|
* @param number The <code>long</code> to format.
|
|
*
|
|
* @return The formatted number
|
|
*/
|
|
public final String format (long number)
|
|
{
|
|
StringBuffer sbuf = new StringBuffer(50);
|
|
format (number, sbuf, new FieldPosition(0));
|
|
return sbuf.toString();
|
|
}
|
|
|
|
/**
|
|
* @specnote this method was final in releases before 1.5
|
|
*/
|
|
public StringBuffer format (Object obj, StringBuffer sbuf,
|
|
FieldPosition pos)
|
|
{
|
|
if (obj instanceof Number)
|
|
return format(((Number) obj).doubleValue(), sbuf, pos);
|
|
|
|
throw new
|
|
IllegalArgumentException("Cannot format given Object as a Number");
|
|
}
|
|
|
|
/**
|
|
* This method formats the specified <code>double</code> and appends it to
|
|
* a <code>StringBuffer</code>.
|
|
*
|
|
* @param number The <code>double</code> to format.
|
|
* @param sbuf The <code>StringBuffer</code> to append the formatted number
|
|
* to.
|
|
* @param pos The desired <code>FieldPosition</code>.
|
|
*
|
|
* @return The <code>StringBuffer</code> with the appended number.
|
|
*/
|
|
public abstract StringBuffer format (double number,
|
|
StringBuffer sbuf, FieldPosition pos);
|
|
|
|
/**
|
|
* This method formats the specified <code>long</code> and appends it to
|
|
* a <code>StringBuffer</code>.
|
|
*
|
|
* @param number The <code>long</code> to format.
|
|
* @param sbuf The <code>StringBuffer</code> to append the formatted number
|
|
* to.
|
|
* @param pos The desired <code>FieldPosition</code>.
|
|
*
|
|
* @return The <code>StringBuffer</code> with the appended number.
|
|
*/
|
|
public abstract StringBuffer format (long number,
|
|
StringBuffer sbuf, FieldPosition pos);
|
|
|
|
/**
|
|
* This method tests the specified object for equality against this object.
|
|
* This will be <code>true</code> if the following conditions are met:
|
|
* <p>
|
|
* <ul>
|
|
* <li>The specified object is not <code>null</code>.
|
|
* <li>The specified object is an instance of <code>NumberFormat</code>.
|
|
* </ul>
|
|
* <p>
|
|
* Since this method does not test much, it is highly advised that
|
|
* concrete subclasses override this method.
|
|
*
|
|
* @param obj The <code>Object</code> to test against equality with
|
|
* this object.
|
|
*
|
|
* @return <code>true</code> if the specified object is equal to
|
|
* this object, <code>false</code> otherwise.
|
|
*/
|
|
public boolean equals (Object obj)
|
|
{
|
|
if (! (obj instanceof NumberFormat))
|
|
return false;
|
|
NumberFormat nf = (NumberFormat) obj;
|
|
return (groupingUsed == nf.groupingUsed
|
|
&& maximumFractionDigits == nf.maximumFractionDigits
|
|
&& maximumIntegerDigits == nf.maximumIntegerDigits
|
|
&& minimumFractionDigits == nf.minimumFractionDigits
|
|
&& minimumIntegerDigits == nf.minimumIntegerDigits
|
|
&& parseIntegerOnly == nf.parseIntegerOnly);
|
|
}
|
|
|
|
/**
|
|
* This method returns a list of locales for which concrete instances
|
|
* of <code>NumberFormat</code> subclasses may be created.
|
|
*
|
|
* @return The list of available locales.
|
|
*/
|
|
public static Locale[] getAvailableLocales ()
|
|
{
|
|
Locale[] list = new Locale[1];
|
|
list[0] = Locale.US;
|
|
return list;
|
|
}
|
|
|
|
private static NumberFormat computeInstance(Locale loc, String resource,
|
|
String def)
|
|
throws MissingResourceException
|
|
{
|
|
if (loc.equals(Locale.ROOT))
|
|
return new DecimalFormat(def, DecimalFormatSymbols.getInstance(loc));
|
|
ResourceBundle res =
|
|
ResourceBundle.getBundle("gnu.java.locale.LocaleInformation",
|
|
loc, ClassLoader.getSystemClassLoader());
|
|
String fmt;
|
|
try
|
|
{
|
|
fmt = res == null ? def : res.getString(resource);
|
|
}
|
|
catch (MissingResourceException x)
|
|
{
|
|
fmt = def;
|
|
}
|
|
DecimalFormatSymbols dfs = DecimalFormatSymbols.getInstance(loc);
|
|
return new DecimalFormat (fmt, dfs);
|
|
}
|
|
|
|
/**
|
|
* This method returns an instance of <code>NumberFormat</code> suitable
|
|
* for formatting and parsing currency values in the default locale.
|
|
*
|
|
* @return An instance of <code>NumberFormat</code> for handling currencies.
|
|
*/
|
|
public static final NumberFormat getCurrencyInstance ()
|
|
{
|
|
return getCurrencyInstance (Locale.getDefault());
|
|
}
|
|
|
|
/**
|
|
* This method returns an instance of <code>NumberFormat</code> suitable
|
|
* for formatting and parsing currency values in the specified locale.
|
|
*
|
|
* @return An instance of <code>NumberFormat</code> for handling currencies.
|
|
*/
|
|
public static NumberFormat getCurrencyInstance (Locale loc)
|
|
{
|
|
try
|
|
{
|
|
NumberFormat format;
|
|
|
|
format = computeInstance (loc, "currencyFormat",
|
|
"\u00A4#,##0.00;(\u00A4#,##0.00)");
|
|
format.setMaximumFractionDigits(format.getCurrency().getDefaultFractionDigits());
|
|
return format;
|
|
}
|
|
catch (MissingResourceException e)
|
|
{
|
|
for (NumberFormatProvider p :
|
|
ServiceLoader.load(NumberFormatProvider.class))
|
|
{
|
|
for (Locale l : p.getAvailableLocales())
|
|
{
|
|
if (l.equals(loc))
|
|
{
|
|
NumberFormat nf = p.getCurrencyInstance(loc);
|
|
if (nf != null)
|
|
return nf;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
return getCurrencyInstance(LocaleHelper.getFallbackLocale(loc));
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This method returns a default instance for the default locale. This
|
|
* will be a concrete subclass of <code>NumberFormat</code>, but the
|
|
* actual class returned is dependent on the locale.
|
|
*
|
|
* @return An instance of the default <code>NumberFormat</code> class.
|
|
*/
|
|
public static final NumberFormat getInstance ()
|
|
{
|
|
return getInstance (Locale.getDefault());
|
|
}
|
|
|
|
/**
|
|
* This method returns a default instance for the specified locale. This
|
|
* will be a concrete subclass of <code>NumberFormat</code>, but the
|
|
* actual class returned is dependent on the locale.
|
|
*
|
|
* @param loc The desired locale.
|
|
*
|
|
* @return An instance of the default <code>NumberFormat</code> class.
|
|
*/
|
|
public static NumberFormat getInstance (Locale loc)
|
|
{
|
|
// For now always return a number instance.
|
|
return getNumberInstance (loc);
|
|
}
|
|
|
|
/**
|
|
* This method returns the maximum number of digits allowed in the fraction
|
|
* portion of a number.
|
|
*
|
|
* @return The maximum number of digits allowed in the fraction
|
|
* portion of a number.
|
|
*/
|
|
public int getMaximumFractionDigits ()
|
|
{
|
|
return maximumFractionDigits;
|
|
}
|
|
|
|
/**
|
|
* This method returns the maximum number of digits allowed in the integer
|
|
* portion of a number.
|
|
*
|
|
* @return The maximum number of digits allowed in the integer
|
|
* portion of a number.
|
|
*/
|
|
public int getMaximumIntegerDigits ()
|
|
{
|
|
return maximumIntegerDigits;
|
|
}
|
|
|
|
/**
|
|
* This method returns the minimum number of digits allowed in the fraction
|
|
* portion of a number.
|
|
*
|
|
* @return The minimum number of digits allowed in the fraction
|
|
* portion of a number.
|
|
*/
|
|
public int getMinimumFractionDigits ()
|
|
{
|
|
return minimumFractionDigits;
|
|
}
|
|
|
|
/**
|
|
* This method returns the minimum number of digits allowed in the integer
|
|
* portion of a number.
|
|
*
|
|
* @return The minimum number of digits allowed in the integer
|
|
* portion of a number.
|
|
*/
|
|
public int getMinimumIntegerDigits ()
|
|
{
|
|
return minimumIntegerDigits;
|
|
}
|
|
|
|
/**
|
|
* This method returns a default instance for the specified locale. This
|
|
* will be a concrete subclass of <code>NumberFormat</code>, but the
|
|
* actual class returned is dependent on the locale.
|
|
*
|
|
* @return An instance of the default <code>NumberFormat</code> class.
|
|
*/
|
|
public static final NumberFormat getNumberInstance ()
|
|
{
|
|
return getNumberInstance (Locale.getDefault());
|
|
}
|
|
|
|
/**
|
|
* This method returns a general purpose number formatting and parsing
|
|
* class for the default locale. This will be a concrete subclass of
|
|
* <code>NumberFormat</code>, but the actual class returned is dependent
|
|
* on the locale.
|
|
*
|
|
* @return An instance of a generic number formatter for the default locale.
|
|
*/
|
|
public static NumberFormat getNumberInstance (Locale loc)
|
|
{
|
|
try
|
|
{
|
|
return computeInstance (loc, "numberFormat", "#,##0.###");
|
|
}
|
|
catch (MissingResourceException e)
|
|
{
|
|
for (NumberFormatProvider p :
|
|
ServiceLoader.load(NumberFormatProvider.class))
|
|
{
|
|
for (Locale l : p.getAvailableLocales())
|
|
{
|
|
if (l.equals(loc))
|
|
{
|
|
NumberFormat nf = p.getNumberInstance(loc);
|
|
if (nf != null)
|
|
return nf;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
return getNumberInstance(LocaleHelper.getFallbackLocale(loc));
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This method returns an integer formatting and parsing class for the
|
|
* default locale. This will be a concrete subclass of <code>NumberFormat</code>,
|
|
* but the actual class returned is dependent on the locale.
|
|
*
|
|
* @return An instance of an integer number formatter for the default locale.
|
|
* @since 1.4
|
|
*/
|
|
public static final NumberFormat getIntegerInstance()
|
|
{
|
|
return getIntegerInstance (Locale.getDefault());
|
|
}
|
|
|
|
/**
|
|
* This method returns an integer formatting and parsing class for the
|
|
* default locale. This will be a concrete subclass of <code>NumberFormat</code>,
|
|
* but the actual class returned is dependent on the locale.
|
|
*
|
|
* @param locale the desired locale.
|
|
*
|
|
* @return An instance of an integer number formatter for the desired locale.
|
|
* @since 1.4
|
|
*/
|
|
public static NumberFormat getIntegerInstance(Locale locale)
|
|
{
|
|
try
|
|
{
|
|
NumberFormat format = computeInstance (locale,
|
|
"integerFormat", "#,##0");
|
|
format.setMaximumFractionDigits(0);
|
|
format.setParseIntegerOnly (true);
|
|
return format;
|
|
}
|
|
catch (MissingResourceException e)
|
|
{
|
|
for (NumberFormatProvider p :
|
|
ServiceLoader.load(NumberFormatProvider.class))
|
|
{
|
|
for (Locale l : p.getAvailableLocales())
|
|
{
|
|
if (l.equals(locale))
|
|
{
|
|
NumberFormat nf = p.getIntegerInstance(locale);
|
|
if (nf != null)
|
|
return nf;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
return getIntegerInstance(LocaleHelper.getFallbackLocale(locale));
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This method returns an instance of <code>NumberFormat</code> suitable
|
|
* for formatting and parsing percentage values in the default locale.
|
|
*
|
|
* @return An instance of <code>NumberFormat</code> for handling percentages.
|
|
*/
|
|
public static final NumberFormat getPercentInstance ()
|
|
{
|
|
return getPercentInstance (Locale.getDefault());
|
|
}
|
|
|
|
/**
|
|
* This method returns an instance of <code>NumberFormat</code> suitable
|
|
* for formatting and parsing percentage values in the specified locale.
|
|
*
|
|
* @param loc The desired locale.
|
|
*
|
|
* @return An instance of <code>NumberFormat</code> for handling percentages.
|
|
*/
|
|
public static NumberFormat getPercentInstance (Locale loc)
|
|
{
|
|
try
|
|
{
|
|
return computeInstance (loc, "percentFormat", "#,##0%");
|
|
}
|
|
catch (MissingResourceException e)
|
|
{
|
|
for (NumberFormatProvider p :
|
|
ServiceLoader.load(NumberFormatProvider.class))
|
|
{
|
|
for (Locale l : p.getAvailableLocales())
|
|
{
|
|
if (l.equals(loc))
|
|
{
|
|
NumberFormat nf = p.getPercentInstance(loc);
|
|
if (nf != null)
|
|
return nf;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
return getPercentInstance(LocaleHelper.getFallbackLocale(loc));
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This method returns a hash value for this object.
|
|
*
|
|
* @return The hash code.
|
|
*/
|
|
public int hashCode ()
|
|
{
|
|
int hash = super.hashCode();
|
|
hash ^= (maximumFractionDigits + maximumIntegerDigits
|
|
+ minimumFractionDigits + minimumIntegerDigits);
|
|
if (groupingUsed)
|
|
hash ^= 0xf0f0;
|
|
if (parseIntegerOnly)
|
|
hash ^= 0x0f0f;
|
|
return hash;
|
|
}
|
|
|
|
/**
|
|
* This method tests whether or not grouping is in use. Grouping is
|
|
* a method of marking separations in numbers, such as thousand separators
|
|
* in the US English locale. The grouping positions and symbols are all
|
|
* locale specific. As an example, with grouping disabled, the number one
|
|
* million would appear as "1000000". With grouping enabled, this number
|
|
* might appear as "1,000,000". (Both of these assume the US English
|
|
* locale).
|
|
*
|
|
* @return <code>true</code> if grouping is enabled,
|
|
* <code>false</code> otherwise.
|
|
*/
|
|
public boolean isGroupingUsed ()
|
|
{
|
|
return groupingUsed;
|
|
}
|
|
|
|
/**
|
|
* This method tests whether or not only integer values should be parsed.
|
|
* If this class is parsing only integers, parsing stops at the decimal
|
|
* point.
|
|
*
|
|
* @return <code>true</code> if only integers are parsed,
|
|
* <code>false</code> otherwise.
|
|
*/
|
|
public boolean isParseIntegerOnly ()
|
|
{
|
|
return parseIntegerOnly;
|
|
}
|
|
|
|
/**
|
|
* This is a default constructor for use by subclasses.
|
|
*/
|
|
protected NumberFormat ()
|
|
{
|
|
}
|
|
|
|
/**
|
|
* This method parses the specified string into a <code>Number</code>. This
|
|
* will be a <code>Long</code> if possible, otherwise it will be a
|
|
* <code>Double</code>. If no number can be parsed, no exception is
|
|
* thrown. Instead, the parse position remains at its initial index.
|
|
*
|
|
* @param sourceStr The string to parse.
|
|
* @param pos The desired <code>ParsePosition</code>.
|
|
*
|
|
* @return The parsed <code>Number</code>
|
|
*/
|
|
public abstract Number parse (String sourceStr, ParsePosition pos);
|
|
|
|
/**
|
|
* This method parses the specified string into a <code>Number</code>. This
|
|
* will be a <code>Long</code> if possible, otherwise it will be a
|
|
* <code>Double</code>. If no number can be parsed, an exception will be
|
|
* thrown.
|
|
*
|
|
* @param sourceStr The string to parse.
|
|
*
|
|
* @return The parsed <code>Number</code>
|
|
*
|
|
* @exception ParseException If no number can be parsed.
|
|
*/
|
|
public Number parse (String sourceStr) throws ParseException
|
|
{
|
|
ParsePosition pp = new ParsePosition (0);
|
|
Number r = parse (sourceStr, pp);
|
|
if (r == null)
|
|
{
|
|
int index = pp.getErrorIndex();
|
|
if (index < 0)
|
|
index = pp.getIndex();
|
|
throw new ParseException ("couldn't parse number", index);
|
|
}
|
|
return r;
|
|
}
|
|
|
|
/**
|
|
* This method parses the specified string into an <code>Object</code>. This
|
|
* will be a <code>Long</code> if possible, otherwise it will be a
|
|
* <code>Double</code>. If no number can be parsed, no exception is
|
|
* thrown. Instead, the parse position remains at its initial index.
|
|
*
|
|
* @param sourceStr The string to parse.
|
|
* @param pos The desired <code>ParsePosition</code>.
|
|
*
|
|
* @return The parsed <code>Object</code>
|
|
*/
|
|
public final Object parseObject (String sourceStr, ParsePosition pos)
|
|
{
|
|
return parse (sourceStr, pos);
|
|
}
|
|
|
|
/**
|
|
* This method sets the grouping behavior of this formatter. Grouping is
|
|
* a method of marking separations in numbers, such as thousand separators
|
|
* in the US English locale. The grouping positions and symbols are all
|
|
* locale specific. As an example, with grouping disabled, the number one
|
|
* million would appear as "1000000". With grouping enabled, this number
|
|
* might appear as "1,000,000". (Both of these assume the US English
|
|
* locale).
|
|
*
|
|
* @param newValue <code>true</code> to enable grouping,
|
|
* <code>false</code> to disable it.
|
|
*/
|
|
public void setGroupingUsed (boolean newValue)
|
|
{
|
|
groupingUsed = newValue;
|
|
}
|
|
|
|
/**
|
|
* This method sets the maximum number of digits allowed in the fraction
|
|
* portion of a number to the specified value. If this is less than the
|
|
* current minimum allowed digits, the minimum allowed digits value will
|
|
* be lowered to be equal to the new maximum allowed digits value.
|
|
*
|
|
* @param digits The new maximum fraction digits value.
|
|
*/
|
|
public void setMaximumFractionDigits (int digits)
|
|
{
|
|
maximumFractionDigits = digits;
|
|
if (getMinimumFractionDigits () > maximumFractionDigits)
|
|
setMinimumFractionDigits (maximumFractionDigits);
|
|
}
|
|
|
|
/**
|
|
* This method sets the maximum number of digits allowed in the integer
|
|
* portion of a number to the specified value. If this is less than the
|
|
* current minimum allowed digits, the minimum allowed digits value will
|
|
* be lowered to be equal to the new maximum allowed digits value.
|
|
*
|
|
* @param digits The new maximum integer digits value.
|
|
*/
|
|
public void setMaximumIntegerDigits (int digits)
|
|
{
|
|
maximumIntegerDigits = digits;
|
|
if (getMinimumIntegerDigits () > maximumIntegerDigits)
|
|
setMinimumIntegerDigits (maximumIntegerDigits);
|
|
}
|
|
|
|
/**
|
|
* This method sets the minimum number of digits allowed in the fraction
|
|
* portion of a number to the specified value. If this is greater than the
|
|
* current maximum allowed digits, the maximum allowed digits value will
|
|
* be raised to be equal to the new minimum allowed digits value.
|
|
*
|
|
* @param digits The new minimum fraction digits value.
|
|
*/
|
|
public void setMinimumFractionDigits (int digits)
|
|
{
|
|
minimumFractionDigits = digits;
|
|
if (getMaximumFractionDigits () < minimumFractionDigits)
|
|
setMaximumFractionDigits (minimumFractionDigits);
|
|
}
|
|
|
|
/**
|
|
* This method sets the minimum number of digits allowed in the integer
|
|
* portion of a number to the specified value. If this is greater than the
|
|
* current maximum allowed digits, the maximum allowed digits value will
|
|
* be raised to be equal to the new minimum allowed digits value.
|
|
*
|
|
* @param digits The new minimum integer digits value.
|
|
*/
|
|
public void setMinimumIntegerDigits (int digits)
|
|
{
|
|
minimumIntegerDigits = digits;
|
|
if (getMaximumIntegerDigits () < minimumIntegerDigits)
|
|
setMaximumIntegerDigits (minimumIntegerDigits);
|
|
}
|
|
|
|
/**
|
|
* This method sets the parsing behavior of this object to parse only
|
|
* integers or not.
|
|
*
|
|
* @param value <code>true</code> to parse only integers,
|
|
* <code>false</code> otherwise.
|
|
*/
|
|
public void setParseIntegerOnly (boolean value)
|
|
{
|
|
parseIntegerOnly = value;
|
|
}
|
|
|
|
/**
|
|
* This method is a specialization of the format method that performs
|
|
* a simple formatting of the specified <code>double</code> number.
|
|
*
|
|
* @param number The <code>double</code> to format.
|
|
*
|
|
* @return The formatted number
|
|
*/
|
|
public final String format (double number)
|
|
{
|
|
StringBuffer sbuf = new StringBuffer(50);
|
|
FieldPosition position = new FieldPosition(0);
|
|
|
|
format (number, sbuf, position);
|
|
return sbuf.toString();
|
|
}
|
|
|
|
// These field names are fixed by the serialization spec.
|
|
boolean groupingUsed;
|
|
int maximumFractionDigits;
|
|
private byte maxFractionDigits;
|
|
int maximumIntegerDigits;
|
|
private byte maxIntegerDigits;
|
|
int minimumFractionDigits;
|
|
private byte minFractionDigits;
|
|
int minimumIntegerDigits;
|
|
private byte minIntegerDigits;
|
|
boolean parseIntegerOnly;
|
|
private int serialVersionOnStream;
|
|
private static final long serialVersionUID = -2308460125733713944L;
|
|
|
|
private void readObject(ObjectInputStream stream)
|
|
throws IOException, ClassNotFoundException
|
|
{
|
|
stream.defaultReadObject();
|
|
if (serialVersionOnStream < 1)
|
|
{
|
|
maximumFractionDigits = maxFractionDigits;
|
|
maximumIntegerDigits = maxIntegerDigits;
|
|
minimumFractionDigits = minFractionDigits;
|
|
minimumIntegerDigits = minIntegerDigits;
|
|
serialVersionOnStream = 1;
|
|
}
|
|
}
|
|
|
|
private void writeObject(ObjectOutputStream stream) throws IOException
|
|
{
|
|
maxFractionDigits = maximumFractionDigits < Byte.MAX_VALUE ?
|
|
(byte) maximumFractionDigits : Byte.MAX_VALUE;
|
|
maxIntegerDigits = maximumIntegerDigits < Byte.MAX_VALUE ?
|
|
(byte) maximumIntegerDigits : Byte.MAX_VALUE;
|
|
minFractionDigits = minimumFractionDigits < Byte.MAX_VALUE ?
|
|
(byte) minimumFractionDigits : Byte.MAX_VALUE;
|
|
minIntegerDigits = minimumIntegerDigits < Byte.MAX_VALUE ?
|
|
(byte) minimumIntegerDigits : Byte.MAX_VALUE;
|
|
serialVersionOnStream = 1;
|
|
stream.defaultWriteObject();
|
|
}
|
|
|
|
/**
|
|
* Returns the currency used by this number format when formatting currency
|
|
* values.
|
|
*
|
|
* The default implementation throws UnsupportedOperationException.
|
|
*
|
|
* @return The used currency object, or null.
|
|
*
|
|
* @throws UnsupportedOperationException If the number format class doesn't
|
|
* implement currency formatting.
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public Currency getCurrency()
|
|
{
|
|
throw new UnsupportedOperationException();
|
|
}
|
|
|
|
/**
|
|
* Sets the currency used by this number format when formatting currency
|
|
* values.
|
|
*
|
|
* The default implementation throws UnsupportedOperationException.
|
|
*
|
|
* @param currency The new currency to be used by this number format.
|
|
*
|
|
* @throws NullPointerException If currenc is null.
|
|
* @throws UnsupportedOperationException If the number format class doesn't
|
|
* implement currency formatting.
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public void setCurrency(Currency currency)
|
|
{
|
|
if (currency == null)
|
|
throw new NullPointerException("currency may not be null");
|
|
|
|
throw new UnsupportedOperationException();
|
|
}
|
|
}
|