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
1326 lines
39 KiB
Java
1326 lines
39 KiB
Java
/* SimpleDateFormat.java -- A class for parsing/formating simple
|
|
date constructs
|
|
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.lang.CPStringBuilder;
|
|
|
|
import gnu.java.text.AttributedFormatBuffer;
|
|
import gnu.java.text.FormatBuffer;
|
|
import gnu.java.text.FormatCharacterIterator;
|
|
import gnu.java.text.StringFormatBuffer;
|
|
|
|
import java.io.IOException;
|
|
import java.io.InvalidObjectException;
|
|
import java.io.ObjectInputStream;
|
|
import java.util.ArrayList;
|
|
import java.util.Calendar;
|
|
import java.util.Date;
|
|
import java.util.GregorianCalendar;
|
|
import java.util.Iterator;
|
|
import java.util.Locale;
|
|
import java.util.TimeZone;
|
|
import java.util.regex.Matcher;
|
|
import java.util.regex.Pattern;
|
|
|
|
/**
|
|
* SimpleDateFormat provides convenient methods for parsing and formatting
|
|
* dates using Gregorian calendars (see java.util.GregorianCalendar).
|
|
* This class is not thread-safe; external synchronisation should be applied
|
|
* if an instance is to be accessed from multiple threads.
|
|
*/
|
|
public class SimpleDateFormat extends DateFormat
|
|
{
|
|
/**
|
|
* This class is used by <code>SimpleDateFormat</code> as a
|
|
* compiled representation of a format string. The field
|
|
* ID, size, and character used are stored for each sequence
|
|
* of pattern characters.
|
|
*/
|
|
private class CompiledField
|
|
{
|
|
/**
|
|
* The ID of the field within the local pattern characters.
|
|
* Package private for use in out class.
|
|
*/
|
|
int field;
|
|
|
|
/**
|
|
* The size of the character sequence.
|
|
* Package private for use in out class.
|
|
*/
|
|
int size;
|
|
|
|
/**
|
|
* The character used.
|
|
*/
|
|
private char character;
|
|
|
|
/**
|
|
* Constructs a compiled field using the
|
|
* the given field ID, size and character
|
|
* values.
|
|
*
|
|
* @param f the field ID.
|
|
* @param s the size of the field.
|
|
* @param c the character used.
|
|
*/
|
|
public CompiledField(int f, int s, char c)
|
|
{
|
|
field = f;
|
|
size = s;
|
|
character = c;
|
|
}
|
|
|
|
/**
|
|
* Retrieves the ID of the field relative to
|
|
* the local pattern characters.
|
|
*/
|
|
public int getField()
|
|
{
|
|
return field;
|
|
}
|
|
|
|
/**
|
|
* Retrieves the size of the character sequence.
|
|
*/
|
|
public int getSize()
|
|
{
|
|
return size;
|
|
}
|
|
|
|
/**
|
|
* Retrieves the character used in the sequence.
|
|
*/
|
|
public char getCharacter()
|
|
{
|
|
return character;
|
|
}
|
|
|
|
/**
|
|
* Returns a <code>String</code> representation
|
|
* of the compiled field, primarily for debugging
|
|
* purposes.
|
|
*
|
|
* @return a <code>String</code> representation.
|
|
*/
|
|
public String toString()
|
|
{
|
|
CPStringBuilder builder;
|
|
|
|
builder = new CPStringBuilder(getClass().getName());
|
|
builder.append("[field=");
|
|
builder.append(field);
|
|
builder.append(", size=");
|
|
builder.append(size);
|
|
builder.append(", character=");
|
|
builder.append(character);
|
|
builder.append("]");
|
|
|
|
return builder.toString();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* A list of <code>CompiledField</code>s,
|
|
* representing the compiled version of the pattern.
|
|
*
|
|
* @see CompiledField
|
|
* @serial Ignored.
|
|
*/
|
|
private transient ArrayList tokens;
|
|
|
|
/**
|
|
* The localised data used in formatting,
|
|
* such as the day and month names in the local
|
|
* language, and the localized pattern characters.
|
|
*
|
|
* @see DateFormatSymbols
|
|
* @serial The localisation data. May not be null.
|
|
*/
|
|
private DateFormatSymbols formatData;
|
|
|
|
/**
|
|
* The date representing the start of the century
|
|
* used for interpreting two digit years. For
|
|
* example, 24/10/2004 would cause two digit
|
|
* years to be interpreted as representing
|
|
* the years between 2004 and 2104.
|
|
*
|
|
* @see #get2DigitYearStart()
|
|
* @see #set2DigitYearStart(java.util.Date)
|
|
* @see Date
|
|
* @serial The start date of the century for parsing two digit years.
|
|
* May not be null.
|
|
*/
|
|
private Date defaultCenturyStart;
|
|
|
|
/**
|
|
* The year at which interpretation of two
|
|
* digit years starts.
|
|
*
|
|
* @see #get2DigitYearStart()
|
|
* @see #set2DigitYearStart(java.util.Date)
|
|
* @serial Ignored.
|
|
*/
|
|
private transient int defaultCentury;
|
|
|
|
/**
|
|
* The non-localized pattern string. This
|
|
* only ever contains the pattern characters
|
|
* stored in standardChars. Localized patterns
|
|
* are translated to this form.
|
|
*
|
|
* @see #applyPattern(String)
|
|
* @see #applyLocalizedPattern(String)
|
|
* @see #toPattern()
|
|
* @see #toLocalizedPattern()
|
|
* @serial The non-localized pattern string. May not be null.
|
|
*/
|
|
private String pattern;
|
|
|
|
/**
|
|
* The version of serialized data used by this class.
|
|
* Version 0 only includes the pattern and formatting
|
|
* data. Version 1 adds the start date for interpreting
|
|
* two digit years.
|
|
*
|
|
* @serial This specifies the version of the data being serialized.
|
|
* Version 0 (or no version) specifies just <code>pattern</code>
|
|
* and <code>formatData</code>. Version 1 adds
|
|
* the <code>defaultCenturyStart</code>. This implementation
|
|
* always writes out version 1 data.
|
|
*/
|
|
private int serialVersionOnStream = 1; // 0 indicates JDK1.1.3 or earlier
|
|
|
|
/**
|
|
* For compatability.
|
|
*/
|
|
private static final long serialVersionUID = 4774881970558875024L;
|
|
|
|
// This string is specified in the Java class libraries.
|
|
private static final String standardChars = "GyMdkHmsSEDFwWahKzZ";
|
|
|
|
/**
|
|
* Represents the position of the RFC822 timezone pattern character
|
|
* in the array of localized pattern characters. In the
|
|
* U.S. locale, this is 'Z'. The value is the offset of the current
|
|
* time from GMT e.g. -0500 would be five hours prior to GMT.
|
|
*/
|
|
private static final int RFC822_TIMEZONE_FIELD = 18;
|
|
|
|
/**
|
|
* Reads the serialized version of this object.
|
|
* If the serialized data is only version 0,
|
|
* then the date for the start of the century
|
|
* for interpreting two digit years is computed.
|
|
* The pattern is parsed and compiled following the process
|
|
* of reading in the serialized data.
|
|
*
|
|
* @param stream the object stream to read the data from.
|
|
* @throws IOException if an I/O error occurs.
|
|
* @throws ClassNotFoundException if the class of the serialized data
|
|
* could not be found.
|
|
* @throws InvalidObjectException if the pattern is invalid.
|
|
*/
|
|
private void readObject(ObjectInputStream stream)
|
|
throws IOException, ClassNotFoundException
|
|
{
|
|
stream.defaultReadObject();
|
|
if (serialVersionOnStream < 1)
|
|
{
|
|
computeCenturyStart ();
|
|
serialVersionOnStream = 1;
|
|
}
|
|
else
|
|
// Ensure that defaultCentury gets set.
|
|
set2DigitYearStart(defaultCenturyStart);
|
|
|
|
// Set up items normally taken care of by the constructor.
|
|
tokens = new ArrayList();
|
|
try
|
|
{
|
|
compileFormat(pattern);
|
|
}
|
|
catch (IllegalArgumentException e)
|
|
{
|
|
throw new InvalidObjectException("The stream pattern was invalid.");
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Compiles the supplied non-localized pattern into a form
|
|
* from which formatting and parsing can be performed.
|
|
* This also detects errors in the pattern, which will
|
|
* be raised on later use of the compiled data.
|
|
*
|
|
* @param pattern the non-localized pattern to compile.
|
|
* @throws IllegalArgumentException if the pattern is invalid.
|
|
*/
|
|
private void compileFormat(String pattern)
|
|
{
|
|
// Any alphabetical characters are treated as pattern characters
|
|
// unless enclosed in single quotes.
|
|
|
|
char thisChar;
|
|
int pos;
|
|
int field;
|
|
CompiledField current = null;
|
|
|
|
for (int i = 0; i < pattern.length(); i++)
|
|
{
|
|
thisChar = pattern.charAt(i);
|
|
field = standardChars.indexOf(thisChar);
|
|
if (field == -1)
|
|
{
|
|
current = null;
|
|
if ((thisChar >= 'A' && thisChar <= 'Z')
|
|
|| (thisChar >= 'a' && thisChar <= 'z'))
|
|
{
|
|
// Not a valid letter
|
|
throw new IllegalArgumentException("Invalid letter "
|
|
+ thisChar +
|
|
" encountered at character "
|
|
+ i + ".");
|
|
}
|
|
else if (thisChar == '\'')
|
|
{
|
|
// Quoted text section; skip to next single quote
|
|
pos = pattern.indexOf('\'', i + 1);
|
|
// First look for '' -- meaning a single quote.
|
|
if (pos == i + 1)
|
|
tokens.add("'");
|
|
else
|
|
{
|
|
// Look for the terminating quote. However, if we
|
|
// see a '', that represents a literal quote and
|
|
// we must iterate.
|
|
CPStringBuilder buf = new CPStringBuilder();
|
|
int oldPos = i + 1;
|
|
do
|
|
{
|
|
if (pos == -1)
|
|
throw new IllegalArgumentException("Quotes starting at character "
|
|
+ i +
|
|
" not closed.");
|
|
buf.append(pattern.substring(oldPos, pos));
|
|
if (pos + 1 >= pattern.length()
|
|
|| pattern.charAt(pos + 1) != '\'')
|
|
break;
|
|
buf.append('\'');
|
|
oldPos = pos + 2;
|
|
pos = pattern.indexOf('\'', pos + 2);
|
|
}
|
|
while (true);
|
|
tokens.add(buf.toString());
|
|
}
|
|
i = pos;
|
|
}
|
|
else
|
|
{
|
|
// A special character
|
|
tokens.add(Character.valueOf(thisChar));
|
|
}
|
|
}
|
|
else
|
|
{
|
|
// A valid field
|
|
if ((current != null) && (field == current.field))
|
|
current.size++;
|
|
else
|
|
{
|
|
current = new CompiledField(field, 1, thisChar);
|
|
tokens.add(current);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns a string representation of this
|
|
* class.
|
|
*
|
|
* @return a string representation of the <code>SimpleDateFormat</code>
|
|
* instance.
|
|
*/
|
|
public String toString()
|
|
{
|
|
CPStringBuilder output = new CPStringBuilder(getClass().getName());
|
|
output.append("[tokens=");
|
|
output.append(tokens);
|
|
output.append(", formatData=");
|
|
output.append(formatData);
|
|
output.append(", defaultCenturyStart=");
|
|
output.append(defaultCenturyStart);
|
|
output.append(", defaultCentury=");
|
|
output.append(defaultCentury);
|
|
output.append(", pattern=");
|
|
output.append(pattern);
|
|
output.append(", serialVersionOnStream=");
|
|
output.append(serialVersionOnStream);
|
|
output.append(", standardChars=");
|
|
output.append(standardChars);
|
|
output.append("]");
|
|
return output.toString();
|
|
}
|
|
|
|
/**
|
|
* Constructs a SimpleDateFormat using the default pattern for
|
|
* the default locale.
|
|
*/
|
|
public SimpleDateFormat()
|
|
{
|
|
/*
|
|
* There does not appear to be a standard API for determining
|
|
* what the default pattern for a locale is, so use package-scope
|
|
* variables in DateFormatSymbols to encapsulate this.
|
|
*/
|
|
super();
|
|
Locale locale = Locale.getDefault();
|
|
calendar = new GregorianCalendar(locale);
|
|
computeCenturyStart();
|
|
tokens = new ArrayList();
|
|
formatData = new DateFormatSymbols(locale);
|
|
pattern = (formatData.dateFormats[DEFAULT] + ' '
|
|
+ formatData.timeFormats[DEFAULT]);
|
|
compileFormat(pattern);
|
|
numberFormat = NumberFormat.getInstance(locale);
|
|
numberFormat.setGroupingUsed (false);
|
|
numberFormat.setParseIntegerOnly (true);
|
|
numberFormat.setMaximumFractionDigits (0);
|
|
}
|
|
|
|
/**
|
|
* Creates a date formatter using the specified non-localized pattern,
|
|
* with the default DateFormatSymbols for the default locale.
|
|
*
|
|
* @param pattern the pattern to use.
|
|
* @throws NullPointerException if the pattern is null.
|
|
* @throws IllegalArgumentException if the pattern is invalid.
|
|
*/
|
|
public SimpleDateFormat(String pattern)
|
|
{
|
|
this(pattern, Locale.getDefault());
|
|
}
|
|
|
|
/**
|
|
* Creates a date formatter using the specified non-localized pattern,
|
|
* with the default DateFormatSymbols for the given locale.
|
|
*
|
|
* @param pattern the non-localized pattern to use.
|
|
* @param locale the locale to use for the formatting symbols.
|
|
* @throws NullPointerException if the pattern is null.
|
|
* @throws IllegalArgumentException if the pattern is invalid.
|
|
*/
|
|
public SimpleDateFormat(String pattern, Locale locale)
|
|
{
|
|
super();
|
|
calendar = new GregorianCalendar(locale);
|
|
computeCenturyStart();
|
|
tokens = new ArrayList();
|
|
formatData = new DateFormatSymbols(locale);
|
|
compileFormat(pattern);
|
|
this.pattern = pattern;
|
|
numberFormat = NumberFormat.getInstance(locale);
|
|
numberFormat.setGroupingUsed (false);
|
|
numberFormat.setParseIntegerOnly (true);
|
|
numberFormat.setMaximumFractionDigits (0);
|
|
}
|
|
|
|
/**
|
|
* Creates a date formatter using the specified non-localized
|
|
* pattern. The specified DateFormatSymbols will be used when
|
|
* formatting.
|
|
*
|
|
* @param pattern the non-localized pattern to use.
|
|
* @param formatData the formatting symbols to use.
|
|
* @throws NullPointerException if the pattern or formatData is null.
|
|
* @throws IllegalArgumentException if the pattern is invalid.
|
|
*/
|
|
public SimpleDateFormat(String pattern, DateFormatSymbols formatData)
|
|
{
|
|
super();
|
|
calendar = new GregorianCalendar();
|
|
computeCenturyStart ();
|
|
tokens = new ArrayList();
|
|
if (formatData == null)
|
|
throw new NullPointerException("formatData");
|
|
this.formatData = formatData;
|
|
compileFormat(pattern);
|
|
this.pattern = pattern;
|
|
numberFormat = NumberFormat.getInstance();
|
|
numberFormat.setGroupingUsed (false);
|
|
numberFormat.setParseIntegerOnly (true);
|
|
numberFormat.setMaximumFractionDigits (0);
|
|
}
|
|
|
|
/**
|
|
* This method returns a string with the formatting pattern being used
|
|
* by this object. This string is unlocalized.
|
|
*
|
|
* @return The format string.
|
|
*/
|
|
public String toPattern()
|
|
{
|
|
return pattern;
|
|
}
|
|
|
|
/**
|
|
* This method returns a string with the formatting pattern being used
|
|
* by this object. This string is localized.
|
|
*
|
|
* @return The format string.
|
|
*/
|
|
public String toLocalizedPattern()
|
|
{
|
|
String localChars = formatData.getLocalPatternChars();
|
|
return translateLocalizedPattern(pattern, standardChars, localChars);
|
|
}
|
|
|
|
/**
|
|
* This method sets the formatting pattern that should be used by this
|
|
* object. This string is not localized.
|
|
*
|
|
* @param pattern The new format pattern.
|
|
* @throws NullPointerException if the pattern is null.
|
|
* @throws IllegalArgumentException if the pattern is invalid.
|
|
*/
|
|
public void applyPattern(String pattern)
|
|
{
|
|
tokens = new ArrayList();
|
|
compileFormat(pattern);
|
|
this.pattern = pattern;
|
|
}
|
|
|
|
/**
|
|
* This method sets the formatting pattern that should be used by this
|
|
* object. This string is localized.
|
|
*
|
|
* @param pattern The new format pattern.
|
|
* @throws NullPointerException if the pattern is null.
|
|
* @throws IllegalArgumentException if the pattern is invalid.
|
|
*/
|
|
public void applyLocalizedPattern(String pattern)
|
|
{
|
|
String localChars = formatData.getLocalPatternChars();
|
|
pattern = translateLocalizedPattern(pattern, localChars, standardChars);
|
|
applyPattern(pattern);
|
|
}
|
|
|
|
/**
|
|
* Translates either from or to a localized variant of the pattern
|
|
* string. For example, in the German locale, 't' (for 'tag') is
|
|
* used instead of 'd' (for 'date'). This method translates
|
|
* a localized pattern (such as 'ttt') to a non-localized pattern
|
|
* (such as 'ddd'), or vice versa. Non-localized patterns use
|
|
* a standard set of characters, which match those of the U.S. English
|
|
* locale.
|
|
*
|
|
* @param pattern the pattern to translate.
|
|
* @param oldChars the old set of characters (used in the pattern).
|
|
* @param newChars the new set of characters (which will be used in the
|
|
* pattern).
|
|
* @return a version of the pattern using the characters in
|
|
* <code>newChars</code>.
|
|
*/
|
|
private String translateLocalizedPattern(String pattern,
|
|
String oldChars, String newChars)
|
|
{
|
|
int len = pattern.length();
|
|
CPStringBuilder buf = new CPStringBuilder(len);
|
|
boolean quoted = false;
|
|
for (int i = 0; i < len; i++)
|
|
{
|
|
char ch = pattern.charAt(i);
|
|
if (ch == '\'')
|
|
quoted = ! quoted;
|
|
if (! quoted)
|
|
{
|
|
int j = oldChars.indexOf(ch);
|
|
if (j >= 0)
|
|
ch = newChars.charAt(j);
|
|
}
|
|
buf.append(ch);
|
|
}
|
|
return buf.toString();
|
|
}
|
|
|
|
/**
|
|
* Returns the start of the century used for two digit years.
|
|
*
|
|
* @return A <code>Date</code> representing the start of the century
|
|
* for two digit years.
|
|
*/
|
|
public Date get2DigitYearStart()
|
|
{
|
|
return defaultCenturyStart;
|
|
}
|
|
|
|
/**
|
|
* Sets the start of the century used for two digit years.
|
|
*
|
|
* @param date A <code>Date</code> representing the start of the century for
|
|
* two digit years.
|
|
*/
|
|
public void set2DigitYearStart(Date date)
|
|
{
|
|
defaultCenturyStart = date;
|
|
calendar.clear();
|
|
calendar.setTime(date);
|
|
int year = calendar.get(Calendar.YEAR);
|
|
defaultCentury = year - (year % 100);
|
|
}
|
|
|
|
/**
|
|
* This method returns a copy of the format symbol information used
|
|
* for parsing and formatting dates.
|
|
*
|
|
* @return a copy of the date format symbols.
|
|
*/
|
|
public DateFormatSymbols getDateFormatSymbols()
|
|
{
|
|
return (DateFormatSymbols) formatData.clone();
|
|
}
|
|
|
|
/**
|
|
* This method sets the format symbols information used for parsing
|
|
* and formatting dates.
|
|
*
|
|
* @param formatData The date format symbols.
|
|
* @throws NullPointerException if <code>formatData</code> is null.
|
|
*/
|
|
public void setDateFormatSymbols(DateFormatSymbols formatData)
|
|
{
|
|
if (formatData == null)
|
|
{
|
|
throw new
|
|
NullPointerException("The supplied format data was null.");
|
|
}
|
|
this.formatData = formatData;
|
|
}
|
|
|
|
/**
|
|
* This methods tests whether the specified object is equal to 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>SimpleDateFormat</code>.</li>
|
|
* <li>Is equal to this object at the superclass (i.e., <code>DateFormat</code>)
|
|
* level.</li>
|
|
* <li>Has the same formatting pattern.</li>
|
|
* <li>Is using the same formatting symbols.</li>
|
|
* <li>Is using the same century for two digit years.</li>
|
|
* </ul>
|
|
*
|
|
* @param o The object to compare for equality against.
|
|
*
|
|
* @return <code>true</code> if the specified object is equal to this object,
|
|
* <code>false</code> otherwise.
|
|
*/
|
|
public boolean equals(Object o)
|
|
{
|
|
if (!super.equals(o))
|
|
return false;
|
|
|
|
if (!(o instanceof SimpleDateFormat))
|
|
return false;
|
|
|
|
SimpleDateFormat sdf = (SimpleDateFormat)o;
|
|
|
|
if (defaultCentury != sdf.defaultCentury)
|
|
return false;
|
|
|
|
if (!toPattern().equals(sdf.toPattern()))
|
|
return false;
|
|
|
|
if (!getDateFormatSymbols().equals(sdf.getDateFormatSymbols()))
|
|
return false;
|
|
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* This method returns a hash value for this object.
|
|
*
|
|
* @return A hash value for this object.
|
|
*/
|
|
public int hashCode()
|
|
{
|
|
return super.hashCode() ^ toPattern().hashCode() ^ defaultCentury ^
|
|
getDateFormatSymbols().hashCode();
|
|
}
|
|
|
|
|
|
/**
|
|
* Formats the date input according to the format string in use,
|
|
* appending to the specified StringBuffer. The input StringBuffer
|
|
* is returned as output for convenience.
|
|
*/
|
|
private void formatWithAttribute(Date date, FormatBuffer buffer, FieldPosition pos)
|
|
{
|
|
String temp;
|
|
AttributedCharacterIterator.Attribute attribute;
|
|
calendar.setTime(date);
|
|
|
|
// go through vector, filling in fields where applicable, else toString
|
|
Iterator iter = tokens.iterator();
|
|
while (iter.hasNext())
|
|
{
|
|
Object o = iter.next();
|
|
if (o instanceof CompiledField)
|
|
{
|
|
CompiledField cf = (CompiledField) o;
|
|
int beginIndex = buffer.length();
|
|
|
|
switch (cf.getField())
|
|
{
|
|
case ERA_FIELD:
|
|
buffer.append (formatData.eras[calendar.get (Calendar.ERA)], DateFormat.Field.ERA);
|
|
break;
|
|
case YEAR_FIELD:
|
|
// If we have two digits, then we truncate. Otherwise, we
|
|
// use the size of the pattern, and zero pad.
|
|
buffer.setDefaultAttribute (DateFormat.Field.YEAR);
|
|
if (cf.getSize() == 2)
|
|
{
|
|
temp = "00"+String.valueOf (calendar.get (Calendar.YEAR));
|
|
buffer.append (temp.substring (temp.length() - 2));
|
|
}
|
|
else
|
|
withLeadingZeros (calendar.get (Calendar.YEAR), cf.getSize(), buffer);
|
|
break;
|
|
case MONTH_FIELD:
|
|
buffer.setDefaultAttribute (DateFormat.Field.MONTH);
|
|
if (cf.getSize() < 3)
|
|
withLeadingZeros (calendar.get (Calendar.MONTH) + 1, cf.getSize(), buffer);
|
|
else if (cf.getSize() < 4)
|
|
buffer.append (formatData.shortMonths[calendar.get (Calendar.MONTH)]);
|
|
else
|
|
buffer.append (formatData.months[calendar.get (Calendar.MONTH)]);
|
|
break;
|
|
case DATE_FIELD:
|
|
buffer.setDefaultAttribute (DateFormat.Field.DAY_OF_MONTH);
|
|
withLeadingZeros (calendar.get (Calendar.DATE), cf.getSize(), buffer);
|
|
break;
|
|
case HOUR_OF_DAY1_FIELD: // 1-24
|
|
buffer.setDefaultAttribute(DateFormat.Field.HOUR_OF_DAY1);
|
|
withLeadingZeros ( ((calendar.get (Calendar.HOUR_OF_DAY) + 23) % 24) + 1,
|
|
cf.getSize(), buffer);
|
|
break;
|
|
case HOUR_OF_DAY0_FIELD: // 0-23
|
|
buffer.setDefaultAttribute (DateFormat.Field.HOUR_OF_DAY0);
|
|
withLeadingZeros (calendar.get (Calendar.HOUR_OF_DAY), cf.getSize(), buffer);
|
|
break;
|
|
case MINUTE_FIELD:
|
|
buffer.setDefaultAttribute (DateFormat.Field.MINUTE);
|
|
withLeadingZeros (calendar.get (Calendar.MINUTE),
|
|
cf.getSize(), buffer);
|
|
break;
|
|
case SECOND_FIELD:
|
|
buffer.setDefaultAttribute (DateFormat.Field.SECOND);
|
|
withLeadingZeros(calendar.get (Calendar.SECOND),
|
|
cf.getSize(), buffer);
|
|
break;
|
|
case MILLISECOND_FIELD:
|
|
buffer.setDefaultAttribute (DateFormat.Field.MILLISECOND);
|
|
withLeadingZeros (calendar.get (Calendar.MILLISECOND), cf.getSize(), buffer);
|
|
break;
|
|
case DAY_OF_WEEK_FIELD:
|
|
buffer.setDefaultAttribute (DateFormat.Field.DAY_OF_WEEK);
|
|
if (cf.getSize() < 4)
|
|
buffer.append (formatData.shortWeekdays[calendar.get (Calendar.DAY_OF_WEEK)]);
|
|
else
|
|
buffer.append (formatData.weekdays[calendar.get (Calendar.DAY_OF_WEEK)]);
|
|
break;
|
|
case DAY_OF_YEAR_FIELD:
|
|
buffer.setDefaultAttribute (DateFormat.Field.DAY_OF_YEAR);
|
|
withLeadingZeros (calendar.get (Calendar.DAY_OF_YEAR), cf.getSize(), buffer);
|
|
break;
|
|
case DAY_OF_WEEK_IN_MONTH_FIELD:
|
|
buffer.setDefaultAttribute (DateFormat.Field.DAY_OF_WEEK_IN_MONTH);
|
|
withLeadingZeros (calendar.get (Calendar.DAY_OF_WEEK_IN_MONTH),
|
|
cf.getSize(), buffer);
|
|
break;
|
|
case WEEK_OF_YEAR_FIELD:
|
|
buffer.setDefaultAttribute (DateFormat.Field.WEEK_OF_YEAR);
|
|
withLeadingZeros (calendar.get (Calendar.WEEK_OF_YEAR),
|
|
cf.getSize(), buffer);
|
|
break;
|
|
case WEEK_OF_MONTH_FIELD:
|
|
buffer.setDefaultAttribute (DateFormat.Field.WEEK_OF_MONTH);
|
|
withLeadingZeros (calendar.get (Calendar.WEEK_OF_MONTH),
|
|
cf.getSize(), buffer);
|
|
break;
|
|
case AM_PM_FIELD:
|
|
buffer.setDefaultAttribute (DateFormat.Field.AM_PM);
|
|
buffer.append (formatData.ampms[calendar.get (Calendar.AM_PM)]);
|
|
break;
|
|
case HOUR1_FIELD: // 1-12
|
|
buffer.setDefaultAttribute (DateFormat.Field.HOUR1);
|
|
withLeadingZeros (((calendar.get (Calendar.HOUR) + 11) % 12) + 1,
|
|
cf.getSize(), buffer);
|
|
break;
|
|
case HOUR0_FIELD: // 0-11
|
|
buffer.setDefaultAttribute (DateFormat.Field.HOUR0);
|
|
withLeadingZeros (calendar.get (Calendar.HOUR), cf.getSize(), buffer);
|
|
break;
|
|
case TIMEZONE_FIELD:
|
|
buffer.setDefaultAttribute (DateFormat.Field.TIME_ZONE);
|
|
TimeZone zone = calendar.getTimeZone();
|
|
boolean isDST = calendar.get (Calendar.DST_OFFSET) != 0;
|
|
// FIXME: XXX: This should be a localized time zone.
|
|
String zoneID = zone.getDisplayName
|
|
(isDST, cf.getSize() > 3 ? TimeZone.LONG : TimeZone.SHORT);
|
|
buffer.append (zoneID);
|
|
break;
|
|
case RFC822_TIMEZONE_FIELD:
|
|
buffer.setDefaultAttribute(DateFormat.Field.TIME_ZONE);
|
|
int pureMinutes = (calendar.get(Calendar.ZONE_OFFSET) +
|
|
calendar.get(Calendar.DST_OFFSET)) / (1000 * 60);
|
|
String sign = (pureMinutes < 0) ? "-" : "+";
|
|
pureMinutes = Math.abs(pureMinutes);
|
|
int hours = pureMinutes / 60;
|
|
int minutes = pureMinutes % 60;
|
|
buffer.append(sign);
|
|
withLeadingZeros(hours, 2, buffer);
|
|
withLeadingZeros(minutes, 2, buffer);
|
|
break;
|
|
default:
|
|
throw new IllegalArgumentException ("Illegal pattern character " +
|
|
cf.getCharacter());
|
|
}
|
|
if (pos != null && (buffer.getDefaultAttribute() == pos.getFieldAttribute()
|
|
|| cf.getField() == pos.getField()))
|
|
{
|
|
pos.setBeginIndex(beginIndex);
|
|
pos.setEndIndex(buffer.length());
|
|
}
|
|
}
|
|
else
|
|
{
|
|
buffer.append(o.toString(), null);
|
|
}
|
|
}
|
|
}
|
|
|
|
public StringBuffer format(Date date, StringBuffer buffer, FieldPosition pos)
|
|
{
|
|
formatWithAttribute(date, new StringFormatBuffer (buffer), pos);
|
|
|
|
return buffer;
|
|
}
|
|
|
|
public AttributedCharacterIterator formatToCharacterIterator(Object date)
|
|
throws IllegalArgumentException
|
|
{
|
|
if (date == null)
|
|
throw new NullPointerException("null argument");
|
|
if (!(date instanceof Date))
|
|
throw new IllegalArgumentException("argument should be an instance of java.util.Date");
|
|
|
|
AttributedFormatBuffer buf = new AttributedFormatBuffer();
|
|
formatWithAttribute((Date)date, buf,
|
|
null);
|
|
buf.sync();
|
|
|
|
return new FormatCharacterIterator(buf.getBuffer().toString(),
|
|
buf.getRanges(),
|
|
buf.getAttributes());
|
|
}
|
|
|
|
private void withLeadingZeros(int value, int length, FormatBuffer buffer)
|
|
{
|
|
String valStr = String.valueOf(value);
|
|
for (length -= valStr.length(); length > 0; length--)
|
|
buffer.append('0');
|
|
buffer.append(valStr);
|
|
}
|
|
|
|
private boolean expect(String source, ParsePosition pos, char ch)
|
|
{
|
|
int x = pos.getIndex();
|
|
boolean r = x < source.length() && source.charAt(x) == ch;
|
|
if (r)
|
|
pos.setIndex(x + 1);
|
|
else
|
|
pos.setErrorIndex(x);
|
|
return r;
|
|
}
|
|
|
|
/**
|
|
* This method parses the specified string into a date.
|
|
*
|
|
* @param dateStr The date string to parse.
|
|
* @param pos The input and output parse position
|
|
*
|
|
* @return The parsed date, or <code>null</code> if the string cannot be
|
|
* parsed.
|
|
*/
|
|
public Date parse (String dateStr, ParsePosition pos)
|
|
{
|
|
int fmt_index = 0;
|
|
int fmt_max = pattern.length();
|
|
|
|
calendar.clear();
|
|
boolean saw_timezone = false;
|
|
int quote_start = -1;
|
|
boolean is2DigitYear = false;
|
|
try
|
|
{
|
|
for (; fmt_index < fmt_max; ++fmt_index)
|
|
{
|
|
char ch = pattern.charAt(fmt_index);
|
|
if (ch == '\'')
|
|
{
|
|
int index = pos.getIndex();
|
|
if (fmt_index < fmt_max - 1
|
|
&& pattern.charAt(fmt_index + 1) == '\'')
|
|
{
|
|
if (! expect (dateStr, pos, ch))
|
|
return null;
|
|
++fmt_index;
|
|
}
|
|
else
|
|
quote_start = quote_start < 0 ? fmt_index : -1;
|
|
continue;
|
|
}
|
|
|
|
if (quote_start != -1
|
|
|| ((ch < 'a' || ch > 'z')
|
|
&& (ch < 'A' || ch > 'Z')))
|
|
{
|
|
if (quote_start == -1 && ch == ' ')
|
|
{
|
|
// A single unquoted space in the pattern may match
|
|
// any number of spaces in the input.
|
|
int index = pos.getIndex();
|
|
int save = index;
|
|
while (index < dateStr.length()
|
|
&& Character.isWhitespace(dateStr.charAt(index)))
|
|
++index;
|
|
if (index > save)
|
|
pos.setIndex(index);
|
|
else
|
|
{
|
|
// Didn't see any whitespace.
|
|
pos.setErrorIndex(index);
|
|
return null;
|
|
}
|
|
}
|
|
else if (! expect (dateStr, pos, ch))
|
|
return null;
|
|
continue;
|
|
}
|
|
|
|
// We've arrived at a potential pattern character in the
|
|
// pattern.
|
|
int fmt_count = 1;
|
|
while (++fmt_index < fmt_max && pattern.charAt(fmt_index) == ch)
|
|
{
|
|
++fmt_count;
|
|
}
|
|
|
|
// We might need to limit the number of digits to parse in
|
|
// some cases. We look to the next pattern character to
|
|
// decide.
|
|
boolean limit_digits = false;
|
|
if (fmt_index < fmt_max
|
|
&& standardChars.indexOf(pattern.charAt(fmt_index)) >= 0)
|
|
limit_digits = true;
|
|
--fmt_index;
|
|
|
|
// We can handle most fields automatically: most either are
|
|
// numeric or are looked up in a string vector. In some cases
|
|
// we need an offset. When numeric, `offset' is added to the
|
|
// resulting value. When doing a string lookup, offset is the
|
|
// initial index into the string array.
|
|
int calendar_field;
|
|
boolean is_numeric = true;
|
|
int offset = 0;
|
|
boolean maybe2DigitYear = false;
|
|
boolean oneBasedHour = false;
|
|
boolean oneBasedHourOfDay = false;
|
|
Integer simpleOffset;
|
|
String[] set1 = null;
|
|
String[] set2 = null;
|
|
switch (ch)
|
|
{
|
|
case 'd':
|
|
calendar_field = Calendar.DATE;
|
|
break;
|
|
case 'D':
|
|
calendar_field = Calendar.DAY_OF_YEAR;
|
|
break;
|
|
case 'F':
|
|
calendar_field = Calendar.DAY_OF_WEEK_IN_MONTH;
|
|
break;
|
|
case 'E':
|
|
is_numeric = false;
|
|
offset = 1;
|
|
calendar_field = Calendar.DAY_OF_WEEK;
|
|
set1 = formatData.getWeekdays();
|
|
set2 = formatData.getShortWeekdays();
|
|
break;
|
|
case 'w':
|
|
calendar_field = Calendar.WEEK_OF_YEAR;
|
|
break;
|
|
case 'W':
|
|
calendar_field = Calendar.WEEK_OF_MONTH;
|
|
break;
|
|
case 'M':
|
|
calendar_field = Calendar.MONTH;
|
|
if (fmt_count <= 2)
|
|
offset = -1;
|
|
else
|
|
{
|
|
is_numeric = false;
|
|
set1 = formatData.getMonths();
|
|
set2 = formatData.getShortMonths();
|
|
}
|
|
break;
|
|
case 'y':
|
|
calendar_field = Calendar.YEAR;
|
|
if (fmt_count <= 2)
|
|
maybe2DigitYear = true;
|
|
break;
|
|
case 'K':
|
|
calendar_field = Calendar.HOUR;
|
|
break;
|
|
case 'h':
|
|
calendar_field = Calendar.HOUR;
|
|
oneBasedHour = true;
|
|
break;
|
|
case 'H':
|
|
calendar_field = Calendar.HOUR_OF_DAY;
|
|
break;
|
|
case 'k':
|
|
calendar_field = Calendar.HOUR_OF_DAY;
|
|
oneBasedHourOfDay = true;
|
|
break;
|
|
case 'm':
|
|
calendar_field = Calendar.MINUTE;
|
|
break;
|
|
case 's':
|
|
calendar_field = Calendar.SECOND;
|
|
break;
|
|
case 'S':
|
|
calendar_field = Calendar.MILLISECOND;
|
|
break;
|
|
case 'a':
|
|
is_numeric = false;
|
|
calendar_field = Calendar.AM_PM;
|
|
set1 = formatData.getAmPmStrings();
|
|
break;
|
|
case 'z':
|
|
case 'Z':
|
|
// We need a special case for the timezone, because it
|
|
// uses a different data structure than the other cases.
|
|
is_numeric = false;
|
|
calendar_field = Calendar.ZONE_OFFSET;
|
|
String[][] zoneStrings = formatData.getZoneStrings();
|
|
int zoneCount = zoneStrings.length;
|
|
int index = pos.getIndex();
|
|
boolean found_zone = false;
|
|
simpleOffset = computeOffset(dateStr.substring(index), pos);
|
|
if (simpleOffset != null)
|
|
{
|
|
found_zone = true;
|
|
saw_timezone = true;
|
|
calendar.set(Calendar.DST_OFFSET, 0);
|
|
offset = simpleOffset.intValue();
|
|
}
|
|
else
|
|
{
|
|
for (int j = 0; j < zoneCount; j++)
|
|
{
|
|
String[] strings = zoneStrings[j];
|
|
int k;
|
|
for (k = 0; k < strings.length; ++k)
|
|
{
|
|
if (dateStr.startsWith(strings[k], index))
|
|
break;
|
|
}
|
|
if (k != strings.length)
|
|
{
|
|
found_zone = true;
|
|
saw_timezone = true;
|
|
TimeZone tz = TimeZone.getTimeZone (strings[0]);
|
|
// Check if it's a DST zone or ordinary
|
|
if(k == 3 || k == 4)
|
|
calendar.set (Calendar.DST_OFFSET, tz.getDSTSavings());
|
|
else
|
|
calendar.set (Calendar.DST_OFFSET, 0);
|
|
offset = tz.getRawOffset ();
|
|
pos.setIndex(index + strings[k].length());
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
if (! found_zone)
|
|
{
|
|
pos.setErrorIndex(pos.getIndex());
|
|
return null;
|
|
}
|
|
break;
|
|
default:
|
|
pos.setErrorIndex(pos.getIndex());
|
|
return null;
|
|
}
|
|
|
|
// Compute the value we should assign to the field.
|
|
int value;
|
|
int index = -1;
|
|
if (is_numeric)
|
|
{
|
|
numberFormat.setMinimumIntegerDigits(fmt_count);
|
|
if (maybe2DigitYear)
|
|
index = pos.getIndex();
|
|
Number n = null;
|
|
if (limit_digits)
|
|
{
|
|
// numberFormat.setMaximumIntegerDigits(fmt_count) may
|
|
// not work as expected. So we explicitly use substring
|
|
// of dateStr.
|
|
int origPos = pos.getIndex();
|
|
pos.setIndex(0);
|
|
n = numberFormat.parse(dateStr.substring(origPos, origPos + fmt_count), pos);
|
|
pos.setIndex(origPos + pos.getIndex());
|
|
}
|
|
else
|
|
n = numberFormat.parse(dateStr, pos);
|
|
if (pos == null || ! (n instanceof Long))
|
|
return null;
|
|
value = n.intValue() + offset;
|
|
}
|
|
else if (set1 != null)
|
|
{
|
|
index = pos.getIndex();
|
|
int i;
|
|
boolean found = false;
|
|
for (i = offset; i < set1.length; ++i)
|
|
{
|
|
if (set1[i] != null)
|
|
if (dateStr.toUpperCase().startsWith(set1[i].toUpperCase(),
|
|
index))
|
|
{
|
|
found = true;
|
|
pos.setIndex(index + set1[i].length());
|
|
break;
|
|
}
|
|
}
|
|
if (!found && set2 != null)
|
|
{
|
|
for (i = offset; i < set2.length; ++i)
|
|
{
|
|
if (set2[i] != null)
|
|
if (dateStr.toUpperCase().startsWith(set2[i].toUpperCase(),
|
|
index))
|
|
{
|
|
found = true;
|
|
pos.setIndex(index + set2[i].length());
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
if (!found)
|
|
{
|
|
pos.setErrorIndex(index);
|
|
return null;
|
|
}
|
|
value = i;
|
|
}
|
|
else
|
|
value = offset;
|
|
|
|
if (maybe2DigitYear)
|
|
{
|
|
// Parse into default century if the numeric year string has
|
|
// exactly 2 digits.
|
|
int digit_count = pos.getIndex() - index;
|
|
if (digit_count == 2)
|
|
{
|
|
is2DigitYear = true;
|
|
value += defaultCentury;
|
|
}
|
|
}
|
|
|
|
// Calendar uses 0-based hours.
|
|
// I.e. 00:00 AM is midnight, not 12 AM or 24:00
|
|
if (oneBasedHour && value == 12)
|
|
value = 0;
|
|
|
|
if (oneBasedHourOfDay && value == 24)
|
|
value = 0;
|
|
|
|
// Assign the value and move on.
|
|
calendar.set(calendar_field, value);
|
|
}
|
|
|
|
if (is2DigitYear)
|
|
{
|
|
// Apply the 80-20 heuristic to dermine the full year based on
|
|
// defaultCenturyStart.
|
|
int year = calendar.get(Calendar.YEAR);
|
|
if (calendar.getTime().compareTo(defaultCenturyStart) < 0)
|
|
calendar.set(Calendar.YEAR, year + 100);
|
|
}
|
|
if (! saw_timezone)
|
|
{
|
|
// Use the real rules to determine whether or not this
|
|
// particular time is in daylight savings.
|
|
calendar.clear (Calendar.DST_OFFSET);
|
|
calendar.clear (Calendar.ZONE_OFFSET);
|
|
}
|
|
return calendar.getTime();
|
|
}
|
|
catch (IllegalArgumentException x)
|
|
{
|
|
pos.setErrorIndex(pos.getIndex());
|
|
return null;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* <p>
|
|
* Computes the time zone offset in milliseconds
|
|
* relative to GMT, based on the supplied
|
|
* <code>String</code> representation.
|
|
* </p>
|
|
* <p>
|
|
* The supplied <code>String</code> must be a three
|
|
* or four digit signed number, with an optional 'GMT'
|
|
* prefix. The first one or two digits represents the hours,
|
|
* while the last two represent the minutes. The
|
|
* two sets of digits can optionally be separated by
|
|
* ':'. The mandatory sign prefix (either '+' or '-')
|
|
* indicates the direction of the offset from GMT.
|
|
* </p>
|
|
* <p>
|
|
* For example, 'GMT+0200' specifies 2 hours after
|
|
* GMT, while '-05:00' specifies 5 hours prior to
|
|
* GMT. The special case of 'GMT' alone can be used
|
|
* to represent the offset, 0.
|
|
* </p>
|
|
* <p>
|
|
* If the <code>String</code> can not be parsed,
|
|
* the result will be null. The resulting offset
|
|
* is wrapped in an <code>Integer</code> object, in
|
|
* order to allow such failure to be represented.
|
|
* </p>
|
|
*
|
|
* @param zoneString a string in the form
|
|
* (GMT)? sign hours : minutes
|
|
* where sign = '+' or '-', hours
|
|
* is a one or two digits representing
|
|
* a number between 0 and 23, and
|
|
* minutes is two digits representing
|
|
* a number between 0 and 59.
|
|
* @return the parsed offset, or null if parsing
|
|
* failed.
|
|
*/
|
|
private Integer computeOffset(String zoneString, ParsePosition pos)
|
|
{
|
|
Pattern pattern =
|
|
Pattern.compile("(GMT)?([+-])([012])?([0-9]):?([0-9]{2})");
|
|
Matcher matcher = pattern.matcher(zoneString);
|
|
|
|
// Match from start, but ignore trailing parts
|
|
boolean hasAll = matcher.lookingAt();
|
|
try
|
|
{
|
|
// Do we have at least the sign, hour and minute?
|
|
matcher.group(2);
|
|
matcher.group(4);
|
|
matcher.group(5);
|
|
}
|
|
catch (IllegalStateException ise)
|
|
{
|
|
hasAll = false;
|
|
}
|
|
if (hasAll)
|
|
{
|
|
int sign = matcher.group(2).equals("+") ? 1 : -1;
|
|
int hour = Integer.parseInt(matcher.group(4));
|
|
if (!matcher.group(3).equals(""))
|
|
hour += (Integer.parseInt(matcher.group(3)) * 10);
|
|
int minutes = Integer.parseInt(matcher.group(5));
|
|
|
|
if (hour > 23)
|
|
return null;
|
|
int offset = sign * ((hour * 60) + minutes) * 60000;
|
|
|
|
// advance the index
|
|
pos.setIndex(pos.getIndex() + matcher.end());
|
|
return Integer.valueOf(offset);
|
|
}
|
|
else if (zoneString.startsWith("GMT"))
|
|
{
|
|
pos.setIndex(pos.getIndex() + 3);
|
|
return Integer.valueOf(0);
|
|
}
|
|
return null;
|
|
}
|
|
|
|
// Compute the start of the current century as defined by
|
|
// get2DigitYearStart.
|
|
private void computeCenturyStart()
|
|
{
|
|
int year = calendar.get(Calendar.YEAR);
|
|
calendar.set(Calendar.YEAR, year - 80);
|
|
set2DigitYearStart(calendar.getTime());
|
|
}
|
|
|
|
/**
|
|
* Returns a copy of this instance of
|
|
* <code>SimpleDateFormat</code>. The copy contains
|
|
* clones of the formatting symbols and the 2-digit
|
|
* year century start date.
|
|
*/
|
|
public Object clone()
|
|
{
|
|
SimpleDateFormat clone = (SimpleDateFormat) super.clone();
|
|
clone.setDateFormatSymbols((DateFormatSymbols) formatData.clone());
|
|
clone.set2DigitYearStart((Date) defaultCenturyStart.clone());
|
|
return clone;
|
|
}
|
|
|
|
}
|