]> granicus.if.org Git - icu/commitdiff
ICU-13413 Merge pull request #43 from yumaoka/icu4j-java7
authorYoshito Umaoka <yumaoka@users.noreply.github.com>
Tue, 14 Aug 2018 20:47:37 +0000 (16:47 -0400)
committerShane Carr <shane@unicode.org>
Thu, 27 Sep 2018 21:27:38 +0000 (14:27 -0700)
ICU-13413 Update the minimum Java runtime version to 7

1  2 
.gitignore
icu4j/main/classes/core/src/com/ibm/icu/impl/locale/XLikelySubtags.java
icu4j/main/classes/core/src/com/ibm/icu/impl/locale/XLocaleDistance.java

diff --cc .gitignore
Simple merge
index 5e07beafe2d41cb2be62c64f8100e6eb482d06f9,dcf676df8ba63836d3affd9c2f6db7baeb7f11d9..48f043e7858f68a66ea21661052a0511bad7ac6a
@@@ -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;