procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Imported GNU Classpath 0.90

Browse source 
Imported GNU Classpath 0.90
       * scripts/makemake.tcl: LocaleData.java moved to gnu/java/locale.

       * sources.am: Regenerated.
       * gcj/javaprims.h: Regenerated.
       * Makefile.in: Regenerated.
       * gcj/Makefile.in: Regenerated.
       * include/Makefile.in: Regenerated.
       * testsuite/Makefile.in: Regenerated.

       * gnu/java/lang/VMInstrumentationImpl.java: New override.
       * gnu/java/net/local/LocalSocketImpl.java: Likewise.
       * gnu/classpath/jdwp/VMMethod.java: Likewise.
       * gnu/classpath/jdwp/VMVirtualMachine.java: Update to latest
       interface.
       * java/lang/Thread.java: Add UncaughtExceptionHandler.
       * java/lang/reflect/Method.java: Implements GenericDeclaration and
       isSynthetic(),
       * java/lang/reflect/Field.java: Likewise.
       * java/lang/reflect/Constructor.java
       * java/lang/Class.java: Implements Type, GenericDeclaration,
       getSimpleName() and getEnclosing*() methods.
       * java/lang/Class.h: Add new public methods.
       * java/lang/Math.java: Add signum(), ulp() and log10().
       * java/lang/natMath.cc (log10): New function.
       * java/security/VMSecureRandom.java: New override.
       * java/util/logging/Logger.java: Updated to latest classpath
       version.
       * java/util/logging/LogManager.java: New override.

From-SVN: r113887
This commit is contained in:
Mark Wielaard 2006-05-18 17:29:21 +00:00
parent eaec4980e1
commit 4f9533c772
1640 changed files with 126485 additions and 104808 deletions
Download patch file Download diff file Expand all files Collapse all files

72
libjava/classpath/java/util/Locale.java
View file

@ -39,6 +39,7 @@ exception statement from your version. */
package java.util;
import gnu.classpath.SystemProperties;
import gnu.java.locale.LocaleHelper;
import java.io.IOException;
import java.io.ObjectInputStream;
@ -65,11 +66,12 @@ import java.io.Serializable;
* be separated by an underscore (U+005F).
*
* <p>The default locale is determined by the values of the system properties
* user.language, user.region, and user.variant, defaulting to "en". 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.
* 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
@ -209,10 +211,18 @@ public final class Locale implements Serializable, Cloneable
* null. Note the logic in the main constructor, to detect when
* bootstrapping has completed.
*/
private static Locale defaultLocale =
getLocale(SystemProperties.getProperty("user.language", "en"),
SystemProperties.getProperty("user.region", ""),
SystemProperties.getProperty("user.variant", ""));
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.
@ -236,38 +246,38 @@ public final class Locale implements Serializable, Cloneable
}
/**
* Retrieves the locale with the specified language and region
* Retrieves the locale with the specified language and country
* from the cache.
*
* @param language the language of the locale to retrieve.
* @param region the region of the locale to retrieve.
* @param country the country of the locale to retrieve.
* @return the locale.
*/
private static Locale getLocale(String language, String region)
private static Locale getLocale(String language, String country)
{
return getLocale(language, region, "");
return getLocale(language, country, "");
}
/**
* Retrieves the locale with the specified language, region
* Retrieves the locale with the specified language, country
* and variant from the cache.
*
* @param language the language of the locale to retrieve.
* @param region the region 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 region, String variant)
private static Locale getLocale(String language, String country, String variant)
{
if (localeMap == null)
localeMap = new HashMap(256);
String name = language + "_" + region + "_" + variant;
String name = language + "_" + country + "_" + variant;
Locale locale = (Locale) localeMap.get(name);
if (locale == null)
{
locale = new Locale(language, region, variant);
locale = new Locale(language, country, variant);
localeMap.put(name, locale);
}
@ -384,33 +394,33 @@ public final class Locale implements Serializable, Cloneable
{
if (availableLocales == null)
{
String[] localeNames = LocaleData.localeNames;
availableLocales = new Locale[localeNames.length];
int len = LocaleHelper.getLocaleCount();
availableLocales = new Locale[len];
for (int i = 0; i < localeNames.length; i++)
for (int i = 0; i < len; i++)
{
String language;
String region = "";
String country = "";
String variant = "";
String name = localeNames[i];
String name = LocaleHelper.getLocaleName(i);
language = name.substring(0, 2);
if (name.length() > 2)
region = name.substring(3);
country = name.substring(3);
int index = region.indexOf("_");
int index = country.indexOf("_");
if (index > 0)
{
variant = region.substring(index + 1);
region = region.substring(0, index - 1);
variant = country.substring(index + 1);
country = country.substring(0, index - 1);
}
availableLocales[i] = getLocale(language, region, variant);
availableLocales[i] = getLocale(language, country, variant);
}
}
return availableLocales;
return (Locale[]) availableLocales.clone();
}
/**
@ -426,7 +436,7 @@ public final class Locale implements Serializable, Cloneable
countryCache = getISOStrings("territories");
}
return countryCache;
return (String[]) countryCache.clone();
}
/**
@ -441,7 +451,7 @@ public final class Locale implements Serializable, Cloneable
{
languageCache = getISOStrings("languages");
}
return languageCache;
return (String[]) languageCache.clone();
}
/**