
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
625 lines
21 KiB
Java
625 lines
21 KiB
Java
/* ResourceBundle -- aids in loading resource bundles
|
|
Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2006
|
|
Free Software Foundation, Inc.
|
|
|
|
This file is part of GNU Classpath.
|
|
|
|
GNU Classpath is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
GNU Classpath is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Classpath; see the file COPYING. If not, write to the
|
|
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
02110-1301 USA.
|
|
|
|
Linking this library statically or dynamically with other modules is
|
|
making a combined work based on this library. Thus, the terms and
|
|
conditions of the GNU General Public License cover the whole
|
|
combination.
|
|
|
|
As a special exception, the copyright holders of this library give you
|
|
permission to link this library with independent modules to produce an
|
|
executable, regardless of the license terms of these independent
|
|
modules, and to copy and distribute the resulting executable under
|
|
terms of your choice, provided that you also meet, for each linked
|
|
independent module, the terms and conditions of the license of that
|
|
module. An independent module is a module which is not derived from
|
|
or based on this library. If you modify this library, you may extend
|
|
this exception to your version of the library, but you are not
|
|
obligated to do so. If you do not wish to do so, delete this
|
|
exception statement from your version. */
|
|
|
|
|
|
package java.util;
|
|
|
|
import gnu.classpath.VMStackWalker;
|
|
|
|
import gnu.java.lang.CPStringBuilder;
|
|
|
|
import java.io.IOException;
|
|
import java.io.InputStream;
|
|
|
|
/**
|
|
* A resource bundle contains locale-specific data. If you need localized
|
|
* data, you can load a resource bundle that matches the locale with
|
|
* <code>getBundle</code>. Now you can get your object by calling
|
|
* <code>getObject</code> or <code>getString</code> on that bundle.
|
|
*
|
|
* <p>When a bundle is demanded for a specific locale, the ResourceBundle
|
|
* is searched in following order (<i>def. language</i> stands for the
|
|
* two letter ISO language code of the default locale (see
|
|
* <code>Locale.getDefault()</code>).
|
|
*
|
|
<pre>baseName_<i>language code</i>_<i>country code</i>_<i>variant</i>
|
|
baseName_<i>language code</i>_<i>country code</i>
|
|
baseName_<i>language code</i>
|
|
baseName_<i>def. language</i>_<i>def. country</i>_<i>def. variant</i>
|
|
baseName_<i>def. language</i>_<i>def. country</i>
|
|
baseName_<i>def. language</i>
|
|
baseName</pre>
|
|
*
|
|
* <p>A bundle is backed up by less specific bundles (omitting variant, country
|
|
* or language). But it is not backed up by the default language locale.
|
|
*
|
|
* <p>If you provide a bundle for a given locale, say
|
|
* <code>Bundle_en_UK_POSIX</code>, you must also provide a bundle for
|
|
* all sub locales, ie. <code>Bundle_en_UK</code>, <code>Bundle_en</code>, and
|
|
* <code>Bundle</code>.
|
|
*
|
|
* <p>When a bundle is searched, we look first for a class with the given
|
|
* name, then for a file with <code>.properties</code> extension in the
|
|
* classpath. The name must be a fully qualified classname (with dots as
|
|
* path separators).
|
|
*
|
|
* <p>(Note: This implementation always backs up the class with a properties
|
|
* file if that is existing, but you shouldn't rely on this, if you want to
|
|
* be compatible to the standard JDK.)
|
|
*
|
|
* @author Jochen Hoenicke
|
|
* @author Eric Blake (ebb9@email.byu.edu)
|
|
* @see Locale
|
|
* @see ListResourceBundle
|
|
* @see PropertyResourceBundle
|
|
* @since 1.1
|
|
* @status updated to 1.4
|
|
*/
|
|
public abstract class ResourceBundle
|
|
{
|
|
/**
|
|
* Maximum size of our cache of <code>ResourceBundle</code>s keyed by
|
|
* {@link BundleKey} instances.
|
|
*
|
|
* @see BundleKey
|
|
*/
|
|
private static final int CACHE_SIZE = 100;
|
|
|
|
/**
|
|
* The parent bundle. This is consulted when you call getObject and there
|
|
* is no such resource in the current bundle. This field may be null.
|
|
*/
|
|
protected ResourceBundle parent;
|
|
|
|
/**
|
|
* The locale of this resource bundle. You can read this with
|
|
* <code>getLocale</code> and it is automatically set in
|
|
* <code>getBundle</code>.
|
|
*/
|
|
private Locale locale;
|
|
|
|
/**
|
|
* A VM-wide cache of resource bundles already fetched.
|
|
* <p>
|
|
* This {@link Map} is a Least Recently Used (LRU) cache, of the last
|
|
* {@link #CACHE_SIZE} accessed <code>ResourceBundle</code>s keyed by the
|
|
* tuple: default locale, resource-bundle name, resource-bundle locale, and
|
|
* classloader.
|
|
*
|
|
* @see BundleKey
|
|
*/
|
|
private static Map<BundleKey,Object> bundleCache =
|
|
new LinkedHashMap<BundleKey,Object>(CACHE_SIZE + 1, 0.75F, true)
|
|
{
|
|
public boolean removeEldestEntry(Map.Entry<BundleKey,Object> entry)
|
|
{
|
|
return size() > CACHE_SIZE;
|
|
}
|
|
};
|
|
|
|
/**
|
|
* The constructor. It does nothing special.
|
|
*/
|
|
public ResourceBundle()
|
|
{
|
|
}
|
|
|
|
/**
|
|
* Get a String from this resource bundle. Since most localized Objects
|
|
* are Strings, this method provides a convenient way to get them without
|
|
* casting.
|
|
*
|
|
* @param key the name of the resource
|
|
* @throws MissingResourceException if the resource can't be found
|
|
* @throws NullPointerException if key is null
|
|
* @throws ClassCastException if resource is not a string
|
|
*/
|
|
public final String getString(String key)
|
|
{
|
|
return (String) getObject(key);
|
|
}
|
|
|
|
/**
|
|
* Get an array of Strings from this resource bundle. This method
|
|
* provides a convenient way to get it without casting.
|
|
*
|
|
* @param key the name of the resource
|
|
* @throws MissingResourceException if the resource can't be found
|
|
* @throws NullPointerException if key is null
|
|
* @throws ClassCastException if resource is not a string
|
|
*/
|
|
public final String[] getStringArray(String key)
|
|
{
|
|
return (String[]) getObject(key);
|
|
}
|
|
|
|
/**
|
|
* Get an object from this resource bundle. This will call
|
|
* <code>handleGetObject</code> for this resource and all of its parents,
|
|
* until it finds a non-null resource.
|
|
*
|
|
* @param key the name of the resource
|
|
* @throws MissingResourceException if the resource can't be found
|
|
* @throws NullPointerException if key is null
|
|
*/
|
|
public final Object getObject(String key)
|
|
{
|
|
for (ResourceBundle bundle = this; bundle != null; bundle = bundle.parent)
|
|
{
|
|
Object o = bundle.handleGetObject(key);
|
|
if (o != null)
|
|
return o;
|
|
}
|
|
|
|
String className = getClass().getName();
|
|
throw new MissingResourceException("Key '" + key
|
|
+ "'not found in Bundle: "
|
|
+ className, className, key);
|
|
}
|
|
|
|
/**
|
|
* Return the actual locale of this bundle. You can use it after calling
|
|
* getBundle, to know if the bundle for the desired locale was loaded or
|
|
* if the fall back was used.
|
|
*
|
|
* @return the bundle's locale
|
|
*/
|
|
public Locale getLocale()
|
|
{
|
|
return locale;
|
|
}
|
|
|
|
/**
|
|
* Set the parent of this bundle. The parent is consulted when you call
|
|
* getObject and there is no such resource in the current bundle.
|
|
*
|
|
* @param parent the parent of this bundle
|
|
*/
|
|
protected void setParent(ResourceBundle parent)
|
|
{
|
|
this.parent = parent;
|
|
}
|
|
|
|
/**
|
|
* Get the appropriate ResourceBundle for the default locale. This is like
|
|
* calling <code>getBundle(baseName, Locale.getDefault(),
|
|
* getClass().getClassLoader()</code>, except that any security check of
|
|
* getClassLoader won't fail.
|
|
*
|
|
* @param baseName the name of the ResourceBundle
|
|
* @return the desired resource bundle
|
|
* @throws MissingResourceException if the resource bundle can't be found
|
|
* @throws NullPointerException if baseName is null
|
|
*/
|
|
public static ResourceBundle getBundle(String baseName)
|
|
{
|
|
ClassLoader cl = VMStackWalker.getCallingClassLoader();
|
|
if (cl == null)
|
|
cl = ClassLoader.getSystemClassLoader();
|
|
return getBundle(baseName, Locale.getDefault(), cl);
|
|
}
|
|
|
|
/**
|
|
* Get the appropriate ResourceBundle for the given locale. This is like
|
|
* calling <code>getBundle(baseName, locale,
|
|
* getClass().getClassLoader()</code>, except that any security check of
|
|
* getClassLoader won't fail.
|
|
*
|
|
* @param baseName the name of the ResourceBundle
|
|
* @param locale A locale
|
|
* @return the desired resource bundle
|
|
* @throws MissingResourceException if the resource bundle can't be found
|
|
* @throws NullPointerException if baseName or locale is null
|
|
*/
|
|
public static ResourceBundle getBundle(String baseName, Locale locale)
|
|
{
|
|
ClassLoader cl = VMStackWalker.getCallingClassLoader();
|
|
if (cl == null)
|
|
cl = ClassLoader.getSystemClassLoader();
|
|
return getBundle(baseName, locale, cl);
|
|
}
|
|
|
|
/** Cache key for the ResourceBundle cache. Resource bundles are keyed
|
|
by the combination of bundle name, locale, and class loader. */
|
|
private static class BundleKey
|
|
{
|
|
Locale defaultLocale;
|
|
String baseName;
|
|
Locale locale;
|
|
ClassLoader classLoader;
|
|
int hashcode;
|
|
|
|
BundleKey() {}
|
|
|
|
BundleKey(Locale dl, String s, Locale l, ClassLoader cl)
|
|
{
|
|
set(dl, s, l, cl);
|
|
}
|
|
|
|
void set(Locale dl, String s, Locale l, ClassLoader cl)
|
|
{
|
|
defaultLocale = dl;
|
|
baseName = s;
|
|
locale = l;
|
|
classLoader = cl;
|
|
hashcode = defaultLocale.hashCode() ^ baseName.hashCode()
|
|
^ locale.hashCode() ^ classLoader.hashCode();
|
|
}
|
|
|
|
public int hashCode()
|
|
{
|
|
return hashcode;
|
|
}
|
|
|
|
public boolean equals(Object o)
|
|
{
|
|
if (! (o instanceof BundleKey))
|
|
return false;
|
|
BundleKey key = (BundleKey) o;
|
|
return hashcode == key.hashcode
|
|
&& defaultLocale.equals(key.defaultLocale)
|
|
&& baseName.equals(key.baseName)
|
|
&& locale.equals(key.locale)
|
|
&& classLoader.equals(key.classLoader);
|
|
}
|
|
|
|
public String toString()
|
|
{
|
|
CPStringBuilder builder = new CPStringBuilder(getClass().getName());
|
|
builder.append("[defaultLocale=");
|
|
builder.append(defaultLocale);
|
|
builder.append(",baseName=");
|
|
builder.append(baseName);
|
|
builder.append(",locale=");
|
|
builder.append(locale);
|
|
builder.append(",classLoader=");
|
|
builder.append(classLoader);
|
|
builder.append("]");
|
|
return builder.toString();
|
|
}
|
|
}
|
|
|
|
/** A cache lookup key. This avoids having to a new one for every
|
|
* getBundle() call. */
|
|
private static final BundleKey lookupKey = new BundleKey();
|
|
|
|
/** Singleton cache entry to represent previous failed lookups. */
|
|
private static final Object nullEntry = new Object();
|
|
|
|
/**
|
|
* Get the appropriate ResourceBundle for the given locale. The following
|
|
* strategy is used:
|
|
*
|
|
* <p>A sequence of candidate bundle names are generated, and tested in
|
|
* this order, where the suffix 1 means the string from the specified
|
|
* locale, and the suffix 2 means the string from the default locale:</p>
|
|
*
|
|
* <ul>
|
|
* <li>baseName + "_" + language1 + "_" + country1 + "_" + variant1</li>
|
|
* <li>baseName + "_" + language1 + "_" + country1</li>
|
|
* <li>baseName + "_" + language1</li>
|
|
* <li>baseName + "_" + language2 + "_" + country2 + "_" + variant2</li>
|
|
* <li>baseName + "_" + language2 + "_" + country2</li>
|
|
* <li>baseName + "_" + language2</li>
|
|
* <li>baseName</li>
|
|
* </ul>
|
|
*
|
|
* <p>In the sequence, entries with an empty string are ignored. Next,
|
|
* <code>getBundle</code> tries to instantiate the resource bundle:</p>
|
|
*
|
|
* <ul>
|
|
* <li>First, an attempt is made to load a class in the specified classloader
|
|
* which is a subclass of ResourceBundle, and which has a public constructor
|
|
* with no arguments, via reflection.</li>
|
|
* <li>Next, a search is made for a property resource file, by replacing
|
|
* '.' with '/' and appending ".properties", and using
|
|
* ClassLoader.getResource(). If a file is found, then a
|
|
* PropertyResourceBundle is created from the file's contents.</li>
|
|
* </ul>
|
|
* If no resource bundle was found, a MissingResourceException is thrown.
|
|
*
|
|
* <p>Next, the parent chain is implemented. The remaining candidate names
|
|
* in the above sequence are tested in a similar manner, and if any results
|
|
* in a resource bundle, it is assigned as the parent of the first bundle
|
|
* using the <code>setParent</code> method (unless the first bundle already
|
|
* has a parent).</p>
|
|
*
|
|
* <p>For example, suppose the following class and property files are
|
|
* provided: MyResources.class, MyResources_fr_CH.properties,
|
|
* MyResources_fr_CH.class, MyResources_fr.properties,
|
|
* MyResources_en.properties, and MyResources_es_ES.class. The contents of
|
|
* all files are valid (that is, public non-abstract subclasses of
|
|
* ResourceBundle with public nullary constructors for the ".class" files,
|
|
* syntactically correct ".properties" files). The default locale is
|
|
* Locale("en", "UK").</p>
|
|
*
|
|
* <p>Calling getBundle with the shown locale argument values instantiates
|
|
* resource bundles from the following sources:</p>
|
|
*
|
|
* <ul>
|
|
* <li>Locale("fr", "CH"): result MyResources_fr_CH.class, parent
|
|
* MyResources_fr.properties, parent MyResources.class</li>
|
|
* <li>Locale("fr", "FR"): result MyResources_fr.properties, parent
|
|
* MyResources.class</li>
|
|
* <li>Locale("de", "DE"): result MyResources_en.properties, parent
|
|
* MyResources.class</li>
|
|
* <li>Locale("en", "US"): result MyResources_en.properties, parent
|
|
* MyResources.class</li>
|
|
* <li>Locale("es", "ES"): result MyResources_es_ES.class, parent
|
|
* MyResources.class</li>
|
|
* </ul>
|
|
*
|
|
* <p>The file MyResources_fr_CH.properties is never used because it is hidden
|
|
* by MyResources_fr_CH.class.</p>
|
|
*
|
|
* @param baseName the name of the ResourceBundle
|
|
* @param locale A locale
|
|
* @param classLoader a ClassLoader
|
|
* @return the desired resource bundle
|
|
* @throws MissingResourceException if the resource bundle can't be found
|
|
* @throws NullPointerException if any argument is null
|
|
* @since 1.2
|
|
*/
|
|
// This method is synchronized so that the cache is properly
|
|
// handled.
|
|
public static synchronized ResourceBundle getBundle
|
|
(String baseName, Locale locale, ClassLoader classLoader)
|
|
{
|
|
Locale defaultLocale = Locale.getDefault();
|
|
// This will throw NullPointerException if any arguments are null.
|
|
lookupKey.set(defaultLocale, baseName, locale, classLoader);
|
|
Object obj = bundleCache.get(lookupKey);
|
|
if (obj instanceof ResourceBundle)
|
|
return (ResourceBundle) obj;
|
|
|
|
if (obj == nullEntry)
|
|
throw new MissingResourceException("Bundle " + baseName
|
|
+ " not found for locale " + locale
|
|
+ " by classloader " + classLoader,
|
|
baseName, "");
|
|
// First, look for a bundle for the specified locale. We don't want
|
|
// the base bundle this time.
|
|
boolean wantBase = locale.equals(defaultLocale);
|
|
ResourceBundle bundle = tryBundle(baseName, locale, classLoader, wantBase);
|
|
// Try the default locale if neccessary.
|
|
if (bundle == null && ! wantBase)
|
|
bundle = tryBundle(baseName, defaultLocale, classLoader, true);
|
|
|
|
BundleKey key = new BundleKey(defaultLocale, baseName, locale, classLoader);
|
|
if (bundle == null)
|
|
{
|
|
// Cache the fact that this lookup has previously failed.
|
|
bundleCache.put(key, nullEntry);
|
|
throw new MissingResourceException("Bundle " + baseName
|
|
+ " not found for locale " + locale
|
|
+ " by classloader " + classLoader,
|
|
baseName, "");
|
|
}
|
|
// Cache the result and return it.
|
|
bundleCache.put(key, bundle);
|
|
return bundle;
|
|
}
|
|
|
|
/**
|
|
* Override this method to provide the resource for a keys. This gets
|
|
* called by <code>getObject</code>. If you don't have a resource
|
|
* for the given key, you should return null instead throwing a
|
|
* MissingResourceException. You don't have to ask the parent, getObject()
|
|
* already does this; nor should you throw a MissingResourceException.
|
|
*
|
|
* @param key the key of the resource
|
|
* @return the resource for the key, or null if not in bundle
|
|
* @throws NullPointerException if key is null
|
|
*/
|
|
protected abstract Object handleGetObject(String key);
|
|
|
|
/**
|
|
* This method should return all keys for which a resource exists; you
|
|
* should include the enumeration of any parent's keys, after filtering out
|
|
* duplicates.
|
|
*
|
|
* @return an enumeration of the keys
|
|
*/
|
|
public abstract Enumeration<String> getKeys();
|
|
|
|
/**
|
|
* Tries to load a class or a property file with the specified name.
|
|
*
|
|
* @param localizedName the name
|
|
* @param classloader the classloader
|
|
* @return the resource bundle if it was loaded, otherwise the backup
|
|
*/
|
|
private static ResourceBundle tryBundle(String localizedName,
|
|
ClassLoader classloader)
|
|
{
|
|
ResourceBundle bundle = null;
|
|
try
|
|
{
|
|
Class<?> rbClass;
|
|
if (classloader == null)
|
|
rbClass = Class.forName(localizedName);
|
|
else
|
|
rbClass = classloader.loadClass(localizedName);
|
|
// Note that we do the check up front instead of catching
|
|
// ClassCastException. The reason for this is that some crazy
|
|
// programs (Eclipse) have classes that do not extend
|
|
// ResourceBundle but that have the same name as a property
|
|
// bundle; in fact Eclipse relies on ResourceBundle not
|
|
// instantiating these classes.
|
|
if (ResourceBundle.class.isAssignableFrom(rbClass))
|
|
bundle = (ResourceBundle) rbClass.newInstance();
|
|
}
|
|
catch (Exception ex) {}
|
|
|
|
if (bundle == null)
|
|
{
|
|
try
|
|
{
|
|
InputStream is;
|
|
String resourceName
|
|
= localizedName.replace('.', '/') + ".properties";
|
|
if (classloader == null)
|
|
is = ClassLoader.getSystemResourceAsStream(resourceName);
|
|
else
|
|
is = classloader.getResourceAsStream(resourceName);
|
|
if (is != null)
|
|
bundle = new PropertyResourceBundle(is);
|
|
}
|
|
catch (IOException ex)
|
|
{
|
|
MissingResourceException mre = new MissingResourceException
|
|
("Failed to load bundle: " + localizedName, localizedName, "");
|
|
mre.initCause(ex);
|
|
throw mre;
|
|
}
|
|
}
|
|
|
|
return bundle;
|
|
}
|
|
|
|
/**
|
|
* Tries to load the bundle for a given locale, also loads the backup
|
|
* locales with the same language.
|
|
*
|
|
* @param baseName the raw bundle name, without locale qualifiers
|
|
* @param locale the locale
|
|
* @param classLoader the classloader
|
|
* @param wantBase whether a resource bundle made only from the base name
|
|
* (with no locale information attached) should be returned.
|
|
* @return the resource bundle if it was loaded, otherwise the backup
|
|
*/
|
|
private static ResourceBundle tryBundle(String baseName, Locale locale,
|
|
ClassLoader classLoader,
|
|
boolean wantBase)
|
|
{
|
|
String language = locale.getLanguage();
|
|
String country = locale.getCountry();
|
|
String variant = locale.getVariant();
|
|
|
|
int baseLen = baseName.length();
|
|
|
|
// Build up a CPStringBuilder containing the complete bundle name, fully
|
|
// qualified by locale.
|
|
CPStringBuilder sb = new CPStringBuilder(baseLen + variant.length() + 7);
|
|
|
|
sb.append(baseName);
|
|
|
|
if (language.length() > 0)
|
|
{
|
|
sb.append('_');
|
|
sb.append(language);
|
|
|
|
if (country.length() > 0)
|
|
{
|
|
sb.append('_');
|
|
sb.append(country);
|
|
|
|
if (variant.length() > 0)
|
|
{
|
|
sb.append('_');
|
|
sb.append(variant);
|
|
}
|
|
}
|
|
}
|
|
|
|
// Now try to load bundles, starting with the most specialized name.
|
|
// Build up the parent chain as we go.
|
|
String bundleName = sb.toString();
|
|
ResourceBundle first = null; // The most specialized bundle.
|
|
ResourceBundle last = null; // The least specialized bundle.
|
|
|
|
while (true)
|
|
{
|
|
ResourceBundle foundBundle = tryBundle(bundleName, classLoader);
|
|
if (foundBundle != null)
|
|
{
|
|
if (first == null)
|
|
first = foundBundle;
|
|
if (last != null)
|
|
last.parent = foundBundle;
|
|
foundBundle.locale = locale;
|
|
last = foundBundle;
|
|
}
|
|
int idx = bundleName.lastIndexOf('_');
|
|
// Try the non-localized base name only if we already have a
|
|
// localized child bundle, or wantBase is true.
|
|
if (idx > baseLen || (idx == baseLen && (first != null || wantBase)))
|
|
bundleName = bundleName.substring(0, idx);
|
|
else
|
|
break;
|
|
}
|
|
|
|
return first;
|
|
}
|
|
|
|
/**
|
|
* Remove all resources from the cache that were loaded
|
|
* using the class loader of the calling class.
|
|
*
|
|
* @since 1.6
|
|
*/
|
|
public static final void clearCache()
|
|
{
|
|
clearCache(VMStackWalker.getCallingClassLoader());
|
|
}
|
|
|
|
/**
|
|
* Remove all resources from the cache that were loaded
|
|
* using the specified class loader.
|
|
*
|
|
* @param loader the loader used for the bundles that will be removed.
|
|
* @throws NullPointerException if {@code loader} is {@code null}.
|
|
* @since 1.6
|
|
*/
|
|
public static final void clearCache(ClassLoader loader)
|
|
{
|
|
if (loader == null)
|
|
throw new NullPointerException("The loader can not be null.");
|
|
synchronized (ResourceBundle.class)
|
|
{
|
|
Iterator<BundleKey> iter = bundleCache.keySet().iterator();
|
|
while (iter.hasNext())
|
|
{
|
|
BundleKey key = iter.next();
|
|
if (key.classLoader == loader)
|
|
iter.remove();
|
|
}
|
|
}
|
|
}
|
|
|
|
}
|