organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-14 17:24:01 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-4069 Some minor updates

Browse source 
X-SVN-Rev: 26603
This commit is contained in:
Yoshito Umaoka 2009-09-04 18:42:47 +00:00
parent 222da0d6ad
commit 71fb8f005b
1 changed files with 21 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
icu4j/main/classes/core/src/com/ibm/icu/util/ULocale.java
View file

@ -1242,25 +1242,14 @@ public final class ULocale implements Serializable {
return new IDParser(localeID).getKeywordValue(keywordName);
}
/** Utility class to handle getDisplayLanguageWithDialect() functions and remember
/*
* Utility class to handle getDisplayLanguageWithDialect() functions and remember
* which fields got eaten.
*/
private static final class DisplayLanguageResult {
protected String value;
protected boolean ateCountry = false;
protected boolean ateScript = false;
public void set(String s) {
value = s;
}
public void eatCountry() {
ateCountry = true;
}
public void eatScript() {
ateScript = true;
}
String value;
boolean ateCountry = false;
boolean ateScript = false;
}
/**
@ -2333,6 +2322,7 @@ public final class ULocale implements Serializable {
* If a dialect name is present in the data, then it is returned.
* @return the localized language name.
* @draft ICU 4.4
* @provisional This API might change or be removed in a future release.
*/
public String getDisplayLanguageWithDialect() {
return getDisplayLanguageWithDialectInternal(localeID, getDefault().localeID).value;
@ -2344,6 +2334,7 @@ public final class ULocale implements Serializable {
* @param displayLocale the locale in which to display the name.
* @return the localized language name.
* @draft ICU 4.4
* @provisional This API might change or be removed in a future release.
*/
public String getDisplayLanguageWithDialect(ULocale displayLocale) {
return getDisplayLanguageWithDialectInternal(localeID, displayLocale.localeID).value;
@ -2357,6 +2348,7 @@ public final class ULocale implements Serializable {
* @param displayLocaleID the id of the locale in which to display the name.
* @return the localized language name.
* @draft ICU 4.4
* @provisional This API might change or be removed in a future release.
*/
public static String getDisplayLanguageWithDialect(String localeID, String displayLocaleID) {
return getDisplayLanguageWithDialectInternal(localeID, getName(displayLocaleID)).value;
@ -2370,6 +2362,7 @@ public final class ULocale implements Serializable {
* @param displayLocale the locale in which to display the name.
* @return the localized language name.
* @draft ICU 4.4
* @provisional This API might change or be removed in a future release.
*/
public static String getDisplayLanguageWithDialect(String localeID, ULocale displayLocale) {
return getDisplayLanguageWithDialectInternal(localeID, displayLocale.localeID).value;
@ -2410,9 +2403,9 @@ public final class ULocale implements Serializable {
String langScriptCountry = names[0] + UNDERSCORE + names[1] + UNDERSCORE + names[2];
String result = getTableString("Languages", null, langScriptCountry, displayLocaleID);
if (!result.equals(langScriptCountry)) {
dlr.set(result);
dlr.eatScript();
dlr.eatCountry();
dlr.value = result;
dlr.ateScript = true;
dlr.ateCountry = true;
return dlr;
}
}
@ -2420,8 +2413,8 @@ public final class ULocale implements Serializable {
String langScript = names[0] + UNDERSCORE + names[1];
String result = getTableString("Languages", null, langScript, displayLocaleID);
if (!result.equals(langScript)) {
dlr.set(result);
dlr.eatScript();
dlr.value = result;
dlr.ateScript = true;
return dlr;
}
}
@ -2429,14 +2422,14 @@ public final class ULocale implements Serializable {
String langCountry = names[0] + UNDERSCORE + names[2];
String result = getTableString("Languages", null, langCountry, displayLocaleID);
if (!result.equals(langCountry)) {
dlr.set(result);
dlr.eatCountry();
dlr.value = result;
dlr.ateCountry = true;
return dlr;
}
}
dlr.set(getTableString("Languages", null, names[0], displayLocaleID));
dlr.value = getTableString("Languages", null, names[0], displayLocaleID);
return dlr;
}
@ -2794,6 +2787,7 @@ public final class ULocale implements Serializable {
* If a dialect name is present in the locale data, then it is returned.
* @return the localized locale name.
* @draft ICU 4.4
* @provisional This API might change or be removed in a future release.
*/
public String getDisplayNameWithDialect() {
return getDisplayNameWithDialectInternal(localeID, getDefault().localeID);
@ -2805,6 +2799,7 @@ public final class ULocale implements Serializable {
* @param displayLocale the locale in which to display the locale name.
* @return the localized locale name.
* @draft ICU 4.4
* @provisional This API might change or be removed in a future release.
*/
public String getDisplayNameWithDialect(ULocale displayLocale) {
return getDisplayNameWithDialectInternal(localeID, displayLocale.localeID);
@ -2818,6 +2813,7 @@ public final class ULocale implements Serializable {
* @param displayLocaleID the id of the locale in which to display the locale name.
* @return the localized locale name.
* @draft ICU 4.4
* @provisional This API might change or be removed in a future release.
*/
public static String getDisplayNameWithDialect(String localeID, String displayLocaleID) {
return getDisplayNameWithDialectInternal(localeID, getName(displayLocaleID));
@ -2831,6 +2827,7 @@ public final class ULocale implements Serializable {
* @param displayLocale the locale in which to display the locale name.
* @return the localized locale name.
* @draft ICU 4.4
* @provisional This API might change or be removed in a future release.
*/
public static String getDisplayNameWithDialect(String localeID, ULocale displayLocale) {
return getDisplayNameWithDialectInternal(localeID, displayLocale.localeID);