
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
1029 lines
33 KiB
Java
1029 lines
33 KiB
Java
/* Locale.java -- i18n locales
|
|
Copyright (C) 1998, 1999, 2001, 2002, 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.SystemProperties;
|
|
|
|
import gnu.java.lang.CPStringBuilder;
|
|
|
|
import gnu.java.locale.LocaleHelper;
|
|
|
|
import java.io.IOException;
|
|
import java.io.ObjectInputStream;
|
|
import java.io.ObjectOutputStream;
|
|
import java.io.Serializable;
|
|
|
|
import java.util.spi.LocaleNameProvider;
|
|
|
|
/**
|
|
* Locales represent a specific country and culture. Classes which can be
|
|
* passed a Locale object tailor their information for a given locale. For
|
|
* instance, currency number formatting is handled differently for the USA
|
|
* and France.
|
|
*
|
|
* <p>Locales are made up of a language code, a country code, and an optional
|
|
* set of variant strings. Language codes are represented by
|
|
* <a href="http://www.ics.uci.edu/pub/ietf/http/related/iso639.txt">
|
|
* ISO 639:1988</a> w/ additions from ISO 639/RA Newsletter No. 1/1989
|
|
* and a decision of the Advisory Committee of ISO/TC39 on August 8, 1997.
|
|
*
|
|
* <p>Country codes are represented by
|
|
* <a href="http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html">
|
|
* ISO 3166</a>. Variant strings are vendor and browser specific. Standard
|
|
* variant strings include "POSIX" for POSIX, "WIN" for MS-Windows, and
|
|
* "MAC" for Macintosh. When there is more than one variant string, they must
|
|
* be separated by an underscore (U+005F).
|
|
*
|
|
* <p>The default locale is determined by the values of the system properties
|
|
* user.language, user.country (or user.region), and user.variant, defaulting
|
|
* to "en_US". Note that the locale does NOT contain the conversion and
|
|
* formatting capabilities (for that, use ResourceBundle and java.text).
|
|
* Rather, it is an immutable tag object for identifying a given locale, which
|
|
* is referenced by these other classes when they must make locale-dependent
|
|
* decisions.
|
|
*
|
|
* @see ResourceBundle
|
|
* @see java.text.Format
|
|
* @see java.text.NumberFormat
|
|
* @see java.text.Collator
|
|
* @author Jochen Hoenicke
|
|
* @author Paul Fisher
|
|
* @author Eric Blake (ebb9@email.byu.edu)
|
|
* @author Andrew John Hughes (gnu_andrew@member.fsf.org)
|
|
* @since 1.1
|
|
* @status updated to 1.4
|
|
*/
|
|
public final class Locale implements Serializable, Cloneable
|
|
{
|
|
/** Locale which represents the English language. */
|
|
public static final Locale ENGLISH = getLocale("en");
|
|
|
|
/** Locale which represents the French language. */
|
|
public static final Locale FRENCH = getLocale("fr");
|
|
|
|
/** Locale which represents the German language. */
|
|
public static final Locale GERMAN = getLocale("de");
|
|
|
|
/** Locale which represents the Italian language. */
|
|
public static final Locale ITALIAN = getLocale("it");
|
|
|
|
/** Locale which represents the Japanese language. */
|
|
public static final Locale JAPANESE = getLocale("ja");
|
|
|
|
/** Locale which represents the Korean language. */
|
|
public static final Locale KOREAN = getLocale("ko");
|
|
|
|
/** Locale which represents the Chinese language. */
|
|
public static final Locale CHINESE = getLocale("zh");
|
|
|
|
/** Locale which represents the Chinese language as used in China. */
|
|
public static final Locale SIMPLIFIED_CHINESE = getLocale("zh", "CN");
|
|
|
|
/**
|
|
* Locale which represents the Chinese language as used in Taiwan.
|
|
* Same as TAIWAN Locale.
|
|
*/
|
|
public static final Locale TRADITIONAL_CHINESE = getLocale("zh", "TW");
|
|
|
|
/** Locale which represents France. */
|
|
public static final Locale FRANCE = getLocale("fr", "FR");
|
|
|
|
/** Locale which represents Germany. */
|
|
public static final Locale GERMANY = getLocale("de", "DE");
|
|
|
|
/** Locale which represents Italy. */
|
|
public static final Locale ITALY = getLocale("it", "IT");
|
|
|
|
/** Locale which represents Japan. */
|
|
public static final Locale JAPAN = getLocale("ja", "JP");
|
|
|
|
/** Locale which represents Korea. */
|
|
public static final Locale KOREA = getLocale("ko", "KR");
|
|
|
|
/**
|
|
* Locale which represents China.
|
|
* Same as SIMPLIFIED_CHINESE Locale.
|
|
*/
|
|
public static final Locale CHINA = SIMPLIFIED_CHINESE;
|
|
|
|
/**
|
|
* Locale which represents the People's Republic of China.
|
|
* Same as CHINA Locale.
|
|
*/
|
|
public static final Locale PRC = CHINA;
|
|
|
|
/**
|
|
* Locale which represents Taiwan.
|
|
* Same as TRADITIONAL_CHINESE Locale.
|
|
*/
|
|
public static final Locale TAIWAN = TRADITIONAL_CHINESE;
|
|
|
|
/** Locale which represents the United Kingdom. */
|
|
public static final Locale UK = getLocale("en", "GB");
|
|
|
|
/** Locale which represents the United States. */
|
|
public static final Locale US = getLocale("en", "US");
|
|
|
|
/** Locale which represents the English speaking portion of Canada. */
|
|
public static final Locale CANADA = getLocale("en", "CA");
|
|
|
|
/** Locale which represents the French speaking portion of Canada. */
|
|
public static final Locale CANADA_FRENCH = getLocale("fr", "CA");
|
|
|
|
/** The root locale, used as the base case in lookups by
|
|
* locale-sensitive operations.
|
|
*/
|
|
public static final Locale ROOT = new Locale("","","");
|
|
|
|
/**
|
|
* Compatible with JDK 1.1+.
|
|
*/
|
|
private static final long serialVersionUID = 9149081749638150636L;
|
|
|
|
/**
|
|
* The language code, as returned by getLanguage().
|
|
*
|
|
* @serial the languange, possibly ""
|
|
*/
|
|
private final String language;
|
|
|
|
/**
|
|
* The country code, as returned by getCountry().
|
|
*
|
|
* @serial the country, possibly ""
|
|
*/
|
|
private final String country;
|
|
|
|
/**
|
|
* The variant code, as returned by getVariant().
|
|
*
|
|
* @serial the variant, possibly ""
|
|
*/
|
|
private final String variant;
|
|
|
|
/**
|
|
* This is the cached hashcode. When writing to stream, we write -1.
|
|
*
|
|
* @serial should be -1 in serial streams
|
|
*/
|
|
private int hashcode;
|
|
|
|
/**
|
|
* Array storing all available locales.
|
|
*/
|
|
private static transient Locale[] availableLocales;
|
|
|
|
/**
|
|
* Locale cache. Only created locale objects are stored.
|
|
* Contains all supported locales when getAvailableLocales()
|
|
* got called.
|
|
*/
|
|
private static transient HashMap localeMap;
|
|
|
|
/**
|
|
* The default locale. Except for during bootstrapping, this should never be
|
|
* null. Note the logic in the main constructor, to detect when
|
|
* bootstrapping has completed.
|
|
*/
|
|
private static Locale defaultLocale;
|
|
|
|
static {
|
|
String language = SystemProperties.getProperty("user.language", "en");
|
|
String country = SystemProperties.getProperty("user.country", "US");
|
|
String region = SystemProperties.getProperty("user.region", null);
|
|
String variant = SystemProperties.getProperty("user.variant", "");
|
|
|
|
defaultLocale = getLocale(language,
|
|
(region != null) ? region : country,
|
|
variant);
|
|
}
|
|
|
|
/**
|
|
* Array storing all the available two-letter ISO639 languages.
|
|
*/
|
|
private static transient String[] languageCache;
|
|
|
|
/**
|
|
* Array storing all the available two-letter ISO3166 country codes.
|
|
*/
|
|
private static transient String[] countryCache;
|
|
|
|
/**
|
|
* Retrieves the locale with the specified language from the cache.
|
|
*
|
|
* @param language the language of the locale to retrieve.
|
|
* @return the locale.
|
|
*/
|
|
private static Locale getLocale(String language)
|
|
{
|
|
return getLocale(language, "", "");
|
|
}
|
|
|
|
/**
|
|
* Retrieves the locale with the specified language and country
|
|
* from the cache.
|
|
*
|
|
* @param language the language of the locale to retrieve.
|
|
* @param country the country of the locale to retrieve.
|
|
* @return the locale.
|
|
*/
|
|
private static Locale getLocale(String language, String country)
|
|
{
|
|
return getLocale(language, country, "");
|
|
}
|
|
|
|
/**
|
|
* Retrieves the locale with the specified language, country
|
|
* and variant from the cache.
|
|
*
|
|
* @param language the language of the locale to retrieve.
|
|
* @param country the country of the locale to retrieve.
|
|
* @param variant the variant of the locale to retrieve.
|
|
* @return the locale.
|
|
*/
|
|
private static Locale getLocale(String language, String country, String variant)
|
|
{
|
|
if (localeMap == null)
|
|
localeMap = new HashMap(256);
|
|
|
|
String name = language + "_" + country + "_" + variant;
|
|
Locale locale = (Locale) localeMap.get(name);
|
|
|
|
if (locale == null)
|
|
{
|
|
locale = new Locale(language, country, variant);
|
|
localeMap.put(name, locale);
|
|
}
|
|
|
|
return locale;
|
|
}
|
|
|
|
/**
|
|
* Convert new iso639 codes to the old ones.
|
|
*
|
|
* @param language the language to check
|
|
* @return the appropriate code
|
|
*/
|
|
private String convertLanguage(String language)
|
|
{
|
|
if (language.equals(""))
|
|
return language;
|
|
language = language.toLowerCase();
|
|
int index = "he,id,yi".indexOf(language);
|
|
if (index != -1)
|
|
return "iw,in,ji".substring(index, index + 2);
|
|
return language;
|
|
}
|
|
|
|
/**
|
|
* Creates a new locale for the given language and country.
|
|
*
|
|
* @param language lowercase two-letter ISO-639 A2 language code
|
|
* @param country uppercase two-letter ISO-3166 A2 contry code
|
|
* @param variant vendor and browser specific
|
|
* @throws NullPointerException if any argument is null
|
|
*/
|
|
public Locale(String language, String country, String variant)
|
|
{
|
|
// During bootstrap, we already know the strings being passed in are
|
|
// the correct capitalization, and not null. We can't call
|
|
// String.toUpperCase during this time, since that depends on the
|
|
// default locale.
|
|
if (defaultLocale != null)
|
|
{
|
|
language = convertLanguage(language);
|
|
country = country.toUpperCase();
|
|
}
|
|
this.language = language.intern();
|
|
this.country = country.intern();
|
|
this.variant = variant.intern();
|
|
hashcode = language.hashCode() ^ country.hashCode() ^ variant.hashCode();
|
|
}
|
|
|
|
/**
|
|
* Creates a new locale for the given language and country.
|
|
*
|
|
* @param language lowercase two-letter ISO-639 A2 language code
|
|
* @param country uppercase two-letter ISO-3166 A2 country code
|
|
* @throws NullPointerException if either argument is null
|
|
*/
|
|
public Locale(String language, String country)
|
|
{
|
|
this(language, country, "");
|
|
}
|
|
|
|
/**
|
|
* Creates a new locale for a language.
|
|
*
|
|
* @param language lowercase two-letter ISO-639 A2 language code
|
|
* @throws NullPointerException if either argument is null
|
|
* @since 1.4
|
|
*/
|
|
public Locale(String language)
|
|
{
|
|
this(language, "", "");
|
|
}
|
|
|
|
/**
|
|
* Returns the default Locale. The default locale is generally once set
|
|
* on start up and then never changed. Normally you should use this locale
|
|
* for everywhere you need a locale. The initial setting matches the
|
|
* default locale, the user has chosen.
|
|
*
|
|
* @return the default locale for this virtual machine
|
|
*/
|
|
public static Locale getDefault()
|
|
{
|
|
return defaultLocale;
|
|
}
|
|
|
|
/**
|
|
* Changes the default locale. Normally only called on program start up.
|
|
* Note that this doesn't change the locale for other programs. This has
|
|
* a security check,
|
|
* <code>PropertyPermission("user.language", "write")</code>, because of
|
|
* its potential impact to running code.
|
|
*
|
|
* @param newLocale the new default locale
|
|
* @throws NullPointerException if newLocale is null
|
|
* @throws SecurityException if permission is denied
|
|
*/
|
|
public static void setDefault(Locale newLocale)
|
|
{
|
|
if (newLocale == null)
|
|
throw new NullPointerException();
|
|
SecurityManager sm = System.getSecurityManager();
|
|
if (sm != null)
|
|
sm.checkPermission(new PropertyPermission("user.language", "write"));
|
|
defaultLocale = newLocale;
|
|
}
|
|
|
|
/**
|
|
* Returns the list of available locales.
|
|
*
|
|
* @return the installed locales
|
|
*/
|
|
public static synchronized Locale[] getAvailableLocales()
|
|
{
|
|
if (availableLocales == null)
|
|
{
|
|
int len = LocaleHelper.getLocaleCount();
|
|
availableLocales = new Locale[len];
|
|
|
|
for (int i = 0; i < len; i++)
|
|
{
|
|
String language;
|
|
String country = "";
|
|
String variant = "";
|
|
String name = LocaleHelper.getLocaleName(i);
|
|
|
|
language = name.substring(0, 2);
|
|
|
|
if (name.length() > 2)
|
|
country = name.substring(3);
|
|
|
|
int index = country.indexOf("_");
|
|
if (index > 0)
|
|
{
|
|
variant = country.substring(index + 1);
|
|
country = country.substring(0, index - 1);
|
|
}
|
|
|
|
availableLocales[i] = getLocale(language, country, variant);
|
|
}
|
|
}
|
|
|
|
return (Locale[]) availableLocales.clone();
|
|
}
|
|
|
|
/**
|
|
* Returns a list of all 2-letter uppercase country codes as defined
|
|
* in ISO 3166.
|
|
*
|
|
* @return a list of acceptable country codes
|
|
*/
|
|
public static String[] getISOCountries()
|
|
{
|
|
if (countryCache == null)
|
|
{
|
|
countryCache = getISOStrings("territories");
|
|
}
|
|
|
|
return (String[]) countryCache.clone();
|
|
}
|
|
|
|
/**
|
|
* Returns a list of all 2-letter lowercase language codes as defined
|
|
* in ISO 639 (both old and new variant).
|
|
*
|
|
* @return a list of acceptable language codes
|
|
*/
|
|
public static String[] getISOLanguages()
|
|
{
|
|
if (languageCache == null)
|
|
{
|
|
languageCache = getISOStrings("languages");
|
|
}
|
|
return (String[]) languageCache.clone();
|
|
}
|
|
|
|
/**
|
|
* Returns the set of keys from the specified resource hashtable, filtered
|
|
* so that only two letter strings are returned.
|
|
*
|
|
* @param tableName the name of the table from which to retrieve the keys.
|
|
* @return an array of two-letter strings.
|
|
*/
|
|
private static String[] getISOStrings(String tableName)
|
|
{
|
|
int count = 0;
|
|
ResourceBundle bundle =
|
|
ResourceBundle.getBundle("gnu.java.locale.LocaleInformation");
|
|
Enumeration e = bundle.getKeys();
|
|
ArrayList tempList = new ArrayList();
|
|
|
|
while (e.hasMoreElements())
|
|
{
|
|
String key = (String) e.nextElement();
|
|
|
|
if (key.startsWith(tableName + "."))
|
|
{
|
|
String str = key.substring(tableName.length() + 1);
|
|
|
|
if (str.length() == 2
|
|
&& Character.isLetter(str.charAt(0))
|
|
&& Character.isLetter(str.charAt(1)))
|
|
{
|
|
tempList.add(str);
|
|
++count;
|
|
}
|
|
}
|
|
}
|
|
|
|
String[] strings = new String[count];
|
|
|
|
for (int a = 0; a < count; ++a)
|
|
strings[a] = (String) tempList.get(a);
|
|
|
|
return strings;
|
|
}
|
|
|
|
/**
|
|
* Returns the language code of this locale. Some language codes have changed
|
|
* as ISO 639 has evolved; this returns the old name, even if you built
|
|
* the locale with the new one.
|
|
*
|
|
* @return language code portion of this locale, or an empty String
|
|
*/
|
|
public String getLanguage()
|
|
{
|
|
return language;
|
|
}
|
|
|
|
/**
|
|
* Returns the country code of this locale.
|
|
*
|
|
* @return country code portion of this locale, or an empty String
|
|
*/
|
|
public String getCountry()
|
|
{
|
|
return country;
|
|
}
|
|
|
|
/**
|
|
* Returns the variant code of this locale.
|
|
*
|
|
* @return the variant code portion of this locale, or an empty String
|
|
*/
|
|
public String getVariant()
|
|
{
|
|
return variant;
|
|
}
|
|
|
|
/**
|
|
* Gets the string representation of the current locale. This consists of
|
|
* the language, the country, and the variant, separated by an underscore.
|
|
* The variant is listed only if there is a language or country. Examples:
|
|
* "en", "de_DE", "_GB", "en_US_WIN", "de__POSIX", "fr__MAC".
|
|
*
|
|
* @return the string representation of this Locale
|
|
* @see #getDisplayName()
|
|
*/
|
|
public String toString()
|
|
{
|
|
if (language.length() == 0 && country.length() == 0)
|
|
return "";
|
|
else if (country.length() == 0 && variant.length() == 0)
|
|
return language;
|
|
CPStringBuilder result = new CPStringBuilder(language);
|
|
result.append('_').append(country);
|
|
if (variant.length() != 0)
|
|
result.append('_').append(variant);
|
|
return result.toString();
|
|
}
|
|
|
|
/**
|
|
* Returns the three-letter ISO language abbrevation of this locale.
|
|
*
|
|
* @throws MissingResourceException if the three-letter code is not known
|
|
*/
|
|
public String getISO3Language()
|
|
{
|
|
// We know all strings are interned so we can use '==' for better performance.
|
|
if (language == "")
|
|
return "";
|
|
int index
|
|
= ("aa,ab,af,am,ar,as,ay,az,ba,be,bg,bh,bi,bn,bo,br,ca,co,cs,cy,da,"
|
|
+ "de,dz,el,en,eo,es,et,eu,fa,fi,fj,fo,fr,fy,ga,gd,gl,gn,gu,ha,iw,"
|
|
+ "hi,hr,hu,hy,ia,in,ie,ik,in,is,it,iu,iw,ja,ji,jw,ka,kk,kl,km,kn,"
|
|
+ "ko,ks,ku,ky,la,ln,lo,lt,lv,mg,mi,mk,ml,mn,mo,mr,ms,mt,my,na,ne,"
|
|
+ "nl,no,oc,om,or,pa,pl,ps,pt,qu,rm,rn,ro,ru,rw,sa,sd,sg,sh,si,sk,"
|
|
+ "sl,sm,sn,so,sq,sr,ss,st,su,sv,sw,ta,te,tg,th,ti,tk,tl,tn,to,tr,"
|
|
+ "ts,tt,tw,ug,uk,ur,uz,vi,vo,wo,xh,ji,yo,za,zh,zu")
|
|
.indexOf(language);
|
|
|
|
if (index % 3 != 0 || language.length() != 2)
|
|
throw new MissingResourceException
|
|
("Can't find ISO3 language for " + language,
|
|
"java.util.Locale", language);
|
|
|
|
// Don't read this aloud. These are the three letter language codes.
|
|
return
|
|
("aarabkaframharaasmaymazebakbelbulbihbisbenbodbrecatcoscescymdandeu"
|
|
+ "dzoellengepospaesteusfasfinfijfaofrafrygaigdhglggrngujhauhebhinhrv"
|
|
+ "hunhyeinaindileipkindislitaikuhebjpnyidjawkatkazkalkhmkankorkaskur"
|
|
+ "kirlatlinlaolitlavmlgmrimkdmalmonmolmarmsamltmyanaunepnldnorociorm"
|
|
+ "oripanpolpusporquerohrunronruskinsansndsagsrpsinslkslvsmosnasomsqi"
|
|
+ "srpsswsotsunsweswatamteltgkthatirtuktgltsntonturtsotattwiuigukrurd"
|
|
+ "uzbvievolwolxhoyidyorzhazhozul")
|
|
.substring(index, index + 3);
|
|
}
|
|
|
|
/**
|
|
* Returns the three-letter ISO country abbrevation of the locale.
|
|
*
|
|
* @throws MissingResourceException if the three-letter code is not known
|
|
*/
|
|
public String getISO3Country()
|
|
{
|
|
// We know all strings are interned so we can use '==' for better performance.
|
|
if (country == "")
|
|
return "";
|
|
int index
|
|
= ("AD,AE,AF,AG,AI,AL,AM,AN,AO,AQ,AR,AS,AT,AU,AW,AZ,BA,BB,BD,BE,BF,"
|
|
+ "BG,BH,BI,BJ,BM,BN,BO,BR,BS,BT,BV,BW,BY,BZ,CA,CC,CF,CG,CH,CI,CK,"
|
|
+ "CL,CM,CN,CO,CR,CU,CV,CX,CY,CZ,DE,DJ,DK,DM,DO,DZ,EC,EE,EG,EH,ER,"
|
|
+ "ES,ET,FI,FJ,FK,FM,FO,FR,FX,GA,GB,GD,GE,GF,GH,GI,GL,GM,GN,GP,GQ,"
|
|
+ "GR,GS,GT,GU,GW,GY,HK,HM,HN,HR,HT,HU,ID,IE,IL,IN,IO,IQ,IR,IS,IT,"
|
|
+ "JM,JO,JP,KE,KG,KH,KI,KM,KN,KP,KR,KW,KY,KZ,LA,LB,LC,LI,LK,LR,LS,"
|
|
+ "LT,LU,LV,LY,MA,MC,MD,MG,MH,MK,ML,MM,MN,MO,MP,MQ,MR,MS,MT,MU,MV,"
|
|
+ "MW,MX,MY,MZ,NA,NC,NE,NF,NG,NI,NL,NO,NP,NR,NU,NZ,OM,PA,PE,PF,PG,"
|
|
+ "PH,PK,PL,PM,PN,PR,PT,PW,PY,QA,RE,RO,RU,RW,SA,SB,SC,SD,SE,SG,SH,"
|
|
+ "SI,SJ,SK,SL,SM,SN,SO,SR,ST,SV,SY,SZ,TC,TD,TF,TG,TH,TJ,TK,TM,TN,"
|
|
+ "TO,TP,TR,TT,TV,TW,TZ,UA,UG,UM,US,UY,UZ,VA,VC,VE,VG,VI,VN,VU,WF,"
|
|
+ "WS,YE,YT,YU,ZA,ZM,ZR,ZW")
|
|
.indexOf(country);
|
|
|
|
if (index % 3 != 0 || country.length() != 2)
|
|
throw new MissingResourceException
|
|
("Can't find ISO3 country for " + country,
|
|
"java.util.Locale", country);
|
|
|
|
// Don't read this aloud. These are the three letter country codes.
|
|
return
|
|
("ANDAREAFGATGAIAALBARMANTAGOATAARGASMAUTAUSABWAZEBIHBRBBGDBELBFABGR"
|
|
+ "BHRBDIBENBMUBRNBOLBRABHSBTNBVTBWABLRBLZCANCCKCAFCOGCHECIVCOKCHLCMR"
|
|
+ "CHNCOLCRICUBCPVCXRCYPCZEDEUDJIDNKDMADOMDZAECUESTEGYESHERIESPETHFIN"
|
|
+ "FJIFLKFSMFROFRAFXXGABGBRGRDGEOGUFGHAGIBGRLGMBGINGLPGNQGRCSGSGTMGUM"
|
|
+ "GNBGUYHKGHMDHNDHRVHTIHUNIDNIRLISRINDIOTIRQIRNISLITAJAMJORJPNKENKGZ"
|
|
+ "KHMKIRCOMKNAPRKKORKWTCYMKAZLAOLBNLCALIELKALBRLSOLTULUXLVALBYMARMCO"
|
|
+ "MDAMDGMHLMKDMLIMMRMNGMACMNPMTQMRTMSRMLTMUSMDVMWIMEXMYSMOZNAMNCLNER"
|
|
+ "NFKNGANICNLDNORNPLNRUNIUNZLOMNPANPERPYFPNGPHLPAKPOLSPMPCNPRIPRTPLW"
|
|
+ "PRYQATREUROMRUSRWASAUSLBSYCSDNSWESGPSHNSVNSJMSVKSLESMRSENSOMSURSTP"
|
|
+ "SLVSYRSWZTCATCDATFTGOTHATJKTKLTKMTUNTONTMPTURTTOTUVTWNTZAUKRUGAUMI"
|
|
+ "USAURYUZBVATVCTVENVGBVIRVNMVUTWLFWSMYEMMYTYUGZAFZMBZARZWE")
|
|
.substring(index, index + 3);
|
|
}
|
|
|
|
/**
|
|
* Gets the country name suitable for display to the user, formatted
|
|
* for the default locale. This has the same effect as
|
|
* <pre>
|
|
* getDisplayLanguage(Locale.getDefault());
|
|
* </pre>
|
|
*
|
|
* @return the language name of this locale localized to the default locale,
|
|
* with the ISO code as backup
|
|
*/
|
|
public String getDisplayLanguage()
|
|
{
|
|
return getDisplayLanguage(defaultLocale);
|
|
}
|
|
|
|
/**
|
|
* <p>
|
|
* Gets the name of the language specified by this locale, in a form suitable
|
|
* for display to the user. If possible, the display name will be localized
|
|
* to the specified locale. For example, if the locale instance is
|
|
* <code>Locale.GERMANY</code>, and the specified locale is <code>Locale.UK</code>,
|
|
* the result would be 'German'. Using the German locale would instead give
|
|
* 'Deutsch'. If the display name can not be localized to the supplied
|
|
* locale, it will fall back on other output in the following order:
|
|
* </p>
|
|
* <ul>
|
|
* <li>the display name in the default locale</li>
|
|
* <li>the display name in English</li>
|
|
* <li>the ISO code</li>
|
|
* </ul>
|
|
* <p>
|
|
* If the language is unspecified by this locale, then the empty string is
|
|
* returned.
|
|
* </p>
|
|
*
|
|
* @param inLocale the locale to use for formatting the display string.
|
|
* @return the language name of this locale localized to the given locale,
|
|
* with the default locale, English and the ISO code as backups.
|
|
* @throws NullPointerException if the supplied locale is null.
|
|
*/
|
|
public String getDisplayLanguage(Locale inLocale)
|
|
{
|
|
if (language.isEmpty())
|
|
return "";
|
|
try
|
|
{
|
|
ResourceBundle res =
|
|
ResourceBundle.getBundle("gnu.java.locale.LocaleInformation",
|
|
inLocale,
|
|
ClassLoader.getSystemClassLoader());
|
|
|
|
return res.getString("languages." + language);
|
|
}
|
|
catch (MissingResourceException e)
|
|
{
|
|
/* This means runtime support for the locale
|
|
* is not available, so we check providers. */
|
|
}
|
|
for (LocaleNameProvider p :
|
|
ServiceLoader.load(LocaleNameProvider.class))
|
|
{
|
|
for (Locale loc : p.getAvailableLocales())
|
|
{
|
|
if (loc.equals(inLocale))
|
|
{
|
|
String locLang = p.getDisplayLanguage(language,
|
|
inLocale);
|
|
if (locLang != null)
|
|
return locLang;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
if (inLocale.equals(Locale.ROOT)) // Base case
|
|
return language;
|
|
return getDisplayLanguage(LocaleHelper.getFallbackLocale(inLocale));
|
|
}
|
|
|
|
/**
|
|
* Returns the country name of this locale localized to the
|
|
* default locale. If the localized is not found, the ISO code
|
|
* is returned. This has the same effect as
|
|
* <pre>
|
|
* getDisplayCountry(Locale.getDefault());
|
|
* </pre>
|
|
*
|
|
* @return the country name of this locale localized to the given locale,
|
|
* with the ISO code as backup
|
|
*/
|
|
public String getDisplayCountry()
|
|
{
|
|
return getDisplayCountry(defaultLocale);
|
|
}
|
|
|
|
/**
|
|
* <p>
|
|
* Gets the name of the country specified by this locale, in a form suitable
|
|
* for display to the user. If possible, the display name will be localized
|
|
* to the specified locale. For example, if the locale instance is
|
|
* <code>Locale.GERMANY</code>, and the specified locale is <code>Locale.UK</code>,
|
|
* the result would be 'Germany'. Using the German locale would instead give
|
|
* 'Deutschland'. If the display name can not be localized to the supplied
|
|
* locale, it will fall back on other output in the following order:
|
|
* </p>
|
|
* <ul>
|
|
* <li>the display name in the default locale</li>
|
|
* <li>the display name in English</li>
|
|
* <li>the ISO code</li>
|
|
* </ul>
|
|
* <p>
|
|
* If the country is unspecified by this locale, then the empty string is
|
|
* returned.
|
|
* </p>
|
|
*
|
|
* @param inLocale the locale to use for formatting the display string.
|
|
* @return the country name of this locale localized to the given locale,
|
|
* with the default locale, English and the ISO code as backups.
|
|
* @throws NullPointerException if the supplied locale is null.
|
|
*/
|
|
public String getDisplayCountry(Locale inLocale)
|
|
{
|
|
if (country.isEmpty())
|
|
return "";
|
|
try
|
|
{
|
|
ResourceBundle res =
|
|
ResourceBundle.getBundle("gnu.java.locale.LocaleInformation",
|
|
inLocale,
|
|
ClassLoader.getSystemClassLoader());
|
|
|
|
return res.getString("territories." + country);
|
|
}
|
|
catch (MissingResourceException e)
|
|
{
|
|
/* This means runtime support for the locale
|
|
* is not available, so we check providers. */
|
|
}
|
|
for (LocaleNameProvider p :
|
|
ServiceLoader.load(LocaleNameProvider.class))
|
|
{
|
|
for (Locale loc : p.getAvailableLocales())
|
|
{
|
|
if (loc.equals(inLocale))
|
|
{
|
|
String locCountry = p.getDisplayCountry(country,
|
|
inLocale);
|
|
if (locCountry != null)
|
|
return locCountry;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
if (inLocale.equals(Locale.ROOT)) // Base case
|
|
return country;
|
|
return getDisplayCountry(LocaleHelper.getFallbackLocale(inLocale));
|
|
}
|
|
|
|
/**
|
|
* Returns the variant name of this locale localized to the
|
|
* default locale. If the localized is not found, the variant code
|
|
* itself is returned. This has the same effect as
|
|
* <pre>
|
|
* getDisplayVariant(Locale.getDefault());
|
|
* </pre>
|
|
*
|
|
* @return the variant code of this locale localized to the given locale,
|
|
* with the ISO code as backup
|
|
*/
|
|
public String getDisplayVariant()
|
|
{
|
|
return getDisplayVariant(defaultLocale);
|
|
}
|
|
|
|
|
|
/**
|
|
* <p>
|
|
* Gets the name of the variant specified by this locale, in a form suitable
|
|
* for display to the user. If possible, the display name will be localized
|
|
* to the specified locale. For example, if the locale instance is a revised
|
|
* variant, and the specified locale is <code>Locale.UK</code>, the result
|
|
* would be 'REVISED'. Using the German locale would instead give
|
|
* 'Revidiert'. If the display name can not be localized to the supplied
|
|
* locale, it will fall back on other output in the following order:
|
|
* </p>
|
|
* <ul>
|
|
* <li>the display name in the default locale</li>
|
|
* <li>the display name in English</li>
|
|
* <li>the ISO code</li>
|
|
* </ul>
|
|
* <p>
|
|
* If the variant is unspecified by this locale, then the empty string is
|
|
* returned.
|
|
* </p>
|
|
*
|
|
* @param inLocale the locale to use for formatting the display string.
|
|
* @return the variant name of this locale localized to the given locale,
|
|
* with the default locale, English and the ISO code as backups.
|
|
* @throws NullPointerException if the supplied locale is null.
|
|
*/
|
|
public String getDisplayVariant(Locale inLocale)
|
|
{
|
|
if (variant.isEmpty())
|
|
return "";
|
|
try
|
|
{
|
|
ResourceBundle res =
|
|
ResourceBundle.getBundle("gnu.java.locale.LocaleInformation",
|
|
inLocale,
|
|
ClassLoader.getSystemClassLoader());
|
|
|
|
return res.getString("variants." + variant);
|
|
}
|
|
catch (MissingResourceException e)
|
|
{
|
|
/* This means runtime support for the locale
|
|
* is not available, so we check providers. */
|
|
}
|
|
for (LocaleNameProvider p :
|
|
ServiceLoader.load(LocaleNameProvider.class))
|
|
{
|
|
for (Locale loc : p.getAvailableLocales())
|
|
{
|
|
if (loc.equals(inLocale))
|
|
{
|
|
String locVar = p.getDisplayVariant(variant,
|
|
inLocale);
|
|
if (locVar != null)
|
|
return locVar;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
if (inLocale.equals(Locale.ROOT)) // Base case
|
|
return country;
|
|
return getDisplayVariant(LocaleHelper.getFallbackLocale(inLocale));
|
|
}
|
|
|
|
/**
|
|
* Gets all local components suitable for display to the user, formatted
|
|
* for the default locale. For the language component, getDisplayLanguage
|
|
* is called. For the country component, getDisplayCountry is called.
|
|
* For the variant set component, getDisplayVariant is called.
|
|
*
|
|
* <p>The returned String will be one of the following forms:<br>
|
|
* <pre>
|
|
* language (country, variant)
|
|
* language (country)
|
|
* language (variant)
|
|
* country (variant)
|
|
* language
|
|
* country
|
|
* variant
|
|
* </pre>
|
|
*
|
|
* @return String version of this locale, suitable for display to the user
|
|
*/
|
|
public String getDisplayName()
|
|
{
|
|
return getDisplayName(defaultLocale);
|
|
}
|
|
|
|
/**
|
|
* Gets all local components suitable for display to the user, formatted
|
|
* for a specified locale. For the language component,
|
|
* getDisplayLanguage(Locale) is called. For the country component,
|
|
* getDisplayCountry(Locale) is called. For the variant set component,
|
|
* getDisplayVariant(Locale) is called.
|
|
*
|
|
* <p>The returned String will be one of the following forms:<br>
|
|
* <pre>
|
|
* language (country, variant)
|
|
* language (country)
|
|
* language (variant)
|
|
* country (variant)
|
|
* language
|
|
* country
|
|
* variant
|
|
* </pre>
|
|
*
|
|
* @param locale locale to use for formatting
|
|
* @return String version of this locale, suitable for display to the user
|
|
*/
|
|
public String getDisplayName(Locale locale)
|
|
{
|
|
CPStringBuilder result = new CPStringBuilder();
|
|
int count = 0;
|
|
String[] delimiters = {"", " (", ","};
|
|
if (language.length() != 0)
|
|
{
|
|
result.append(delimiters[count++]);
|
|
result.append(getDisplayLanguage(locale));
|
|
}
|
|
if (country.length() != 0)
|
|
{
|
|
result.append(delimiters[count++]);
|
|
result.append(getDisplayCountry(locale));
|
|
}
|
|
if (variant.length() != 0)
|
|
{
|
|
result.append(delimiters[count++]);
|
|
result.append(getDisplayVariant(locale));
|
|
}
|
|
if (count > 1)
|
|
result.append(")");
|
|
return result.toString();
|
|
}
|
|
|
|
/**
|
|
* Does the same as <code>Object.clone()</code> but does not throw
|
|
* a <code>CloneNotSupportedException</code>. Why anyone would
|
|
* use this method is a secret to me, since this class is immutable.
|
|
*
|
|
* @return the clone
|
|
*/
|
|
public Object clone()
|
|
{
|
|
// This class is final, so no need to use native super.clone().
|
|
return new Locale(language, country, variant);
|
|
}
|
|
|
|
/**
|
|
* Return the hash code for this locale. The hashcode is the logical
|
|
* xor of the hash codes of the language, the country and the variant.
|
|
* The hash code is precomputed, since <code>Locale</code>s are often
|
|
* used in hash tables.
|
|
*
|
|
* @return the hashcode
|
|
*/
|
|
public int hashCode()
|
|
{
|
|
return hashcode;
|
|
}
|
|
|
|
/**
|
|
* Compares two locales. To be equal, obj must be a Locale with the same
|
|
* language, country, and variant code.
|
|
*
|
|
* @param obj the other locale
|
|
* @return true if obj is equal to this
|
|
*/
|
|
public boolean equals(Object obj)
|
|
{
|
|
if (this == obj)
|
|
return true;
|
|
if (! (obj instanceof Locale))
|
|
return false;
|
|
Locale l = (Locale) obj;
|
|
|
|
return (language == l.language
|
|
&& country == l.country
|
|
&& variant == l.variant);
|
|
}
|
|
|
|
/**
|
|
* Write the locale to an object stream.
|
|
*
|
|
* @param s the stream to write to
|
|
* @throws IOException if the write fails
|
|
* @serialData The first three fields are Strings representing language,
|
|
* country, and variant. The fourth field is a placeholder for
|
|
* the cached hashcode, but this is always written as -1, and
|
|
* recomputed when reading it back.
|
|
*/
|
|
private void writeObject(ObjectOutputStream s)
|
|
throws IOException
|
|
{
|
|
ObjectOutputStream.PutField fields = s.putFields();
|
|
fields.put("hashcode", -1);
|
|
s.defaultWriteObject();
|
|
}
|
|
|
|
/**
|
|
* Reads a locale from the input stream.
|
|
*
|
|
* @param s the stream to read from
|
|
* @throws IOException if reading fails
|
|
* @throws ClassNotFoundException if reading fails
|
|
* @serialData the hashCode is always invalid and must be recomputed
|
|
*/
|
|
private void readObject(ObjectInputStream s)
|
|
throws IOException, ClassNotFoundException
|
|
{
|
|
s.defaultReadObject();
|
|
hashcode = language.hashCode() ^ country.hashCode() ^ variant.hashCode();
|
|
}
|
|
} // class Locale
|