From 55372c11e2c70c69d5cdd5b4f1e08df7f1517939 Mon Sep 17 00:00:00 2001 From: Mark Davis Date: Sun, 2 Dec 2012 19:22:16 +0000 Subject: [PATCH] ICU-7645 Fix for old compilers X-SVN-Rev: 32915 --- .../classes/core/src/com/ibm/icu/text/IdentifierInfo.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/IdentifierInfo.java b/icu4j/main/classes/core/src/com/ibm/icu/text/IdentifierInfo.java index edda33f9b55..870a0193538 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/text/IdentifierInfo.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/text/IdentifierInfo.java @@ -343,7 +343,7 @@ public class IdentifierInfo { // The number of scripts in the text. // Plus 1 if there is some commonality among the alternates (eg [Arab Thaa]; [Arab Syrc]) // Plus number of alternates otherwise (this only works because we only test cardinality up to 2.) - final int cardinalityPlus = temp.cardinality() + (commonAmongAlternates.isEmpty() ? scriptSetSet.size() : 1); + final int cardinalityPlus = temp.cardinality() + (commonAmongAlternates.cardinality() == 0 ? scriptSetSet.size() : 1); if (cardinalityPlus < 2) { return RestrictionLevel.HIGHLY_RESTRICTIVE; } @@ -422,7 +422,7 @@ public class IdentifierInfo { public static BitSet parseScripts(String scriptsString) { BitSet result = new BitSet(); for (String item : scriptsString.trim().split(",?\\s+")) { - if (!item.isEmpty()) { + if (item.length() != 0) { result.set(UScript.getCodeFromName(item)); } } @@ -439,7 +439,7 @@ public class IdentifierInfo { public static Set parseAlternates(String scriptsSetString) { Set result = new HashSet(); for (String item : scriptsSetString.trim().split("\\s*;\\s*")) { - if (!item.isEmpty()) { + if (item.length() != 0) { result.add(parseScripts(item)); } } -- 2.40.0