Skip to content

D
dragonwell8_jdk

openanolis / dragonwell8_jdk

通知 4
Star 2
Fork 0
D
dragonwell8_jdk
提交 7186bcf5 编写于 作者: O okutsu
浏览文件
操作

7028818: (lc) Lazily initialize locale extension 

7029740: (lc) New Locale class implementation doesn't follow the Java coding conventions
7032820: (lc) sun.util.locale.InternalLocaleBuilder.CaseInsensitiveChar.equals problems
7033503: (lc) Restore optimization code for Locale class initialization
7033504: (lc) incompatible behavior change for ja_JP_JP and th_TH_TH locales
Reviewed-by: naoto
上级 e9f30601
隐藏空白更改
内联 并排
Showing with 1094 addition and 669 deletion
make/java/java/FILES_java.gmk
浏览文件 @ 7186bcf5
# #
# Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
...@@ -189,7 +189,6 @@ JAVA_JAVA_java = \ ...@@ -189,7 +189,6 @@ JAVA_JAVA_java = \
java/util/ListResourceBundle.java \ java/util/ListResourceBundle.java \
sun/util/EmptyListResourceBundle.java \ sun/util/EmptyListResourceBundle.java \
java/util/Locale.java \ java/util/Locale.java \
sun/util/locale/AsciiUtil.java \
sun/util/locale/BaseLocale.java \ sun/util/locale/BaseLocale.java \
sun/util/locale/Extension.java \ sun/util/locale/Extension.java \
sun/util/locale/InternalLocaleBuilder.java \ sun/util/locale/InternalLocaleBuilder.java \
...@@ -197,6 +196,7 @@ JAVA_JAVA_java = \ ...@@ -197,6 +196,7 @@ JAVA_JAVA_java = \
sun/util/locale/LocaleExtensions.java \ sun/util/locale/LocaleExtensions.java \
sun/util/locale/LocaleObjectCache.java \ sun/util/locale/LocaleObjectCache.java \
sun/util/locale/LocaleSyntaxException.java \ sun/util/locale/LocaleSyntaxException.java \
sun/util/locale/LocaleUtils.java \
sun/util/locale/ParseStatus.java \ sun/util/locale/ParseStatus.java \
sun/util/locale/StringTokenIterator.java \ sun/util/locale/StringTokenIterator.java \
sun/util/locale/UnicodeLocaleExtension.java \ sun/util/locale/UnicodeLocaleExtension.java \
......
src/share/classes/java/util/Locale.java
浏览文件 @ 7186bcf5
/* /*
* Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -51,13 +51,13 @@ import java.util.spi.LocaleNameProvider; ...@@ -51,13 +51,13 @@ import java.util.spi.LocaleNameProvider;
import sun.security.action.GetPropertyAction; import sun.security.action.GetPropertyAction;
import sun.util.LocaleServiceProviderPool; import sun.util.LocaleServiceProviderPool;
import sun.util.locale.AsciiUtil;
import sun.util.locale.BaseLocale; import sun.util.locale.BaseLocale;
import sun.util.locale.InternalLocaleBuilder; import sun.util.locale.InternalLocaleBuilder;
import sun.util.locale.LanguageTag; import sun.util.locale.LanguageTag;
import sun.util.locale.LocaleExtensions; import sun.util.locale.LocaleExtensions;
import sun.util.locale.LocaleObjectCache; import sun.util.locale.LocaleObjectCache;
import sun.util.locale.LocaleSyntaxException; import sun.util.locale.LocaleSyntaxException;
import sun.util.locale.LocaleUtils;
import sun.util.locale.ParseStatus; import sun.util.locale.ParseStatus;
import sun.util.locale.UnicodeLocaleExtension; import sun.util.locale.UnicodeLocaleExtension;
import sun.util.resources.LocaleData; import sun.util.resources.LocaleData;
...@@ -412,59 +412,59 @@ public final class Locale implements Cloneable, Serializable { ...@@ -412,59 +412,59 @@ public final class Locale implements Cloneable, Serializable {
/** Useful constant for language. /** Useful constant for language.
*/ */
static public final Locale ENGLISH = getInstance("en", "", ""); static public final Locale ENGLISH = createConstant("en", "");
/** Useful constant for language. /** Useful constant for language.
*/ */
static public final Locale FRENCH = getInstance("fr", "", ""); static public final Locale FRENCH = createConstant("fr", "");
/** Useful constant for language. /** Useful constant for language.
*/ */
static public final Locale GERMAN = getInstance("de", "", ""); static public final Locale GERMAN = createConstant("de", "");
/** Useful constant for language. /** Useful constant for language.
*/ */
static public final Locale ITALIAN = getInstance("it", "", ""); static public final Locale ITALIAN = createConstant("it", "");
/** Useful constant for language. /** Useful constant for language.
*/ */
static public final Locale JAPANESE = getInstance("ja", "", ""); static public final Locale JAPANESE = createConstant("ja", "");
/** Useful constant for language. /** Useful constant for language.
*/ */
static public final Locale KOREAN = getInstance("ko", "", ""); static public final Locale KOREAN = createConstant("ko", "");
/** Useful constant for language. /** Useful constant for language.
*/ */
static public final Locale CHINESE = getInstance("zh", "", ""); static public final Locale CHINESE = createConstant("zh", "");
/** Useful constant for language. /** Useful constant for language.
*/ */
static public final Locale SIMPLIFIED_CHINESE = getInstance("zh", "CN", ""); static public final Locale SIMPLIFIED_CHINESE = createConstant("zh", "CN");
/** Useful constant for language. /** Useful constant for language.
*/ */
static public final Locale TRADITIONAL_CHINESE = getInstance("zh", "TW", ""); static public final Locale TRADITIONAL_CHINESE = createConstant("zh", "TW");
/** Useful constant for country. /** Useful constant for country.
*/ */
static public final Locale FRANCE = getInstance("fr", "FR", ""); static public final Locale FRANCE = createConstant("fr", "FR");
/** Useful constant for country. /** Useful constant for country.
*/ */
static public final Locale GERMANY = getInstance("de", "DE", ""); static public final Locale GERMANY = createConstant("de", "DE");
/** Useful constant for country. /** Useful constant for country.
*/ */
static public final Locale ITALY = getInstance("it", "IT", ""); static public final Locale ITALY = createConstant("it", "IT");
/** Useful constant for country. /** Useful constant for country.
*/ */
static public final Locale JAPAN = getInstance("ja", "JP", ""); static public final Locale JAPAN = createConstant("ja", "JP");
/** Useful constant for country. /** Useful constant for country.
*/ */
static public final Locale KOREA = getInstance("ko", "KR", ""); static public final Locale KOREA = createConstant("ko", "KR");
/** Useful constant for country. /** Useful constant for country.
*/ */
...@@ -480,19 +480,19 @@ public final class Locale implements Cloneable, Serializable { ...@@ -480,19 +480,19 @@ public final class Locale implements Cloneable, Serializable {
/** Useful constant for country. /** Useful constant for country.
*/ */
static public final Locale UK = getInstance("en", "GB", ""); static public final Locale UK = createConstant("en", "GB");
/** Useful constant for country. /** Useful constant for country.
*/ */
static public final Locale US = getInstance("en", "US", ""); static public final Locale US = createConstant("en", "US");
/** Useful constant for country. /** Useful constant for country.
*/ */
static public final Locale CANADA = getInstance("en", "CA", ""); static public final Locale CANADA = createConstant("en", "CA");
/** Useful constant for country. /** Useful constant for country.
*/ */
static public final Locale CANADA_FRENCH = getInstance("fr", "CA", ""); static public final Locale CANADA_FRENCH = createConstant("fr", "CA");
/** /**
* Useful constant for the root locale. The root locale is the locale whose * Useful constant for the root locale. The root locale is the locale whose
...@@ -502,7 +502,7 @@ public final class Locale implements Cloneable, Serializable { ...@@ -502,7 +502,7 @@ public final class Locale implements Cloneable, Serializable {
* *
* @since 1.6 * @since 1.6
*/ */
static public final Locale ROOT = getInstance("", "", ""); static public final Locale ROOT = createConstant("", "");
/** /**
* The key for the private use extension ('x'). * The key for the private use extension ('x').
...@@ -532,14 +532,14 @@ public final class Locale implements Cloneable, Serializable { ...@@ -532,14 +532,14 @@ public final class Locale implements Cloneable, Serializable {
private static final int DISPLAY_LANGUAGE = 0; private static final int DISPLAY_LANGUAGE = 0;
private static final int DISPLAY_COUNTRY = 1; private static final int DISPLAY_COUNTRY = 1;
private static final int DISPLAY_VARIANT = 2; private static final int DISPLAY_VARIANT = 2;
private static final int DISPLAY_SCRIPT = 3; private static final int DISPLAY_SCRIPT = 3;
/** /**
* Private constructor used by getInstance method * Private constructor used by getInstance method
*/ */
private Locale(BaseLocale baseLocale, LocaleExtensions extensions) { private Locale(BaseLocale baseLocale, LocaleExtensions extensions) {
_baseLocale = baseLocale; this.baseLocale = baseLocale;
_extensions = extensions; this.localeExtensions = extensions;
} }
/** /**
...@@ -572,8 +572,8 @@ public final class Locale implements Cloneable, Serializable { ...@@ -572,8 +572,8 @@ public final class Locale implements Cloneable, Serializable {
if (language== null || country == null || variant == null) { if (language== null || country == null || variant == null) {
throw new NullPointerException(); throw new NullPointerException();
} }
_baseLocale = BaseLocale.getInstance(convertOldISOCodes(language), "", country, variant); baseLocale = BaseLocale.getInstance(convertOldISOCodes(language), "", country, variant);
_extensions = getCompatibilityExtensions(language, "", country, variant); localeExtensions = getCompatibilityExtensions(language, "", country, variant);
} }
/** /**
...@@ -626,6 +626,15 @@ public final class Locale implements Cloneable, Serializable { ...@@ -626,6 +626,15 @@ public final class Locale implements Cloneable, Serializable {
this(language, "", ""); this(language, "", "");
} }
/**
* This method must be called only for creating the Locale.*
* constants due to making shortcuts.
*/
private static Locale createConstant(String lang, String country) {
BaseLocale base = BaseLocale.createInstance(lang, country);
return getInstance(base, null);
}
/** /**
* Returns a <code>Locale</code> constructed from the given * Returns a <code>Locale</code> constructed from the given
* <code>language</code>, <code>country</code> and * <code>language</code>, <code>country</code> and
...@@ -641,7 +650,7 @@ public final class Locale implements Cloneable, Serializable { ...@@ -641,7 +650,7 @@ public final class Locale implements Cloneable, Serializable {
* @exception NullPointerException if any argument is null. * @exception NullPointerException if any argument is null.
*/ */
static Locale getInstance(String language, String country, String variant) { static Locale getInstance(String language, String country, String variant) {
return getInstance(language, "", country, variant, LocaleExtensions.EMPTY_EXTENSIONS); return getInstance(language, "", country, variant, null);
} }
static Locale getInstance(String language, String script, String country, static Locale getInstance(String language, String script, String country,
...@@ -651,10 +660,6 @@ public final class Locale implements Cloneable, Serializable { ...@@ -651,10 +660,6 @@ public final class Locale implements Cloneable, Serializable {
} }
if (extensions == null) { if (extensions == null) {
extensions = LocaleExtensions.EMPTY_EXTENSIONS;
}
if (extensions.equals(LocaleExtensions.EMPTY_EXTENSIONS)) {
extensions = getCompatibilityExtensions(language, script, country, variant); extensions = getCompatibilityExtensions(language, script, country, variant);
} }
...@@ -668,22 +673,33 @@ public final class Locale implements Cloneable, Serializable { ...@@ -668,22 +673,33 @@ public final class Locale implements Cloneable, Serializable {
} }
private static class Cache extends LocaleObjectCache<LocaleKey, Locale> { private static class Cache extends LocaleObjectCache<LocaleKey, Locale> {
public Cache() { private Cache() {
} }
@Override
protected Locale createObject(LocaleKey key) { protected Locale createObject(LocaleKey key) {
return new Locale(key._base, key._exts); return new Locale(key.base, key.exts);
} }
} }
private static class LocaleKey { private static final class LocaleKey {
private BaseLocale _base; private final BaseLocale base;
private LocaleExtensions _exts; private final LocaleExtensions exts;
private final int hash;
private LocaleKey(BaseLocale baseLocale, LocaleExtensions extensions) { private LocaleKey(BaseLocale baseLocale, LocaleExtensions extensions) {
_base = baseLocale; base = baseLocale;
_exts = extensions; exts = extensions;
// Calculate the hash value here because it's always used.
int h = base.hashCode();
if (exts != null) {
h ^= exts.hashCode();
}
hash = h;
} }
@Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (this == obj) { if (this == obj) {
return true; return true;
...@@ -692,11 +708,18 @@ public final class Locale implements Cloneable, Serializable { ...@@ -692,11 +708,18 @@ public final class Locale implements Cloneable, Serializable {
return false; return false;
} }
LocaleKey other = (LocaleKey)obj; LocaleKey other = (LocaleKey)obj;
return _base.equals(other._base) && _exts.equals(other._exts); if (hash != other.hash || !base.equals(other.base)) {
return false;
}
if (exts == null) {
return other.exts == null;
}
return exts.equals(other.exts);
} }
@Override
public int hashCode() { public int hashCode() {
return _base.hashCode() ^ _exts.hashCode(); return hash;
} }
} }
...@@ -981,7 +1004,7 @@ public final class Locale implements Cloneable, Serializable { ...@@ -981,7 +1004,7 @@ public final class Locale implements Cloneable, Serializable {
* @see #getDisplayLanguage * @see #getDisplayLanguage
*/ */
public String getLanguage() { public String getLanguage() {
return _baseLocale.getLanguage(); return baseLocale.getLanguage();
} }
/** /**
...@@ -995,7 +1018,7 @@ public final class Locale implements Cloneable, Serializable { ...@@ -995,7 +1018,7 @@ public final class Locale implements Cloneable, Serializable {
* @since 1.7 * @since 1.7
*/ */
public String getScript() { public String getScript() {
return _baseLocale.getScript(); return baseLocale.getScript();
} }
/** /**
...@@ -1007,7 +1030,7 @@ public final class Locale implements Cloneable, Serializable { ...@@ -1007,7 +1030,7 @@ public final class Locale implements Cloneable, Serializable {
* @see #getDisplayCountry * @see #getDisplayCountry
*/ */
public String getCountry() { public String getCountry() {
return _baseLocale.getRegion(); return baseLocale.getRegion();
} }
/** /**
...@@ -1017,7 +1040,7 @@ public final class Locale implements Cloneable, Serializable { ...@@ -1017,7 +1040,7 @@ public final class Locale implements Cloneable, Serializable {
* @see #getDisplayVariant * @see #getDisplayVariant
*/ */
public String getVariant() { public String getVariant() {
return _baseLocale.getVariant(); return baseLocale.getVariant();
} }
/** /**
...@@ -1039,7 +1062,7 @@ public final class Locale implements Cloneable, Serializable { ...@@ -1039,7 +1062,7 @@ public final class Locale implements Cloneable, Serializable {
if (!LocaleExtensions.isValidKey(key)) { if (!LocaleExtensions.isValidKey(key)) {
throw new IllegalArgumentException("Ill-formed extension key: " + key); throw new IllegalArgumentException("Ill-formed extension key: " + key);
} }
return _extensions.getExtensionValue(key); return (localeExtensions == null) ? null : localeExtensions.getExtensionValue(key);
} }
/** /**
...@@ -1052,7 +1075,10 @@ public final class Locale implements Cloneable, Serializable { ...@@ -1052,7 +1075,10 @@ public final class Locale implements Cloneable, Serializable {
* @since 1.7 * @since 1.7
*/ */
public Set<Character> getExtensionKeys() { public Set<Character> getExtensionKeys() {
return _extensions.getKeys(); if (localeExtensions == null) {
return Collections.emptySet();
}
return localeExtensions.getKeys();
} }
/** /**
...@@ -1064,7 +1090,10 @@ public final class Locale implements Cloneable, Serializable { ...@@ -1064,7 +1090,10 @@ public final class Locale implements Cloneable, Serializable {
* @since 1.7 * @since 1.7
*/ */
public Set<String> getUnicodeLocaleAttributes() { public Set<String> getUnicodeLocaleAttributes() {
return _extensions.getUnicodeLocaleAttributes(); if (localeExtensions == null) {
return Collections.emptySet();
}
return localeExtensions.getUnicodeLocaleAttributes();
} }
/** /**
...@@ -1085,7 +1114,7 @@ public final class Locale implements Cloneable, Serializable { ...@@ -1085,7 +1114,7 @@ public final class Locale implements Cloneable, Serializable {
if (!UnicodeLocaleExtension.isKey(key)) { if (!UnicodeLocaleExtension.isKey(key)) {
throw new IllegalArgumentException("Ill-formed Unicode locale key: " + key); throw new IllegalArgumentException("Ill-formed Unicode locale key: " + key);
} }
return _extensions.getUnicodeLocaleType(key); return (localeExtensions == null) ? null : localeExtensions.getUnicodeLocaleType(key);
} }
/** /**
...@@ -1097,7 +1126,10 @@ public final class Locale implements Cloneable, Serializable { ...@@ -1097,7 +1126,10 @@ public final class Locale implements Cloneable, Serializable {
* @since 1.7 * @since 1.7
*/ */
public Set<String> getUnicodeLocaleKeys() { public Set<String> getUnicodeLocaleKeys() {
return _extensions.getUnicodeLocaleKeys(); if (localeExtensions == null) {
return Collections.emptySet();
}
return localeExtensions.getUnicodeLocaleKeys();
} }
/** /**
...@@ -1106,16 +1138,17 @@ public final class Locale implements Cloneable, Serializable { ...@@ -1106,16 +1138,17 @@ public final class Locale implements Cloneable, Serializable {
* @return base locale of this Locale * @return base locale of this Locale
*/ */
BaseLocale getBaseLocale() { BaseLocale getBaseLocale() {
return _baseLocale; return baseLocale;
} }
/** /**
* Package local method returning the Locale's LocaleExtensions, * Package private method returning the Locale's LocaleExtensions,
* used by ResourceBundle * used by ResourceBundle.
* @return locale exnteions of this Locale * @return locale exnteions of this Locale,
* or {@code null} if no extensions are defined
*/ */
LocaleExtensions getLocaleExtensions() { LocaleExtensions getLocaleExtensions() {
return _extensions; return localeExtensions;
} }
/** /**
...@@ -1160,26 +1193,27 @@ public final class Locale implements Cloneable, Serializable { ...@@ -1160,26 +1193,27 @@ public final class Locale implements Cloneable, Serializable {
* @see #getDisplayName * @see #getDisplayName
* @see #toLanguageTag * @see #toLanguageTag
*/ */
@Override
public final String toString() { public final String toString() {
boolean l = (_baseLocale.getLanguage().length() != 0); boolean l = (baseLocale.getLanguage().length() != 0);
boolean s = (_baseLocale.getScript().length() != 0); boolean s = (baseLocale.getScript().length() != 0);
boolean r = (_baseLocale.getRegion().length() != 0); boolean r = (baseLocale.getRegion().length() != 0);
boolean v = (_baseLocale.getVariant().length() != 0); boolean v = (baseLocale.getVariant().length() != 0);
boolean e = (_extensions.getID().length() != 0); boolean e = (localeExtensions != null && localeExtensions.getID().length() != 0);
StringBuilder result = new StringBuilder(_baseLocale.getLanguage()); StringBuilder result = new StringBuilder(baseLocale.getLanguage());
if (r || (l && (v || s || e))) { if (r || (l && (v || s || e))) {
result.append('_') result.append('_')
.append(_baseLocale.getRegion()); // This may just append '_' .append(baseLocale.getRegion()); // This may just append '_'
} }
if (v && (l || r)) { if (v && (l || r)) {
result.append('_') result.append('_')
.append(_baseLocale.getVariant()); .append(baseLocale.getVariant());
} }
if (s && (l || r)) { if (s && (l || r)) {
result.append("_#") result.append("_#")
.append(_baseLocale.getScript()); .append(baseLocale.getScript());
} }
if (e && (l || r)) { if (e && (l || r)) {
...@@ -1187,7 +1221,7 @@ public final class Locale implements Cloneable, Serializable { ...@@ -1187,7 +1221,7 @@ public final class Locale implements Cloneable, Serializable {
if (!s) { if (!s) {
result.append('#'); result.append('#');
} }
result.append(_extensions.getID()); result.append(localeExtensions.getID());
} }
return result.toString(); return result.toString();
...@@ -1261,7 +1295,7 @@ public final class Locale implements Cloneable, Serializable { ...@@ -1261,7 +1295,7 @@ public final class Locale implements Cloneable, Serializable {
* @since 1.7 * @since 1.7
*/ */
public String toLanguageTag() { public String toLanguageTag() {
LanguageTag tag = LanguageTag.parseLocale(_baseLocale, _extensions); LanguageTag tag = LanguageTag.parseLocale(baseLocale, localeExtensions);
StringBuilder buf = new StringBuilder(); StringBuilder buf = new StringBuilder();
String subtag = tag.getLanguage(); String subtag = tag.getLanguage();
...@@ -1433,8 +1467,9 @@ public final class Locale implements Cloneable, Serializable { ...@@ -1433,8 +1467,9 @@ public final class Locale implements Cloneable, Serializable {
bldr.setLanguageTag(tag); bldr.setLanguageTag(tag);
BaseLocale base = bldr.getBaseLocale(); BaseLocale base = bldr.getBaseLocale();
LocaleExtensions exts = bldr.getLocaleExtensions(); LocaleExtensions exts = bldr.getLocaleExtensions();
if (exts.isEmpty() && base.getVariant().length() > 0) { if (exts == null && base.getVariant().length() > 0) {
exts = getCompatibilityExtensions(base.getLanguage(), base.getScript(), base.getRegion(), base.getVariant()); exts = getCompatibilityExtensions(base.getLanguage(), base.getScript(),
base.getRegion(), base.getVariant());
} }
return getInstance(base, exts); return getInstance(base, exts);
} }
...@@ -1454,7 +1489,7 @@ public final class Locale implements Cloneable, Serializable { ...@@ -1454,7 +1489,7 @@ public final class Locale implements Cloneable, Serializable {
* three-letter language abbreviation is not available for this locale. * three-letter language abbreviation is not available for this locale.
*/ */
public String getISO3Language() throws MissingResourceException { public String getISO3Language() throws MissingResourceException {
String lang = _baseLocale.getLanguage(); String lang = baseLocale.getLanguage();
if (lang.length() == 3) { if (lang.length() == 3) {
return lang; return lang;
} }
...@@ -1481,10 +1516,10 @@ public final class Locale implements Cloneable, Serializable { ...@@ -1481,10 +1516,10 @@ public final class Locale implements Cloneable, Serializable {
* three-letter country abbreviation is not available for this locale. * three-letter country abbreviation is not available for this locale.
*/ */
public String getISO3Country() throws MissingResourceException { public String getISO3Country() throws MissingResourceException {
String country3 = getISO3Code(_baseLocale.getRegion(), LocaleISOData.isoCountryTable); String country3 = getISO3Code(baseLocale.getRegion(), LocaleISOData.isoCountryTable);
if (country3 == null) { if (country3 == null) {
throw new MissingResourceException("Couldn't find 3-letter country code for " throw new MissingResourceException("Couldn't find 3-letter country code for "
+ _baseLocale.getRegion(), "FormatData_" + toString(), "ShortCountry"); + baseLocale.getRegion(), "FormatData_" + toString(), "ShortCountry");
} }
return country3; return country3;
} }
...@@ -1542,7 +1577,7 @@ public final class Locale implements Cloneable, Serializable { ...@@ -1542,7 +1577,7 @@ public final class Locale implements Cloneable, Serializable {
* @exception NullPointerException if <code>inLocale</code> is <code>null</code> * @exception NullPointerException if <code>inLocale</code> is <code>null</code>
*/ */
public String getDisplayLanguage(Locale inLocale) { public String getDisplayLanguage(Locale inLocale) {
return getDisplayString(_baseLocale.getLanguage(), inLocale, DISPLAY_LANGUAGE); return getDisplayString(baseLocale.getLanguage(), inLocale, DISPLAY_LANGUAGE);
} }
/** /**
...@@ -1568,7 +1603,7 @@ public final class Locale implements Cloneable, Serializable { ...@@ -1568,7 +1603,7 @@ public final class Locale implements Cloneable, Serializable {
* @since 1.7 * @since 1.7
*/ */
public String getDisplayScript(Locale inLocale) { public String getDisplayScript(Locale inLocale) {
return getDisplayString(_baseLocale.getScript(), inLocale, DISPLAY_SCRIPT); return getDisplayString(baseLocale.getScript(), inLocale, DISPLAY_SCRIPT);
} }
/** /**
...@@ -1603,7 +1638,7 @@ public final class Locale implements Cloneable, Serializable { ...@@ -1603,7 +1638,7 @@ public final class Locale implements Cloneable, Serializable {
* @exception NullPointerException if <code>inLocale</code> is <code>null</code> * @exception NullPointerException if <code>inLocale</code> is <code>null</code>
*/ */
public String getDisplayCountry(Locale inLocale) { public String getDisplayCountry(Locale inLocale) {
return getDisplayString(_baseLocale.getRegion(), inLocale, DISPLAY_COUNTRY); return getDisplayString(baseLocale.getRegion(), inLocale, DISPLAY_COUNTRY);
} }
private String getDisplayString(String code, Locale inLocale, int type) { private String getDisplayString(String code, Locale inLocale, int type) {
...@@ -1662,7 +1697,7 @@ public final class Locale implements Cloneable, Serializable { ...@@ -1662,7 +1697,7 @@ public final class Locale implements Cloneable, Serializable {
* @exception NullPointerException if <code>inLocale</code> is <code>null</code> * @exception NullPointerException if <code>inLocale</code> is <code>null</code>
*/ */
public String getDisplayVariant(Locale inLocale) { public String getDisplayVariant(Locale inLocale) {
if (_baseLocale.getVariant().length() == 0) if (baseLocale.getVariant().length() == 0)
return ""; return "";
OpenListResourceBundle bundle = LocaleData.getLocaleNames(inLocale); OpenListResourceBundle bundle = LocaleData.getLocaleNames(inLocale);
...@@ -1758,7 +1793,7 @@ public final class Locale implements Cloneable, Serializable { ...@@ -1758,7 +1793,7 @@ public final class Locale implements Cloneable, Serializable {
return formatList(variantNames, listPattern, listCompositionPattern); return formatList(variantNames, listPattern, listCompositionPattern);
} }
} }
ArrayList<String> names = new ArrayList<String>(4); ArrayList<String> names = new ArrayList<>(4);
if (languageName.length() != 0) { if (languageName.length() != 0) {
names.add(languageName); names.add(languageName);
} }
...@@ -1833,10 +1868,14 @@ public final class Locale implements Cloneable, Serializable { ...@@ -1833,10 +1868,14 @@ public final class Locale implements Cloneable, Serializable {
* Since Locales are often used in hashtables, caches the value * Since Locales are often used in hashtables, caches the value
* for speed. * for speed.
*/ */
@Override
public int hashCode() { public int hashCode() {
int hc = hashCodeValue; int hc = hashCodeValue;
if (hc == 0) { if (hc == 0) {
hc = _baseLocale.hashCode() ^ _extensions.hashCode(); hc = baseLocale.hashCode();
if (localeExtensions != null) {
hc ^= localeExtensions.hashCode();
}
hashCodeValue = hc; hashCodeValue = hc;
} }
return hc; return hc;
...@@ -1851,21 +1890,26 @@ public final class Locale implements Cloneable, Serializable { ...@@ -1851,21 +1890,26 @@ public final class Locale implements Cloneable, Serializable {
* *
* @return true if this Locale is equal to the specified object. * @return true if this Locale is equal to the specified object.
*/ */
@Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (this == obj) // quick check if (this == obj) // quick check
return true; return true;
if (!(obj instanceof Locale)) if (!(obj instanceof Locale))
return false; return false;
BaseLocale otherBase = ((Locale)obj)._baseLocale; BaseLocale otherBase = ((Locale)obj).baseLocale;
LocaleExtensions otherExt = ((Locale)obj)._extensions; if (!baseLocale.equals(otherBase)) {
return _baseLocale.equals(otherBase) && _extensions.equals(otherExt); return false;
}
if (localeExtensions == null) {
return ((Locale)obj).localeExtensions == null;
}
return localeExtensions.equals(((Locale)obj).localeExtensions);
} }
// ================= privates ===================================== // ================= privates =====================================
private transient BaseLocale _baseLocale; private transient BaseLocale baseLocale;
private transient LocaleExtensions _extensions; private transient LocaleExtensions localeExtensions;
/** /**
* Calculated hashcode * Calculated hashcode
...@@ -1883,7 +1927,7 @@ public final class Locale implements Cloneable, Serializable { ...@@ -1883,7 +1927,7 @@ public final class Locale implements Cloneable, Serializable {
*/ */
private String[] getDisplayVariantArray(OpenListResourceBundle bundle, Locale inLocale) { private String[] getDisplayVariantArray(OpenListResourceBundle bundle, Locale inLocale) {
// Split the variant name into tokens separated by '_'. // Split the variant name into tokens separated by '_'.
StringTokenizer tokenizer = new StringTokenizer(_baseLocale.getVariant(), "_"); StringTokenizer tokenizer = new StringTokenizer(baseLocale.getVariant(), "_");
String[] names = new String[tokenizer.countTokens()]; String[] names = new String[tokenizer.countTokens()];
// For each variant token, lookup the display name. If // For each variant token, lookup the display name. If
...@@ -1996,11 +2040,11 @@ public final class Locale implements Cloneable, Serializable { ...@@ -1996,11 +2040,11 @@ public final class Locale implements Cloneable, Serializable {
*/ */
private void writeObject(ObjectOutputStream out) throws IOException { private void writeObject(ObjectOutputStream out) throws IOException {
ObjectOutputStream.PutField fields = out.putFields(); ObjectOutputStream.PutField fields = out.putFields();
fields.put("language", _baseLocale.getLanguage()); fields.put("language", baseLocale.getLanguage());
fields.put("script", _baseLocale.getScript()); fields.put("script", baseLocale.getScript());
fields.put("country", _baseLocale.getRegion()); fields.put("country", baseLocale.getRegion());
fields.put("variant", _baseLocale.getVariant()); fields.put("variant", baseLocale.getVariant());
fields.put("extensions", _extensions.getID()); fields.put("extensions", localeExtensions == null ? "" : localeExtensions.getID());
fields.put("hashcode", -1); // place holder just for backward support fields.put("hashcode", -1); // place holder just for backward support
out.writeFields(); out.writeFields();
} }
...@@ -2020,13 +2064,17 @@ public final class Locale implements Cloneable, Serializable { ...@@ -2020,13 +2064,17 @@ public final class Locale implements Cloneable, Serializable {
String country = (String)fields.get("country", ""); String country = (String)fields.get("country", "");
String variant = (String)fields.get("variant", ""); String variant = (String)fields.get("variant", "");
String extStr = (String)fields.get("extensions", ""); String extStr = (String)fields.get("extensions", "");
_baseLocale = BaseLocale.getInstance(convertOldISOCodes(language), script, country, variant); baseLocale = BaseLocale.getInstance(convertOldISOCodes(language), script, country, variant);
try { if (extStr.length() > 0) {
InternalLocaleBuilder bldr = new InternalLocaleBuilder(); try {
bldr.setExtensions(extStr); InternalLocaleBuilder bldr = new InternalLocaleBuilder();
_extensions = bldr.getLocaleExtensions(); bldr.setExtensions(extStr);
} catch (LocaleSyntaxException e) { localeExtensions = bldr.getLocaleExtensions();
throw new IllformedLocaleException(e.getMessage()); } catch (LocaleSyntaxException e) {
throw new IllformedLocaleException(e.getMessage());
}
} else {
localeExtensions = null;
} }
} }
...@@ -2045,8 +2093,8 @@ public final class Locale implements Cloneable, Serializable { ...@@ -2045,8 +2093,8 @@ public final class Locale implements Cloneable, Serializable {
* @throws java.io.ObjectStreamException * @throws java.io.ObjectStreamException
*/ */
private Object readResolve() throws java.io.ObjectStreamException { private Object readResolve() throws java.io.ObjectStreamException {
return getInstance(_baseLocale.getLanguage(), _baseLocale.getScript(), return getInstance(baseLocale.getLanguage(), baseLocale.getScript(),
_baseLocale.getRegion(), _baseLocale.getVariant(), _extensions); baseLocale.getRegion(), baseLocale.getVariant(), localeExtensions);
} }
private static volatile String[] isoLanguages = null; private static volatile String[] isoLanguages = null;
...@@ -2056,7 +2104,7 @@ public final class Locale implements Cloneable, Serializable { ...@@ -2056,7 +2104,7 @@ public final class Locale implements Cloneable, Serializable {
private static String convertOldISOCodes(String language) { private static String convertOldISOCodes(String language) {
// we accept both the old and the new ISO codes for the languages whose ISO // we accept both the old and the new ISO codes for the languages whose ISO
// codes have changed, but we always store the OLD code, for backward compatibility // codes have changed, but we always store the OLD code, for backward compatibility
language = AsciiUtil.toLowerString(language).intern(); language = LocaleUtils.toLowerString(language).intern();
if (language == "he") { if (language == "he") {
return "iw"; return "iw";
} else if (language == "yi") { } else if (language == "yi") {
...@@ -2068,19 +2116,22 @@ public final class Locale implements Cloneable, Serializable { ...@@ -2068,19 +2116,22 @@ public final class Locale implements Cloneable, Serializable {
} }
} }
private static LocaleExtensions getCompatibilityExtensions(String language, String script, String country, String variant) { private static LocaleExtensions getCompatibilityExtensions(String language,
LocaleExtensions extensions = LocaleExtensions.EMPTY_EXTENSIONS; String script,
String country,
String variant) {
LocaleExtensions extensions = null;
// Special cases for backward compatibility support // Special cases for backward compatibility support
if (AsciiUtil.caseIgnoreMatch(language, "ja") if (LocaleUtils.caseIgnoreMatch(language, "ja")
&& script.length() == 0 && script.length() == 0
&& AsciiUtil.caseIgnoreMatch(country, "JP") && LocaleUtils.caseIgnoreMatch(country, "jp")
&& AsciiUtil.caseIgnoreMatch(variant, "JP")) { && "JP".equals(variant)) {
// ja_JP_JP -> u-ca-japanese (calendar = japanese) // ja_JP_JP -> u-ca-japanese (calendar = japanese)
extensions = LocaleExtensions.CALENDAR_JAPANESE; extensions = LocaleExtensions.CALENDAR_JAPANESE;
} else if (AsciiUtil.caseIgnoreMatch(language, "th") } else if (LocaleUtils.caseIgnoreMatch(language, "th")
&& script.length() == 0 && script.length() == 0
&& AsciiUtil.caseIgnoreMatch(country, "TH") && LocaleUtils.caseIgnoreMatch(country, "th")
&& AsciiUtil.caseIgnoreMatch(variant, "TH")) { && "TH".equals(variant)) {
// th_TH_TH -> u-nu-thai (numbersystem = thai) // th_TH_TH -> u-nu-thai (numbersystem = thai)
extensions = LocaleExtensions.NUMBER_THAI; extensions = LocaleExtensions.NUMBER_THAI;
} }
...@@ -2196,7 +2247,7 @@ public final class Locale implements Cloneable, Serializable { ...@@ -2196,7 +2247,7 @@ public final class Locale implements Cloneable, Serializable {
* @since 1.7 * @since 1.7
*/ */
public static final class Builder { public static final class Builder {
private InternalLocaleBuilder _locbld; private final InternalLocaleBuilder localeBuilder;
/** /**
* Constructs an empty Builder. The default value of all * Constructs an empty Builder. The default value of all
...@@ -2204,7 +2255,7 @@ public final class Locale implements Cloneable, Serializable { ...@@ -2204,7 +2255,7 @@ public final class Locale implements Cloneable, Serializable {
* empty string. * empty string.
*/ */
public Builder() { public Builder() {
_locbld = new InternalLocaleBuilder(); localeBuilder = new InternalLocaleBuilder();
} }
/** /**
...@@ -2229,7 +2280,7 @@ public final class Locale implements Cloneable, Serializable { ...@@ -2229,7 +2280,7 @@ public final class Locale implements Cloneable, Serializable {
*/ */
public Builder setLocale(Locale locale) { public Builder setLocale(Locale locale) {
try { try {
_locbld.setLocale(locale._baseLocale, locale._extensions); localeBuilder.setLocale(locale.baseLocale, locale.localeExtensions);
} catch (LocaleSyntaxException e) { } catch (LocaleSyntaxException e) {
throw new IllformedLocaleException(e.getMessage(), e.getErrorIndex()); throw new IllformedLocaleException(e.getMessage(), e.getErrorIndex());
} }
...@@ -2259,8 +2310,7 @@ public final class Locale implements Cloneable, Serializable { ...@@ -2259,8 +2310,7 @@ public final class Locale implements Cloneable, Serializable {
if (sts.isError()) { if (sts.isError()) {
throw new IllformedLocaleException(sts.getErrorMessage(), sts.getErrorIndex()); throw new IllformedLocaleException(sts.getErrorMessage(), sts.getErrorIndex());
} }
_locbld.setLanguageTag(tag); localeBuilder.setLanguageTag(tag);
return this; return this;
} }
...@@ -2279,7 +2329,7 @@ public final class Locale implements Cloneable, Serializable { ...@@ -2279,7 +2329,7 @@ public final class Locale implements Cloneable, Serializable {
*/ */
public Builder setLanguage(String language) { public Builder setLanguage(String language) {
try { try {
_locbld.setLanguage(language); localeBuilder.setLanguage(language);
} catch (LocaleSyntaxException e) { } catch (LocaleSyntaxException e) {
throw new IllformedLocaleException(e.getMessage(), e.getErrorIndex()); throw new IllformedLocaleException(e.getMessage(), e.getErrorIndex());
} }
...@@ -2300,7 +2350,7 @@ public final class Locale implements Cloneable, Serializable { ...@@ -2300,7 +2350,7 @@ public final class Locale implements Cloneable, Serializable {
*/ */
public Builder setScript(String script) { public Builder setScript(String script) {
try { try {
_locbld.setScript(script); localeBuilder.setScript(script);
} catch (LocaleSyntaxException e) { } catch (LocaleSyntaxException e) {
throw new IllformedLocaleException(e.getMessage(), e.getErrorIndex()); throw new IllformedLocaleException(e.getMessage(), e.getErrorIndex());
} }
...@@ -2325,7 +2375,7 @@ public final class Locale implements Cloneable, Serializable { ...@@ -2325,7 +2375,7 @@ public final class Locale implements Cloneable, Serializable {
*/ */
public Builder setRegion(String region) { public Builder setRegion(String region) {
try { try {
_locbld.setRegion(region); localeBuilder.setRegion(region);
} catch (LocaleSyntaxException e) { } catch (LocaleSyntaxException e) {
throw new IllformedLocaleException(e.getMessage(), e.getErrorIndex()); throw new IllformedLocaleException(e.getMessage(), e.getErrorIndex());
} }
...@@ -2352,7 +2402,7 @@ public final class Locale implements Cloneable, Serializable { ...@@ -2352,7 +2402,7 @@ public final class Locale implements Cloneable, Serializable {
*/ */
public Builder setVariant(String variant) { public Builder setVariant(String variant) {
try { try {
_locbld.setVariant(variant); localeBuilder.setVariant(variant);
} catch (LocaleSyntaxException e) { } catch (LocaleSyntaxException e) {
throw new IllformedLocaleException(e.getMessage(), e.getErrorIndex()); throw new IllformedLocaleException(e.getMessage(), e.getErrorIndex());
} }
...@@ -2384,7 +2434,7 @@ public final class Locale implements Cloneable, Serializable { ...@@ -2384,7 +2434,7 @@ public final class Locale implements Cloneable, Serializable {
*/ */
public Builder setExtension(char key, String value) { public Builder setExtension(char key, String value) {
try { try {
_locbld.setExtension(key, value); localeBuilder.setExtension(key, value);
} catch (LocaleSyntaxException e) { } catch (LocaleSyntaxException e) {
throw new IllformedLocaleException(e.getMessage(), e.getErrorIndex()); throw new IllformedLocaleException(e.getMessage(), e.getErrorIndex());
} }
...@@ -2414,7 +2464,7 @@ public final class Locale implements Cloneable, Serializable { ...@@ -2414,7 +2464,7 @@ public final class Locale implements Cloneable, Serializable {
*/ */
public Builder setUnicodeLocaleKeyword(String key, String type) { public Builder setUnicodeLocaleKeyword(String key, String type) {
try { try {
_locbld.setUnicodeLocaleKeyword(key, type); localeBuilder.setUnicodeLocaleKeyword(key, type);
} catch (LocaleSyntaxException e) { } catch (LocaleSyntaxException e) {
throw new IllformedLocaleException(e.getMessage(), e.getErrorIndex()); throw new IllformedLocaleException(e.getMessage(), e.getErrorIndex());
} }
...@@ -2435,7 +2485,7 @@ public final class Locale implements Cloneable, Serializable { ...@@ -2435,7 +2485,7 @@ public final class Locale implements Cloneable, Serializable {
*/ */
public Builder addUnicodeLocaleAttribute(String attribute) { public Builder addUnicodeLocaleAttribute(String attribute) {
try { try {
_locbld.addUnicodeLocaleAttribute(attribute); localeBuilder.addUnicodeLocaleAttribute(attribute);
} catch (LocaleSyntaxException e) { } catch (LocaleSyntaxException e) {
throw new IllformedLocaleException(e.getMessage(), e.getErrorIndex()); throw new IllformedLocaleException(e.getMessage(), e.getErrorIndex());
} }
...@@ -2458,7 +2508,7 @@ public final class Locale implements Cloneable, Serializable { ...@@ -2458,7 +2508,7 @@ public final class Locale implements Cloneable, Serializable {
*/ */
public Builder removeUnicodeLocaleAttribute(String attribute) { public Builder removeUnicodeLocaleAttribute(String attribute) {
try { try {
_locbld.removeUnicodeLocaleAttribute(attribute); localeBuilder.removeUnicodeLocaleAttribute(attribute);
} catch (LocaleSyntaxException e) { } catch (LocaleSyntaxException e) {
throw new IllformedLocaleException(e.getMessage(), e.getErrorIndex()); throw new IllformedLocaleException(e.getMessage(), e.getErrorIndex());
} }
...@@ -2471,7 +2521,7 @@ public final class Locale implements Cloneable, Serializable { ...@@ -2471,7 +2521,7 @@ public final class Locale implements Cloneable, Serializable {
* @return This builder. * @return This builder.
*/ */
public Builder clear() { public Builder clear() {
_locbld.clear(); localeBuilder.clear();
return this; return this;
} }
...@@ -2483,7 +2533,7 @@ public final class Locale implements Cloneable, Serializable { ...@@ -2483,7 +2533,7 @@ public final class Locale implements Cloneable, Serializable {
* @see #setExtension(char, String) * @see #setExtension(char, String)
*/ */
public Builder clearExtensions() { public Builder clearExtensions() {
_locbld.clearExtensions(); localeBuilder.clearExtensions();
return this; return this;
} }
...@@ -2498,9 +2548,9 @@ public final class Locale implements Cloneable, Serializable { ...@@ -2498,9 +2548,9 @@ public final class Locale implements Cloneable, Serializable {
* @return A Locale. * @return A Locale.
*/ */
public Locale build() { public Locale build() {
BaseLocale baseloc = _locbld.getBaseLocale(); BaseLocale baseloc = localeBuilder.getBaseLocale();
LocaleExtensions extensions = _locbld.getLocaleExtensions(); LocaleExtensions extensions = localeBuilder.getLocaleExtensions();
if (extensions.isEmpty() && baseloc.getVariant().length() > 0) { if (extensions == null && baseloc.getVariant().length() > 0) {
extensions = getCompatibilityExtensions(baseloc.getLanguage(), baseloc.getScript(), extensions = getCompatibilityExtensions(baseloc.getLanguage(), baseloc.getScript(),
baseloc.getRegion(), baseloc.getVariant()); baseloc.getRegion(), baseloc.getVariant());
} }
......
src/share/classes/java/util/ResourceBundle.java
浏览文件 @ 7186bcf5
/* /*
* Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -57,7 +57,6 @@ import java.util.concurrent.ConcurrentMap; ...@@ -57,7 +57,6 @@ import java.util.concurrent.ConcurrentMap;
import java.util.jar.JarEntry; import java.util.jar.JarEntry;
import sun.util.locale.BaseLocale; import sun.util.locale.BaseLocale;
import sun.util.locale.LocaleExtensions;
import sun.util.locale.LocaleObjectCache; import sun.util.locale.LocaleObjectCache;
...@@ -290,7 +289,7 @@ public abstract class ResourceBundle { ...@@ -290,7 +289,7 @@ public abstract class ResourceBundle {
* name for compatibility with some workarounds for bug 4212439. * name for compatibility with some workarounds for bug 4212439.
*/ */
private static final ConcurrentMap<CacheKey, BundleReference> cacheList private static final ConcurrentMap<CacheKey, BundleReference> cacheList
= new ConcurrentHashMap<CacheKey, BundleReference>(INITIAL_CACHE_SIZE); = new ConcurrentHashMap<>(INITIAL_CACHE_SIZE);
/** /**
* Queue for reference objects referring to class loaders or bundles. * Queue for reference objects referring to class loaders or bundles.
...@@ -1755,7 +1754,7 @@ public abstract class ResourceBundle { ...@@ -1755,7 +1754,7 @@ public abstract class ResourceBundle {
* @since 1.6 * @since 1.6
*/ */
public Set<String> keySet() { public Set<String> keySet() {
Set<String> keys = new HashSet<String>(); Set<String> keys = new HashSet<>();
for (ResourceBundle rb = this; rb != null; rb = rb.parent) { for (ResourceBundle rb = this; rb != null; rb = rb.parent) {
keys.addAll(rb.handleKeySet()); keys.addAll(rb.handleKeySet());
} }
...@@ -1783,7 +1782,7 @@ public abstract class ResourceBundle { ...@@ -1783,7 +1782,7 @@ public abstract class ResourceBundle {
if (keySet == null) { if (keySet == null) {
synchronized (this) { synchronized (this) {
if (keySet == null) { if (keySet == null) {
Set<String> keys = new HashSet<String>(); Set<String> keys = new HashSet<>();
Enumeration<String> enumKeys = getKeys(); Enumeration<String> enumKeys = getKeys();
while (enumKeys.hasMoreElements()) { while (enumKeys.hasMoreElements()) {
String key = enumKeys.nextElement(); String key = enumKeys.nextElement();
...@@ -2301,7 +2300,7 @@ public abstract class ResourceBundle { ...@@ -2301,7 +2300,7 @@ public abstract class ResourceBundle {
if (baseName == null) { if (baseName == null) {
throw new NullPointerException(); throw new NullPointerException();
} }
return new ArrayList<Locale>(CANDIDATES_CACHE.get(locale.getBaseLocale())); return new ArrayList<>(CANDIDATES_CACHE.get(locale.getBaseLocale()));
} }
private static final CandidateListCache CANDIDATES_CACHE = new CandidateListCache(); private static final CandidateListCache CANDIDATES_CACHE = new CandidateListCache();
...@@ -2327,14 +2326,14 @@ public abstract class ResourceBundle { ...@@ -2327,14 +2326,14 @@ public abstract class ResourceBundle {
if (language.equals("nb") || isNorwegianBokmal) { if (language.equals("nb") || isNorwegianBokmal) {
List<Locale> tmpList = getDefaultList("nb", script, region, variant); List<Locale> tmpList = getDefaultList("nb", script, region, variant);
// Insert a locale replacing "nb" with "no" for every list entry // Insert a locale replacing "nb" with "no" for every list entry
List<Locale> bokmalList = new LinkedList<Locale>(); List<Locale> bokmalList = new LinkedList<>();
for (Locale l : tmpList) { for (Locale l : tmpList) {
bokmalList.add(l); bokmalList.add(l);
if (l.getLanguage().length() == 0) { if (l.getLanguage().length() == 0) {
break; break;
} }
bokmalList.add(Locale.getInstance("no", l.getScript(), l.getCountry(), bokmalList.add(Locale.getInstance("no", l.getScript(), l.getCountry(),
l.getVariant(), LocaleExtensions.EMPTY_EXTENSIONS)); l.getVariant(), null));
} }
return bokmalList; return bokmalList;
} else if (language.equals("nn") || isNorwegianNynorsk) { } else if (language.equals("nn") || isNorwegianNynorsk) {
...@@ -2374,7 +2373,7 @@ public abstract class ResourceBundle { ...@@ -2374,7 +2373,7 @@ public abstract class ResourceBundle {
List<String> variants = null; List<String> variants = null;
if (variant.length() > 0) { if (variant.length() > 0) {
variants = new LinkedList<String>(); variants = new LinkedList<>();
int idx = variant.length(); int idx = variant.length();
while (idx != -1) { while (idx != -1) {
variants.add(variant.substring(0, idx)); variants.add(variant.substring(0, idx));
...@@ -2382,32 +2381,32 @@ public abstract class ResourceBundle { ...@@ -2382,32 +2381,32 @@ public abstract class ResourceBundle {
} }
} }
LinkedList<Locale> list = new LinkedList<Locale>(); List<Locale> list = new LinkedList<>();
if (variants != null) { if (variants != null) {
for (String v : variants) { for (String v : variants) {
list.add(Locale.getInstance(language, script, region, v, LocaleExtensions.EMPTY_EXTENSIONS)); list.add(Locale.getInstance(language, script, region, v, null));
} }
} }
if (region.length() > 0) { if (region.length() > 0) {
list.add(Locale.getInstance(language, script, region, "", LocaleExtensions.EMPTY_EXTENSIONS)); list.add(Locale.getInstance(language, script, region, "", null));
} }
if (script.length() > 0) { if (script.length() > 0) {
list.add(Locale.getInstance(language, script, "", "", LocaleExtensions.EMPTY_EXTENSIONS)); list.add(Locale.getInstance(language, script, "", "", null));
// With script, after truncating variant, region and script, // With script, after truncating variant, region and script,
// start over without script. // start over without script.
if (variants != null) { if (variants != null) {
for (String v : variants) { for (String v : variants) {
list.add(Locale.getInstance(language, "", region, v, LocaleExtensions.EMPTY_EXTENSIONS)); list.add(Locale.getInstance(language, "", region, v, null));
} }
} }
if (region.length() > 0) { if (region.length() > 0) {
list.add(Locale.getInstance(language, "", region, "", LocaleExtensions.EMPTY_EXTENSIONS)); list.add(Locale.getInstance(language, "", region, "", null));
} }
} }
if (language.length() > 0) { if (language.length() > 0) {
list.add(Locale.getInstance(language, "", "", "", LocaleExtensions.EMPTY_EXTENSIONS)); list.add(Locale.getInstance(language, "", "", "", null));
} }
// Add root locale at the end // Add root locale at the end
list.add(Locale.ROOT); list.add(Locale.ROOT);
......
src/share/classes/sun/util/locale/BaseLocale.java
浏览文件 @ 7186bcf5
/* /*
* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -38,38 +38,46 @@ public final class BaseLocale { ...@@ -38,38 +38,46 @@ public final class BaseLocale {
public static final String SEP = "_"; public static final String SEP = "_";
private static final Cache CACHE = new Cache(); private static final Cache CACHE = new Cache();
public static final BaseLocale ROOT = BaseLocale.getInstance("", "", "", "");
private String _language = ""; private final String language;
private String _script = ""; private final String script;
private String _region = ""; private final String region;
private String _variant = ""; private final String variant;
private transient volatile int _hash = 0; private volatile int hash = 0;
// This method must be called only when creating the Locale.* constants.
private BaseLocale(String language, String region) {
this.language = language;
this.script = "";
this.region = region;
this.variant = "";
}
private BaseLocale(String language, String script, String region, String variant) { private BaseLocale(String language, String script, String region, String variant) {
if (language != null) { this.language = (language != null) ? LocaleUtils.toLowerString(language).intern() : "";
_language = AsciiUtil.toLowerString(language).intern(); this.script = (script != null) ? LocaleUtils.toTitleString(script).intern() : "";
} this.region = (region != null) ? LocaleUtils.toUpperString(region).intern() : "";
if (script != null) { this.variant = (variant != null) ? variant.intern() : "";
_script = AsciiUtil.toTitleString(script).intern(); }
}
if (region != null) { // Called for creating the Locale.* constants. No argument
_region = AsciiUtil.toUpperString(region).intern(); // validation is performed.
} public static BaseLocale createInstance(String language, String region) {
if (variant != null) { BaseLocale base = new BaseLocale(language, region);
_variant = variant.intern(); CACHE.put(new Key(language, region), base);
} return base;
} }
public static BaseLocale getInstance(String language, String script, String region, String variant) { public static BaseLocale getInstance(String language, String script,
String region, String variant) {
// JDK uses deprecated ISO639.1 language codes for he, yi and id // JDK uses deprecated ISO639.1 language codes for he, yi and id
if (language != null) { if (language != null) {
if (AsciiUtil.caseIgnoreMatch(language, "he")) { if (LocaleUtils.caseIgnoreMatch(language, "he")) {
language = "iw"; language = "iw";
} else if (AsciiUtil.caseIgnoreMatch(language, "yi")) { } else if (LocaleUtils.caseIgnoreMatch(language, "yi")) {
language = "ji"; language = "ji";
} else if (AsciiUtil.caseIgnoreMatch(language, "id")) { } else if (LocaleUtils.caseIgnoreMatch(language, "id")) {
language = "in"; language = "in";
} }
} }
...@@ -80,21 +88,22 @@ public final class BaseLocale { ...@@ -80,21 +88,22 @@ public final class BaseLocale {
} }
public String getLanguage() { public String getLanguage() {
return _language; return language;
} }
public String getScript() { public String getScript() {
return _script; return script;
} }
public String getRegion() { public String getRegion() {
return _region; return region;
} }
public String getVariant() { public String getVariant() {
return _variant; return variant;
} }
@Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (this == obj) { if (this == obj) {
return true; return true;
...@@ -103,138 +112,178 @@ public final class BaseLocale { ...@@ -103,138 +112,178 @@ public final class BaseLocale {
return false; return false;
} }
BaseLocale other = (BaseLocale)obj; BaseLocale other = (BaseLocale)obj;
return hashCode() == other.hashCode() return language == other.language
&& _language.equals(other._language) && script == other.script
&& _script.equals(other._script) && region == other.region
&& _region.equals(other._region) && variant == other.variant;
&& _variant.equals(other._variant);
} }
@Override
public String toString() { public String toString() {
StringBuilder buf = new StringBuilder(); StringBuilder buf = new StringBuilder();
if (_language.length() > 0) { if (language.length() > 0) {
buf.append("language="); buf.append("language=");
buf.append(_language); buf.append(language);
} }
if (_script.length() > 0) { if (script.length() > 0) {
if (buf.length() > 0) { if (buf.length() > 0) {
buf.append(", "); buf.append(", ");
} }
buf.append("script="); buf.append("script=");
buf.append(_script); buf.append(script);
} }
if (_region.length() > 0) { if (region.length() > 0) {
if (buf.length() > 0) { if (buf.length() > 0) {
buf.append(", "); buf.append(", ");
} }
buf.append("region="); buf.append("region=");
buf.append(_region); buf.append(region);
} }
if (_variant.length() > 0) { if (variant.length() > 0) {
if (buf.length() > 0) { if (buf.length() > 0) {
buf.append(", "); buf.append(", ");
} }
buf.append("variant="); buf.append("variant=");
buf.append(_variant); buf.append(variant);
} }
return buf.toString(); return buf.toString();
} }
@Override
public int hashCode() { public int hashCode() {
int h = _hash; int h = hash;
if (h == 0) { if (h == 0) {
// Generating a hash value from language, script, region and variant // Generating a hash value from language, script, region and variant
for (int i = 0; i < _language.length(); i++) { h = language.hashCode();
h = 31*h + _language.charAt(i); h = 31 * h + script.hashCode();
} h = 31 * h + region.hashCode();
for (int i = 0; i < _script.length(); i++) { h = 31 * h + variant.hashCode();
h = 31*h + _script.charAt(i); hash = h;
}
for (int i = 0; i < _region.length(); i++) {
h = 31*h + _region.charAt(i);
}
for (int i = 0; i < _variant.length(); i++) {
h = 31*h + _variant.charAt(i);
}
_hash = h;
} }
return h; return h;
} }
private static class Key implements Comparable<Key> { private static final class Key implements Comparable<Key> {
private String _lang = ""; private final String lang;
private String _scrt = ""; private final String scrt;
private String _regn = ""; private final String regn;
private String _vart = ""; private final String vart;
private final boolean normalized;
private final int hash;
/**
* Creates a Key. language and region must be normalized
* (intern'ed in the proper case).
*/
private Key(String language, String region) {
assert language.intern() == language
&& region.intern() == region;
private volatile int _hash; // Default to 0 lang = language;
scrt = "";
regn = region;
vart = "";
this.normalized = true;
int h = language.hashCode();
if (region != "") {
int len = region.length();
for (int i = 0; i < len; i++) {
h = 31 * h + LocaleUtils.toLower(region.charAt(i));
}
}
hash = h;
}
public Key(String language, String script, String region, String variant) { public Key(String language, String script, String region, String variant) {
this(language, script, region, variant, false);
}
private Key(String language, String script, String region,
String variant, boolean normalized) {
int h = 0;
if (language != null) { if (language != null) {
_lang = language; lang = language;
int len = language.length();
for (int i = 0; i < len; i++) {
h = 31*h + LocaleUtils.toLower(language.charAt(i));
}
} else {
lang = "";
} }
if (script != null) { if (script != null) {
_scrt = script; scrt = script;
int len = script.length();
for (int i = 0; i < len; i++) {
h = 31*h + LocaleUtils.toLower(script.charAt(i));
}
} else {
scrt = "";
} }
if (region != null) { if (region != null) {
_regn = region; regn = region;
int len = region.length();
for (int i = 0; i < len; i++) {
h = 31*h + LocaleUtils.toLower(region.charAt(i));
}
} else {
regn = "";
} }
if (variant != null) { if (variant != null) {
_vart = variant; vart = variant;
int len = variant.length();
for (int i = 0; i < len; i++) {
h = 31*h + variant.charAt(i);
}
} else {
vart = "";
} }
hash = h;
this.normalized = normalized;
} }
@Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
return (this == obj) || return (this == obj) ||
(obj instanceof Key) (obj instanceof Key)
&& AsciiUtil.caseIgnoreMatch(((Key)obj)._lang, this._lang) && this.hash == ((Key)obj).hash
&& AsciiUtil.caseIgnoreMatch(((Key)obj)._scrt, this._scrt) && LocaleUtils.caseIgnoreMatch(((Key)obj).lang, this.lang)
&& AsciiUtil.caseIgnoreMatch(((Key)obj)._regn, this._regn) && LocaleUtils.caseIgnoreMatch(((Key)obj).scrt, this.scrt)
&& ((Key)obj)._vart.equals(_vart); // variant is case sensitive in JDK! && LocaleUtils.caseIgnoreMatch(((Key)obj).regn, this.regn)
&& ((Key)obj).vart.equals(vart); // variant is case sensitive in JDK!
} }
@Override
public int compareTo(Key other) { public int compareTo(Key other) {
int res = AsciiUtil.caseIgnoreCompare(this._lang, other._lang); int res = LocaleUtils.caseIgnoreCompare(this.lang, other.lang);
if (res == 0) { if (res == 0) {
res = AsciiUtil.caseIgnoreCompare(this._scrt, other._scrt); res = LocaleUtils.caseIgnoreCompare(this.scrt, other.scrt);
if (res == 0) { if (res == 0) {
res = AsciiUtil.caseIgnoreCompare(this._regn, other._regn); res = LocaleUtils.caseIgnoreCompare(this.regn, other.regn);
if (res == 0) { if (res == 0) {
res = this._vart.compareTo(other._vart); res = this.vart.compareTo(other.vart);
} }
} }
} }
return res; return res;
} }
@Override
public int hashCode() { public int hashCode() {
int h = _hash; return hash;
if (h == 0) {
// Generating a hash value from language, script, region and variant
for (int i = 0; i < _lang.length(); i++) {
h = 31*h + AsciiUtil.toLower(_lang.charAt(i));
}
for (int i = 0; i < _scrt.length(); i++) {
h = 31*h + AsciiUtil.toLower(_scrt.charAt(i));
}
for (int i = 0; i < _regn.length(); i++) {
h = 31*h + AsciiUtil.toLower(_regn.charAt(i));
}
for (int i = 0; i < _vart.length(); i++) {
h = 31*h + _vart.charAt(i);
}
_hash = h;
}
return h;
} }
public static Key normalize(Key key) { public static Key normalize(Key key) {
String lang = AsciiUtil.toLowerString(key._lang).intern(); if (key.normalized) {
String scrt = AsciiUtil.toTitleString(key._scrt).intern(); return key;
String regn = AsciiUtil.toUpperString(key._regn).intern(); }
String vart = key._vart.intern(); // preserve upper/lower cases
return new Key(lang, scrt, regn, vart); String lang = LocaleUtils.toLowerString(key.lang).intern();
String scrt = LocaleUtils.toTitleString(key.scrt).intern();
String regn = LocaleUtils.toUpperString(key.regn).intern();
String vart = key.vart.intern(); // preserve upper/lower cases
return new Key(lang, scrt, regn, vart, true);
} }
} }
...@@ -243,13 +292,14 @@ public final class BaseLocale { ...@@ -243,13 +292,14 @@ public final class BaseLocale {
public Cache() { public Cache() {
} }
@Override
protected Key normalizeKey(Key key) { protected Key normalizeKey(Key key) {
return Key.normalize(key); return Key.normalize(key);
} }
@Override
protected BaseLocale createObject(Key key) { protected BaseLocale createObject(Key key) {
return new BaseLocale(key._lang, key._scrt, key._regn, key._vart); return new BaseLocale(key.lang, key.scrt, key.regn, key.vart);
} }
} }
} }
src/share/classes/sun/util/locale/Extension.java
浏览文件 @ 7186bcf5
/* /*
* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -32,29 +32,34 @@ ...@@ -32,29 +32,34 @@
package sun.util.locale; package sun.util.locale;
public class Extension { class Extension {
private char _key; private final char key;
protected String _value; private String value, id;
protected Extension(char key) { protected Extension(char key) {
_key = key; this.key = key;
} }
Extension(char key, String value) { Extension(char key, String value) {
_key = key; this.key = key;
_value = value; setValue(value);
}
protected void setValue(String value) {
this.value = value;
this.id = key + LanguageTag.SEP + value;
} }
public char getKey() { public char getKey() {
return _key; return key;
} }
public String getValue() { public String getValue() {
return _value; return value;
} }
public String getID() { public String getID() {
return _key + LanguageTag.SEP + _value; return id;
} }
public String toString() { public String toString() {
......
src/share/classes/sun/util/locale/InternalLocaleBuilder.java
浏览文件 @ 7186bcf5
/* /*
* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -35,64 +35,66 @@ import java.util.ArrayList; ...@@ -35,64 +35,66 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Set; import java.util.Set;
public final class InternalLocaleBuilder { public final class InternalLocaleBuilder {
private String _language = ""; private static final CaseInsensitiveChar PRIVATEUSE_KEY
private String _script = ""; = new CaseInsensitiveChar(LanguageTag.PRIVATEUSE);
private String _region = "";
private String _variant = "";
private static final CaseInsensitiveChar PRIVUSE_KEY = new CaseInsensitiveChar(LanguageTag.PRIVATEUSE.charAt(0)); private String language = "";
private String script = "";
private String region = "";
private String variant = "";
private HashMap<CaseInsensitiveChar, String> _extensions; private Map<CaseInsensitiveChar, String> extensions;
private HashSet<CaseInsensitiveString> _uattributes; private Set<CaseInsensitiveString> uattributes;
private HashMap<CaseInsensitiveString, String> _ukeywords; private Map<CaseInsensitiveString, String> ukeywords;
public InternalLocaleBuilder() { public InternalLocaleBuilder() {
} }
public InternalLocaleBuilder setLanguage(String language) throws LocaleSyntaxException { public InternalLocaleBuilder setLanguage(String language) throws LocaleSyntaxException {
if (language == null || language.length() == 0) { if (LocaleUtils.isEmpty(language)) {
_language = ""; this.language = "";
} else { } else {
if (!LanguageTag.isLanguage(language)) { if (!LanguageTag.isLanguage(language)) {
throw new LocaleSyntaxException("Ill-formed language: " + language, 0); throw new LocaleSyntaxException("Ill-formed language: " + language, 0);
} }
_language = language; this.language = language;
} }
return this; return this;
} }
public InternalLocaleBuilder setScript(String script) throws LocaleSyntaxException { public InternalLocaleBuilder setScript(String script) throws LocaleSyntaxException {
if (script == null || script.length() == 0) { if (LocaleUtils.isEmpty(script)) {
_script = ""; this.script = "";
} else { } else {
if (!LanguageTag.isScript(script)) { if (!LanguageTag.isScript(script)) {
throw new LocaleSyntaxException("Ill-formed script: " + script, 0); throw new LocaleSyntaxException("Ill-formed script: " + script, 0);
} }
_script = script; this.script = script;
} }
return this; return this;
} }
public InternalLocaleBuilder setRegion(String region) throws LocaleSyntaxException { public InternalLocaleBuilder setRegion(String region) throws LocaleSyntaxException {
if (region == null || region.length() == 0) { if (LocaleUtils.isEmpty(region)) {
_region = ""; this.region = "";
} else { } else {
if (!LanguageTag.isRegion(region)) { if (!LanguageTag.isRegion(region)) {
throw new LocaleSyntaxException("Ill-formed region: " + region, 0); throw new LocaleSyntaxException("Ill-formed region: " + region, 0);
} }
_region = region; this.region = region;
} }
return this; return this;
} }
public InternalLocaleBuilder setVariant(String variant) throws LocaleSyntaxException { public InternalLocaleBuilder setVariant(String variant) throws LocaleSyntaxException {
if (variant == null || variant.length() == 0) { if (LocaleUtils.isEmpty(variant)) {
_variant = ""; this.variant = "";
} else { } else {
// normalize separators to "_" // normalize separators to "_"
String var = variant.replaceAll(LanguageTag.SEP, BaseLocale.SEP); String var = variant.replaceAll(LanguageTag.SEP, BaseLocale.SEP);
...@@ -100,7 +102,7 @@ public final class InternalLocaleBuilder { ...@@ -100,7 +102,7 @@ public final class InternalLocaleBuilder {
if (errIdx != -1) { if (errIdx != -1) {
throw new LocaleSyntaxException("Ill-formed variant: " + variant, errIdx); throw new LocaleSyntaxException("Ill-formed variant: " + variant, errIdx);
} }
_variant = var; this.variant = var;
} }
return this; return this;
} }
...@@ -110,10 +112,10 @@ public final class InternalLocaleBuilder { ...@@ -110,10 +112,10 @@ public final class InternalLocaleBuilder {
throw new LocaleSyntaxException("Ill-formed Unicode locale attribute: " + attribute); throw new LocaleSyntaxException("Ill-formed Unicode locale attribute: " + attribute);
} }
// Use case insensitive string to prevent duplication // Use case insensitive string to prevent duplication
if (_uattributes == null) { if (uattributes == null) {
_uattributes = new HashSet<CaseInsensitiveString>(4); uattributes = new HashSet<>(4);
} }
_uattributes.add(new CaseInsensitiveString(attribute)); uattributes.add(new CaseInsensitiveString(attribute));
return this; return this;
} }
...@@ -121,8 +123,8 @@ public final class InternalLocaleBuilder { ...@@ -121,8 +123,8 @@ public final class InternalLocaleBuilder {
if (attribute == null || !UnicodeLocaleExtension.isAttribute(attribute)) { if (attribute == null || !UnicodeLocaleExtension.isAttribute(attribute)) {
throw new LocaleSyntaxException("Ill-formed Unicode locale attribute: " + attribute); throw new LocaleSyntaxException("Ill-formed Unicode locale attribute: " + attribute);
} }
if (_uattributes != null) { if (uattributes != null) {
_uattributes.remove(new CaseInsensitiveString(attribute)); uattributes.remove(new CaseInsensitiveString(attribute));
} }
return this; return this;
} }
...@@ -134,9 +136,9 @@ public final class InternalLocaleBuilder { ...@@ -134,9 +136,9 @@ public final class InternalLocaleBuilder {
CaseInsensitiveString cikey = new CaseInsensitiveString(key); CaseInsensitiveString cikey = new CaseInsensitiveString(key);
if (type == null) { if (type == null) {
if (_ukeywords != null) { if (ukeywords != null) {
// null type is used for remove the key // null type is used for remove the key
_ukeywords.remove(cikey); ukeywords.remove(cikey);
} }
} else { } else {
if (type.length() != 0) { if (type.length() != 0) {
...@@ -147,15 +149,17 @@ public final class InternalLocaleBuilder { ...@@ -147,15 +149,17 @@ public final class InternalLocaleBuilder {
while (!itr.isDone()) { while (!itr.isDone()) {
String s = itr.current(); String s = itr.current();
if (!UnicodeLocaleExtension.isTypeSubtag(s)) { if (!UnicodeLocaleExtension.isTypeSubtag(s)) {
throw new LocaleSyntaxException("Ill-formed Unicode locale keyword type: " + type, itr.currentStart()); throw new LocaleSyntaxException("Ill-formed Unicode locale keyword type: "
+ type,
itr.currentStart());
} }
itr.next(); itr.next();
} }
} }
if (_ukeywords == null) { if (ukeywords == null) {
_ukeywords = new HashMap<CaseInsensitiveString, String>(4); ukeywords = new HashMap<>(4);
} }
_ukeywords.put(cikey, type); ukeywords.put(cikey, type);
} }
return this; return this;
} }
...@@ -167,21 +171,21 @@ public final class InternalLocaleBuilder { ...@@ -167,21 +171,21 @@ public final class InternalLocaleBuilder {
throw new LocaleSyntaxException("Ill-formed extension key: " + singleton); throw new LocaleSyntaxException("Ill-formed extension key: " + singleton);
} }
boolean remove = (value == null || value.length() == 0); boolean remove = LocaleUtils.isEmpty(value);
CaseInsensitiveChar key = new CaseInsensitiveChar(singleton); CaseInsensitiveChar key = new CaseInsensitiveChar(singleton);
if (remove) { if (remove) {
if (UnicodeLocaleExtension.isSingletonChar(key.value())) { if (UnicodeLocaleExtension.isSingletonChar(key.value())) {
// clear entire Unicode locale extension // clear entire Unicode locale extension
if (_uattributes != null) { if (uattributes != null) {
_uattributes.clear(); uattributes.clear();
} }
if (_ukeywords != null) { if (ukeywords != null) {
_ukeywords.clear(); ukeywords.clear();
} }
} else { } else {
if (_extensions != null && _extensions.containsKey(key)) { if (extensions != null && extensions.containsKey(key)) {
_extensions.remove(key); extensions.remove(key);
} }
} }
} else { } else {
...@@ -197,7 +201,8 @@ public final class InternalLocaleBuilder { ...@@ -197,7 +201,8 @@ public final class InternalLocaleBuilder {
validSubtag = LanguageTag.isExtensionSubtag(s); validSubtag = LanguageTag.isExtensionSubtag(s);
} }
if (!validSubtag) { if (!validSubtag) {
throw new LocaleSyntaxException("Ill-formed extension value: " + s, itr.currentStart()); throw new LocaleSyntaxException("Ill-formed extension value: " + s,
itr.currentStart());
} }
itr.next(); itr.next();
} }
...@@ -205,10 +210,10 @@ public final class InternalLocaleBuilder { ...@@ -205,10 +210,10 @@ public final class InternalLocaleBuilder {
if (UnicodeLocaleExtension.isSingletonChar(key.value())) { if (UnicodeLocaleExtension.isSingletonChar(key.value())) {
setUnicodeLocaleExtension(val); setUnicodeLocaleExtension(val);
} else { } else {
if (_extensions == null) { if (extensions == null) {
_extensions = new HashMap<CaseInsensitiveChar, String>(4); extensions = new HashMap<>(4);
} }
_extensions.put(key, val); extensions.put(key, val);
} }
} }
return this; return this;
...@@ -218,7 +223,7 @@ public final class InternalLocaleBuilder { ...@@ -218,7 +223,7 @@ public final class InternalLocaleBuilder {
* Set extension/private subtags in a single string representation * Set extension/private subtags in a single string representation
*/ */
public InternalLocaleBuilder setExtensions(String subtags) throws LocaleSyntaxException { public InternalLocaleBuilder setExtensions(String subtags) throws LocaleSyntaxException {
if (subtags == null || subtags.length() == 0) { if (LocaleUtils.isEmpty(subtags)) {
clearExtensions(); clearExtensions();
return this; return this;
} }
...@@ -252,11 +257,12 @@ public final class InternalLocaleBuilder { ...@@ -252,11 +257,12 @@ public final class InternalLocaleBuilder {
} }
if (parsed < start) { if (parsed < start) {
throw new LocaleSyntaxException("Incomplete extension '" + singleton + "'", start); throw new LocaleSyntaxException("Incomplete extension '" + singleton + "'",
start);
} }
if (extensions == null) { if (extensions == null) {
extensions = new ArrayList<String>(4); extensions = new ArrayList<>(4);
} }
extensions.add(sb.toString()); extensions.add(sb.toString());
} else { } else {
...@@ -281,7 +287,9 @@ public final class InternalLocaleBuilder { ...@@ -281,7 +287,9 @@ public final class InternalLocaleBuilder {
itr.next(); itr.next();
} }
if (parsed <= start) { if (parsed <= start) {
throw new LocaleSyntaxException("Incomplete privateuse:" + subtags.substring(start), start); throw new LocaleSyntaxException("Incomplete privateuse:"
+ subtags.substring(start),
start);
} else { } else {
privateuse = sb.toString(); privateuse = sb.toString();
} }
...@@ -289,7 +297,9 @@ public final class InternalLocaleBuilder { ...@@ -289,7 +297,9 @@ public final class InternalLocaleBuilder {
} }
if (!itr.isDone()) { if (!itr.isDone()) {
throw new LocaleSyntaxException("Ill-formed extension subtags:" + subtags.substring(itr.currentStart()), itr.currentStart()); throw new LocaleSyntaxException("Ill-formed extension subtags:"
+ subtags.substring(itr.currentStart()),
itr.currentStart());
} }
return setExtensions(extensions, privateuse); return setExtensions(extensions, privateuse);
...@@ -302,30 +312,31 @@ public final class InternalLocaleBuilder { ...@@ -302,30 +312,31 @@ public final class InternalLocaleBuilder {
private InternalLocaleBuilder setExtensions(List<String> bcpExtensions, String privateuse) { private InternalLocaleBuilder setExtensions(List<String> bcpExtensions, String privateuse) {
clearExtensions(); clearExtensions();
if (bcpExtensions != null && bcpExtensions.size() > 0) { if (!LocaleUtils.isEmpty(bcpExtensions)) {
HashSet<CaseInsensitiveChar> processedExntensions = new HashSet<CaseInsensitiveChar>(bcpExtensions.size()); Set<CaseInsensitiveChar> done = new HashSet<>(bcpExtensions.size());
for (String bcpExt : bcpExtensions) { for (String bcpExt : bcpExtensions) {
CaseInsensitiveChar key = new CaseInsensitiveChar(bcpExt.charAt(0)); CaseInsensitiveChar key = new CaseInsensitiveChar(bcpExt);
// ignore duplicates // ignore duplicates
if (!processedExntensions.contains(key)) { if (!done.contains(key)) {
// each extension string contains singleton, e.g. "a-abc-def" // each extension string contains singleton, e.g. "a-abc-def"
if (UnicodeLocaleExtension.isSingletonChar(key.value())) { if (UnicodeLocaleExtension.isSingletonChar(key.value())) {
setUnicodeLocaleExtension(bcpExt.substring(2)); setUnicodeLocaleExtension(bcpExt.substring(2));
} else { } else {
if (_extensions == null) { if (extensions == null) {
_extensions = new HashMap<CaseInsensitiveChar, String>(4); extensions = new HashMap<>(4);
} }
_extensions.put(key, bcpExt.substring(2)); extensions.put(key, bcpExt.substring(2));
} }
} }
done.add(key);
} }
} }
if (privateuse != null && privateuse.length() > 0) { if (privateuse != null && privateuse.length() > 0) {
// privateuse string contains prefix, e.g. "x-abc-def" // privateuse string contains prefix, e.g. "x-abc-def"
if (_extensions == null) { if (extensions == null) {
_extensions = new HashMap<CaseInsensitiveChar, String>(1); extensions = new HashMap<>(1);
} }
_extensions.put(new CaseInsensitiveChar(privateuse.charAt(0)), privateuse.substring(2)); extensions.put(new CaseInsensitiveChar(privateuse), privateuse.substring(2));
} }
return this; return this;
...@@ -336,24 +347,25 @@ public final class InternalLocaleBuilder { ...@@ -336,24 +347,25 @@ public final class InternalLocaleBuilder {
*/ */
public InternalLocaleBuilder setLanguageTag(LanguageTag langtag) { public InternalLocaleBuilder setLanguageTag(LanguageTag langtag) {
clear(); clear();
if (langtag.getExtlangs().size() > 0) { if (!langtag.getExtlangs().isEmpty()) {
_language = langtag.getExtlangs().get(0); language = langtag.getExtlangs().get(0);
} else { } else {
String language = langtag.getLanguage(); String lang = langtag.getLanguage();
if (!language.equals(LanguageTag.UNDETERMINED)) { if (!lang.equals(LanguageTag.UNDETERMINED)) {
_language = language; language = lang;
} }
} }
_script = langtag.getScript(); script = langtag.getScript();
_region = langtag.getRegion(); region = langtag.getRegion();
List<String> bcpVariants = langtag.getVariants(); List<String> bcpVariants = langtag.getVariants();
if (bcpVariants.size() > 0) { if (!bcpVariants.isEmpty()) {
StringBuilder var = new StringBuilder(bcpVariants.get(0)); StringBuilder var = new StringBuilder(bcpVariants.get(0));
for (int i = 1; i < bcpVariants.size(); i++) { int size = bcpVariants.size();
for (int i = 1; i < size; i++) {
var.append(BaseLocale.SEP).append(bcpVariants.get(i)); var.append(BaseLocale.SEP).append(bcpVariants.get(i));
} }
_variant = var.toString(); variant = var.toString();
} }
setExtensions(langtag.getExtensions(), langtag.getPrivateuse()); setExtensions(langtag.getExtensions(), langtag.getPrivateuse());
...@@ -361,7 +373,7 @@ public final class InternalLocaleBuilder { ...@@ -361,7 +373,7 @@ public final class InternalLocaleBuilder {
return this; return this;
} }
public InternalLocaleBuilder setLocale(BaseLocale base, LocaleExtensions extensions) throws LocaleSyntaxException { public InternalLocaleBuilder setLocale(BaseLocale base, LocaleExtensions localeExtensions) throws LocaleSyntaxException {
String language = base.getLanguage(); String language = base.getLanguage();
String script = base.getScript(); String script = base.getScript();
String region = base.getRegion(); String region = base.getRegion();
...@@ -373,14 +385,14 @@ public final class InternalLocaleBuilder { ...@@ -373,14 +385,14 @@ public final class InternalLocaleBuilder {
if (language.equals("ja") && region.equals("JP") && variant.equals("JP")) { if (language.equals("ja") && region.equals("JP") && variant.equals("JP")) {
// When locale ja_JP_JP is created, ca-japanese is always there. // When locale ja_JP_JP is created, ca-japanese is always there.
// The builder ignores the variant "JP" // The builder ignores the variant "JP"
assert("japanese".equals(extensions.getUnicodeLocaleType("ca"))); assert("japanese".equals(localeExtensions.getUnicodeLocaleType("ca")));
variant = ""; variant = "";
} }
// Exception 2 - th_TH_TH // Exception 2 - th_TH_TH
else if (language.equals("th") && region.equals("TH") && variant.equals("TH")) { else if (language.equals("th") && region.equals("TH") && variant.equals("TH")) {
// When locale th_TH_TH is created, nu-thai is always there. // When locale th_TH_TH is created, nu-thai is always there.
// The builder ignores the variant "TH" // The builder ignores the variant "TH"
assert("thai".equals(extensions.getUnicodeLocaleType("nu"))); assert("thai".equals(localeExtensions.getUnicodeLocaleType("nu")));
variant = ""; variant = "";
} }
// Exception 3 - no_NO_NY // Exception 3 - no_NO_NY
...@@ -415,36 +427,36 @@ public final class InternalLocaleBuilder { ...@@ -415,36 +427,36 @@ public final class InternalLocaleBuilder {
// The input locale is validated at this point. // The input locale is validated at this point.
// Now, updating builder's internal fields. // Now, updating builder's internal fields.
_language = language; this.language = language;
_script = script; this.script = script;
_region = region; this.region = region;
_variant = variant; this.variant = variant;
clearExtensions(); clearExtensions();
Set<Character> extKeys = (extensions == null) ? null : extensions.getKeys(); Set<Character> extKeys = (localeExtensions == null) ? null : localeExtensions.getKeys();
if (extKeys != null) { if (extKeys != null) {
// map extensions back to builder's internal format // map localeExtensions back to builder's internal format
for (Character key : extKeys) { for (Character key : extKeys) {
Extension e = extensions.getExtension(key); Extension e = localeExtensions.getExtension(key);
if (e instanceof UnicodeLocaleExtension) { if (e instanceof UnicodeLocaleExtension) {
UnicodeLocaleExtension ue = (UnicodeLocaleExtension)e; UnicodeLocaleExtension ue = (UnicodeLocaleExtension)e;
for (String uatr : ue.getUnicodeLocaleAttributes()) { for (String uatr : ue.getUnicodeLocaleAttributes()) {
if (_uattributes == null) { if (uattributes == null) {
_uattributes = new HashSet<CaseInsensitiveString>(4); uattributes = new HashSet<>(4);
} }
_uattributes.add(new CaseInsensitiveString(uatr)); uattributes.add(new CaseInsensitiveString(uatr));
} }
for (String ukey : ue.getUnicodeLocaleKeys()) { for (String ukey : ue.getUnicodeLocaleKeys()) {
if (_ukeywords == null) { if (ukeywords == null) {
_ukeywords = new HashMap<CaseInsensitiveString, String>(4); ukeywords = new HashMap<>(4);
} }
_ukeywords.put(new CaseInsensitiveString(ukey), ue.getUnicodeLocaleType(ukey)); ukeywords.put(new CaseInsensitiveString(ukey), ue.getUnicodeLocaleType(ukey));
} }
} else { } else {
if (_extensions == null) { if (extensions == null) {
_extensions = new HashMap<CaseInsensitiveChar, String>(4); extensions = new HashMap<>(4);
} }
_extensions.put(new CaseInsensitiveChar(key.charValue()), e.getValue()); extensions.put(new CaseInsensitiveChar(key), e.getValue());
} }
} }
} }
...@@ -452,37 +464,37 @@ public final class InternalLocaleBuilder { ...@@ -452,37 +464,37 @@ public final class InternalLocaleBuilder {
} }
public InternalLocaleBuilder clear() { public InternalLocaleBuilder clear() {
_language = ""; language = "";
_script = ""; script = "";
_region = ""; region = "";
_variant = ""; variant = "";
clearExtensions(); clearExtensions();
return this; return this;
} }
public InternalLocaleBuilder clearExtensions() { public InternalLocaleBuilder clearExtensions() {
if (_extensions != null) { if (extensions != null) {
_extensions.clear(); extensions.clear();
} }
if (_uattributes != null) { if (uattributes != null) {
_uattributes.clear(); uattributes.clear();
} }
if (_ukeywords != null) { if (ukeywords != null) {
_ukeywords.clear(); ukeywords.clear();
} }
return this; return this;
} }
public BaseLocale getBaseLocale() { public BaseLocale getBaseLocale() {
String language = _language; String language = this.language;
String script = _script; String script = this.script;
String region = _region; String region = this.region;
String variant = _variant; String variant = this.variant;
// Special private use subtag sequence identified by "lvariant" will be // Special private use subtag sequence identified by "lvariant" will be
// interpreted as Java variant. // interpreted as Java variant.
if (_extensions != null) { if (extensions != null) {
String privuse = _extensions.get(PRIVUSE_KEY); String privuse = extensions.get(PRIVATEUSE_KEY);
if (privuse != null) { if (privuse != null) {
StringTokenIterator itr = new StringTokenIterator(privuse, LanguageTag.SEP); StringTokenIterator itr = new StringTokenIterator(privuse, LanguageTag.SEP);
boolean sawPrefix = false; boolean sawPrefix = false;
...@@ -492,7 +504,7 @@ public final class InternalLocaleBuilder { ...@@ -492,7 +504,7 @@ public final class InternalLocaleBuilder {
privVarStart = itr.currentStart(); privVarStart = itr.currentStart();
break; break;
} }
if (AsciiUtil.caseIgnoreMatch(itr.current(), LanguageTag.PRIVUSE_VARIANT_PREFIX)) { if (LocaleUtils.caseIgnoreMatch(itr.current(), LanguageTag.PRIVUSE_VARIANT_PREFIX)) {
sawPrefix = true; sawPrefix = true;
} }
itr.next(); itr.next();
...@@ -502,7 +514,8 @@ public final class InternalLocaleBuilder { ...@@ -502,7 +514,8 @@ public final class InternalLocaleBuilder {
if (sb.length() != 0) { if (sb.length() != 0) {
sb.append(BaseLocale.SEP); sb.append(BaseLocale.SEP);
} }
sb.append(privuse.substring(privVarStart).replaceAll(LanguageTag.SEP, BaseLocale.SEP)); sb.append(privuse.substring(privVarStart).replaceAll(LanguageTag.SEP,
BaseLocale.SEP));
variant = sb.toString(); variant = sb.toString();
} }
} }
...@@ -512,13 +525,13 @@ public final class InternalLocaleBuilder { ...@@ -512,13 +525,13 @@ public final class InternalLocaleBuilder {
} }
public LocaleExtensions getLocaleExtensions() { public LocaleExtensions getLocaleExtensions() {
if ((_extensions == null || _extensions.size() == 0) if (LocaleUtils.isEmpty(extensions) && LocaleUtils.isEmpty(uattributes)
&& (_uattributes == null || _uattributes.size() == 0) && LocaleUtils.isEmpty(ukeywords)) {
&& (_ukeywords == null || _ukeywords.size() == 0)) { return null;
return LocaleExtensions.EMPTY_EXTENSIONS;
} }
return new LocaleExtensions(_extensions, _uattributes, _ukeywords); LocaleExtensions lext = new LocaleExtensions(extensions, uattributes, ukeywords);
return lext.isEmpty() ? null : lext;
} }
/* /*
...@@ -540,7 +553,7 @@ public final class InternalLocaleBuilder { ...@@ -540,7 +553,7 @@ public final class InternalLocaleBuilder {
sawPrivuseVar = true; sawPrivuseVar = true;
break; break;
} }
if (AsciiUtil.caseIgnoreMatch(itr.current(), LanguageTag.PRIVUSE_VARIANT_PREFIX)) { if (LocaleUtils.caseIgnoreMatch(itr.current(), LanguageTag.PRIVUSE_VARIANT_PREFIX)) {
prefixStart = itr.currentStart(); prefixStart = itr.currentStart();
} }
itr.next(); itr.next();
...@@ -576,11 +589,11 @@ public final class InternalLocaleBuilder { ...@@ -576,11 +589,11 @@ public final class InternalLocaleBuilder {
*/ */
private void setUnicodeLocaleExtension(String subtags) { private void setUnicodeLocaleExtension(String subtags) {
// wipe out existing attributes/keywords // wipe out existing attributes/keywords
if (_uattributes != null) { if (uattributes != null) {
_uattributes.clear(); uattributes.clear();
} }
if (_ukeywords != null) { if (ukeywords != null) {
_ukeywords.clear(); ukeywords.clear();
} }
StringTokenIterator itr = new StringTokenIterator(subtags, LanguageTag.SEP); StringTokenIterator itr = new StringTokenIterator(subtags, LanguageTag.SEP);
...@@ -590,10 +603,10 @@ public final class InternalLocaleBuilder { ...@@ -590,10 +603,10 @@ public final class InternalLocaleBuilder {
if (!UnicodeLocaleExtension.isAttribute(itr.current())) { if (!UnicodeLocaleExtension.isAttribute(itr.current())) {
break; break;
} }
if (_uattributes == null) { if (uattributes == null) {
_uattributes = new HashSet<CaseInsensitiveString>(4); uattributes = new HashSet<>(4);
} }
_uattributes.add(new CaseInsensitiveString(itr.current())); uattributes.add(new CaseInsensitiveString(itr.current()));
itr.next(); itr.next();
} }
...@@ -608,14 +621,14 @@ public final class InternalLocaleBuilder { ...@@ -608,14 +621,14 @@ public final class InternalLocaleBuilder {
// next keyword - emit previous one // next keyword - emit previous one
assert(typeStart == -1 || typeEnd != -1); assert(typeStart == -1 || typeEnd != -1);
type = (typeStart == -1) ? "" : subtags.substring(typeStart, typeEnd); type = (typeStart == -1) ? "" : subtags.substring(typeStart, typeEnd);
if (_ukeywords == null) { if (ukeywords == null) {
_ukeywords = new HashMap<CaseInsensitiveString, String>(4); ukeywords = new HashMap<>(4);
} }
_ukeywords.put(key, type); ukeywords.put(key, type);
// reset keyword info // reset keyword info
CaseInsensitiveString tmpKey = new CaseInsensitiveString(itr.current()); CaseInsensitiveString tmpKey = new CaseInsensitiveString(itr.current());
key = _ukeywords.containsKey(tmpKey) ? null : tmpKey; key = ukeywords.containsKey(tmpKey) ? null : tmpKey;
typeStart = typeEnd = -1; typeStart = typeEnd = -1;
} else { } else {
if (typeStart == -1) { if (typeStart == -1) {
...@@ -627,7 +640,7 @@ public final class InternalLocaleBuilder { ...@@ -627,7 +640,7 @@ public final class InternalLocaleBuilder {
// 1. first keyword or // 1. first keyword or
// 2. next keyword, but previous one was duplicate // 2. next keyword, but previous one was duplicate
key = new CaseInsensitiveString(itr.current()); key = new CaseInsensitiveString(itr.current());
if (_ukeywords != null && _ukeywords.containsKey(key)) { if (ukeywords != null && ukeywords.containsKey(key)) {
// duplicate // duplicate
key = null; key = null;
} }
...@@ -638,10 +651,10 @@ public final class InternalLocaleBuilder { ...@@ -638,10 +651,10 @@ public final class InternalLocaleBuilder {
// last keyword // last keyword
assert(typeStart == -1 || typeEnd != -1); assert(typeStart == -1 || typeEnd != -1);
type = (typeStart == -1) ? "" : subtags.substring(typeStart, typeEnd); type = (typeStart == -1) ? "" : subtags.substring(typeStart, typeEnd);
if (_ukeywords == null) { if (ukeywords == null) {
_ukeywords = new HashMap<CaseInsensitiveString, String>(4); ukeywords = new HashMap<>(4);
} }
_ukeywords.put(key, type); ukeywords.put(key, type);
} }
break; break;
} }
...@@ -650,21 +663,24 @@ public final class InternalLocaleBuilder { ...@@ -650,21 +663,24 @@ public final class InternalLocaleBuilder {
} }
} }
static class CaseInsensitiveString { static final class CaseInsensitiveString {
private String _s; private final String str, lowerStr;
CaseInsensitiveString(String s) { CaseInsensitiveString(String s) {
_s = s; str = s;
lowerStr = LocaleUtils.toLowerString(s);
} }
public String value() { public String value() {
return _s; return str;
} }
@Override
public int hashCode() { public int hashCode() {
return AsciiUtil.toLowerString(_s).hashCode(); return lowerStr.hashCode();
} }
@Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (this == obj) { if (this == obj) {
return true; return true;
...@@ -672,25 +688,36 @@ public final class InternalLocaleBuilder { ...@@ -672,25 +688,36 @@ public final class InternalLocaleBuilder {
if (!(obj instanceof CaseInsensitiveString)) { if (!(obj instanceof CaseInsensitiveString)) {
return false; return false;
} }
return AsciiUtil.caseIgnoreMatch(_s, ((CaseInsensitiveString)obj).value()); return lowerStr.equals(((CaseInsensitiveString)obj).lowerStr);
} }
} }
static class CaseInsensitiveChar { static final class CaseInsensitiveChar {
private char _c; private final char ch, lowerCh;
/**
* Constructs a CaseInsensitiveChar with the first char of the
* given s.
*/
private CaseInsensitiveChar(String s) {
this(s.charAt(0));
}
CaseInsensitiveChar(char c) { CaseInsensitiveChar(char c) {
_c = c; ch = c;
lowerCh = LocaleUtils.toLower(ch);
} }
public char value() { public char value() {
return _c; return ch;
} }
@Override
public int hashCode() { public int hashCode() {
return AsciiUtil.toLower(_c); return lowerCh;
} }
@Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (this == obj) { if (this == obj) {
return true; return true;
...@@ -698,8 +725,7 @@ public final class InternalLocaleBuilder { ...@@ -698,8 +725,7 @@ public final class InternalLocaleBuilder {
if (!(obj instanceof CaseInsensitiveChar)) { if (!(obj instanceof CaseInsensitiveChar)) {
return false; return false;
} }
return _c == AsciiUtil.toLower(((CaseInsensitiveChar)obj).value()); return lowerCh == ((CaseInsensitiveChar)obj).lowerCh;
} }
} }
} }
src/share/classes/sun/util/locale/LanguageTag.java
浏览文件 @ 7186bcf5
/* /*
* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -44,25 +44,25 @@ public class LanguageTag { ...@@ -44,25 +44,25 @@ public class LanguageTag {
// //
public static final String SEP = "-"; public static final String SEP = "-";
public static final String PRIVATEUSE = "x"; public static final String PRIVATEUSE = "x";
public static String UNDETERMINED = "und"; public static final String UNDETERMINED = "und";
public static final String PRIVUSE_VARIANT_PREFIX = "lvariant"; public static final String PRIVUSE_VARIANT_PREFIX = "lvariant";
// //
// Language subtag fields // Language subtag fields
// //
private String _language = ""; // language subtag private String language = ""; // language subtag
private String _script = ""; // script subtag private String script = ""; // script subtag
private String _region = ""; // region subtag private String region = ""; // region subtag
private String _privateuse = ""; // privateuse private String privateuse = ""; // privateuse
private List<String> _extlangs = Collections.emptyList(); // extlang subtags private List<String> extlangs = Collections.emptyList(); // extlang subtags
private List<String> _variants = Collections.emptyList(); // variant subtags private List<String> variants = Collections.emptyList(); // variant subtags
private List<String> _extensions = Collections.emptyList(); // extensions private List<String> extensions = Collections.emptyList(); // extensions
// Map contains grandfathered tags and its preferred mappings from // Map contains grandfathered tags and its preferred mappings from
// http://www.ietf.org/rfc/rfc5646.txt // http://www.ietf.org/rfc/rfc5646.txt
private static final Map<AsciiUtil.CaseInsensitiveKey, String[]> GRANDFATHERED = // Keys are lower-case strings.
new HashMap<AsciiUtil.CaseInsensitiveKey, String[]>(); private static final Map<String, String[]> GRANDFATHERED = new HashMap<>();
static { static {
// grandfathered = irregular ; non-redundant tags registered // grandfathered = irregular ; non-redundant tags registered
...@@ -126,7 +126,7 @@ public class LanguageTag { ...@@ -126,7 +126,7 @@ public class LanguageTag {
{"zh-xiang", "hsn"}, {"zh-xiang", "hsn"},
}; };
for (String[] e : entries) { for (String[] e : entries) {
GRANDFATHERED.put(new AsciiUtil.CaseInsensitiveKey(e[0]), e); GRANDFATHERED.put(LocaleUtils.toLowerString(e[0]), e);
} }
} }
...@@ -188,7 +188,7 @@ public class LanguageTag { ...@@ -188,7 +188,7 @@ public class LanguageTag {
StringTokenIterator itr; StringTokenIterator itr;
// Check if the tag is grandfathered // Check if the tag is grandfathered
String[] gfmap = GRANDFATHERED.get(new AsciiUtil.CaseInsensitiveKey(languageTag)); String[] gfmap = GRANDFATHERED.get(LocaleUtils.toLowerString(languageTag));
if (gfmap != null) { if (gfmap != null) {
// use preferred mapping // use preferred mapping
itr = new StringTokenIterator(gfmap[1], SEP); itr = new StringTokenIterator(gfmap[1], SEP);
...@@ -210,11 +210,11 @@ public class LanguageTag { ...@@ -210,11 +210,11 @@ public class LanguageTag {
if (!itr.isDone() && !sts.isError()) { if (!itr.isDone() && !sts.isError()) {
String s = itr.current(); String s = itr.current();
sts._errorIndex = itr.currentStart(); sts.errorIndex = itr.currentStart();
if (s.length() == 0) { if (s.length() == 0) {
sts._errorMsg = "Empty subtag"; sts.errorMsg = "Empty subtag";
} else { } else {
sts._errorMsg = "Invalid subtag: " + s; sts.errorMsg = "Invalid subtag: " + s;
} }
} }
...@@ -235,8 +235,8 @@ public class LanguageTag { ...@@ -235,8 +235,8 @@ public class LanguageTag {
String s = itr.current(); String s = itr.current();
if (isLanguage(s)) { if (isLanguage(s)) {
found = true; found = true;
_language = s; language = s;
sts._parseLength = itr.currentEnd(); sts.parseLength = itr.currentEnd();
itr.next(); itr.next();
} }
...@@ -256,14 +256,14 @@ public class LanguageTag { ...@@ -256,14 +256,14 @@ public class LanguageTag {
break; break;
} }
found = true; found = true;
if (_extlangs.isEmpty()) { if (extlangs.isEmpty()) {
_extlangs = new ArrayList<String>(3); extlangs = new ArrayList<>(3);
} }
_extlangs.add(s); extlangs.add(s);
sts._parseLength = itr.currentEnd(); sts.parseLength = itr.currentEnd();
itr.next(); itr.next();
if (_extlangs.size() == 3) { if (extlangs.size() == 3) {
// Maximum 3 extlangs // Maximum 3 extlangs
break; break;
} }
...@@ -282,8 +282,8 @@ public class LanguageTag { ...@@ -282,8 +282,8 @@ public class LanguageTag {
String s = itr.current(); String s = itr.current();
if (isScript(s)) { if (isScript(s)) {
found = true; found = true;
_script = s; script = s;
sts._parseLength = itr.currentEnd(); sts.parseLength = itr.currentEnd();
itr.next(); itr.next();
} }
...@@ -300,8 +300,8 @@ public class LanguageTag { ...@@ -300,8 +300,8 @@ public class LanguageTag {
String s = itr.current(); String s = itr.current();
if (isRegion(s)) { if (isRegion(s)) {
found = true; found = true;
_region = s; region = s;
sts._parseLength = itr.currentEnd(); sts.parseLength = itr.currentEnd();
itr.next(); itr.next();
} }
...@@ -321,11 +321,11 @@ public class LanguageTag { ...@@ -321,11 +321,11 @@ public class LanguageTag {
break; break;
} }
found = true; found = true;
if (_variants.isEmpty()) { if (variants.isEmpty()) {
_variants = new ArrayList<String>(3); variants = new ArrayList<>(3);
} }
_variants.add(s); variants.add(s);
sts._parseLength = itr.currentEnd(); sts.parseLength = itr.currentEnd();
itr.next(); itr.next();
} }
...@@ -351,23 +351,23 @@ public class LanguageTag { ...@@ -351,23 +351,23 @@ public class LanguageTag {
s = itr.current(); s = itr.current();
if (isExtensionSubtag(s)) { if (isExtensionSubtag(s)) {
sb.append(SEP).append(s); sb.append(SEP).append(s);
sts._parseLength = itr.currentEnd(); sts.parseLength = itr.currentEnd();
} else { } else {
break; break;
} }
itr.next(); itr.next();
} }
if (sts._parseLength <= start) { if (sts.parseLength <= start) {
sts._errorIndex = start; sts.errorIndex = start;
sts._errorMsg = "Incomplete extension '" + singleton + "'"; sts.errorMsg = "Incomplete extension '" + singleton + "'";
break; break;
} }
if (_extensions.size() == 0) { if (extensions.isEmpty()) {
_extensions = new ArrayList<String>(4); extensions = new ArrayList<>(4);
} }
_extensions.add(sb.toString()); extensions.add(sb.toString());
found = true; found = true;
} else { } else {
break; break;
...@@ -395,17 +395,17 @@ public class LanguageTag { ...@@ -395,17 +395,17 @@ public class LanguageTag {
break; break;
} }
sb.append(SEP).append(s); sb.append(SEP).append(s);
sts._parseLength = itr.currentEnd(); sts.parseLength = itr.currentEnd();
itr.next(); itr.next();
} }
if (sts._parseLength <= start) { if (sts.parseLength <= start) {
// need at least 1 private subtag // need at least 1 private subtag
sts._errorIndex = start; sts.errorIndex = start;
sts._errorMsg = "Incomplete privateuse"; sts.errorMsg = "Incomplete privateuse";
} else { } else {
_privateuse = sb.toString(); privateuse = sb.toString();
found = true; found = true;
} }
} }
...@@ -425,9 +425,8 @@ public class LanguageTag { ...@@ -425,9 +425,8 @@ public class LanguageTag {
String privuseVar = null; // store ill-formed variant subtags String privuseVar = null; // store ill-formed variant subtags
if (language.length() > 0 && isLanguage(language)) { if (isLanguage(language)) {
// Convert a deprecated language code used by Java to // Convert a deprecated language code to its new code
// a new code
if (language.equals("iw")) { if (language.equals("iw")) {
language = "he"; language = "he";
} else if (language.equals("ji")) { } else if (language.equals("ji")) {
...@@ -435,22 +434,22 @@ public class LanguageTag { ...@@ -435,22 +434,22 @@ public class LanguageTag {
} else if (language.equals("in")) { } else if (language.equals("in")) {
language = "id"; language = "id";
} }
tag._language = language; tag.language = language;
} }
if (script.length() > 0 && isScript(script)) { if (isScript(script)) {
tag._script = canonicalizeScript(script); tag.script = canonicalizeScript(script);
hasSubtag = true; hasSubtag = true;
} }
if (region.length() > 0 && isRegion(region)) { if (isRegion(region)) {
tag._region = canonicalizeRegion(region); tag.region = canonicalizeRegion(region);
hasSubtag = true; hasSubtag = true;
} }
// Special handling for no_NO_NY - use nn_NO for language tag // Special handling for no_NO_NY - use nn_NO for language tag
if (tag._language.equals("no") && tag._region.equals("NO") && variant.equals("NY")) { if (tag.language.equals("no") && tag.region.equals("NO") && variant.equals("NY")) {
tag._language = "nn"; tag.language = "nn";
variant = ""; variant = "";
} }
...@@ -463,13 +462,13 @@ public class LanguageTag { ...@@ -463,13 +462,13 @@ public class LanguageTag {
break; break;
} }
if (variants == null) { if (variants == null) {
variants = new ArrayList<String>(); variants = new ArrayList<>();
} }
variants.add(var); // Do not canonicalize! variants.add(var); // Do not canonicalize!
varitr.next(); varitr.next();
} }
if (variants != null) { if (variants != null) {
tag._variants = variants; tag.variants = variants;
hasSubtag = true; hasSubtag = true;
} }
if (!varitr.isDone()) { if (!varitr.isDone()) {
...@@ -496,21 +495,23 @@ public class LanguageTag { ...@@ -496,21 +495,23 @@ public class LanguageTag {
List<String> extensions = null; List<String> extensions = null;
String privateuse = null; String privateuse = null;
Set<Character> locextKeys = localeExtensions.getKeys(); if (localeExtensions != null) {
for (Character locextKey : locextKeys) { Set<Character> locextKeys = localeExtensions.getKeys();
Extension ext = localeExtensions.getExtension(locextKey); for (Character locextKey : locextKeys) {
if (isPrivateusePrefixChar(locextKey.charValue())) { Extension ext = localeExtensions.getExtension(locextKey);
privateuse = ext.getValue(); if (isPrivateusePrefixChar(locextKey)) {
} else { privateuse = ext.getValue();
if (extensions == null) { } else {
extensions = new ArrayList<String>(); if (extensions == null) {
extensions = new ArrayList<>();
}
extensions.add(locextKey.toString() + SEP + ext.getValue());
} }
extensions.add(locextKey.toString() + SEP + ext.getValue());
} }
} }
if (extensions != null) { if (extensions != null) {
tag._extensions = extensions; tag.extensions = extensions;
hasSubtag = true; hasSubtag = true;
} }
...@@ -519,19 +520,20 @@ public class LanguageTag { ...@@ -519,19 +520,20 @@ public class LanguageTag {
if (privateuse == null) { if (privateuse == null) {
privateuse = PRIVUSE_VARIANT_PREFIX + SEP + privuseVar; privateuse = PRIVUSE_VARIANT_PREFIX + SEP + privuseVar;
} else { } else {
privateuse = privateuse + SEP + PRIVUSE_VARIANT_PREFIX + SEP + privuseVar.replace(BaseLocale.SEP, SEP); privateuse = privateuse + SEP + PRIVUSE_VARIANT_PREFIX
+ SEP + privuseVar.replace(BaseLocale.SEP, SEP);
} }
} }
if (privateuse != null) { if (privateuse != null) {
tag._privateuse = privateuse; tag.privateuse = privateuse;
} }
if (tag._language.length() == 0 && (hasSubtag || privateuse == null)) { if (tag.language.length() == 0 && (hasSubtag || privateuse == null)) {
// use lang "und" when 1) no language is available AND // use lang "und" when 1) no language is available AND
// 2) any of other subtags other than private use are available or // 2) any of other subtags other than private use are available or
// no private use tag is available // no private use tag is available
tag._language = UNDETERMINED; tag.language = UNDETERMINED;
} }
return tag; return tag;
...@@ -542,31 +544,40 @@ public class LanguageTag { ...@@ -542,31 +544,40 @@ public class LanguageTag {
// //
public String getLanguage() { public String getLanguage() {
return _language; return language;
} }
public List<String> getExtlangs() { public List<String> getExtlangs() {
return Collections.unmodifiableList(_extlangs); if (extlangs.isEmpty()) {
return Collections.emptyList();
}
return Collections.unmodifiableList(extlangs);
} }
public String getScript() { public String getScript() {
return _script; return script;
} }
public String getRegion() { public String getRegion() {
return _region; return region;
} }
public List<String> getVariants() { public List<String> getVariants() {
return Collections.unmodifiableList(_variants); if (variants.isEmpty()) {
return Collections.emptyList();
}
return Collections.unmodifiableList(variants);
} }
public List<String> getExtensions() { public List<String> getExtensions() {
return Collections.unmodifiableList(_extensions); if (extensions.isEmpty()) {
return Collections.emptyList();
}
return Collections.unmodifiableList(extensions);
} }
public String getPrivateuse() { public String getPrivateuse() {
return _privateuse; return privateuse;
} }
// //
...@@ -579,25 +590,26 @@ public class LanguageTag { ...@@ -579,25 +590,26 @@ public class LanguageTag {
// ; extended language subtags // ; extended language subtags
// / 4ALPHA ; or reserved for future use // / 4ALPHA ; or reserved for future use
// / 5*8ALPHA ; or registered language subtag // / 5*8ALPHA ; or registered language subtag
return (s.length() >= 2) && (s.length() <= 8) && AsciiUtil.isAlphaString(s); int len = s.length();
return (len >= 2) && (len <= 8) && LocaleUtils.isAlphaString(s);
} }
public static boolean isExtlang(String s) { public static boolean isExtlang(String s) {
// extlang = 3ALPHA ; selected ISO 639 codes // extlang = 3ALPHA ; selected ISO 639 codes
// *2("-" 3ALPHA) ; permanently reserved // *2("-" 3ALPHA) ; permanently reserved
return (s.length() == 3) && AsciiUtil.isAlphaString(s); return (s.length() == 3) && LocaleUtils.isAlphaString(s);
} }
public static boolean isScript(String s) { public static boolean isScript(String s) {
// script = 4ALPHA ; ISO 15924 code // script = 4ALPHA ; ISO 15924 code
return (s.length() == 4) && AsciiUtil.isAlphaString(s); return (s.length() == 4) && LocaleUtils.isAlphaString(s);
} }
public static boolean isRegion(String s) { public static boolean isRegion(String s) {
// region = 2ALPHA ; ISO 3166-1 code // region = 2ALPHA ; ISO 3166-1 code
// / 3DIGIT ; UN M.49 code // / 3DIGIT ; UN M.49 code
return ((s.length() == 2) && AsciiUtil.isAlphaString(s)) return ((s.length() == 2) && LocaleUtils.isAlphaString(s))
|| ((s.length() == 3) && AsciiUtil.isNumericString(s)); || ((s.length() == 3) && LocaleUtils.isNumericString(s));
} }
public static boolean isVariant(String s) { public static boolean isVariant(String s) {
...@@ -605,13 +617,13 @@ public class LanguageTag { ...@@ -605,13 +617,13 @@ public class LanguageTag {
// / (DIGIT 3alphanum) // / (DIGIT 3alphanum)
int len = s.length(); int len = s.length();
if (len >= 5 && len <= 8) { if (len >= 5 && len <= 8) {
return AsciiUtil.isAlphaNumericString(s); return LocaleUtils.isAlphaNumericString(s);
} }
if (len == 4) { if (len == 4) {
return AsciiUtil.isNumeric(s.charAt(0)) return LocaleUtils.isNumeric(s.charAt(0))
&& AsciiUtil.isAlphaNumeric(s.charAt(1)) && LocaleUtils.isAlphaNumeric(s.charAt(1))
&& AsciiUtil.isAlphaNumeric(s.charAt(2)) && LocaleUtils.isAlphaNumeric(s.charAt(2))
&& AsciiUtil.isAlphaNumeric(s.charAt(3)); && LocaleUtils.isAlphaNumeric(s.charAt(3));
} }
return false; return false;
} }
...@@ -624,8 +636,8 @@ public class LanguageTag { ...@@ -624,8 +636,8 @@ public class LanguageTag {
// / %x79-7A ; y - z // / %x79-7A ; y - z
return (s.length() == 1) return (s.length() == 1)
&& AsciiUtil.isAlphaString(s) && LocaleUtils.isAlphaString(s)
&& !AsciiUtil.caseIgnoreMatch(PRIVATEUSE, s); && !LocaleUtils.caseIgnoreMatch(PRIVATEUSE, s);
} }
public static boolean isExtensionSingletonChar(char c) { public static boolean isExtensionSingletonChar(char c) {
...@@ -634,22 +646,24 @@ public class LanguageTag { ...@@ -634,22 +646,24 @@ public class LanguageTag {
public static boolean isExtensionSubtag(String s) { public static boolean isExtensionSubtag(String s) {
// extension = singleton 1*("-" (2*8alphanum)) // extension = singleton 1*("-" (2*8alphanum))
return (s.length() >= 2) && (s.length() <= 8) && AsciiUtil.isAlphaNumericString(s); int len = s.length();
return (len >= 2) && (len <= 8) && LocaleUtils.isAlphaNumericString(s);
} }
public static boolean isPrivateusePrefix(String s) { public static boolean isPrivateusePrefix(String s) {
// privateuse = "x" 1*("-" (1*8alphanum)) // privateuse = "x" 1*("-" (1*8alphanum))
return (s.length() == 1) return (s.length() == 1)
&& AsciiUtil.caseIgnoreMatch(PRIVATEUSE, s); && LocaleUtils.caseIgnoreMatch(PRIVATEUSE, s);
} }
public static boolean isPrivateusePrefixChar(char c) { public static boolean isPrivateusePrefixChar(char c) {
return (AsciiUtil.caseIgnoreMatch(PRIVATEUSE, String.valueOf(c))); return (LocaleUtils.caseIgnoreMatch(PRIVATEUSE, String.valueOf(c)));
} }
public static boolean isPrivateuseSubtag(String s) { public static boolean isPrivateuseSubtag(String s) {
// privateuse = "x" 1*("-" (1*8alphanum)) // privateuse = "x" 1*("-" (1*8alphanum))
return (s.length() >= 1) && (s.length() <= 8) && AsciiUtil.isAlphaNumericString(s); int len = s.length();
return (len >= 1) && (len <= 8) && LocaleUtils.isAlphaNumericString(s);
} }
// //
...@@ -657,76 +671,77 @@ public class LanguageTag { ...@@ -657,76 +671,77 @@ public class LanguageTag {
// //
public static String canonicalizeLanguage(String s) { public static String canonicalizeLanguage(String s) {
return AsciiUtil.toLowerString(s); return LocaleUtils.toLowerString(s);
} }
public static String canonicalizeExtlang(String s) { public static String canonicalizeExtlang(String s) {
return AsciiUtil.toLowerString(s); return LocaleUtils.toLowerString(s);
} }
public static String canonicalizeScript(String s) { public static String canonicalizeScript(String s) {
return AsciiUtil.toTitleString(s); return LocaleUtils.toTitleString(s);
} }
public static String canonicalizeRegion(String s) { public static String canonicalizeRegion(String s) {
return AsciiUtil.toUpperString(s); return LocaleUtils.toUpperString(s);
} }
public static String canonicalizeVariant(String s) { public static String canonicalizeVariant(String s) {
return AsciiUtil.toLowerString(s); return LocaleUtils.toLowerString(s);
} }
public static String canonicalizeExtension(String s) { public static String canonicalizeExtension(String s) {
return AsciiUtil.toLowerString(s); return LocaleUtils.toLowerString(s);
} }
public static String canonicalizeExtensionSingleton(String s) { public static String canonicalizeExtensionSingleton(String s) {
return AsciiUtil.toLowerString(s); return LocaleUtils.toLowerString(s);
} }
public static String canonicalizeExtensionSubtag(String s) { public static String canonicalizeExtensionSubtag(String s) {
return AsciiUtil.toLowerString(s); return LocaleUtils.toLowerString(s);
} }
public static String canonicalizePrivateuse(String s) { public static String canonicalizePrivateuse(String s) {
return AsciiUtil.toLowerString(s); return LocaleUtils.toLowerString(s);
} }
public static String canonicalizePrivateuseSubtag(String s) { public static String canonicalizePrivateuseSubtag(String s) {
return AsciiUtil.toLowerString(s); return LocaleUtils.toLowerString(s);
} }
@Override
public String toString() { public String toString() {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
if (_language.length() > 0) { if (language.length() > 0) {
sb.append(_language); sb.append(language);
for (String extlang : _extlangs) { for (String extlang : extlangs) {
sb.append(SEP).append(extlang); sb.append(SEP).append(extlang);
} }
if (_script.length() > 0) { if (script.length() > 0) {
sb.append(SEP).append(_script); sb.append(SEP).append(script);
} }
if (_region.length() > 0) { if (region.length() > 0) {
sb.append(SEP).append(_region); sb.append(SEP).append(region);
} }
for (String variant : _extlangs) { for (String variant : variants) {
sb.append(SEP).append(variant); sb.append(SEP).append(variant);
} }
for (String extension : _extensions) { for (String extension : extensions) {
sb.append(SEP).append(extension); sb.append(SEP).append(extension);
} }
} }
if (_privateuse.length() > 0) { if (privateuse.length() > 0) {
if (sb.length() > 0) { if (sb.length() > 0) {
sb.append(SEP); sb.append(SEP);
} }
sb.append(_privateuse); sb.append(privateuse);
} }
return sb.toString(); return sb.toString();
......
src/share/classes/sun/util/locale/LocaleExtensions.java
浏览文件 @ 7186bcf5
/* /*
* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -36,6 +36,7 @@ import java.util.Map; ...@@ -36,6 +36,7 @@ import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Set; import java.util.Set;
import java.util.SortedMap; import java.util.SortedMap;
import java.util.SortedSet;
import java.util.TreeMap; import java.util.TreeMap;
import java.util.TreeSet; import java.util.TreeSet;
...@@ -45,55 +46,45 @@ import sun.util.locale.InternalLocaleBuilder.CaseInsensitiveString; ...@@ -45,55 +46,45 @@ import sun.util.locale.InternalLocaleBuilder.CaseInsensitiveString;
public class LocaleExtensions { public class LocaleExtensions {
private SortedMap<Character, Extension> _map; private final Map<Character, Extension> extensionMap;
private String _id; private final String id;
private static final SortedMap<Character, Extension> EMPTY_MAP = public static final LocaleExtensions CALENDAR_JAPANESE
Collections.unmodifiableSortedMap(new TreeMap<Character, Extension>()); = new LocaleExtensions("u-ca-japanese",
UnicodeLocaleExtension.SINGLETON,
UnicodeLocaleExtension.CA_JAPANESE);
public static final LocaleExtensions EMPTY_EXTENSIONS; public static final LocaleExtensions NUMBER_THAI
public static final LocaleExtensions CALENDAR_JAPANESE; = new LocaleExtensions("u-nu-thai",
public static final LocaleExtensions NUMBER_THAI; UnicodeLocaleExtension.SINGLETON,
UnicodeLocaleExtension.NU_THAI);
static { private LocaleExtensions(String id, Character key, Extension value) {
EMPTY_EXTENSIONS = new LocaleExtensions(); this.id = id;
EMPTY_EXTENSIONS._id = ""; this.extensionMap = Collections.singletonMap(key, value);
EMPTY_EXTENSIONS._map = EMPTY_MAP;
CALENDAR_JAPANESE = new LocaleExtensions();
CALENDAR_JAPANESE._id = "u-ca-japanese";
CALENDAR_JAPANESE._map = new TreeMap<Character, Extension>();
CALENDAR_JAPANESE._map.put(Character.valueOf(UnicodeLocaleExtension.SINGLETON), UnicodeLocaleExtension.CA_JAPANESE);
NUMBER_THAI = new LocaleExtensions();
NUMBER_THAI._id = "u-nu-thai";
NUMBER_THAI._map = new TreeMap<Character, Extension>();
NUMBER_THAI._map.put(Character.valueOf(UnicodeLocaleExtension.SINGLETON), UnicodeLocaleExtension.NU_THAI);
}
private LocaleExtensions() {
} }
/* /*
* Package local constructor, only used by InternalLocaleBuilder. * Package private constructor, only used by InternalLocaleBuilder.
*/ */
LocaleExtensions(Map<CaseInsensitiveChar, String> extensions, LocaleExtensions(Map<CaseInsensitiveChar, String> extensions,
Set<CaseInsensitiveString> uattributes, Map<CaseInsensitiveString, String> ukeywords) { Set<CaseInsensitiveString> uattributes,
boolean hasExtension = (extensions != null && extensions.size() > 0); Map<CaseInsensitiveString, String> ukeywords) {
boolean hasUAttributes = (uattributes != null && uattributes.size() > 0); boolean hasExtension = !LocaleUtils.isEmpty(extensions);
boolean hasUKeywords = (ukeywords != null && ukeywords.size() > 0); boolean hasUAttributes = !LocaleUtils.isEmpty(uattributes);
boolean hasUKeywords = !LocaleUtils.isEmpty(ukeywords);
if (!hasExtension && !hasUAttributes && !hasUKeywords) { if (!hasExtension && !hasUAttributes && !hasUKeywords) {
_map = EMPTY_MAP; id = "";
_id = ""; extensionMap = Collections.emptyMap();
return; return;
} }
// Build extension map // Build extension map
_map = new TreeMap<Character, Extension>(); SortedMap<Character, Extension> map = new TreeMap<>();
if (hasExtension) { if (hasExtension) {
for (Entry<CaseInsensitiveChar, String> ext : extensions.entrySet()) { for (Entry<CaseInsensitiveChar, String> ext : extensions.entrySet()) {
char key = AsciiUtil.toLower(ext.getKey().value()); char key = LocaleUtils.toLower(ext.getKey().value());
String value = ext.getValue(); String value = ext.getValue();
if (LanguageTag.isPrivateusePrefixChar(key)) { if (LanguageTag.isPrivateusePrefixChar(key)) {
...@@ -104,54 +95,57 @@ public class LocaleExtensions { ...@@ -104,54 +95,57 @@ public class LocaleExtensions {
} }
} }
Extension e = new Extension(key, AsciiUtil.toLowerString(value)); map.put(key, new Extension(key, LocaleUtils.toLowerString(value)));
_map.put(Character.valueOf(key), e);
} }
} }
if (hasUAttributes || hasUKeywords) { if (hasUAttributes || hasUKeywords) {
TreeSet<String> uaset = null; SortedSet<String> uaset = null;
TreeMap<String, String> ukmap = null; SortedMap<String, String> ukmap = null;
if (hasUAttributes) { if (hasUAttributes) {
uaset = new TreeSet<String>(); uaset = new TreeSet<>();
for (CaseInsensitiveString cis : uattributes) { for (CaseInsensitiveString cis : uattributes) {
uaset.add(AsciiUtil.toLowerString(cis.value())); uaset.add(LocaleUtils.toLowerString(cis.value()));
} }
} }
if (hasUKeywords) { if (hasUKeywords) {
ukmap = new TreeMap<String, String>(); ukmap = new TreeMap<>();
for (Entry<CaseInsensitiveString, String> kwd : ukeywords.entrySet()) { for (Entry<CaseInsensitiveString, String> kwd : ukeywords.entrySet()) {
String key = AsciiUtil.toLowerString(kwd.getKey().value()); String key = LocaleUtils.toLowerString(kwd.getKey().value());
String type = AsciiUtil.toLowerString(kwd.getValue()); String type = LocaleUtils.toLowerString(kwd.getValue());
ukmap.put(key, type); ukmap.put(key, type);
} }
} }
UnicodeLocaleExtension ule = new UnicodeLocaleExtension(uaset, ukmap); UnicodeLocaleExtension ule = new UnicodeLocaleExtension(uaset, ukmap);
_map.put(Character.valueOf(UnicodeLocaleExtension.SINGLETON), ule); map.put(UnicodeLocaleExtension.SINGLETON, ule);
} }
if (_map.size() == 0) { if (map.isEmpty()) {
// this could happen when only privuateuse with special variant // this could happen when only privuateuse with special variant
_map = EMPTY_MAP; id = "";
_id = ""; extensionMap = Collections.emptyMap();
} else { } else {
_id = toID(_map); id = toID(map);
extensionMap = map;
} }
} }
public Set<Character> getKeys() { public Set<Character> getKeys() {
return Collections.unmodifiableSet(_map.keySet()); if (extensionMap.isEmpty()) {
return Collections.emptySet();
}
return Collections.unmodifiableSet(extensionMap.keySet());
} }
public Extension getExtension(Character key) { public Extension getExtension(Character key) {
return _map.get(Character.valueOf(AsciiUtil.toLower(key.charValue()))); return extensionMap.get(LocaleUtils.toLower(key));
} }
public String getExtensionValue(Character key) { public String getExtensionValue(Character key) {
Extension ext = _map.get(Character.valueOf(AsciiUtil.toLower(key.charValue()))); Extension ext = extensionMap.get(LocaleUtils.toLower(key));
if (ext == null) { if (ext == null) {
return null; return null;
} }
...@@ -159,7 +153,7 @@ public class LocaleExtensions { ...@@ -159,7 +153,7 @@ public class LocaleExtensions {
} }
public Set<String> getUnicodeLocaleAttributes() { public Set<String> getUnicodeLocaleAttributes() {
Extension ext = _map.get(Character.valueOf(UnicodeLocaleExtension.SINGLETON)); Extension ext = extensionMap.get(UnicodeLocaleExtension.SINGLETON);
if (ext == null) { if (ext == null) {
return Collections.emptySet(); return Collections.emptySet();
} }
...@@ -168,7 +162,7 @@ public class LocaleExtensions { ...@@ -168,7 +162,7 @@ public class LocaleExtensions {
} }
public Set<String> getUnicodeLocaleKeys() { public Set<String> getUnicodeLocaleKeys() {
Extension ext = _map.get(Character.valueOf(UnicodeLocaleExtension.SINGLETON)); Extension ext = extensionMap.get(UnicodeLocaleExtension.SINGLETON);
if (ext == null) { if (ext == null) {
return Collections.emptySet(); return Collections.emptySet();
} }
...@@ -177,16 +171,16 @@ public class LocaleExtensions { ...@@ -177,16 +171,16 @@ public class LocaleExtensions {
} }
public String getUnicodeLocaleType(String unicodeLocaleKey) { public String getUnicodeLocaleType(String unicodeLocaleKey) {
Extension ext = _map.get(Character.valueOf(UnicodeLocaleExtension.SINGLETON)); Extension ext = extensionMap.get(UnicodeLocaleExtension.SINGLETON);
if (ext == null) { if (ext == null) {
return null; return null;
} }
assert (ext instanceof UnicodeLocaleExtension); assert (ext instanceof UnicodeLocaleExtension);
return ((UnicodeLocaleExtension)ext).getUnicodeLocaleType(AsciiUtil.toLowerString(unicodeLocaleKey)); return ((UnicodeLocaleExtension)ext).getUnicodeLocaleType(LocaleUtils.toLowerString(unicodeLocaleKey));
} }
public boolean isEmpty() { public boolean isEmpty() {
return _map.isEmpty(); return extensionMap.isEmpty();
} }
public static boolean isValidKey(char c) { public static boolean isValidKey(char c) {
...@@ -201,7 +195,7 @@ public class LocaleExtensions { ...@@ -201,7 +195,7 @@ public class LocaleExtensions {
StringBuilder buf = new StringBuilder(); StringBuilder buf = new StringBuilder();
Extension privuse = null; Extension privuse = null;
for (Entry<Character, Extension> entry : map.entrySet()) { for (Entry<Character, Extension> entry : map.entrySet()) {
char singleton = entry.getKey().charValue(); char singleton = entry.getKey();
Extension extension = entry.getValue(); Extension extension = entry.getValue();
if (LanguageTag.isPrivateusePrefixChar(singleton)) { if (LanguageTag.isPrivateusePrefixChar(singleton)) {
privuse = extension; privuse = extension;
...@@ -221,19 +215,21 @@ public class LocaleExtensions { ...@@ -221,19 +215,21 @@ public class LocaleExtensions {
return buf.toString(); return buf.toString();
} }
@Override
public String toString() { public String toString() {
return _id; return id;
} }
public String getID() { public String getID() {
return _id; return id;
} }
@Override
public int hashCode() { public int hashCode() {
return _id.hashCode(); return id.hashCode();
} }
@Override
public boolean equals(Object other) { public boolean equals(Object other) {
if (this == other) { if (this == other) {
return true; return true;
...@@ -241,6 +237,6 @@ public class LocaleExtensions { ...@@ -241,6 +237,6 @@ public class LocaleExtensions {
if (!(other instanceof LocaleExtensions)) { if (!(other instanceof LocaleExtensions)) {
return false; return false;
} }
return this._id.equals(((LocaleExtensions)other)._id); return id.equals(((LocaleExtensions)other).id);
} }
} }
src/share/classes/sun/util/locale/LocaleObjectCache.java
浏览文件 @ 7186bcf5
/* /*
* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -34,24 +34,25 @@ package sun.util.locale; ...@@ -34,24 +34,25 @@ package sun.util.locale;
import java.lang.ref.ReferenceQueue; import java.lang.ref.ReferenceQueue;
import java.lang.ref.SoftReference; import java.lang.ref.SoftReference;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
public abstract class LocaleObjectCache<K, V> { public abstract class LocaleObjectCache<K, V> {
private ConcurrentHashMap<K, CacheEntry<K, V>> _map; private ConcurrentMap<K, CacheEntry<K, V>> map;
private ReferenceQueue<V> _queue = new ReferenceQueue<V>(); private ReferenceQueue<V> queue = new ReferenceQueue<>();
public LocaleObjectCache() { public LocaleObjectCache() {
this(16, 0.75f, 16); this(16, 0.75f, 16);
} }
public LocaleObjectCache(int initialCapacity, float loadFactor, int concurrencyLevel) { public LocaleObjectCache(int initialCapacity, float loadFactor, int concurrencyLevel) {
_map = new ConcurrentHashMap<K, CacheEntry<K, V>>(initialCapacity, loadFactor, concurrencyLevel); map = new ConcurrentHashMap<>(initialCapacity, loadFactor, concurrencyLevel);
} }
public V get(K key) { public V get(K key) {
V value = null; V value = null;
cleanStaleEntries(); cleanStaleEntries();
CacheEntry<K, V> entry = _map.get(key); CacheEntry<K, V> entry = map.get(key);
if (entry != null) { if (entry != null) {
value = entry.get(); value = entry.get();
} }
...@@ -63,11 +64,11 @@ public abstract class LocaleObjectCache<K, V> { ...@@ -63,11 +64,11 @@ public abstract class LocaleObjectCache<K, V> {
return null; return null;
} }
CacheEntry<K, V> newEntry = new CacheEntry<K, V>(key, newVal, _queue); CacheEntry<K, V> newEntry = new CacheEntry<>(key, newVal, queue);
while (value == null) { while (value == null) {
cleanStaleEntries(); cleanStaleEntries();
entry = _map.putIfAbsent(key, newEntry); entry = map.putIfAbsent(key, newEntry);
if (entry == null) { if (entry == null) {
value = newVal; value = newVal;
break; break;
...@@ -79,11 +80,17 @@ public abstract class LocaleObjectCache<K, V> { ...@@ -79,11 +80,17 @@ public abstract class LocaleObjectCache<K, V> {
return value; return value;
} }
protected V put(K key, V value) {
CacheEntry<K, V> entry = new CacheEntry<>(key, value, queue);
CacheEntry<K, V> oldEntry = map.put(key, entry);
return (oldEntry == null) ? null : oldEntry.get();
}
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private void cleanStaleEntries() { private void cleanStaleEntries() {
CacheEntry<K, V> entry; CacheEntry<K, V> entry;
while ((entry = (CacheEntry<K, V>)_queue.poll()) != null) { while ((entry = (CacheEntry<K, V>)queue.poll()) != null) {
_map.remove(entry.getKey()); map.remove(entry.getKey());
} }
} }
...@@ -94,15 +101,15 @@ public abstract class LocaleObjectCache<K, V> { ...@@ -94,15 +101,15 @@ public abstract class LocaleObjectCache<K, V> {
} }
private static class CacheEntry<K, V> extends SoftReference<V> { private static class CacheEntry<K, V> extends SoftReference<V> {
private K _key; private K key;
CacheEntry(K key, V value, ReferenceQueue<V> queue) { CacheEntry(K key, V value, ReferenceQueue<V> queue) {
super(value, queue); super(value, queue);
_key = key; this.key = key;
} }
K getKey() { K getKey() {
return _key; return key;
} }
} }
} }
src/share/classes/sun/util/locale/LocaleSyntaxException.java
浏览文件 @ 7186bcf5
/* /*
* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -35,7 +35,7 @@ public class LocaleSyntaxException extends Exception { ...@@ -35,7 +35,7 @@ public class LocaleSyntaxException extends Exception {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private int _index = -1; private int index = -1;
public LocaleSyntaxException(String msg) { public LocaleSyntaxException(String msg) {
this(msg, 0); this(msg, 0);
...@@ -43,10 +43,10 @@ public class LocaleSyntaxException extends Exception { ...@@ -43,10 +43,10 @@ public class LocaleSyntaxException extends Exception {
public LocaleSyntaxException(String msg, int errorIndex) { public LocaleSyntaxException(String msg, int errorIndex) {
super(msg); super(msg);
_index = errorIndex; index = errorIndex;
} }
public int getErrorIndex() { public int getErrorIndex() {
return _index; return index;
} }
} }
src/share/classes/sun/util/locale/LocaleUtils.java 0 → 100644
浏览文件 @ 7186bcf5
/*
* Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code 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
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
*******************************************************************************
* Copyright (C) 2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
package sun.util.locale;
import java.util.List;
import java.util.Map;
import java.util.Set;
/**
* Collection of static utility methods for Locale support. The
* methods which manipulate characters or strings support ASCII only.
*/
public final class LocaleUtils {
private LocaleUtils() {
}
/**
* Compares two ASCII Strings s1 and s2, ignoring case.
*/
public static boolean caseIgnoreMatch(String s1, String s2) {
if (s1 == s2) {
return true;
}
int len = s1.length();
if (len != s2.length()) {
return false;
}
for (int i = 0; i < len; i++) {
char c1 = s1.charAt(i);
char c2 = s2.charAt(i);
if (c1 != c2 && toLower(c1) != toLower(c2)) {
return false;
}
}
return true;
}
static int caseIgnoreCompare(String s1, String s2) {
if (s1 == s2) {
return 0;
}
return toLowerString(s1).compareTo(toLowerString(s2));
}
static char toUpper(char c) {
return isLower(c) ? (char)(c - 0x20) : c;
}
static char toLower(char c) {
return isUpper(c) ? (char)(c + 0x20) : c;
}
/**
* Converts the given ASCII String to lower-case.
*/
public static String toLowerString(String s) {
int len = s.length();
int idx = 0;
for (; idx < len; idx++) {
if (isUpper(s.charAt(idx))) {
break;
}
}
if (idx == len) {
return s;
}
char[] buf = new char[len];
for (int i = 0; i < len; i++) {
char c = s.charAt(i);
buf[i] = (i < idx) ? c : toLower(c);
}
return new String(buf);
}
static String toUpperString(String s) {
int len = s.length();
int idx = 0;
for (; idx < len; idx++) {
if (isLower(s.charAt(idx))) {
break;
}
}
if (idx == len) {
return s;
}
char[] buf = new char[len];
for (int i = 0; i < len; i++) {
char c = s.charAt(i);
buf[i] = (i < idx) ? c : toUpper(c);
}
return new String(buf);
}
static String toTitleString(String s) {
int len;
if ((len = s.length()) == 0) {
return s;
}
int idx = 0;
if (!isLower(s.charAt(idx))) {
for (idx = 1; idx < len; idx++) {
if (isUpper(s.charAt(idx))) {
break;
}
}
}
if (idx == len) {
return s;
}
char[] buf = new char[len];
for (int i = 0; i < len; i++) {
char c = s.charAt(i);
if (i == 0 && idx == 0) {
buf[i] = toUpper(c);
} else if (i < idx) {
buf[i] = c;
} else {
buf[i] = toLower(c);
}
}
return new String(buf);
}
private static boolean isUpper(char c) {
return c >= 'A' && c <= 'Z';
}
private static boolean isLower(char c) {
return c >= 'a' && c <= 'z';
}
static boolean isAlpha(char c) {
return (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z');
}
static boolean isAlphaString(String s) {
int len = s.length();
for (int i = 0; i < len; i++) {
if (!isAlpha(s.charAt(i))) {
return false;
}
}
return true;
}
static boolean isNumeric(char c) {
return (c >= '0' && c <= '9');
}
static boolean isNumericString(String s) {
int len = s.length();
for (int i = 0; i < len; i++) {
if (!isNumeric(s.charAt(i))) {
return false;
}
}
return true;
}
static boolean isAlphaNumeric(char c) {
return isAlpha(c) || isNumeric(c);
}
static boolean isAlphaNumericString(String s) {
int len = s.length();
for (int i = 0; i < len; i++) {
if (!isAlphaNumeric(s.charAt(i))) {
return false;
}
}
return true;
}
static boolean isEmpty(String str) {
return str == null || str.length() == 0;
}
static boolean isEmpty(Set<?> set) {
return set == null || set.isEmpty();
}
static boolean isEmpty(Map<?, ?> map) {
return map == null || map.isEmpty();
}
static boolean isEmpty(List<?> list) {
return list == null || list.isEmpty();
}
}
src/share/classes/sun/util/locale/ParseStatus.java
浏览文件 @ 7186bcf5
/* /*
* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -32,29 +32,33 @@ ...@@ -32,29 +32,33 @@
package sun.util.locale; package sun.util.locale;
public class ParseStatus { public class ParseStatus {
int _parseLength = 0; int parseLength;
int _errorIndex = -1; int errorIndex;
String _errorMsg = null; String errorMsg;
public ParseStatus() {
reset();
}
public void reset() { public void reset() {
_parseLength = 0; parseLength = 0;
_errorIndex = -1; errorIndex = -1;
_errorMsg = null; errorMsg = null;
} }
public boolean isError() { public boolean isError() {
return (_errorIndex >= 0); return (errorIndex >= 0);
} }
public int getErrorIndex() { public int getErrorIndex() {
return _errorIndex; return errorIndex;
} }
public int getParseLength() { public int getParseLength() {
return _parseLength; return parseLength;
} }
public String getErrorMessage() { public String getErrorMessage() {
return _errorMsg; return errorMsg;
} }
} }
src/share/classes/sun/util/locale/StringTokenIterator.java
浏览文件 @ 7186bcf5
/* /*
* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -31,87 +31,99 @@ ...@@ -31,87 +31,99 @@
package sun.util.locale; package sun.util.locale;
public class StringTokenIterator { public class StringTokenIterator {
private String _text; private String text;
private String _dlms; private String dlms; // null if a single char delimiter
private char delimiterChar; // delimiter if a single char delimiter
private String _token; private String token;
private int _start; private int start;
private int _end; private int end;
private boolean _done; private boolean done;
public StringTokenIterator(String text, String dlms) { public StringTokenIterator(String text, String dlms) {
_text = text; this.text = text;
_dlms = dlms; if (dlms.length() == 1) {
delimiterChar = dlms.charAt(0);
} else {
this.dlms = dlms;
}
setStart(0); setStart(0);
} }
public String first() { public String first() {
setStart(0); setStart(0);
return _token; return token;
} }
public String current() { public String current() {
return _token; return token;
} }
public int currentStart() { public int currentStart() {
return _start; return start;
} }
public int currentEnd() { public int currentEnd() {
return _end; return end;
} }
public boolean isDone() { public boolean isDone() {
return _done; return done;
} }
public String next() { public String next() {
if (hasNext()) { if (hasNext()) {
_start = _end + 1; start = end + 1;
_end = nextDelimiter(_start); end = nextDelimiter(start);
_token = _text.substring(_start, _end); token = text.substring(start, end);
} else { } else {
_start = _end; start = end;
_token = null; token = null;
_done = true; done = true;
} }
return _token; return token;
} }
public boolean hasNext() { public boolean hasNext() {
return (_end < _text.length()); return (end < text.length());
} }
public StringTokenIterator setStart(int offset) { public StringTokenIterator setStart(int offset) {
if (offset > _text.length()) { if (offset > text.length()) {
throw new IndexOutOfBoundsException(); throw new IndexOutOfBoundsException();
} }
_start = offset; start = offset;
_end = nextDelimiter(_start); end = nextDelimiter(start);
_token = _text.substring(_start, _end); token = text.substring(start, end);
_done = false; done = false;
return this; return this;
} }
public StringTokenIterator setText(String text) { public StringTokenIterator setText(String text) {
_text = text; this.text = text;
setStart(0); setStart(0);
return this; return this;
} }
private int nextDelimiter(int start) { private int nextDelimiter(int start) {
int idx = start; int textlen = this.text.length();
outer: while (idx < _text.length()) { if (dlms == null) {
char c = _text.charAt(idx); for (int idx = start; idx < textlen; idx++) {
for (int i = 0; i < _dlms.length(); i++) { if (text.charAt(idx) == delimiterChar) {
if (c == _dlms.charAt(i)) { return idx;
break outer; }
}
} else {
int dlmslen = dlms.length();
for (int idx = start; idx < textlen; idx++) {
char c = text.charAt(idx);
for (int i = 0; i < dlmslen; i++) {
if (c == dlms.charAt(i)) {
return idx;
}
} }
} }
idx++;
} }
return idx; return textlen;
} }
} }
src/share/classes/sun/util/locale/UnicodeLocaleExtension.java
浏览文件 @ 7186bcf5
/* /*
* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -32,56 +33,48 @@ ...@@ -32,56 +33,48 @@
package sun.util.locale; package sun.util.locale;
import java.util.Collections; import java.util.Collections;
import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Set; import java.util.Set;
import java.util.SortedMap; import java.util.SortedMap;
import java.util.SortedSet; import java.util.SortedSet;
import java.util.TreeMap;
import java.util.TreeSet;
public class UnicodeLocaleExtension extends Extension { public class UnicodeLocaleExtension extends Extension {
public static final char SINGLETON = 'u'; public static final char SINGLETON = 'u';
private static final SortedSet<String> EMPTY_SORTED_SET = new TreeSet<String>(); private final Set<String> attributes;
private static final SortedMap<String, String> EMPTY_SORTED_MAP = new TreeMap<String, String>(); private final Map<String, String> keywords;
private SortedSet<String> _attributes = EMPTY_SORTED_SET;
private SortedMap<String, String> _keywords = EMPTY_SORTED_MAP;
public static final UnicodeLocaleExtension CA_JAPANESE;
public static final UnicodeLocaleExtension NU_THAI;
static { public static final UnicodeLocaleExtension CA_JAPANESE
CA_JAPANESE = new UnicodeLocaleExtension(); = new UnicodeLocaleExtension("ca", "japanese");
CA_JAPANESE._keywords = new TreeMap<String, String>(); public static final UnicodeLocaleExtension NU_THAI
CA_JAPANESE._keywords.put("ca", "japanese"); = new UnicodeLocaleExtension("nu", "thai");
CA_JAPANESE._value = "ca-japanese";
NU_THAI = new UnicodeLocaleExtension(); private UnicodeLocaleExtension(String key, String value) {
NU_THAI._keywords = new TreeMap<String, String>(); super(SINGLETON, key + "-" + value);
NU_THAI._keywords.put("nu", "thai"); attributes = Collections.emptySet();
NU_THAI._value = "nu-thai"; keywords = Collections.singletonMap(key, value);
}
private UnicodeLocaleExtension() {
super(SINGLETON);
} }
UnicodeLocaleExtension(SortedSet<String> attributes, SortedMap<String, String> keywords) { UnicodeLocaleExtension(SortedSet<String> attributes, SortedMap<String, String> keywords) {
this(); super(SINGLETON);
if (attributes != null && attributes.size() > 0) { if (attributes != null) {
_attributes = attributes; this.attributes = attributes;
} else {
this.attributes = Collections.emptySet();
} }
if (keywords != null && keywords.size() > 0) { if (keywords != null) {
_keywords = keywords; this.keywords = keywords;
} else {
this.keywords = Collections.emptyMap();
} }
if (_attributes.size() > 0 || _keywords.size() > 0) { if (!this.attributes.isEmpty() || !this.keywords.isEmpty()) {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
for (String attribute : _attributes) { for (String attribute : this.attributes) {
sb.append(LanguageTag.SEP).append(attribute); sb.append(LanguageTag.SEP).append(attribute);
} }
for (Entry<String, String> keyword : _keywords.entrySet()) { for (Entry<String, String> keyword : this.keywords.entrySet()) {
String key = keyword.getKey(); String key = keyword.getKey();
String value = keyword.getValue(); String value = keyword.getValue();
...@@ -90,38 +83,46 @@ public class UnicodeLocaleExtension extends Extension { ...@@ -90,38 +83,46 @@ public class UnicodeLocaleExtension extends Extension {
sb.append(LanguageTag.SEP).append(value); sb.append(LanguageTag.SEP).append(value);
} }
} }
_value = sb.substring(1); // skip leading '-' setValue(sb.substring(1)); // skip leading '-'
} }
} }
public Set<String> getUnicodeLocaleAttributes() { public Set<String> getUnicodeLocaleAttributes() {
return Collections.unmodifiableSet(_attributes); if (attributes == Collections.EMPTY_SET) {
return attributes;
}
return Collections.unmodifiableSet(attributes);
} }
public Set<String> getUnicodeLocaleKeys() { public Set<String> getUnicodeLocaleKeys() {
return Collections.unmodifiableSet(_keywords.keySet()); if (keywords == Collections.EMPTY_MAP) {
return Collections.emptySet();
}
return Collections.unmodifiableSet(keywords.keySet());
} }
public String getUnicodeLocaleType(String unicodeLocaleKey) { public String getUnicodeLocaleType(String unicodeLocaleKey) {
return _keywords.get(unicodeLocaleKey); return keywords.get(unicodeLocaleKey);
} }
public static boolean isSingletonChar(char c) { public static boolean isSingletonChar(char c) {
return (SINGLETON == AsciiUtil.toLower(c)); return (SINGLETON == LocaleUtils.toLower(c));
} }
public static boolean isAttribute(String s) { public static boolean isAttribute(String s) {
// 3*8alphanum // 3*8alphanum
return (s.length() >= 3) && (s.length() <= 8) && AsciiUtil.isAlphaNumericString(s); int len = s.length();
return (len >= 3) && (len <= 8) && LocaleUtils.isAlphaNumericString(s);
} }
public static boolean isKey(String s) { public static boolean isKey(String s) {
// 2alphanum // 2alphanum
return (s.length() == 2) && AsciiUtil.isAlphaNumericString(s); return (s.length() == 2) && LocaleUtils.isAlphaNumericString(s);
} }
public static boolean isTypeSubtag(String s) { public static boolean isTypeSubtag(String s) {
// 3*8alphanum // 3*8alphanum
return (s.length() >= 3) && (s.length() <= 8) && AsciiUtil.isAlphaNumericString(s); int len = s.length();
return (len >= 3) && (len <= 8) && LocaleUtils.isAlphaNumericString(s);
} }
} }
test/java/util/Locale/LocaleEnhanceTest.java
浏览文件 @ 7186bcf5
/* /*
* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -33,8 +33,10 @@ import java.io.ObjectInputStream; ...@@ -33,8 +33,10 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream; import java.io.ObjectOutputStream;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
import java.text.DecimalFormatSymbols;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Calendar;
import java.util.IllformedLocaleException; import java.util.IllformedLocaleException;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
...@@ -43,8 +45,10 @@ import java.util.Set; ...@@ -43,8 +45,10 @@ import java.util.Set;
/** /**
* @test * @test
* @bug 6875847 6992272 7002320 7015500 7023613 * @bug 6875847 6992272 7002320 7015500 7023613 7032820 7033504
* @summary test API changes to Locale * @summary test API changes to Locale
* @compile LocaleEnhanceTest.java
* @run main/othervm -esa LocaleEnhanceTest
*/ */
public class LocaleEnhanceTest extends LocaleTestFmwk { public class LocaleEnhanceTest extends LocaleTestFmwk {
...@@ -593,6 +597,9 @@ public class LocaleEnhanceTest extends LocaleTestFmwk { ...@@ -593,6 +597,9 @@ public class LocaleEnhanceTest extends LocaleTestFmwk {
assertEquals("extension", "aa-00-bb-01", locale.getExtension('d')); assertEquals("extension", "aa-00-bb-01", locale.getExtension('d'));
assertEquals("extension c", "1234", locale.getExtension('c')); assertEquals("extension c", "1234", locale.getExtension('c'));
locale = Locale.forLanguageTag("und-U-ca-gregory-u-ca-japanese");
assertEquals("Unicode extension", "ca-gregory", locale.getExtension(Locale.UNICODE_LOCALE_EXTENSION));
// redundant Unicode locale keys in an extension are ignored // redundant Unicode locale keys in an extension are ignored
locale = Locale.forLanguageTag("und-u-aa-000-bb-001-bB-002-cc-003-c-1234"); locale = Locale.forLanguageTag("und-u-aa-000-bb-001-bB-002-cc-003-c-1234");
assertEquals("Unicode keywords", "aa-000-bb-001-cc-003", locale.getExtension(Locale.UNICODE_LOCALE_EXTENSION)); assertEquals("Unicode keywords", "aa-000-bb-001-cc-003", locale.getExtension(Locale.UNICODE_LOCALE_EXTENSION));
...@@ -1275,6 +1282,35 @@ public class LocaleEnhanceTest extends LocaleTestFmwk { ...@@ -1275,6 +1282,35 @@ public class LocaleEnhanceTest extends LocaleTestFmwk {
} }
} }
/*
* 7033504: (lc) incompatible behavior change for ja_JP_JP and th_TH_TH locales
*/
public void testBug7033504() {
checkCalendar(new Locale("ja", "JP", "jp"), "java.util.GregorianCalendar");
checkCalendar(new Locale("ja", "jp", "jp"), "java.util.GregorianCalendar");
checkCalendar(new Locale("ja", "JP", "JP"), "java.util.JapaneseImperialCalendar");
checkCalendar(new Locale("ja", "jp", "JP"), "java.util.JapaneseImperialCalendar");
checkCalendar(Locale.forLanguageTag("en-u-ca-japanese"),
"java.util.JapaneseImperialCalendar");
checkDigit(new Locale("th", "TH", "th"), '0');
checkDigit(new Locale("th", "th", "th"), '0');
checkDigit(new Locale("th", "TH", "TH"), '\u0e50');
checkDigit(new Locale("th", "TH", "TH"), '\u0e50');
checkDigit(Locale.forLanguageTag("en-u-nu-thai"), '\u0e50');
}
private void checkCalendar(Locale loc, String expected) {
Calendar cal = Calendar.getInstance(loc);
assertEquals("Wrong calendar", expected, cal.getClass().getName());
}
private void checkDigit(Locale loc, Character expected) {
DecimalFormatSymbols dfs = DecimalFormatSymbols.getInstance(loc);
Character zero = dfs.getZeroDigit();
assertEquals("Wrong digit zero char", expected, zero);
}
/// ///
/// utility asserts /// utility asserts
/// ///
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或