diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/locale/XLikelySubtags.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/locale/XLikelySubtags.java index 22fd4d269e8..b5dcd6cd073 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/impl/locale/XLikelySubtags.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/locale/XLikelySubtags.java @@ -143,8 +143,8 @@ public class XLikelySubtags { throw new ICUException("too many subtags"); } String lang = parts[0].toLowerCase(); - String p2 = parts.length < 2 ? "": parts[1]; - String p3 = parts.length < 3 ? "": parts[2]; + String p2 = parts.length < 2 ? "" : parts[1]; + String p3 = parts.length < 3 ? "" : parts[2]; return p2.length() < 4 ? new LSR(lang, "", p2) : new LSR(lang, p2, p3); // Matcher matcher = LANGUAGE_PATTERN.matcher(languageIdentifier); @@ -166,7 +166,7 @@ public class XLikelySubtags { public static LSR fromMaximalized(String language, String script, String region) { String canonicalLanguage = LANGUAGE_ALIASES.getCanonical(language); // script is ok - String canonicalRegion = REGION_ALIASES.getCanonical(region); // getCanonical(REGION_ALIASES.get(region)); + String canonicalRegion = REGION_ALIASES.getCanonical(region); return DEFAULT.maximize(canonicalLanguage, script, canonicalRegion); } diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/locale/XLocaleDistance.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/locale/XLocaleDistance.java index b24d70a2b33..5e07beafe2d 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/impl/locale/XLocaleDistance.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/locale/XLocaleDistance.java @@ -739,7 +739,7 @@ public class XLocaleDistance { * ULocales must be in canonical, addLikelySubtags format. Returns distance */ public int distanceRaw( - String desiredLang, String supportedlang, + String desiredLang, String supportedLang, String desiredScript, String supportedScript, String desiredRegion, String supportedRegion, int threshold, @@ -747,7 +747,7 @@ public class XLocaleDistance { Output subtable = new Output(); - int distance = languageDesired2Supported.getDistance(desiredLang, supportedlang, subtable, true); + int distance = languageDesired2Supported.getDistance(desiredLang, supportedLang, subtable, true); boolean scriptFirst = distanceOption == DistanceOption.SCRIPT_FIRST; if (scriptFirst) { distance >>= 2; diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/locale/XLocaleMatcher.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/locale/XLocaleMatcher.java index 4623884771a..09ef5f02d42 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/impl/locale/XLocaleMatcher.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/locale/XLocaleMatcher.java @@ -40,7 +40,6 @@ public class XLocaleMatcher { private final Set exactSupportedLocales; // the locales in the collection are ordered! private final ULocale defaultLanguage; - public static class Builder { private Set supportedLanguagesList; private int thresholdDistance = -1;