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
834 lines
23 KiB
Java
834 lines
23 KiB
Java
/* MessageFormat.java - Localized message formatting.
|
|
Copyright (C) 1999, 2001, 2002, 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.text.FormatCharacterIterator;
|
|
|
|
import java.io.InvalidObjectException;
|
|
import java.util.Date;
|
|
import java.util.HashMap;
|
|
import java.util.Locale;
|
|
import java.util.Vector;
|
|
|
|
public class MessageFormat extends Format
|
|
{
|
|
/**
|
|
* @author Tom Tromey (tromey@cygnus.com)
|
|
* @author Jorge Aliss (jaliss@hotmail.com)
|
|
* @date March 3, 1999
|
|
*/
|
|
/* Written using "Java Class Libraries", 2nd edition, plus online
|
|
* API docs for JDK 1.2 from http://www.javasoft.com.
|
|
* Status: Believed complete and correct to 1.2, except serialization.
|
|
* and parsing.
|
|
*/
|
|
private static final class MessageFormatElement
|
|
{
|
|
// Argument number.
|
|
int argNumber;
|
|
// Formatter to be used. This is the format set by setFormat.
|
|
Format setFormat;
|
|
// Formatter to be used based on the type.
|
|
Format format;
|
|
|
|
// Argument will be checked to make sure it is an instance of this
|
|
// class.
|
|
Class formatClass;
|
|
|
|
// Formatter type.
|
|
String type;
|
|
// Formatter style.
|
|
String style;
|
|
|
|
// Text to follow this element.
|
|
String trailer;
|
|
|
|
// Recompute the locale-based formatter.
|
|
void setLocale (Locale loc)
|
|
{
|
|
if (type != null)
|
|
{
|
|
if (type.equals("number"))
|
|
{
|
|
formatClass = java.lang.Number.class;
|
|
|
|
if (style == null)
|
|
format = NumberFormat.getInstance(loc);
|
|
else if (style.equals("currency"))
|
|
format = NumberFormat.getCurrencyInstance(loc);
|
|
else if (style.equals("percent"))
|
|
format = NumberFormat.getPercentInstance(loc);
|
|
else if (style.equals("integer"))
|
|
{
|
|
NumberFormat nf = NumberFormat.getNumberInstance(loc);
|
|
nf.setMaximumFractionDigits(0);
|
|
nf.setGroupingUsed(false);
|
|
format = nf;
|
|
}
|
|
else
|
|
{
|
|
format = NumberFormat.getNumberInstance(loc);
|
|
DecimalFormat df = (DecimalFormat) format;
|
|
df.applyPattern(style);
|
|
}
|
|
}
|
|
else if (type.equals("time") || type.equals("date"))
|
|
{
|
|
formatClass = java.util.Date.class;
|
|
|
|
int val = DateFormat.DEFAULT;
|
|
boolean styleIsPattern = false;
|
|
if (style != null)
|
|
{
|
|
if (style.equals("short"))
|
|
val = DateFormat.SHORT;
|
|
else if (style.equals("medium"))
|
|
val = DateFormat.MEDIUM;
|
|
else if (style.equals("long"))
|
|
val = DateFormat.LONG;
|
|
else if (style.equals("full"))
|
|
val = DateFormat.FULL;
|
|
else
|
|
styleIsPattern = true;
|
|
}
|
|
|
|
if (type.equals("time"))
|
|
format = DateFormat.getTimeInstance(val, loc);
|
|
else
|
|
format = DateFormat.getDateInstance(val, loc);
|
|
|
|
if (styleIsPattern)
|
|
{
|
|
SimpleDateFormat sdf = (SimpleDateFormat) format;
|
|
sdf.applyPattern(style);
|
|
}
|
|
}
|
|
else if (type.equals("choice"))
|
|
{
|
|
formatClass = java.lang.Number.class;
|
|
|
|
if (style == null)
|
|
throw new
|
|
IllegalArgumentException ("style required for choice format");
|
|
format = new ChoiceFormat (style);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
private static final long serialVersionUID = 6479157306784022952L;
|
|
|
|
public static class Field extends Format.Field
|
|
{
|
|
static final long serialVersionUID = 7899943957617360810L;
|
|
|
|
/**
|
|
* This is the attribute set for all characters produced
|
|
* by MessageFormat during a formatting.
|
|
*/
|
|
public static final MessageFormat.Field ARGUMENT = new MessageFormat.Field("argument");
|
|
|
|
// For deserialization
|
|
private Field()
|
|
{
|
|
super("");
|
|
}
|
|
|
|
protected Field(String s)
|
|
{
|
|
super(s);
|
|
}
|
|
|
|
/**
|
|
* invoked to resolve the true static constant by
|
|
* comparing the deserialized object to know name.
|
|
*
|
|
* @return object constant
|
|
*/
|
|
protected Object readResolve() throws InvalidObjectException
|
|
{
|
|
if (getName().equals(ARGUMENT.getName()))
|
|
return ARGUMENT;
|
|
|
|
throw new InvalidObjectException("no such MessageFormat field called " + getName());
|
|
}
|
|
|
|
}
|
|
|
|
// Helper that returns the text up to the next format opener. The
|
|
// text is put into BUFFER. Returns index of character after end of
|
|
// string. Throws IllegalArgumentException on error.
|
|
private static int scanString(String pat, int index, StringBuilder buffer)
|
|
{
|
|
int max = pat.length();
|
|
buffer.setLength(0);
|
|
boolean quoted = false;
|
|
for (; index < max; ++index)
|
|
{
|
|
char c = pat.charAt(index);
|
|
if (quoted)
|
|
{
|
|
// In a quoted context, a single quote ends the quoting.
|
|
if (c == '\'')
|
|
quoted = false;
|
|
else
|
|
buffer.append(c);
|
|
}
|
|
// Check for '', which is a single quote.
|
|
else if (c == '\'' && index + 1 < max && pat.charAt(index + 1) == '\'')
|
|
{
|
|
buffer.append(c);
|
|
++index;
|
|
}
|
|
else if (c == '\'')
|
|
{
|
|
// Start quoting.
|
|
quoted = true;
|
|
}
|
|
else if (c == '{')
|
|
break;
|
|
else
|
|
buffer.append(c);
|
|
}
|
|
// Note that we explicitly allow an unterminated quote. This is
|
|
// done for compatibility.
|
|
return index;
|
|
}
|
|
|
|
// This helper retrieves a single part of a format element. Returns
|
|
// the index of the terminating character.
|
|
private static int scanFormatElement(String pat, int index,
|
|
StringBuilder buffer, char term)
|
|
{
|
|
int max = pat.length();
|
|
buffer.setLength(0);
|
|
int brace_depth = 1;
|
|
boolean quoted = false;
|
|
|
|
for (; index < max; ++index)
|
|
{
|
|
char c = pat.charAt(index);
|
|
// First see if we should turn off quoting.
|
|
if (quoted)
|
|
{
|
|
if (c == '\'')
|
|
quoted = false;
|
|
// In both cases we fall through to inserting the
|
|
// character here.
|
|
}
|
|
// See if we have just a plain quote to insert.
|
|
else if (c == '\'' && index + 1 < max
|
|
&& pat.charAt(index + 1) == '\'')
|
|
{
|
|
buffer.append(c);
|
|
++index;
|
|
}
|
|
// See if quoting should turn on.
|
|
else if (c == '\'')
|
|
quoted = true;
|
|
else if (c == '{')
|
|
++brace_depth;
|
|
else if (c == '}')
|
|
{
|
|
if (--brace_depth == 0)
|
|
break;
|
|
}
|
|
// Check for TERM after braces, because TERM might be `}'.
|
|
else if (c == term)
|
|
break;
|
|
// All characters, including opening and closing quotes, are
|
|
// inserted here.
|
|
buffer.append(c);
|
|
}
|
|
return index;
|
|
}
|
|
|
|
// This is used to parse a format element and whatever non-format
|
|
// text might trail it.
|
|
private static int scanFormat(String pat, int index, StringBuilder buffer,
|
|
Vector elts, Locale locale)
|
|
{
|
|
MessageFormatElement mfe = new MessageFormatElement ();
|
|
elts.addElement(mfe);
|
|
|
|
int max = pat.length();
|
|
|
|
// Skip the opening `{'.
|
|
++index;
|
|
|
|
// Fetch the argument number.
|
|
index = scanFormatElement (pat, index, buffer, ',');
|
|
try
|
|
{
|
|
mfe.argNumber = Integer.parseInt(buffer.toString());
|
|
}
|
|
catch (NumberFormatException nfx)
|
|
{
|
|
IllegalArgumentException iae = new IllegalArgumentException(pat);
|
|
iae.initCause(nfx);
|
|
throw iae;
|
|
}
|
|
|
|
// Extract the element format.
|
|
if (index < max && pat.charAt(index) == ',')
|
|
{
|
|
index = scanFormatElement (pat, index + 1, buffer, ',');
|
|
mfe.type = buffer.toString();
|
|
|
|
// Extract the style.
|
|
if (index < max && pat.charAt(index) == ',')
|
|
{
|
|
index = scanFormatElement (pat, index + 1, buffer, '}');
|
|
mfe.style = buffer.toString ();
|
|
}
|
|
}
|
|
|
|
// Advance past the last terminator.
|
|
if (index >= max || pat.charAt(index) != '}')
|
|
throw new IllegalArgumentException("Missing '}' at end of message format");
|
|
++index;
|
|
|
|
// Now fetch trailing string.
|
|
index = scanString (pat, index, buffer);
|
|
mfe.trailer = buffer.toString ();
|
|
|
|
mfe.setLocale(locale);
|
|
|
|
return index;
|
|
}
|
|
|
|
/**
|
|
* Applies the specified pattern to this MessageFormat.
|
|
*
|
|
* @param newPattern The Pattern
|
|
*/
|
|
public void applyPattern (String newPattern)
|
|
{
|
|
pattern = newPattern;
|
|
|
|
StringBuilder tempBuffer = new StringBuilder ();
|
|
|
|
int index = scanString (newPattern, 0, tempBuffer);
|
|
leader = tempBuffer.toString();
|
|
|
|
Vector elts = new Vector ();
|
|
while (index < newPattern.length())
|
|
index = scanFormat (newPattern, index, tempBuffer, elts, locale);
|
|
|
|
elements = new MessageFormatElement[elts.size()];
|
|
elts.copyInto(elements);
|
|
}
|
|
|
|
/**
|
|
* Overrides Format.clone()
|
|
*/
|
|
public Object clone ()
|
|
{
|
|
MessageFormat c = (MessageFormat) super.clone ();
|
|
c.elements = (MessageFormatElement[]) elements.clone ();
|
|
return c;
|
|
}
|
|
|
|
/**
|
|
* Overrides Format.equals(Object obj)
|
|
*/
|
|
public boolean equals (Object obj)
|
|
{
|
|
if (! (obj instanceof MessageFormat))
|
|
return false;
|
|
MessageFormat mf = (MessageFormat) obj;
|
|
return (pattern.equals(mf.pattern)
|
|
&& locale.equals(mf.locale));
|
|
}
|
|
|
|
/**
|
|
* A convinience method to format patterns.
|
|
*
|
|
* @param arguments The array containing the objects to be formatted.
|
|
*/
|
|
public AttributedCharacterIterator formatToCharacterIterator (Object arguments)
|
|
{
|
|
Object[] arguments_array = (Object[])arguments;
|
|
FormatCharacterIterator iterator = new FormatCharacterIterator();
|
|
|
|
formatInternal(arguments_array, new StringBuffer(), null, iterator);
|
|
|
|
return iterator;
|
|
}
|
|
|
|
/**
|
|
* A convinience method to format patterns.
|
|
*
|
|
* @param pattern The pattern used when formatting.
|
|
* @param arguments The array containing the objects to be formatted.
|
|
*/
|
|
public static String format (String pattern, Object... arguments)
|
|
{
|
|
MessageFormat mf = new MessageFormat (pattern);
|
|
StringBuffer sb = new StringBuffer ();
|
|
FieldPosition fp = new FieldPosition (NumberFormat.INTEGER_FIELD);
|
|
return mf.formatInternal(arguments, sb, fp, null).toString();
|
|
}
|
|
|
|
/**
|
|
* Returns the pattern with the formatted objects.
|
|
*
|
|
* @param arguments The array containing the objects to be formatted.
|
|
* @param appendBuf The StringBuffer where the text is appened.
|
|
* @param fp A FieldPosition object (it is ignored).
|
|
*/
|
|
public final StringBuffer format (Object arguments[], StringBuffer appendBuf,
|
|
FieldPosition fp)
|
|
{
|
|
return formatInternal(arguments, appendBuf, fp, null);
|
|
}
|
|
|
|
private StringBuffer formatInternal (Object arguments[],
|
|
StringBuffer appendBuf,
|
|
FieldPosition fp,
|
|
FormatCharacterIterator output_iterator)
|
|
{
|
|
appendBuf.append(leader);
|
|
if (output_iterator != null)
|
|
output_iterator.append(leader);
|
|
|
|
for (int i = 0; i < elements.length; ++i)
|
|
{
|
|
Object thisArg = null;
|
|
boolean unavailable = false;
|
|
if (arguments == null || elements[i].argNumber >= arguments.length)
|
|
unavailable = true;
|
|
else
|
|
thisArg = arguments[elements[i].argNumber];
|
|
|
|
AttributedCharacterIterator iterator = null;
|
|
|
|
Format formatter = null;
|
|
|
|
if (fp != null && i == fp.getField() && fp.getFieldAttribute() == Field.ARGUMENT)
|
|
fp.setBeginIndex(appendBuf.length());
|
|
|
|
if (unavailable)
|
|
appendBuf.append("{" + elements[i].argNumber + "}");
|
|
else
|
|
{
|
|
if (elements[i].setFormat != null)
|
|
formatter = elements[i].setFormat;
|
|
else if (elements[i].format != null)
|
|
{
|
|
if (elements[i].formatClass != null
|
|
&& ! elements[i].formatClass.isInstance(thisArg))
|
|
throw new IllegalArgumentException("Wrong format class");
|
|
|
|
formatter = elements[i].format;
|
|
}
|
|
else if (thisArg instanceof Number)
|
|
formatter = NumberFormat.getInstance(locale);
|
|
else if (thisArg instanceof Date)
|
|
formatter = DateFormat.getTimeInstance(DateFormat.DEFAULT, locale);
|
|
else
|
|
appendBuf.append(thisArg);
|
|
}
|
|
|
|
if (fp != null && fp.getField() == i && fp.getFieldAttribute() == Field.ARGUMENT)
|
|
fp.setEndIndex(appendBuf.length());
|
|
|
|
if (formatter != null)
|
|
{
|
|
// Special-case ChoiceFormat.
|
|
if (formatter instanceof ChoiceFormat)
|
|
{
|
|
StringBuffer buf = new StringBuffer ();
|
|
formatter.format(thisArg, buf, fp);
|
|
MessageFormat mf = new MessageFormat ();
|
|
mf.setLocale(locale);
|
|
mf.applyPattern(buf.toString());
|
|
mf.format(arguments, appendBuf, fp);
|
|
}
|
|
else
|
|
{
|
|
if (output_iterator != null)
|
|
iterator = formatter.formatToCharacterIterator(thisArg);
|
|
else
|
|
formatter.format(thisArg, appendBuf, fp);
|
|
}
|
|
|
|
elements[i].format = formatter;
|
|
}
|
|
|
|
if (output_iterator != null)
|
|
{
|
|
HashMap hash_argument = new HashMap();
|
|
int position = output_iterator.getEndIndex();
|
|
|
|
hash_argument.put (MessageFormat.Field.ARGUMENT,
|
|
Integer.valueOf(elements[i].argNumber));
|
|
|
|
|
|
if (iterator != null)
|
|
{
|
|
output_iterator.append(iterator);
|
|
output_iterator.addAttributes(hash_argument, position,
|
|
output_iterator.getEndIndex());
|
|
}
|
|
else
|
|
output_iterator.append(thisArg.toString(), hash_argument);
|
|
|
|
output_iterator.append(elements[i].trailer);
|
|
}
|
|
|
|
appendBuf.append(elements[i].trailer);
|
|
}
|
|
|
|
return appendBuf;
|
|
}
|
|
|
|
/**
|
|
* Returns the pattern with the formatted objects. The first argument
|
|
* must be a array of Objects.
|
|
* This is equivalent to format((Object[]) objectArray, appendBuf, fpos)
|
|
*
|
|
* @param objectArray The object array to be formatted.
|
|
* @param appendBuf The StringBuffer where the text is appened.
|
|
* @param fpos A FieldPosition object (it is ignored).
|
|
*/
|
|
public final StringBuffer format (Object objectArray, StringBuffer appendBuf,
|
|
FieldPosition fpos)
|
|
{
|
|
return format ((Object[])objectArray, appendBuf, fpos);
|
|
}
|
|
|
|
/**
|
|
* Returns an array with the Formats for
|
|
* the arguments.
|
|
*/
|
|
public Format[] getFormats ()
|
|
{
|
|
Format[] f = new Format[elements.length];
|
|
for (int i = elements.length - 1; i >= 0; --i)
|
|
f[i] = elements[i].setFormat;
|
|
return f;
|
|
}
|
|
|
|
/**
|
|
* Returns the locale.
|
|
*/
|
|
public Locale getLocale ()
|
|
{
|
|
return locale;
|
|
}
|
|
|
|
/**
|
|
* Overrides Format.hashCode()
|
|
*/
|
|
public int hashCode ()
|
|
{
|
|
// FIXME: not a very good hash.
|
|
return pattern.hashCode() + locale.hashCode();
|
|
}
|
|
|
|
private MessageFormat ()
|
|
{
|
|
}
|
|
|
|
/**
|
|
* Creates a new MessageFormat object with
|
|
* the specified pattern
|
|
*
|
|
* @param pattern The Pattern
|
|
*/
|
|
public MessageFormat(String pattern)
|
|
{
|
|
this(pattern, Locale.getDefault());
|
|
}
|
|
|
|
/**
|
|
* Creates a new MessageFormat object with
|
|
* the specified pattern
|
|
*
|
|
* @param pattern The Pattern
|
|
* @param locale The Locale to use
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public MessageFormat(String pattern, Locale locale)
|
|
{
|
|
this.locale = locale;
|
|
applyPattern (pattern);
|
|
}
|
|
|
|
/**
|
|
* Parse a string <code>sourceStr</code> against the pattern specified
|
|
* to the MessageFormat constructor.
|
|
*
|
|
* @param sourceStr the string to be parsed.
|
|
* @param pos the current parse position (and eventually the error position).
|
|
* @return the array of parsed objects sorted according to their argument number
|
|
* in the pattern.
|
|
*/
|
|
public Object[] parse (String sourceStr, ParsePosition pos)
|
|
{
|
|
// Check initial text.
|
|
int index = pos.getIndex();
|
|
if (! sourceStr.startsWith(leader, index))
|
|
{
|
|
pos.setErrorIndex(index);
|
|
return null;
|
|
}
|
|
index += leader.length();
|
|
|
|
Vector results = new Vector (elements.length, 1);
|
|
// Now check each format.
|
|
for (int i = 0; i < elements.length; ++i)
|
|
{
|
|
Format formatter = null;
|
|
if (elements[i].setFormat != null)
|
|
formatter = elements[i].setFormat;
|
|
else if (elements[i].format != null)
|
|
formatter = elements[i].format;
|
|
|
|
Object value = null;
|
|
if (formatter instanceof ChoiceFormat)
|
|
{
|
|
// We must special-case a ChoiceFormat because it might
|
|
// have recursive formatting.
|
|
ChoiceFormat cf = (ChoiceFormat) formatter;
|
|
String[] formats = (String[]) cf.getFormats();
|
|
double[] limits = cf.getLimits();
|
|
MessageFormat subfmt = new MessageFormat ();
|
|
subfmt.setLocale(locale);
|
|
ParsePosition subpos = new ParsePosition (index);
|
|
|
|
int j;
|
|
for (j = 0; value == null && j < limits.length; ++j)
|
|
{
|
|
subfmt.applyPattern(formats[j]);
|
|
subpos.setIndex(index);
|
|
value = subfmt.parse(sourceStr, subpos);
|
|
}
|
|
if (value != null)
|
|
{
|
|
index = subpos.getIndex();
|
|
value = new Double (limits[j]);
|
|
}
|
|
}
|
|
else if (formatter != null)
|
|
{
|
|
pos.setIndex(index);
|
|
value = formatter.parseObject(sourceStr, pos);
|
|
if (value != null)
|
|
index = pos.getIndex();
|
|
}
|
|
else
|
|
{
|
|
// We have a String format. This can lose in a number
|
|
// of ways, but we give it a shot.
|
|
int next_index;
|
|
if (elements[i].trailer.length() > 0)
|
|
next_index = sourceStr.indexOf(elements[i].trailer, index);
|
|
else
|
|
next_index = sourceStr.length();
|
|
if (next_index == -1)
|
|
{
|
|
pos.setErrorIndex(index);
|
|
return null;
|
|
}
|
|
value = sourceStr.substring(index, next_index);
|
|
index = next_index;
|
|
}
|
|
|
|
if (value == null
|
|
|| ! sourceStr.startsWith(elements[i].trailer, index))
|
|
{
|
|
pos.setErrorIndex(index);
|
|
return null;
|
|
}
|
|
|
|
if (elements[i].argNumber >= results.size())
|
|
results.setSize(elements[i].argNumber + 1);
|
|
results.setElementAt(value, elements[i].argNumber);
|
|
|
|
index += elements[i].trailer.length();
|
|
}
|
|
|
|
Object[] r = new Object[results.size()];
|
|
results.copyInto(r);
|
|
return r;
|
|
}
|
|
|
|
public Object[] parse (String sourceStr) throws ParseException
|
|
{
|
|
ParsePosition pp = new ParsePosition (0);
|
|
Object[] r = parse (sourceStr, pp);
|
|
if (r == null)
|
|
throw new ParseException ("couldn't parse string", pp.getErrorIndex());
|
|
return r;
|
|
}
|
|
|
|
public Object parseObject (String sourceStr, ParsePosition pos)
|
|
{
|
|
return parse (sourceStr, pos);
|
|
}
|
|
|
|
/**
|
|
* Sets the format for the argument at an specified
|
|
* index.
|
|
*
|
|
* @param variableNum The index.
|
|
* @param newFormat The Format object.
|
|
*/
|
|
public void setFormat (int variableNum, Format newFormat)
|
|
{
|
|
elements[variableNum].setFormat = newFormat;
|
|
}
|
|
|
|
/**
|
|
* Sets the formats for the arguments.
|
|
*
|
|
* @param newFormats An array of Format objects.
|
|
*/
|
|
public void setFormats (Format[] newFormats)
|
|
{
|
|
if (newFormats.length < elements.length)
|
|
throw new IllegalArgumentException("Not enough format objects");
|
|
|
|
int len = Math.min(newFormats.length, elements.length);
|
|
for (int i = 0; i < len; ++i)
|
|
elements[i].setFormat = newFormats[i];
|
|
}
|
|
|
|
/**
|
|
* Sets the locale.
|
|
*
|
|
* @param loc A Locale
|
|
*/
|
|
public void setLocale (Locale loc)
|
|
{
|
|
locale = loc;
|
|
if (elements != null)
|
|
{
|
|
for (int i = 0; i < elements.length; ++i)
|
|
elements[i].setLocale(loc);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns the pattern.
|
|
*/
|
|
public String toPattern ()
|
|
{
|
|
return pattern;
|
|
}
|
|
|
|
/**
|
|
* Return the formatters used sorted by argument index. It uses the
|
|
* internal table to fill in this array: if a format has been
|
|
* set using <code>setFormat</code> or <code>setFormatByArgumentIndex</code>
|
|
* then it returns it at the right index. If not it uses the detected
|
|
* formatters during a <code>format</code> call. If nothing is known
|
|
* about that argument index it just puts null at that position.
|
|
* To get useful informations you may have to call <code>format</code>
|
|
* at least once.
|
|
*
|
|
* @return an array of formatters sorted by argument index.
|
|
*/
|
|
public Format[] getFormatsByArgumentIndex()
|
|
{
|
|
int argNumMax = 0;
|
|
// First, find the greatest argument number.
|
|
for (int i=0;i<elements.length;i++)
|
|
if (elements[i].argNumber > argNumMax)
|
|
argNumMax = elements[i].argNumber;
|
|
|
|
Format[] formats = new Format[argNumMax];
|
|
for (int i=0;i<elements.length;i++)
|
|
{
|
|
if (elements[i].setFormat != null)
|
|
formats[elements[i].argNumber] = elements[i].setFormat;
|
|
else if (elements[i].format != null)
|
|
formats[elements[i].argNumber] = elements[i].format;
|
|
}
|
|
return formats;
|
|
}
|
|
|
|
/**
|
|
* Set the format to used using the argument index number.
|
|
*
|
|
* @param argumentIndex the argument index.
|
|
* @param newFormat the format to use for this argument.
|
|
*/
|
|
public void setFormatByArgumentIndex(int argumentIndex,
|
|
Format newFormat)
|
|
{
|
|
for (int i=0;i<elements.length;i++)
|
|
{
|
|
if (elements[i].argNumber == argumentIndex)
|
|
elements[i].setFormat = newFormat;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Set the format for argument using a specified array of formatters
|
|
* which is sorted according to the argument index. If the number of
|
|
* elements in the array is fewer than the number of arguments only
|
|
* the arguments specified by the array are touched.
|
|
*
|
|
* @param newFormats array containing the new formats to set.
|
|
*
|
|
* @throws NullPointerException if newFormats is null
|
|
*/
|
|
public void setFormatsByArgumentIndex(Format[] newFormats)
|
|
{
|
|
for (int i=0;i<newFormats.length;i++)
|
|
{
|
|
// Nothing better than that can exist here.
|
|
setFormatByArgumentIndex(i, newFormats[i]);
|
|
}
|
|
}
|
|
|
|
// The pattern string.
|
|
private String pattern;
|
|
// The locale.
|
|
private Locale locale;
|
|
// Variables.
|
|
private MessageFormatElement[] elements;
|
|
// Leader text.
|
|
private String leader;
|
|
}
|