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
767 lines
21 KiB
Java
767 lines
21 KiB
Java
/* DecimalFormatSymbols.java -- Format symbols used by DecimalFormat
|
|
Copyright (C) 1999, 2000, 2001, 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.ObjectInputStream;
|
|
import java.io.Serializable;
|
|
|
|
import java.text.spi.DecimalFormatSymbolsProvider;
|
|
|
|
import java.util.Currency;
|
|
import java.util.Locale;
|
|
import java.util.MissingResourceException;
|
|
import java.util.ResourceBundle;
|
|
import java.util.ServiceLoader;
|
|
|
|
/**
|
|
* This class is a container for the symbols used by
|
|
* <code>DecimalFormat</code> to format numbers and currency
|
|
* for a particular locale. These are
|
|
* normally handled automatically, but an application can override
|
|
* values as desired using this class.
|
|
*
|
|
* @author Tom Tromey (tromey@cygnus.com)
|
|
* @author Aaron M. Renn (arenn@urbanophile.com)
|
|
* @author Andrew John Hughes (gnu_andrew@member.fsf.org)
|
|
* @date February 24, 1999
|
|
* @see java.text.DecimalFormat
|
|
*/
|
|
/* 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.
|
|
*/
|
|
public class DecimalFormatSymbols implements Cloneable, Serializable
|
|
{
|
|
public Object clone ()
|
|
{
|
|
try
|
|
{
|
|
return super.clone();
|
|
}
|
|
catch(CloneNotSupportedException e)
|
|
{
|
|
return null;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This method initializes a new instance of
|
|
* <code>DecimalFormatSymbols</code> for the default locale.
|
|
* This constructor only obtains instances using the runtime's resources;
|
|
* to also include {@link java.text.spi.DateFormatSymbolsProvider} instances,
|
|
* call {@link #getInstance()} instead.
|
|
*
|
|
* @see #getInstance()
|
|
*/
|
|
public DecimalFormatSymbols ()
|
|
{
|
|
this (Locale.getDefault());
|
|
}
|
|
|
|
/**
|
|
* Retrieves a valid string, either using the supplied resource
|
|
* bundle or the default value.
|
|
*
|
|
* @param bundle the resource bundle to use to find the string.
|
|
* @param name key for the string in the resource bundle.
|
|
* @param def default value for the string.
|
|
*/
|
|
private String safeGetString(ResourceBundle bundle,
|
|
String name, String def)
|
|
{
|
|
if (bundle != null)
|
|
{
|
|
try
|
|
{
|
|
return bundle.getString(name);
|
|
}
|
|
catch (MissingResourceException x)
|
|
{
|
|
}
|
|
}
|
|
return def;
|
|
}
|
|
|
|
private char safeGetChar(ResourceBundle bundle,
|
|
String name, char def)
|
|
{
|
|
String r = null;
|
|
if (bundle != null)
|
|
{
|
|
try
|
|
{
|
|
r = bundle.getString(name);
|
|
}
|
|
catch (MissingResourceException x)
|
|
{
|
|
}
|
|
}
|
|
if (r == null || r.length() < 1)
|
|
return def;
|
|
return r.charAt(0);
|
|
}
|
|
|
|
/**
|
|
* This method initializes a new instance of
|
|
* <code>DecimalFormatSymbols</code> for the specified locale.
|
|
* <strong>Note</strong>: if the locale does not have an associated
|
|
* <code>Currency</code> instance, the currency symbol and
|
|
* international currency symbol will be set to the strings "?"
|
|
* and "XXX" respectively. This generally happens with language
|
|
* locales (those with no specified country), such as
|
|
* <code>Locale.ENGLISH</code>. This constructor only obtains
|
|
* instances using the runtime's resources; to also include
|
|
* {@link java.text.spi.DecimalFormatSymbolsProvider} instances,
|
|
* call {@link #getInstance(java.util.Locale)} instead.
|
|
*
|
|
* @param loc The local to load symbols for.
|
|
* @throws NullPointerException if the locale is null.
|
|
* @see #getInstance(java.util.Locale)
|
|
*/
|
|
public DecimalFormatSymbols (Locale loc)
|
|
{
|
|
ResourceBundle res;
|
|
|
|
try
|
|
{
|
|
res = ResourceBundle.getBundle("gnu.java.locale.LocaleInformation",
|
|
loc, ClassLoader.getSystemClassLoader());
|
|
}
|
|
catch (MissingResourceException x)
|
|
{
|
|
res = null;
|
|
}
|
|
locale = loc;
|
|
currency = Currency.getInstance("XXX");
|
|
currencySymbol = "?";
|
|
intlCurrencySymbol = "XXX";
|
|
try
|
|
{
|
|
Currency localeCurrency = Currency.getInstance(loc);
|
|
if (localeCurrency != null)
|
|
{
|
|
setCurrency(localeCurrency);
|
|
}
|
|
}
|
|
catch(IllegalArgumentException exception)
|
|
{
|
|
/* Locale has an invalid currency */
|
|
}
|
|
decimalSeparator = safeGetChar (res, "decimalSeparator", '.');
|
|
digit = safeGetChar (res, "digit", '#');
|
|
exponential = safeGetChar (res, "exponential", 'E');
|
|
groupingSeparator = safeGetChar (res, "groupingSeparator", ',');
|
|
infinity = safeGetString (res, "infinity", "\u221e");
|
|
try
|
|
{
|
|
monetarySeparator = safeGetChar (res, "monetarySeparator", '.');
|
|
}
|
|
catch (MissingResourceException x)
|
|
{
|
|
monetarySeparator = decimalSeparator;
|
|
}
|
|
minusSign = safeGetChar (res, "minusSign", '-');
|
|
NaN = safeGetString (res, "NaN", "\ufffd");
|
|
patternSeparator = safeGetChar (res, "patternSeparator", ';');
|
|
percent = safeGetChar (res, "percent", '%');
|
|
perMill = safeGetChar (res, "perMill", '\u2030');
|
|
zeroDigit = safeGetChar (res, "zeroDigit", '0');
|
|
}
|
|
|
|
/**
|
|
* This method this this object for equality against the specified object.
|
|
* This will be true if and only if the following criteria are met with
|
|
* regard to the specified object:
|
|
* <p>
|
|
* <ul>
|
|
* <li>It is not <code>null</code>.</li>
|
|
* <li>It is an instance of <code>DecimalFormatSymbols</code>.</li>
|
|
* <li>All of its symbols are identical to the symbols in this object.</li>
|
|
* </ul>
|
|
*
|
|
* @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 DecimalFormatSymbols))
|
|
return false;
|
|
DecimalFormatSymbols dfs = (DecimalFormatSymbols) obj;
|
|
return (currencySymbol.equals(dfs.currencySymbol)
|
|
&& decimalSeparator == dfs.decimalSeparator
|
|
&& digit == dfs.digit
|
|
&& exponential == dfs.exponential
|
|
&& groupingSeparator == dfs.groupingSeparator
|
|
&& infinity.equals(dfs.infinity)
|
|
&& intlCurrencySymbol.equals(dfs.intlCurrencySymbol)
|
|
&& minusSign == dfs.minusSign
|
|
&& monetarySeparator == dfs.monetarySeparator
|
|
&& NaN.equals(dfs.NaN)
|
|
&& patternSeparator == dfs.patternSeparator
|
|
&& percent == dfs.percent
|
|
&& perMill == dfs.perMill
|
|
&& zeroDigit == dfs.zeroDigit);
|
|
}
|
|
|
|
/**
|
|
* Returns the currency corresponding to the currency symbol stored
|
|
* in this instance of <code>DecimalFormatSymbols</code>.
|
|
*
|
|
* @return An instance of <code>Currency</code> which matches
|
|
* the currency used, or null if there is no corresponding
|
|
* instance.
|
|
*/
|
|
public Currency getCurrency ()
|
|
{
|
|
return currency;
|
|
}
|
|
|
|
/**
|
|
* This method returns the currency symbol in local format. For example,
|
|
* "$" for Canadian dollars.
|
|
*
|
|
* @return The currency symbol in local format.
|
|
*/
|
|
public String getCurrencySymbol ()
|
|
{
|
|
return currencySymbol;
|
|
}
|
|
|
|
/**
|
|
* This method returns the character used as the decimal point.
|
|
*
|
|
* @return The character used as the decimal point.
|
|
*/
|
|
public char getDecimalSeparator ()
|
|
{
|
|
return decimalSeparator;
|
|
}
|
|
|
|
/**
|
|
* This method returns the character used to represent a digit in a
|
|
* format pattern string.
|
|
*
|
|
* @return The character used to represent a digit in a format
|
|
* pattern string.
|
|
*/
|
|
public char getDigit ()
|
|
{
|
|
return digit;
|
|
}
|
|
|
|
/**
|
|
* This method returns the character used to represent the exponential
|
|
* format. This is a GNU Classpath extension.
|
|
*
|
|
* @return the character used to represent an exponential in a format
|
|
* pattern string.
|
|
*/
|
|
char getExponential ()
|
|
{
|
|
return exponential;
|
|
}
|
|
|
|
/**
|
|
* This method sets the character used to separate groups of digits. For
|
|
* example, the United States uses a comma (,) to separate thousands in
|
|
* a number.
|
|
*
|
|
* @return The character used to separate groups of digits.
|
|
*/
|
|
public char getGroupingSeparator ()
|
|
{
|
|
return groupingSeparator;
|
|
}
|
|
|
|
/**
|
|
* This method returns the character used to represent infinity.
|
|
*
|
|
* @return The character used to represent infinity.
|
|
*/
|
|
public String getInfinity ()
|
|
{
|
|
return infinity;
|
|
}
|
|
|
|
/**
|
|
* This method returns the ISO 4217 currency code for
|
|
* the currency used.
|
|
*
|
|
* @return the ISO 4217 currency code.
|
|
*/
|
|
public String getInternationalCurrencySymbol ()
|
|
{
|
|
return intlCurrencySymbol;
|
|
}
|
|
|
|
/**
|
|
* This method returns the character used to represent the minus sign.
|
|
*
|
|
* @return The character used to represent the minus sign.
|
|
*/
|
|
public char getMinusSign ()
|
|
{
|
|
return minusSign;
|
|
}
|
|
|
|
/**
|
|
* This method returns the character used to represent the decimal
|
|
* point for currency values.
|
|
*
|
|
* @return The decimal point character used in currency values.
|
|
*/
|
|
public char getMonetaryDecimalSeparator ()
|
|
{
|
|
return monetarySeparator;
|
|
}
|
|
|
|
/**
|
|
* This method returns the string used to represent the NaN (not a number)
|
|
* value.
|
|
*
|
|
* @return The string used to represent NaN
|
|
*/
|
|
public String getNaN ()
|
|
{
|
|
return NaN;
|
|
}
|
|
|
|
/**
|
|
* This method returns the character used to separate positive and negative
|
|
* subpatterns in a format pattern.
|
|
*
|
|
* @return The character used to separate positive and negative subpatterns
|
|
* in a format pattern.
|
|
*/
|
|
public char getPatternSeparator ()
|
|
{
|
|
return patternSeparator;
|
|
}
|
|
|
|
/**
|
|
* This method returns the character used as the percent sign.
|
|
*
|
|
* @return The character used as the percent sign.
|
|
*/
|
|
public char getPercent ()
|
|
{
|
|
return percent;
|
|
}
|
|
|
|
/**
|
|
* This method returns the character used as the per mille character.
|
|
*
|
|
* @return The per mille character.
|
|
*/
|
|
public char getPerMill ()
|
|
{
|
|
return perMill;
|
|
}
|
|
|
|
/**
|
|
* This method returns the character used to represent the digit zero.
|
|
*
|
|
* @return The character used to represent the digit zero.
|
|
*/
|
|
public char getZeroDigit ()
|
|
{
|
|
return zeroDigit;
|
|
}
|
|
|
|
/**
|
|
* This method returns a hash value for this object.
|
|
*
|
|
* @return A hash value for this object.
|
|
*/
|
|
public int hashCode ()
|
|
{
|
|
// Compute based on zero digit, grouping separator, and decimal
|
|
// separator -- JCL book. This probably isn't a very good hash
|
|
// code.
|
|
return zeroDigit << 16 + groupingSeparator << 8 + decimalSeparator;
|
|
}
|
|
|
|
/**
|
|
* This method sets the currency symbol and ISO 4217 currency
|
|
* code to the values obtained from the supplied currency.
|
|
*
|
|
* @param currency the currency from which to obtain the values.
|
|
* @throws NullPointerException if the currency is null.
|
|
*/
|
|
public void setCurrency (Currency currency)
|
|
{
|
|
intlCurrencySymbol = currency.getCurrencyCode();
|
|
currencySymbol = currency.getSymbol(locale);
|
|
this.currency = currency;
|
|
}
|
|
|
|
/**
|
|
* This method sets the currency symbol to the specified value.
|
|
*
|
|
* @param currency The new currency symbol
|
|
*/
|
|
public void setCurrencySymbol (String currency)
|
|
{
|
|
currencySymbol = currency;
|
|
}
|
|
|
|
/**
|
|
* This method sets the decimal point character to the specified value.
|
|
*
|
|
* @param decimalSep The new decimal point character
|
|
*/
|
|
public void setDecimalSeparator (char decimalSep)
|
|
{
|
|
decimalSeparator = decimalSep;
|
|
}
|
|
|
|
/**
|
|
* This method sets the character used to represents a digit in a format
|
|
* string to the specified value.
|
|
*
|
|
* @param digit The character used to represent a digit in a format pattern.
|
|
*/
|
|
public void setDigit (char digit)
|
|
{
|
|
this.digit = digit;
|
|
}
|
|
|
|
/**
|
|
* This method sets the exponential character used in the format string to
|
|
* the specified value. This is a GNU Classpath extension.
|
|
*
|
|
* @param exp the character used for the exponential in a format pattern.
|
|
*/
|
|
void setExponential (char exp)
|
|
{
|
|
exponential = exp;
|
|
}
|
|
|
|
/**
|
|
* This method sets the character used to separate groups of digits.
|
|
*
|
|
* @param groupSep The character used to separate groups of digits.
|
|
*/
|
|
public void setGroupingSeparator (char groupSep)
|
|
{
|
|
groupingSeparator = groupSep;
|
|
}
|
|
|
|
/**
|
|
* This method sets the string used to represents infinity.
|
|
*
|
|
* @param infinity The string used to represent infinity.
|
|
*/
|
|
public void setInfinity (String infinity)
|
|
{
|
|
this.infinity = infinity;
|
|
}
|
|
|
|
/**
|
|
* This method sets the international currency symbol to the
|
|
* specified value. If a valid <code>Currency</code> instance
|
|
* exists for the international currency code, then this is
|
|
* used for the currency attribute, and the currency symbol
|
|
* is set to the corresponding value from this instance.
|
|
* Otherwise, the currency attribute is set to null and the
|
|
* symbol is left unmodified.
|
|
*
|
|
* @param currencyCode The new international currency symbol.
|
|
*/
|
|
public void setInternationalCurrencySymbol (String currencyCode)
|
|
{
|
|
intlCurrencySymbol = currencyCode;
|
|
try
|
|
{
|
|
currency = Currency.getInstance(currencyCode);
|
|
}
|
|
catch (IllegalArgumentException exception)
|
|
{
|
|
currency = null;
|
|
}
|
|
if (currency != null)
|
|
{
|
|
setCurrencySymbol(currency.getSymbol(locale));
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This method sets the character used to represent the minus sign.
|
|
*
|
|
* @param minusSign The character used to represent the minus sign.
|
|
*/
|
|
public void setMinusSign (char minusSign)
|
|
{
|
|
this.minusSign = minusSign;
|
|
}
|
|
|
|
/**
|
|
* This method sets the character used for the decimal point in currency
|
|
* values.
|
|
*
|
|
* @param decimalSep The decimal point character used in currency values.
|
|
*/
|
|
public void setMonetaryDecimalSeparator (char decimalSep)
|
|
{
|
|
monetarySeparator = decimalSep;
|
|
}
|
|
|
|
/**
|
|
* This method sets the string used to represent the NaN (not a
|
|
* number) value.
|
|
*
|
|
* @param nan The string used to represent NaN
|
|
*/
|
|
public void setNaN (String nan)
|
|
{
|
|
NaN = nan;
|
|
}
|
|
|
|
/**
|
|
* This method sets the character used to separate positive and negative
|
|
* subpatterns in a format pattern.
|
|
*
|
|
* @param patternSep The character used to separate positive and
|
|
* negative subpatterns in a format pattern.
|
|
*/
|
|
public void setPatternSeparator (char patternSep)
|
|
{
|
|
patternSeparator = patternSep;
|
|
}
|
|
|
|
/**
|
|
* This method sets the character used as the percent sign.
|
|
*
|
|
* @param percent The character used as the percent sign.
|
|
*/
|
|
public void setPercent (char percent)
|
|
{
|
|
this.percent = percent;
|
|
}
|
|
|
|
/**
|
|
* This method sets the character used as the per mille character.
|
|
*
|
|
* @param perMill The per mille character.
|
|
*/
|
|
public void setPerMill (char perMill)
|
|
{
|
|
this.perMill = perMill;
|
|
}
|
|
|
|
/**
|
|
* This method sets the character used to represent the digit zero.
|
|
*
|
|
* @param zeroDigit The character used to represent the digit zero.
|
|
*/
|
|
public void setZeroDigit (char zeroDigit)
|
|
{
|
|
this.zeroDigit = zeroDigit;
|
|
}
|
|
|
|
/**
|
|
* @serial A string used for the local currency
|
|
*/
|
|
private String currencySymbol;
|
|
/**
|
|
* @serial The <code>char</code> used to separate decimals in a number.
|
|
*/
|
|
private char decimalSeparator;
|
|
/**
|
|
* @serial This is the <code>char</code> used to represent a digit in
|
|
* a format specification.
|
|
*/
|
|
private char digit;
|
|
/**
|
|
* @serial This is the <code>char</code> used to represent the exponent
|
|
* separator in exponential notation.
|
|
*/
|
|
private char exponential;
|
|
/**
|
|
* @serial This separates groups of thousands in numbers.
|
|
*/
|
|
private char groupingSeparator;
|
|
/**
|
|
* @serial This string represents infinity.
|
|
*/
|
|
private String infinity;
|
|
/**
|
|
* @serial This string represents the local currency in an international
|
|
* context, eg, "C$" for Canadian dollars.
|
|
*/
|
|
private String intlCurrencySymbol;
|
|
/**
|
|
* @serial This is the character used to represent the minus sign.
|
|
*/
|
|
private char minusSign;
|
|
/**
|
|
* @serial This character is used to separate decimals when formatting
|
|
* currency values.
|
|
*/
|
|
private char monetarySeparator;
|
|
/**
|
|
* @serial This string is used the represent the Java NaN value for
|
|
* "not a number".
|
|
*/
|
|
private String NaN;
|
|
/**
|
|
* @serial This is the character used to separate positive and negative
|
|
* subpatterns in a format pattern.
|
|
*/
|
|
private char patternSeparator;
|
|
/**
|
|
* @serial This is the percent symbols
|
|
*/
|
|
private char percent;
|
|
/**
|
|
* @serial This character is used for the mille percent sign.
|
|
*/
|
|
private char perMill;
|
|
/**
|
|
* @serial This value represents the type of object being de-serialized.
|
|
* 0 indicates a pre-Java 1.1.6 version, 1 indicates 1.1.6 or later.
|
|
* 0 indicates a pre-Java 1.1.6 version, 1 indicates 1.1.6 or later,
|
|
* 2 indicates 1.4 or later
|
|
*/
|
|
private int serialVersionOnStream = 2;
|
|
/**
|
|
* @serial This is the character used to represent 0.
|
|
*/
|
|
private char zeroDigit;
|
|
|
|
/**
|
|
* @serial The locale of these currency symbols.
|
|
*/
|
|
private Locale locale;
|
|
|
|
/**
|
|
* The currency used for the symbols in this instance.
|
|
* This is stored temporarily for efficiency reasons,
|
|
* as well as to ensure that the correct instance
|
|
* is restored from the currency code.
|
|
*
|
|
* @serial Ignored.
|
|
*/
|
|
private transient Currency currency;
|
|
|
|
private static final long serialVersionUID = 5772796243397350300L;
|
|
|
|
private void readObject(ObjectInputStream stream)
|
|
throws IOException, ClassNotFoundException
|
|
{
|
|
stream.defaultReadObject();
|
|
if (serialVersionOnStream < 1)
|
|
{
|
|
monetarySeparator = decimalSeparator;
|
|
exponential = 'E';
|
|
}
|
|
if (serialVersionOnStream < 2)
|
|
locale = Locale.getDefault();
|
|
|
|
serialVersionOnStream = 2;
|
|
}
|
|
|
|
/**
|
|
* Returns a {@link DecimalFormatSymbols} instance for the
|
|
* default locale obtained from either the runtime itself
|
|
* or one of the installed
|
|
* {@link java.text.spi.DecimalFormatSymbolsProvider} instances.
|
|
* This is equivalent to calling
|
|
* <code>getInstance(Locale.getDefault())</code>.
|
|
*
|
|
* @return a {@link DecimalFormatSymbols} instance for the default
|
|
* locale.
|
|
* @since 1.6
|
|
*/
|
|
public static final DecimalFormatSymbols getInstance()
|
|
{
|
|
return getInstance(Locale.getDefault());
|
|
}
|
|
|
|
/**
|
|
* Returns a {@link DecimalFormatSymbols} instance for the
|
|
* specified locale obtained from either the runtime itself
|
|
* or one of the installed
|
|
* {@link java.text.spi.DecimalFormatSymbolsProvider} instances.
|
|
*
|
|
* @param locale the locale for which an instance should be
|
|
* returned.
|
|
* @return a {@link DecimalFormatSymbols} instance for the specified
|
|
* locale.
|
|
* @throws NullPointerException if <code>locale</code> is
|
|
* <code>null</code>.
|
|
* @since 1.6
|
|
*/
|
|
public static final DecimalFormatSymbols getInstance(Locale locale)
|
|
{
|
|
try
|
|
{
|
|
if (!locale.equals(Locale.ROOT))
|
|
ResourceBundle.getBundle("gnu.java.locale.LocaleInformation",
|
|
locale,
|
|
ClassLoader.getSystemClassLoader());
|
|
return new DecimalFormatSymbols(locale);
|
|
}
|
|
catch (MissingResourceException x)
|
|
{
|
|
/* This means runtime support for the locale
|
|
* is not available, so we check providers. */
|
|
}
|
|
for (DecimalFormatSymbolsProvider p :
|
|
ServiceLoader.load(DecimalFormatSymbolsProvider.class))
|
|
{
|
|
for (Locale loc : p.getAvailableLocales())
|
|
{
|
|
if (loc.equals(locale))
|
|
{
|
|
DecimalFormatSymbols syms = p.getInstance(locale);
|
|
if (syms != null)
|
|
return syms;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
return getInstance(LocaleHelper.getFallbackLocale(locale));
|
|
}
|
|
|
|
}
|