AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-7645 Fix for old compilers

Browse Source 
X-SVN-Rev: 32915
This commit is contained in:
Mark Davis 2012-12-02 19:22:16 +00:00
parent c85f5b613a
commit 55372c11e2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
icu4j/main/classes/core/src/com/ibm/icu/text/IdentifierInfo.java
View File

@ -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<BitSet> parseAlternates(String scriptsSetString) {
Set<BitSet> result = new HashSet<BitSet>();
for (String item : scriptsSetString.trim().split("\\s*;\\s*")) {
if (!item.isEmpty()) {
if (item.length() != 0) {
result.add(parseScripts(item));
}
}