ICU-13829 Languagematcher: Fixes straightforward code issues.

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 22fd4d269e822a36d0faf565805f2d597a156b9c..7a77b3185ab126ebb232a6974a65561407d573a9 100644 (file)
--- 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
@@ -3,14 +3,6 @@
 package com.ibm.icu.impl.locale;
 
 import java.util.Collection;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.TreeMap;
-
 import com.ibm.icu.impl.ICUData;
 import com.ibm.icu.impl.ICUResourceBundle;
 import com.ibm.icu.impl.Utility;
@@ -21,6 +13,13 @@ import com.ibm.icu.util.ICUException;
 import com.ibm.icu.util.ULocale;
 import com.ibm.icu.util.ULocale.Minimize;
 import com.ibm.icu.util.UResourceBundle;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TreeMap;
 
 public class XLikelySubtags {
 
@@ -143,8 +142,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 +165,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 b24d70a2b3398477f9e494a11f9b3e0c3b4cd2f8..5e07beafe2d41cb2be62c64f8100e6eb482d06f9 100644 (file)
--- 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<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;

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 4623884771a18f2644e633bee18fc810e8784b12..8f7901a97cc3b63a095c62a011f5d636b4f85f55 100644 (file)
--- 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
@@ -2,13 +2,6 @@
 // License & terms of use: http://www.unicode.org/copyright.html#License
 package com.ibm.icu.impl.locale;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
 import com.ibm.icu.impl.locale.XCldrStub.ImmutableMultimap;
 import com.ibm.icu.impl.locale.XCldrStub.ImmutableSet;
 import com.ibm.icu.impl.locale.XCldrStub.LinkedHashMultimap;
@@ -18,6 +11,12 @@ import com.ibm.icu.impl.locale.XLocaleDistance.DistanceOption;
 import com.ibm.icu.util.LocalePriorityList;
 import com.ibm.icu.util.Output;
 import com.ibm.icu.util.ULocale;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
 
 /**
  * Immutable class that picks best match between user's desired locales and application's supported locales.
@@ -40,7 +39,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;