From: Yoshito Umaoka <yumaoka@users.noreply.github.com>
Date: Tue, 14 Aug 2018 20:47:37 +0000 (-0400)
Subject: ICU-13413 Merge pull request #43 from yumaoka/icu4j-java7
X-Git-Tag: release-63-rc~120
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8a52f44951a459721ede57a1f2ea3621ac852dfc;p=icu

ICU-13413 Merge pull request #43 from yumaoka/icu4j-java7

ICU-13413 Update the minimum Java runtime version to 7
---

8a52f44951a459721ede57a1f2ea3621ac852dfc
diff --cc icu4j/main/classes/core/src/com/ibm/icu/impl/locale/XLocaleDistance.java
index 5e07beafe2d,dcf676df8ba..48f043e7858
--- 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
@@@ -745,9 -745,9 +745,9 @@@ public class XLocaleDistance 
              int threshold,
              DistanceOption distanceOption) {
  
-         Output<DistanceTable> subtable = new Output<DistanceTable>();
+         Output<DistanceTable> 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;