
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
955 lines
27 KiB
Java
955 lines
27 KiB
Java
/* DateFormat.java -- Class for formatting/parsing date/times
|
|
Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005
|
|
Free Software Foundation, Inc.
|
|
|
|
This file is part of GNU Classpath.
|
|
|
|
GNU Classpath is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
GNU Classpath is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Classpath; see the file COPYING. If not, write to the
|
|
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
02110-1301 USA.
|
|
|
|
Linking this library statically or dynamically with other modules is
|
|
making a combined work based on this library. Thus, the terms and
|
|
conditions of the GNU General Public License cover the whole
|
|
combination.
|
|
|
|
As a special exception, the copyright holders of this library give you
|
|
permission to link this library with independent modules to produce an
|
|
executable, regardless of the license terms of these independent
|
|
modules, and to copy and distribute the resulting executable under
|
|
terms of your choice, provided that you also meet, for each linked
|
|
independent module, the terms and conditions of the license of that
|
|
module. An independent module is a module which is not derived from
|
|
or based on this library. If you modify this library, you may extend
|
|
this exception to your version of the library, but you are not
|
|
obligated to do so. If you do not wish to do so, delete this
|
|
exception statement from your version. */
|
|
|
|
|
|
package java.text;
|
|
|
|
import gnu.java.locale.LocaleHelper;
|
|
|
|
import java.text.spi.DateFormatProvider;
|
|
|
|
import java.io.InvalidObjectException;
|
|
import java.util.Calendar;
|
|
import java.util.Date;
|
|
import java.util.Locale;
|
|
import java.util.MissingResourceException;
|
|
import java.util.ResourceBundle;
|
|
import java.util.ServiceLoader;
|
|
import java.util.TimeZone;
|
|
|
|
/**
|
|
* @author Per Bothner (bothner@cygnus.com)
|
|
* @date October 25, 1998.
|
|
*/
|
|
/* Written using "Java Class Libraries", 2nd edition, plus online
|
|
* API docs for JDK 1.2 beta from http://www.javasoft.com.
|
|
* Status: Mostly complete; search for FIXME to see omissions.
|
|
*/
|
|
|
|
public abstract class DateFormat extends Format implements Cloneable
|
|
{
|
|
private static final long serialVersionUID = 7218322306649953788L;
|
|
|
|
// Names fixed by serialization spec.
|
|
protected Calendar calendar;
|
|
protected NumberFormat numberFormat;
|
|
|
|
// (Values determined using a test program.)
|
|
public static final int FULL = 0;
|
|
public static final int LONG = 1;
|
|
public static final int MEDIUM = 2;
|
|
public static final int SHORT = 3;
|
|
public static final int DEFAULT = MEDIUM;
|
|
|
|
/* These constants need to have these exact values. They
|
|
* correspond to index positions within the localPatternChars
|
|
* string for a given locale. Each locale may specify its
|
|
* own character for a particular field, but the position
|
|
* of these characters must correspond to an appropriate field
|
|
* number (as listed below), in order for their meaning to
|
|
* be determined. For example, the US locale uses
|
|
* the string "GyMdkHmsSEDFwWahKzYeugAZ", where 'G' is the character
|
|
* for era, 'y' for year, and so on down to 'Z' for time zone.
|
|
*/
|
|
/**
|
|
* Represents the position of the era
|
|
* pattern character in the array of
|
|
* localized pattern characters.
|
|
* For example, 'AD' is an era used
|
|
* in the Gregorian calendar system.
|
|
* In the U.S. locale, this is 'G'.
|
|
*/
|
|
public static final int ERA_FIELD = 0;
|
|
/**
|
|
* Represents the position of the year
|
|
* pattern character in the array of
|
|
* localized pattern characters.
|
|
* In the U.S. locale, this is 'y'.
|
|
*/
|
|
public static final int YEAR_FIELD = 1;
|
|
/**
|
|
* Represents the position of the month
|
|
* pattern character in the array of
|
|
* localized pattern characters.
|
|
* In the U.S. locale, this is 'M'.
|
|
*/
|
|
public static final int MONTH_FIELD = 2;
|
|
/**
|
|
* Represents the position of the date
|
|
* or day of the month pattern character
|
|
* in the array of localized pattern
|
|
* characters. In the U.S. locale,
|
|
* this is 'd'.
|
|
*/
|
|
public static final int DATE_FIELD = 3;
|
|
/**
|
|
* Represents the position of the 24
|
|
* hour pattern character in the array of
|
|
* localized pattern characters.
|
|
* In the U.S. locale, this is 'k'.
|
|
* This field numbers hours from 1 to 24.
|
|
*/
|
|
public static final int HOUR_OF_DAY1_FIELD = 4;
|
|
/**
|
|
* Represents the position of the 24
|
|
* hour pattern character in the array of
|
|
* localized pattern characters.
|
|
* In the U.S. locale, this is 'H'.
|
|
* This field numbers hours from 0 to 23.
|
|
*/
|
|
public static final int HOUR_OF_DAY0_FIELD = 5;
|
|
/**
|
|
* Represents the position of the minute
|
|
* pattern character in the array of
|
|
* localized pattern characters.
|
|
* In the U.S. locale, this is 'm'.
|
|
*/
|
|
public static final int MINUTE_FIELD = 6;
|
|
/**
|
|
* Represents the position of the second
|
|
* pattern character in the array of
|
|
* localized pattern characters.
|
|
* In the U.S. locale, this is 's'.
|
|
*/
|
|
public static final int SECOND_FIELD = 7;
|
|
/**
|
|
* Represents the position of the millisecond
|
|
* pattern character in the array of
|
|
* localized pattern characters.
|
|
* In the U.S. locale, this is 'S'.
|
|
*/
|
|
public static final int MILLISECOND_FIELD = 8;
|
|
/**
|
|
* Represents the position of the day of the
|
|
* week pattern character in the array of
|
|
* localized pattern characters.
|
|
* In the U.S. locale, this is 'E'.
|
|
*/
|
|
public static final int DAY_OF_WEEK_FIELD = 9;
|
|
/**
|
|
* Represents the position of the day of the
|
|
* year pattern character in the array of
|
|
* localized pattern characters.
|
|
* In the U.S. locale, this is 'D'.
|
|
*/
|
|
public static final int DAY_OF_YEAR_FIELD = 10;
|
|
/**
|
|
* Represents the position of the day of the
|
|
* week in the month pattern character in the
|
|
* array of localized pattern characters.
|
|
* In the U.S. locale, this is 'F'.
|
|
*/
|
|
public static final int DAY_OF_WEEK_IN_MONTH_FIELD = 11;
|
|
/**
|
|
* Represents the position of the week of the
|
|
* year pattern character in the array of
|
|
* localized pattern characters.
|
|
* In the U.S. locale, this is 'w'.
|
|
*/
|
|
public static final int WEEK_OF_YEAR_FIELD = 12;
|
|
/**
|
|
* Represents the position of the week of the
|
|
* month pattern character in the array of
|
|
* localized pattern characters.
|
|
* In the U.S. locale, this is 'W'.
|
|
*/
|
|
public static final int WEEK_OF_MONTH_FIELD = 13;
|
|
/**
|
|
* Represents the position of the am/pm
|
|
* pattern character in the array of
|
|
* localized pattern characters.
|
|
* In the U.S. locale, this is 'a'.
|
|
*/
|
|
public static final int AM_PM_FIELD = 14;
|
|
/**
|
|
* Represents the position of the 12
|
|
* hour pattern character in the array of
|
|
* localized pattern characters.
|
|
* In the U.S. locale, this is 'h'.
|
|
* This field numbers hours from 1 to 12.
|
|
*/
|
|
public static final int HOUR1_FIELD = 15;
|
|
/**
|
|
* Represents the position of the 12
|
|
* hour pattern character in the array of
|
|
* localized pattern characters.
|
|
* In the U.S. locale, this is 'K'.
|
|
* This field numbers hours from 0 to 11.
|
|
*/
|
|
public static final int HOUR0_FIELD = 16;
|
|
/**
|
|
* Represents the position of the generic
|
|
* timezone pattern character in the array of
|
|
* localized pattern characters.
|
|
* In the U.S. locale, this is 'z'.
|
|
*/
|
|
public static final int TIMEZONE_FIELD = 17;
|
|
|
|
public static class Field extends Format.Field
|
|
{
|
|
static final long serialVersionUID = 7441350119349544720L;
|
|
|
|
private int calendarField;
|
|
|
|
public static final DateFormat.Field ERA
|
|
= new Field("era", Calendar.ERA);
|
|
public static final DateFormat.Field YEAR
|
|
= new Field("year", Calendar.YEAR);
|
|
public static final DateFormat.Field MONTH
|
|
= new Field("month", Calendar.MONTH);
|
|
public static final DateFormat.Field DAY_OF_MONTH
|
|
= new Field("day of month", Calendar.DAY_OF_MONTH);
|
|
public static final DateFormat.Field HOUR_OF_DAY1
|
|
= new Field("hour of day 1", Calendar.HOUR_OF_DAY);
|
|
public static final DateFormat.Field HOUR_OF_DAY0
|
|
= new Field("hour of day 0", Calendar.HOUR_OF_DAY);
|
|
public static final DateFormat.Field MINUTE
|
|
= new Field("minute", Calendar.MINUTE);
|
|
public static final DateFormat.Field SECOND
|
|
= new Field("second", Calendar.SECOND);
|
|
public static final DateFormat.Field MILLISECOND
|
|
= new Field("millisecond", Calendar.MILLISECOND);
|
|
public static final DateFormat.Field DAY_OF_WEEK
|
|
= new Field("day of week", Calendar.DAY_OF_WEEK);
|
|
public static final DateFormat.Field DAY_OF_YEAR
|
|
= new Field("day of year", Calendar.DAY_OF_YEAR);
|
|
public static final DateFormat.Field DAY_OF_WEEK_IN_MONTH
|
|
= new Field("day of week in month", Calendar.DAY_OF_WEEK_IN_MONTH);
|
|
public static final DateFormat.Field WEEK_OF_YEAR
|
|
= new Field("week of year", Calendar.WEEK_OF_YEAR);
|
|
public static final DateFormat.Field WEEK_OF_MONTH
|
|
= new Field("week of month", Calendar.WEEK_OF_MONTH);
|
|
public static final DateFormat.Field AM_PM
|
|
= new Field("am/pm", Calendar.AM_PM);
|
|
public static final DateFormat.Field HOUR1
|
|
= new Field("hour1", Calendar.HOUR);
|
|
public static final DateFormat.Field HOUR0
|
|
= new Field("hour0", Calendar.HOUR);
|
|
public static final DateFormat.Field TIME_ZONE
|
|
= new Field("timezone", Calendar.ZONE_OFFSET);
|
|
|
|
static final DateFormat.Field[] allFields =
|
|
{
|
|
ERA, YEAR, MONTH, DAY_OF_MONTH, HOUR_OF_DAY1,
|
|
HOUR_OF_DAY0, MINUTE, SECOND, MILLISECOND,
|
|
DAY_OF_WEEK, DAY_OF_YEAR, DAY_OF_WEEK_IN_MONTH,
|
|
WEEK_OF_YEAR, WEEK_OF_MONTH, AM_PM, HOUR1, HOUR0,
|
|
TIME_ZONE
|
|
};
|
|
|
|
// For deserialization
|
|
private Field()
|
|
{
|
|
super("");
|
|
}
|
|
|
|
protected Field(String name, int calendarField)
|
|
{
|
|
super(name);
|
|
this.calendarField = calendarField;
|
|
}
|
|
|
|
public int getCalendarField()
|
|
{
|
|
return calendarField;
|
|
}
|
|
|
|
public static Field ofCalendarField(int calendarField)
|
|
{
|
|
if (calendarField >= allFields.length || calendarField < 0)
|
|
throw new IllegalArgumentException("no such calendar field ("
|
|
+ calendarField + ")");
|
|
|
|
return allFields[calendarField];
|
|
}
|
|
|
|
protected Object readResolve() throws InvalidObjectException
|
|
{
|
|
String s = getName();
|
|
|
|
for (int i=0;i<allFields.length;i++)
|
|
if (s.equals(allFields[i].getName()))
|
|
return allFields[i];
|
|
|
|
throw new InvalidObjectException("no such DateFormat field called " + s);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This method initializes a new instance of <code>DateFormat</code>.
|
|
*/
|
|
protected DateFormat ()
|
|
{
|
|
}
|
|
|
|
/**
|
|
* This method tests this object for equality against the specified object.
|
|
* The two objects will be considered equal if an only if the specified
|
|
* object:
|
|
* <P>
|
|
* <ul>
|
|
* <li>Is not <code>null</code>.</li>
|
|
* <li>Is an instance of <code>DateFormat</code>.</li>
|
|
* <li>Has equal numberFormat field as this object.</li>
|
|
* <li>Has equal (Calendar) TimeZone rules as this object.</li>
|
|
* <li>Has equal (Calendar) isLenient results.</li>
|
|
* <li>Has equal Calendar first day of week and minimal days in week
|
|
* values.</li>
|
|
* </ul>
|
|
* Note that not all properties of the Calendar are relevant for a
|
|
* DateFormat. For formatting only the fact whether or not the
|
|
* TimeZone has the same rules and whether the calendar is lenient
|
|
* and has the same week rules is compared for this implementation
|
|
* of equals. Other properties of the Calendar (such as the time)
|
|
* are not taken into account.
|
|
*
|
|
* @param obj The object to test for equality against.
|
|
*
|
|
* @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 DateFormat))
|
|
return false;
|
|
|
|
DateFormat d = (DateFormat) obj;
|
|
TimeZone tz = getTimeZone();
|
|
TimeZone tzd = d.getTimeZone();
|
|
if (tz.hasSameRules(tzd))
|
|
if (isLenient() == d.isLenient())
|
|
{
|
|
Calendar c = getCalendar();
|
|
Calendar cd = d.getCalendar();
|
|
if ((c == null && cd == null)
|
|
||
|
|
(c.getFirstDayOfWeek() == cd.getFirstDayOfWeek()
|
|
&&
|
|
c.getMinimalDaysInFirstWeek()
|
|
== cd.getMinimalDaysInFirstWeek()))
|
|
return ((numberFormat == null && d.numberFormat == null)
|
|
|| numberFormat.equals(d.numberFormat));
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* This method returns a copy of this object.
|
|
*
|
|
* @return A copy of this object.
|
|
*/
|
|
public Object clone ()
|
|
{
|
|
// We know the superclass just call's Object's generic cloner.
|
|
return super.clone ();
|
|
}
|
|
|
|
/**
|
|
* This method formats the specified <code>Object</code> into a date string
|
|
* and appends it to the specified <code>StringBuffer</code>.
|
|
* The specified object must be an instance of <code>Number</code> or
|
|
* <code>Date</code> or an <code>IllegalArgumentException</code> will be
|
|
* thrown.
|
|
*
|
|
* @param obj The <code>Object</code> to format.
|
|
* @param buf The <code>StringBuffer</code> to append the resultant
|
|
* <code>String</code> to.
|
|
* @param pos Is updated to the start and end index of the
|
|
* specified field.
|
|
*
|
|
* @return The <code>StringBuffer</code> supplied on input, with the
|
|
* formatted date/time appended.
|
|
*/
|
|
public final StringBuffer format (Object obj,
|
|
StringBuffer buf, FieldPosition pos)
|
|
{
|
|
if (obj instanceof Number)
|
|
obj = new Date(((Number) obj).longValue());
|
|
else if (! (obj instanceof Date))
|
|
throw new IllegalArgumentException
|
|
("Cannot format given Object as a Date");
|
|
|
|
return format ((Date) obj, buf, pos);
|
|
}
|
|
|
|
/**
|
|
* Formats the date argument according to the pattern specified.
|
|
*
|
|
* @param date The formatted date.
|
|
*/
|
|
public final String format (Date date)
|
|
{
|
|
StringBuffer sb = new StringBuffer ();
|
|
format (date, sb, new FieldPosition (MONTH_FIELD));
|
|
return sb.toString();
|
|
}
|
|
|
|
/**
|
|
* This method formats a <code>Date</code> into a string and appends it
|
|
* to the specified <code>StringBuffer</code>.
|
|
*
|
|
* @param date The <code>Date</code> value to format.
|
|
* @param buf The <code>StringBuffer</code> to append the resultant
|
|
* <code>String</code> to.
|
|
* @param pos Is updated to the start and end index of the
|
|
* specified field.
|
|
*
|
|
* @return The <code>StringBuffer</code> supplied on input, with the
|
|
* formatted date/time appended.
|
|
*/
|
|
public abstract StringBuffer format (Date date,
|
|
StringBuffer buf, FieldPosition pos);
|
|
|
|
/**
|
|
* This method returns a list of available locales supported by this
|
|
* class.
|
|
*/
|
|
public static Locale[] getAvailableLocales()
|
|
{
|
|
return Locale.getAvailableLocales();
|
|
}
|
|
|
|
/**
|
|
* This method returns the <code>Calendar</code> object being used by
|
|
* this object to parse/format datetimes.
|
|
*
|
|
* @return The <code>Calendar</code> being used by this object.
|
|
*
|
|
* @see java.util.Calendar
|
|
*/
|
|
public Calendar getCalendar ()
|
|
{
|
|
return calendar;
|
|
}
|
|
|
|
private static DateFormat computeInstance (int style, Locale loc,
|
|
boolean use_date, boolean use_time)
|
|
{
|
|
return computeInstance (style, style, loc, use_date, use_time);
|
|
}
|
|
|
|
private static DateFormat computeInstance (int dateStyle, int timeStyle,
|
|
Locale loc, boolean use_date,
|
|
boolean use_time)
|
|
throws MissingResourceException
|
|
{
|
|
if (loc.equals(Locale.ROOT))
|
|
return computeDefault(dateStyle,timeStyle,use_date,use_time);
|
|
|
|
ResourceBundle res =
|
|
ResourceBundle.getBundle("gnu.java.locale.LocaleInformation",
|
|
loc, ClassLoader.getSystemClassLoader());
|
|
|
|
String pattern = null;
|
|
if (use_date)
|
|
{
|
|
String name, def;
|
|
switch (dateStyle)
|
|
{
|
|
case FULL:
|
|
name = "fullDateFormat";
|
|
def = "EEEE MMMM d, yyyy G";
|
|
break;
|
|
case LONG:
|
|
name = "longDateFormat";
|
|
def = "MMMM d, yyyy";
|
|
break;
|
|
case MEDIUM:
|
|
name = "mediumDateFormat";
|
|
def = "d-MMM-yy";
|
|
break;
|
|
case SHORT:
|
|
name = "shortDateFormat";
|
|
def = "M/d/yy";
|
|
break;
|
|
default:
|
|
throw new IllegalArgumentException ();
|
|
}
|
|
try
|
|
{
|
|
pattern = res == null ? def : res.getString(name);
|
|
}
|
|
catch (MissingResourceException x)
|
|
{
|
|
pattern = def;
|
|
}
|
|
}
|
|
|
|
if (use_time)
|
|
{
|
|
if (pattern == null)
|
|
pattern = "";
|
|
else
|
|
pattern += " ";
|
|
|
|
String name, def;
|
|
switch (timeStyle)
|
|
{
|
|
case FULL:
|
|
name = "fullTimeFormat";
|
|
def = "h:mm:ss;S 'o''clock' a z";
|
|
break;
|
|
case LONG:
|
|
name = "longTimeFormat";
|
|
def = "h:mm:ss a z";
|
|
break;
|
|
case MEDIUM:
|
|
name = "mediumTimeFormat";
|
|
def = "h:mm:ss a";
|
|
break;
|
|
case SHORT:
|
|
name = "shortTimeFormat";
|
|
def = "h:mm a";
|
|
break;
|
|
default:
|
|
throw new IllegalArgumentException ();
|
|
}
|
|
|
|
String s;
|
|
try
|
|
{
|
|
s = res == null ? def : res.getString(name);
|
|
}
|
|
catch (MissingResourceException x)
|
|
{
|
|
s = def;
|
|
}
|
|
pattern += s;
|
|
}
|
|
|
|
return new SimpleDateFormat (pattern, loc);
|
|
}
|
|
|
|
private static DateFormat computeDefault (int dateStyle, int timeStyle,
|
|
boolean use_date, boolean use_time)
|
|
{
|
|
String pattern = null;
|
|
if (use_date)
|
|
{
|
|
switch (dateStyle)
|
|
{
|
|
case FULL:
|
|
pattern = "EEEE MMMM d, yyyy G";
|
|
break;
|
|
case LONG:
|
|
pattern = "MMMM d, yyyy";
|
|
break;
|
|
case MEDIUM:
|
|
pattern = "d-MMM-yy";
|
|
break;
|
|
case SHORT:
|
|
pattern = "M/d/yy";
|
|
default:
|
|
throw new IllegalArgumentException ();
|
|
}
|
|
}
|
|
|
|
if (use_time)
|
|
{
|
|
if (pattern == null)
|
|
pattern = "";
|
|
else
|
|
pattern += " ";
|
|
|
|
switch (timeStyle)
|
|
{
|
|
case FULL:
|
|
pattern += "h:mm:ss;S 'o''clock' a z";
|
|
break;
|
|
case LONG:
|
|
pattern += "h:mm:ss a z";
|
|
break;
|
|
case MEDIUM:
|
|
pattern += "h:mm:ss a";
|
|
break;
|
|
case SHORT:
|
|
pattern += "h:mm a";
|
|
break;
|
|
default:
|
|
throw new IllegalArgumentException ();
|
|
}
|
|
}
|
|
|
|
return new SimpleDateFormat (pattern, Locale.ROOT);
|
|
}
|
|
|
|
/**
|
|
* This method returns an instance of <code>DateFormat</code> that will
|
|
* format using the default formatting style for dates.
|
|
*
|
|
* @return A new <code>DateFormat</code> instance.
|
|
*/
|
|
public static final DateFormat getDateInstance ()
|
|
{
|
|
return getDateInstance (DEFAULT, Locale.getDefault());
|
|
}
|
|
|
|
/**
|
|
* This method returns an instance of <code>DateFormat</code> that will
|
|
* format using the specified formatting style for dates.
|
|
*
|
|
* @param style The type of formatting to perform.
|
|
*
|
|
* @return A new <code>DateFormat</code> instance.
|
|
*/
|
|
public static final DateFormat getDateInstance (int style)
|
|
{
|
|
return getDateInstance (style, Locale.getDefault());
|
|
}
|
|
|
|
/**
|
|
* This method returns an instance of <code>DateFormat</code> that will
|
|
* format using the specified formatting style for dates. The specified
|
|
* localed will be used in place of the default.
|
|
*
|
|
* @param style The type of formatting to perform.
|
|
* @param loc The desired locale.
|
|
*
|
|
* @return A new <code>DateFormat</code> instance.
|
|
*/
|
|
public static final DateFormat getDateInstance (int style, Locale loc)
|
|
{
|
|
try
|
|
{
|
|
return computeInstance (style, loc, true, false);
|
|
}
|
|
catch (MissingResourceException e)
|
|
{
|
|
for (DateFormatProvider p :
|
|
ServiceLoader.load(DateFormatProvider.class))
|
|
{
|
|
for (Locale l : p.getAvailableLocales())
|
|
{
|
|
if (l.equals(loc))
|
|
{
|
|
DateFormat df = p.getDateInstance(style, loc);
|
|
if (df != null)
|
|
return df;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
return getDateInstance(style,
|
|
LocaleHelper.getFallbackLocale(loc));
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This method returns a new instance of <code>DateFormat</code> that
|
|
* formats both dates and times using the <code>SHORT</code> style.
|
|
*
|
|
* @return A new <code>DateFormat</code>instance.
|
|
*/
|
|
public static final DateFormat getDateTimeInstance ()
|
|
{
|
|
return getDateTimeInstance (DEFAULT, DEFAULT, Locale.getDefault());
|
|
}
|
|
|
|
/**
|
|
* This method returns a new instance of <code>DateFormat</code> that
|
|
* formats both dates and times using the <code>DEFAULT</code> style.
|
|
*
|
|
* @return A new <code>DateFormat</code>instance.
|
|
*/
|
|
public static final DateFormat getDateTimeInstance (int dateStyle,
|
|
int timeStyle)
|
|
{
|
|
return getDateTimeInstance (dateStyle, timeStyle, Locale.getDefault());
|
|
}
|
|
|
|
/**
|
|
* This method returns a new instance of <code>DateFormat</code> that
|
|
* formats both dates and times using the specified styles.
|
|
*
|
|
* @param dateStyle The desired style for date formatting.
|
|
* @param timeStyle The desired style for time formatting
|
|
*
|
|
* @return A new <code>DateFormat</code>instance.
|
|
*/
|
|
public static final DateFormat getDateTimeInstance (int dateStyle,
|
|
int timeStyle,
|
|
Locale loc)
|
|
{
|
|
try
|
|
{
|
|
return computeInstance (dateStyle, timeStyle, loc, true, true);
|
|
}
|
|
catch (MissingResourceException e)
|
|
{
|
|
for (DateFormatProvider p :
|
|
ServiceLoader.load(DateFormatProvider.class))
|
|
{
|
|
for (Locale l : p.getAvailableLocales())
|
|
{
|
|
if (l.equals(loc))
|
|
{
|
|
DateFormat df = p.getDateTimeInstance(dateStyle,
|
|
timeStyle, loc);
|
|
if (df != null)
|
|
return df;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
return getDateTimeInstance(dateStyle, timeStyle,
|
|
LocaleHelper.getFallbackLocale(loc));
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This method returns a new instance of <code>DateFormat</code> that
|
|
* formats both dates and times using the <code>SHORT</code> style.
|
|
*
|
|
* @return A new <code>DateFormat</code>instance.
|
|
*/
|
|
public static final DateFormat getInstance ()
|
|
{
|
|
// JCL book says SHORT.
|
|
return getDateTimeInstance (SHORT, SHORT, Locale.getDefault());
|
|
}
|
|
|
|
/**
|
|
* This method returns the <code>NumberFormat</code> object being used
|
|
* by this object to parse/format time values.
|
|
*
|
|
* @return The <code>NumberFormat</code> in use by this object.
|
|
*/
|
|
public NumberFormat getNumberFormat ()
|
|
{
|
|
return numberFormat;
|
|
}
|
|
|
|
/**
|
|
* This method returns an instance of <code>DateFormat</code> that will
|
|
* format using the default formatting style for times.
|
|
*
|
|
* @return A new <code>DateFormat</code> instance.
|
|
*/
|
|
public static final DateFormat getTimeInstance ()
|
|
{
|
|
return getTimeInstance (DEFAULT, Locale.getDefault());
|
|
}
|
|
|
|
/**
|
|
* This method returns an instance of <code>DateFormat</code> that will
|
|
* format using the specified formatting style for times.
|
|
*
|
|
* @param style The type of formatting to perform.
|
|
*
|
|
* @return A new <code>DateFormat</code> instance.
|
|
*/
|
|
public static final DateFormat getTimeInstance (int style)
|
|
{
|
|
return getTimeInstance (style, Locale.getDefault());
|
|
}
|
|
|
|
/**
|
|
* This method returns an instance of <code>DateFormat</code> that will
|
|
* format using the specified formatting style for times. The specified
|
|
* localed will be used in place of the default.
|
|
*
|
|
* @param style The type of formatting to perform.
|
|
* @param loc The desired locale.
|
|
*
|
|
* @return A new <code>DateFormat</code> instance.
|
|
*/
|
|
public static final DateFormat getTimeInstance (int style, Locale loc)
|
|
{
|
|
try
|
|
{
|
|
return computeInstance (style, loc, false, true);
|
|
}
|
|
catch (MissingResourceException e)
|
|
{
|
|
for (DateFormatProvider p :
|
|
ServiceLoader.load(DateFormatProvider.class))
|
|
{
|
|
for (Locale l : p.getAvailableLocales())
|
|
{
|
|
if (l.equals(loc))
|
|
{
|
|
DateFormat df = p.getTimeInstance(style, loc);
|
|
if (df != null)
|
|
return df;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
return getTimeInstance(style,
|
|
LocaleHelper.getFallbackLocale(loc));
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This method returns the <code>TimeZone</code> object being used by
|
|
* this instance.
|
|
*
|
|
* @return The time zone in use.
|
|
*/
|
|
public TimeZone getTimeZone ()
|
|
{
|
|
return calendar.getTimeZone();
|
|
}
|
|
|
|
/**
|
|
* This method returns a hash value for this object.
|
|
*
|
|
* @return A hash value for this object.
|
|
*/
|
|
public int hashCode ()
|
|
{
|
|
if (numberFormat != null)
|
|
return numberFormat.hashCode();
|
|
else
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* This method indicates whether or not the parsing of date and time
|
|
* values should be done in a lenient value.
|
|
*
|
|
* @return <code>true</code> if date/time parsing is lenient,
|
|
* <code>false</code> otherwise.
|
|
*/
|
|
public boolean isLenient ()
|
|
{
|
|
return calendar.isLenient();
|
|
}
|
|
|
|
/**
|
|
* This method parses the specified date/time string.
|
|
*
|
|
* @param source The string to parse.
|
|
* @return The resultant date.
|
|
*
|
|
* @exception ParseException If the specified string cannot be parsed.
|
|
*/
|
|
public Date parse (String source) throws ParseException
|
|
{
|
|
ParsePosition pos = new ParsePosition(0);
|
|
Date result = parse (source, pos);
|
|
if (result == null)
|
|
{
|
|
int index = pos.getErrorIndex();
|
|
if (index < 0)
|
|
index = pos.getIndex();
|
|
throw new ParseException("invalid Date syntax in \""
|
|
+ source + '\"', index);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
/**
|
|
* This method parses the specified <code>String</code> into a
|
|
* <code>Date</code>. The <code>pos</code> argument contains the
|
|
* starting parse position on method entry and the ending parse
|
|
* position on method exit.
|
|
*
|
|
* @param source The string to parse.
|
|
* @param pos The starting parse position in entry, the ending parse
|
|
* position on exit.
|
|
*
|
|
* @return The parsed date, or <code>null</code> if the string cannot
|
|
* be parsed.
|
|
*/
|
|
public abstract Date parse (String source, ParsePosition pos);
|
|
|
|
/**
|
|
* This method is identical to <code>parse(String, ParsePosition)</code>,
|
|
* but returns its result as an <code>Object</code> instead of a
|
|
* <code>Date</code>.
|
|
*
|
|
* @param source The string to parse.
|
|
* @param pos The starting parse position in entry, the ending parse
|
|
* position on exit.
|
|
*
|
|
* @return The parsed date, or <code>null</code> if the string cannot
|
|
* be parsed.
|
|
*/
|
|
public Object parseObject (String source, ParsePosition pos)
|
|
{
|
|
return parse(source, pos);
|
|
}
|
|
|
|
/**
|
|
* This method specified the <code>Calendar</code> that should be used
|
|
* by this object to parse/format datetimes.
|
|
*
|
|
* @param calendar The new <code>Calendar</code> for this object.
|
|
*
|
|
* @see java.util.Calendar
|
|
*/
|
|
public void setCalendar (Calendar calendar)
|
|
{
|
|
this.calendar = calendar;
|
|
}
|
|
|
|
/**
|
|
* This method specifies whether or not this object should be lenient in
|
|
* the syntax it accepts while parsing date/time values.
|
|
*
|
|
* @param lenient <code>true</code> if parsing should be lenient,
|
|
* <code>false</code> otherwise.
|
|
*/
|
|
public void setLenient (boolean lenient)
|
|
{
|
|
calendar.setLenient(lenient);
|
|
}
|
|
|
|
/**
|
|
* This method specifies the <code>NumberFormat</code> object that should
|
|
* be used by this object to parse/format times.
|
|
*
|
|
* @param numberFormat The <code>NumberFormat</code> in use by this object.
|
|
*/
|
|
public void setNumberFormat (NumberFormat numberFormat)
|
|
{
|
|
this.numberFormat = numberFormat;
|
|
}
|
|
|
|
/**
|
|
* This method sets the time zone that should be used by this object.
|
|
*
|
|
* @param timeZone The new time zone.
|
|
*/
|
|
public void setTimeZone (TimeZone timeZone)
|
|
{
|
|
calendar.setTimeZone(timeZone);
|
|
}
|
|
}
|