ICU-13829 Merge pull request unicode-org#25 from gnrunge/icu4j_13829

ICU-13829 Languagematcher: Fixes straightforward code issues.

Author: gnrunge

icu4j/main/classes/core/src/com/ibm/icu/impl/locale/XLikelySubtags.java

@@ -143,8 +143,8 @@ static LSR from(String languageIdentifier) {
                 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 static LSR fromMaximalized(ULocale locale) {
         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);
         }

icu4j/main/classes/core/src/com/ibm/icu/impl/locale/XLocaleDistance.java

@@ -739,15 +739,15 @@ public enum DistanceOption {NORMAL, SCRIPT_FIRST}
      * 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,
             DistanceOption distanceOption) {
 
         Output<DistanceTable> subtable = new Output<DistanceTable>();
 
-        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;

icu4j/main/classes/core/src/com/ibm/icu/impl/locale/XLocaleMatcher.java

@@ -40,7 +40,6 @@ public class XLocaleMatcher {
     private final Set<ULocale> exactSupportedLocales; // the locales in the collection are ordered!
     private final ULocale defaultLanguage;
 
-
     public static class Builder {
         private Set<ULocale> supportedLanguagesList;
         private int thresholdDistance = -1;