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
762 lines
24 KiB
Java
762 lines
24 KiB
Java
/* DateFormatSymbols.java -- Format over a range of numbers
|
|
Copyright (C) 1998, 1999, 2000, 2001, 2003, 2005, 2006 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.text.spi.DateFormatSymbolsProvider;
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.HashMap;
|
|
import java.util.List;
|
|
import java.util.Locale;
|
|
import java.util.Map;
|
|
import java.util.MissingResourceException;
|
|
import java.util.Properties;
|
|
import java.util.ResourceBundle;
|
|
import java.util.ServiceLoader;
|
|
import java.util.TimeZone;
|
|
|
|
import java.util.spi.TimeZoneNameProvider;
|
|
|
|
/**
|
|
* This class acts as container for locale specific date/time formatting
|
|
* information such as the days of the week and the months of the year.
|
|
*
|
|
* @author Per Bothner (bothner@cygnus.com)
|
|
* @author Andrew John Hughes (gnu_andrew@member.fsf.org)
|
|
* @date October 24, 1998.
|
|
*/
|
|
/* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3.
|
|
* Status: Believed complete and correct.
|
|
*/
|
|
public class DateFormatSymbols implements java.io.Serializable, Cloneable
|
|
{
|
|
String[] ampms;
|
|
String[] eras;
|
|
private String localPatternChars;
|
|
String[] months;
|
|
String[] shortMonths;
|
|
String[] shortWeekdays;
|
|
String[] weekdays;
|
|
|
|
/**
|
|
* The set of properties for obtaining the metazone data.
|
|
*/
|
|
private static transient final Properties properties;
|
|
|
|
/**
|
|
* Reads in the properties.
|
|
*/
|
|
static
|
|
{
|
|
properties = new Properties();
|
|
try
|
|
{
|
|
properties.load(DateFormatSymbols.class.getResourceAsStream("metazones.properties"));
|
|
}
|
|
catch (IOException exception)
|
|
{
|
|
System.out.println("Failed to load weeks resource: " + exception);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* The timezone strings supplied by the runtime.
|
|
*/
|
|
private String[][] runtimeZoneStrings;
|
|
|
|
/**
|
|
* Custom timezone strings supplied by {@link #setZoneStrings()}.
|
|
*/
|
|
private String[][] zoneStrings;
|
|
|
|
private static final long serialVersionUID = -5987973545549424702L;
|
|
|
|
// The order of these prefixes must be the same as in DateFormat
|
|
private static final String[] formatPrefixes =
|
|
{
|
|
"full", "long", "medium", "short"
|
|
};
|
|
|
|
// These are each arrays with a value for SHORT, MEDIUM, LONG, FULL,
|
|
// and DEFAULT (constants defined in java.text.DateFormat). While
|
|
// not part of the official spec, we need a way to get at locale-specific
|
|
// default formatting patterns. They are declared package scope so
|
|
// as to be easily accessible where needed (DateFormat, SimpleDateFormat).
|
|
transient String[] dateFormats;
|
|
transient String[] timeFormats;
|
|
|
|
private static String[] getStringArray(ResourceBundle res, String name)
|
|
{
|
|
return res.getString(name).split("\u00ae");
|
|
}
|
|
|
|
private String[][] getZoneStrings(ResourceBundle res, Locale locale)
|
|
{
|
|
List<String[]> allZones = new ArrayList<String[]>();
|
|
try
|
|
{
|
|
Map<String,String[]> systemZones = new HashMap<String,String[]>();
|
|
while (true)
|
|
{
|
|
int index = 0;
|
|
String country = locale.getCountry();
|
|
String data = res.getString("zoneStrings");
|
|
String[] zones = data.split("\u00a9");
|
|
for (int a = 0; a < zones.length; ++a)
|
|
{
|
|
String[] strings = zones[a].split("\u00ae");
|
|
String type = properties.getProperty(strings[0] + "." + country);
|
|
if (type == null)
|
|
type = properties.getProperty(strings[0] + ".DEFAULT");
|
|
if (type != null)
|
|
strings[0] = type;
|
|
if (strings.length < 5)
|
|
{
|
|
String[] newStrings = new String[5];
|
|
System.arraycopy(strings, 0, newStrings, 0, strings.length);
|
|
for (int b = strings.length; b < newStrings.length; ++b)
|
|
newStrings[b] = "";
|
|
strings = newStrings;
|
|
}
|
|
String[] existing = systemZones.get(strings[0]);
|
|
if (existing != null && existing.length > 1)
|
|
{
|
|
for (int b = 1; b < existing.length; ++b)
|
|
if (!existing[b].equals(""))
|
|
strings[b] = existing[b];
|
|
}
|
|
systemZones.put(strings[0], strings);
|
|
}
|
|
if (res.getLocale() == Locale.ROOT)
|
|
break;
|
|
else
|
|
res = ResourceBundle.getBundle("gnu.java.locale.LocaleInformation",
|
|
LocaleHelper.getFallbackLocale(res.getLocale()),
|
|
ClassLoader.getSystemClassLoader());
|
|
}
|
|
/* Final sanity check for missing values */
|
|
for (String[] zstrings : systemZones.values())
|
|
{
|
|
if (zstrings[1].equals("") && zstrings[2].equals(""))
|
|
{
|
|
for (Map.Entry<Object,Object> entry : properties.entrySet())
|
|
{
|
|
String val = (String) entry.getValue();
|
|
if (val.equals(zstrings[0]))
|
|
{
|
|
String key = (String) entry.getKey();
|
|
String metazone = key.substring(0, key.indexOf("."));
|
|
String type = properties.getProperty(metazone + "." + locale.getCountry());
|
|
if (type == null)
|
|
type = properties.getProperty(metazone + ".DEFAULT");
|
|
if (type != null)
|
|
{
|
|
String[] ostrings = systemZones.get(type);
|
|
zstrings[1] = ostrings[1];
|
|
zstrings[2] = ostrings[2];
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
allZones.addAll(systemZones.values());
|
|
}
|
|
catch (MissingResourceException e)
|
|
{
|
|
/* This means runtime support for the locale
|
|
* is not available, so we just include providers. */
|
|
}
|
|
for (TimeZoneNameProvider p :
|
|
ServiceLoader.load(TimeZoneNameProvider.class))
|
|
{
|
|
for (Locale loc : p.getAvailableLocales())
|
|
{
|
|
if (loc.equals(locale))
|
|
{
|
|
for (String id : TimeZone.getAvailableIDs())
|
|
{
|
|
String[] z = new String[5];
|
|
z[0] = id;
|
|
z[1] = p.getDisplayName(id, false,
|
|
TimeZone.LONG,
|
|
locale);
|
|
z[2] = p.getDisplayName(id, false,
|
|
TimeZone.SHORT,
|
|
locale);
|
|
z[3] = p.getDisplayName(id, true,
|
|
TimeZone.LONG,
|
|
locale);
|
|
z[4] = p.getDisplayName(id, true,
|
|
TimeZone.SHORT,
|
|
locale);
|
|
allZones.add(z);
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
return allZones.toArray(new String[allZones.size()][]);
|
|
}
|
|
|
|
private String[] formatsForKey(ResourceBundle res, String key)
|
|
{
|
|
String[] values = new String[formatPrefixes.length];
|
|
|
|
for (int i = 0; i < formatPrefixes.length; i++)
|
|
values[i] = res.getString(formatPrefixes[i] + key);
|
|
|
|
return values;
|
|
}
|
|
|
|
/**
|
|
* This method initializes a new instance of <code>DateFormatSymbols</code>
|
|
* by loading the date format information for the specified locale.
|
|
* This constructor only obtains instances using the runtime's resources;
|
|
* to also include {@link java.text.spi.DateFormatSymbolsProvider} instances,
|
|
* call {@link #getInstance(java.util.Locale)} instead.
|
|
*
|
|
* @param locale The locale for which date formatting symbols should
|
|
* be loaded.
|
|
* @throws MissingResourceException if the resources for the specified
|
|
* locale could not be found or loaded.
|
|
* @see #getInstance(java.util.Locale)
|
|
*/
|
|
public DateFormatSymbols (Locale locale)
|
|
throws MissingResourceException
|
|
{
|
|
ResourceBundle res
|
|
= ResourceBundle.getBundle("gnu.java.locale.LocaleInformation", locale,
|
|
ClassLoader.getSystemClassLoader());
|
|
|
|
ampms = getStringArray(res, "ampms");
|
|
eras = getStringArray(res, "eras");
|
|
localPatternChars = res.getString("localPatternChars");
|
|
months = getStringArray(res, "months");
|
|
shortMonths = getStringArray(res, "shortMonths");
|
|
shortWeekdays = getStringArray(res, "shortWeekdays");
|
|
weekdays = getStringArray(res, "weekdays");
|
|
dateFormats = formatsForKey(res, "DateFormat");
|
|
timeFormats = formatsForKey(res, "TimeFormat");
|
|
runtimeZoneStrings = getZoneStrings(res, locale);
|
|
}
|
|
|
|
/**
|
|
* This method loads the format symbol information 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.
|
|
*
|
|
* @throws MissingResourceException if the resources for the default
|
|
* locale could not be found or loaded.
|
|
* @see #getInstance()
|
|
*/
|
|
public DateFormatSymbols()
|
|
throws MissingResourceException
|
|
{
|
|
this (Locale.getDefault());
|
|
}
|
|
|
|
/**
|
|
* This method returns the list of strings used for displaying AM or PM.
|
|
* This is a two element <code>String</code> array indexed by
|
|
* <code>Calendar.AM</code> and <code>Calendar.PM</code>
|
|
*
|
|
* @return The list of AM/PM display strings.
|
|
*/
|
|
public String[] getAmPmStrings()
|
|
{
|
|
return ampms;
|
|
}
|
|
|
|
/**
|
|
* This method returns the list of strings used for displaying eras
|
|
* (e.g., "BC" and "AD"). This is a two element <code>String</code>
|
|
* array indexed by <code>Calendar.BC</code> and <code>Calendar.AD</code>.
|
|
*
|
|
* @return The list of era disply strings.
|
|
*/
|
|
public String[] getEras()
|
|
{
|
|
return eras;
|
|
}
|
|
|
|
/**
|
|
* This method returns the pattern character information for this
|
|
* object. This is an 18 character string that contains the characters
|
|
* that are used in creating the date formatting strings in
|
|
* <code>SimpleDateFormat</code>. The following are the character
|
|
* positions in the string and which format character they correspond
|
|
* to (the character in parentheses is the default value in the US English
|
|
* locale):
|
|
* <p>
|
|
* <ul>
|
|
* <li>0 - era (G)</li>
|
|
* <li>1 - year (y)</li>
|
|
* <li>2 - month (M)</li>
|
|
* <li>3 - day of month (d)</li>
|
|
* <li>4 - hour out of 12, from 1-12 (h)</li>
|
|
* <li>5 - hour out of 24, from 0-23 (H)</li>
|
|
* <li>6 - minute (m)</li>
|
|
* <li>7 - second (s)</li>
|
|
* <li>8 - millisecond (S)</li>
|
|
* <li>9 - date of week (E)</li>
|
|
* <li>10 - date of year (D)</li>
|
|
* <li>11 - day of week in month, eg. "4th Thur in Nov" (F)</li>
|
|
* <li>12 - week in year (w)</li>
|
|
* <li>13 - week in month (W)</li>
|
|
* <li>14 - am/pm (a)</li>
|
|
* <li>15 - hour out of 24, from 1-24 (k)</li>
|
|
* <li>16 - hour out of 12, from 0-11 (K)</li>
|
|
* <li>17 - time zone (z)</li>
|
|
* </ul>
|
|
*
|
|
* @return The format patter characters
|
|
*/
|
|
public String getLocalPatternChars()
|
|
{
|
|
return localPatternChars;
|
|
}
|
|
|
|
/**
|
|
* This method returns the list of strings used for displaying month
|
|
* names (e.g., "January" and "February"). This is a thirteen element
|
|
* string array indexed by <code>Calendar.JANUARY</code> through
|
|
* <code>Calendar.UNDECEMBER</code>. Note that there are thirteen
|
|
* elements because some calendars have thriteen months.
|
|
*
|
|
* @return The list of month display strings.
|
|
*/
|
|
public String[] getMonths ()
|
|
{
|
|
return months;
|
|
}
|
|
|
|
/**
|
|
* This method returns the list of strings used for displaying abbreviated
|
|
* month names (e.g., "Jan" and "Feb"). This is a thirteen element
|
|
* <code>String</code> array indexed by <code>Calendar.JANUARY</code>
|
|
* through <code>Calendar.UNDECEMBER</code>. Note that there are thirteen
|
|
* elements because some calendars have thirteen months.
|
|
*
|
|
* @return The list of abbreviated month display strings.
|
|
*/
|
|
public String[] getShortMonths ()
|
|
{
|
|
return shortMonths;
|
|
}
|
|
|
|
/**
|
|
* This method returns the list of strings used for displaying abbreviated
|
|
* weekday names (e.g., "Sun" and "Mon"). This is an eight element
|
|
* <code>String</code> array indexed by <code>Calendar.SUNDAY</code>
|
|
* through <code>Calendar.SATURDAY</code>. Note that the first element
|
|
* of this array is ignored.
|
|
*
|
|
* @return This list of abbreviated weekday display strings.
|
|
*/
|
|
public String[] getShortWeekdays ()
|
|
{
|
|
return shortWeekdays;
|
|
}
|
|
|
|
/**
|
|
* This method returns the list of strings used for displaying weekday
|
|
* names (e.g., "Sunday" and "Monday"). This is an eight element
|
|
* <code>String</code> array indexed by <code>Calendar.SUNDAY</code>
|
|
* through <code>Calendar.SATURDAY</code>. Note that the first element
|
|
* of this array is ignored.
|
|
*
|
|
* @return This list of weekday display strings.
|
|
*/
|
|
public String[] getWeekdays ()
|
|
{
|
|
return weekdays;
|
|
}
|
|
|
|
/**
|
|
* This method returns this list of localized timezone display strings.
|
|
* This is a two dimensional <code>String</code> array where each row in
|
|
* the array contains five values:
|
|
* <P>
|
|
* <ul>
|
|
* <li>0 - The non-localized time zone id string.</li>
|
|
* <li>1 - The long name of the time zone (standard time).</li>
|
|
* <li>2 - The short name of the time zone (standard time).</li>
|
|
* <li>3 - The long name of the time zone (daylight savings time).</li>
|
|
* <li>4 - the short name of the time zone (daylight savings time).</li>
|
|
* </ul>
|
|
* <p>
|
|
* If {@link #setZoneStrings(String[][])} has been called, then the value
|
|
* passed to this will be returned. Otherwise the returned array contains
|
|
* zone names provided by the runtime environment and any
|
|
* {@link java.util.spi.TimeZoneProvider} instances.
|
|
* </p>
|
|
*
|
|
* @return The list of time zone display strings.
|
|
* @see #setZoneStrings(String[][])
|
|
*/
|
|
public String[][] getZoneStrings()
|
|
{
|
|
if (zoneStrings != null)
|
|
return zoneStrings;
|
|
return runtimeZoneStrings;
|
|
}
|
|
|
|
/**
|
|
* This method sets the list of strings used to display AM/PM values to
|
|
* the specified list.
|
|
* This is a two element <code>String</code> array indexed by
|
|
* <code>Calendar.AM</code> and <code>Calendar.PM</code>
|
|
*
|
|
* @param value The new list of AM/PM display strings.
|
|
*/
|
|
public void setAmPmStrings (String[] value)
|
|
{
|
|
if(value==null)
|
|
throw new NullPointerException();
|
|
ampms = value;
|
|
}
|
|
|
|
/**
|
|
* This method sets the list of strings used to display time eras to
|
|
* to the specified list.
|
|
* This is a two element <code>String</code>
|
|
* array indexed by <code>Calendar.BC</code> and <code>Calendar.AD</code>.
|
|
*
|
|
* @param labels The new list of era display strings.
|
|
*/
|
|
public void setEras (String[] labels)
|
|
{
|
|
if(labels==null)
|
|
throw new NullPointerException();
|
|
eras = labels;
|
|
}
|
|
|
|
/**
|
|
* This method sets the list of characters used to specific date/time
|
|
* formatting strings.
|
|
* This is an 18 character string that contains the characters
|
|
* that are used in creating the date formatting strings in
|
|
* <code>SimpleDateFormat</code>. The following are the character
|
|
* positions in the string and which format character they correspond
|
|
* to (the character in parentheses is the default value in the US English
|
|
* locale):
|
|
* <p>
|
|
* <ul>
|
|
* <li>0 - era (G)</li>
|
|
* <li>1 - year (y)</li>
|
|
* <li>2 - month (M)</li>
|
|
* <li>3 - day of month (d)</li>
|
|
* <li>4 - hour out of 12, from 1-12 (h)</li>
|
|
* <li>5 - hour out of 24, from 0-23 (H)</li>
|
|
* <li>6 - minute (m)</li>
|
|
* <li>7 - second (s)</li>
|
|
* <li>8 - millisecond (S)</li>
|
|
* <li>9 - date of week (E)</li>
|
|
* <li>10 - date of year (D)</li>
|
|
* <li>11 - day of week in month, eg. "4th Thur in Nov" (F)</li>
|
|
* <li>12 - week in year (w)</li>
|
|
* <li>13 - week in month (W)</li>
|
|
* <li>14 - am/pm (a)</li>
|
|
* <li>15 - hour out of 24, from 1-24 (k)</li>
|
|
* <li>16 - hour out of 12, from 0-11 (K)</li>
|
|
* <li>17 - time zone (z)</li>
|
|
* </ul>
|
|
*
|
|
* @param chars The new format pattern characters
|
|
*/
|
|
public void setLocalPatternChars (String chars)
|
|
{
|
|
if(chars==null)
|
|
throw new NullPointerException();
|
|
localPatternChars = chars;
|
|
}
|
|
|
|
/**
|
|
* This method sets the list of strings used to display month names.
|
|
* This is a thirteen element
|
|
* string array indexed by <code>Calendar.JANUARY</code> through
|
|
* <code>Calendar.UNDECEMBER</code>. Note that there are thirteen
|
|
* elements because some calendars have thriteen months.
|
|
*
|
|
* @param labels The list of month display strings.
|
|
*/
|
|
public void setMonths (String[] labels)
|
|
{
|
|
if(labels==null)
|
|
throw new NullPointerException();
|
|
months = labels;
|
|
}
|
|
|
|
/**
|
|
* This method sets the list of strings used to display abbreviated month
|
|
* names.
|
|
* This is a thirteen element
|
|
* <code>String</code> array indexed by <code>Calendar.JANUARY</code>
|
|
* through <code>Calendar.UNDECEMBER</code>. Note that there are thirteen
|
|
* elements because some calendars have thirteen months.
|
|
*
|
|
* @param labels The new list of abbreviated month display strings.
|
|
*/
|
|
public void setShortMonths (String[] labels)
|
|
{
|
|
if(labels==null)
|
|
throw new NullPointerException();
|
|
shortMonths = labels;
|
|
}
|
|
|
|
/**
|
|
* This method sets the list of strings used to display abbreviated
|
|
* weekday names.
|
|
* This is an eight element
|
|
* <code>String</code> array indexed by <code>Calendar.SUNDAY</code>
|
|
* through <code>Calendar.SATURDAY</code>. Note that the first element
|
|
* of this array is ignored.
|
|
*
|
|
* @param labels This list of abbreviated weekday display strings.
|
|
*/
|
|
public void setShortWeekdays (String[] labels)
|
|
{
|
|
if(labels==null)
|
|
throw new NullPointerException();
|
|
shortWeekdays = labels;
|
|
}
|
|
|
|
/**
|
|
* This method sets the list of strings used to display weekday names.
|
|
* This is an eight element
|
|
* <code>String</code> array indexed by <code>Calendar.SUNDAY</code>
|
|
* through <code>Calendar.SATURDAY</code>. Note that the first element
|
|
* of this array is ignored.
|
|
*
|
|
* @param labels This list of weekday display strings.
|
|
*/
|
|
public void setWeekdays (String[] labels)
|
|
{
|
|
if(labels==null)
|
|
throw new NullPointerException();
|
|
weekdays = labels;
|
|
}
|
|
|
|
/**
|
|
* This method sets the list of display strings for time zones.
|
|
* This is a two dimensional <code>String</code> array where each row in
|
|
* the array contains five values:
|
|
* <P>
|
|
* <ul>
|
|
* <li>0 - The non-localized time zone id string.</li>
|
|
* <li>1 - The long name of the time zone (standard time).</li>
|
|
* <li>2 - The short name of the time zone (standard time).</li>
|
|
* <li>3 - The long name of the time zone (daylight savings time).</li>
|
|
* <li>4 - the short name of the time zone (daylight savings time).</li>
|
|
* </ul>
|
|
*
|
|
* @params zones The list of time zone display strings.
|
|
*/
|
|
public void setZoneStrings (String[][] zones)
|
|
{
|
|
if(zones==null)
|
|
throw new NullPointerException();
|
|
zoneStrings = zones;
|
|
}
|
|
|
|
/* Does a "deep" equality test - recurses into arrays. */
|
|
private static boolean equals (Object x, Object y)
|
|
{
|
|
if (x == y)
|
|
return true;
|
|
if (x == null || y == null)
|
|
return false;
|
|
if (! (x instanceof Object[]) || ! (y instanceof Object[]))
|
|
return x.equals(y);
|
|
Object[] xa = (Object[]) x;
|
|
Object[] ya = (Object[]) y;
|
|
if (xa.length != ya.length)
|
|
return false;
|
|
for (int i = xa.length; --i >= 0; )
|
|
{
|
|
if (! equals(xa[i], ya[i]))
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
private static int hashCode (Object x)
|
|
{
|
|
if (x == null)
|
|
return 0;
|
|
if (! (x instanceof Object[]))
|
|
return x.hashCode();
|
|
Object[] xa = (Object[]) x;
|
|
int hash = 0;
|
|
for (int i = 0; i < xa.length; i++)
|
|
hash = 37 * hashCode(xa[i]);
|
|
return hash;
|
|
}
|
|
|
|
/**
|
|
* This method tests a specified object for equality against this object.
|
|
* This will be true if and only if the specified object:
|
|
* <p>
|
|
* <ul>
|
|
* <li> Is not <code>null</code>.</li>
|
|
* <li> Is an instance of <code>DateFormatSymbols</code>.</li>
|
|
* <li> Contains identical formatting symbols to this object.</li>
|
|
* </ul>
|
|
*
|
|
* @param obj The <code>Object</code> to test for equality against.
|
|
*
|
|
* @return <code>true</code> if the specified object is equal to this one,
|
|
* <code>false</code> otherwise.
|
|
*/
|
|
public boolean equals (Object obj)
|
|
{
|
|
if (! (obj instanceof DateFormatSymbols))
|
|
return false;
|
|
DateFormatSymbols other = (DateFormatSymbols) obj;
|
|
return (equals(ampms, other.ampms)
|
|
&& equals(eras, other.eras)
|
|
&& equals(localPatternChars, other.localPatternChars)
|
|
&& equals(months, other.months)
|
|
&& equals(shortMonths, other.shortMonths)
|
|
&& equals(shortWeekdays, other.shortWeekdays)
|
|
&& equals(weekdays, other.weekdays)
|
|
&& equals(zoneStrings, other.zoneStrings));
|
|
}
|
|
|
|
/**
|
|
* Returns a new copy of this object.
|
|
*
|
|
* @return A copy of this object
|
|
*/
|
|
public Object clone ()
|
|
{
|
|
try
|
|
{
|
|
return super.clone ();
|
|
}
|
|
catch (CloneNotSupportedException e)
|
|
{
|
|
return null;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This method returns a hash value for this object.
|
|
*
|
|
* @return A hash value for this object.
|
|
*/
|
|
public int hashCode ()
|
|
{
|
|
return (hashCode(ampms)
|
|
^ hashCode(eras)
|
|
^ hashCode(localPatternChars)
|
|
^ hashCode(months)
|
|
^ hashCode(shortMonths)
|
|
^ hashCode(shortWeekdays)
|
|
^ hashCode(weekdays)
|
|
^ hashCode(zoneStrings));
|
|
}
|
|
|
|
/**
|
|
* Returns a {@link DateFormatSymbols} instance for the
|
|
* default locale obtained from either the runtime itself
|
|
* or one of the installed
|
|
* {@link java.text.spi.DateFormatSymbolsProvider} instances.
|
|
* This is equivalent to calling
|
|
* <code>getInstance(Locale.getDefault())</code>.
|
|
*
|
|
* @return a {@link DateFormatSymbols} instance for the default
|
|
* locale.
|
|
* @since 1.6
|
|
*/
|
|
public static final DateFormatSymbols getInstance()
|
|
{
|
|
return getInstance(Locale.getDefault());
|
|
}
|
|
|
|
/**
|
|
* Returns a {@link DateFormatSymbols} instance for the
|
|
* specified locale obtained from either the runtime itself
|
|
* or one of the installed
|
|
* {@link java.text.spi.DateFormatSymbolsProvider} instances.
|
|
*
|
|
* @param locale the locale for which an instance should be
|
|
* returned.
|
|
* @return a {@link DateFormatSymbols} instance for the specified
|
|
* locale.
|
|
* @throws NullPointerException if <code>locale</code> is
|
|
* <code>null</code>.
|
|
* @since 1.6
|
|
*/
|
|
public static final DateFormatSymbols getInstance(Locale locale)
|
|
{
|
|
try
|
|
{
|
|
DateFormatSymbols syms = new DateFormatSymbols(locale);
|
|
return syms;
|
|
}
|
|
catch (MissingResourceException e)
|
|
{
|
|
/* This means runtime support for the locale
|
|
* is not available, so we check providers. */
|
|
}
|
|
for (DateFormatSymbolsProvider p :
|
|
ServiceLoader.load(DateFormatSymbolsProvider.class))
|
|
{
|
|
for (Locale loc : p.getAvailableLocales())
|
|
{
|
|
if (loc.equals(locale))
|
|
{
|
|
DateFormatSymbols syms = p.getInstance(locale);
|
|
if (syms != null)
|
|
return syms;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
return getInstance(LocaleHelper.getFallbackLocale(locale));
|
|
}
|
|
|
|
}
|