From 9c66e7e083de8ff2a8622534ea791294634a771b Mon Sep 17 00:00:00 2001 From: Mark Davis Date: Tue, 9 Apr 2013 09:04:45 +0000 Subject: [PATCH] ICU-8474 correct isEmpty() X-SVN-Rev: 33501 --- .../com/ibm/icu/dev/test/format/WritePluralRulesData.java | 6 +++--- .../translit/src/com/ibm/icu/dev/util/UnicodeProperty.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/WritePluralRulesData.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/WritePluralRulesData.java index 60e105f105c..c06f5516db7 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/WritePluralRulesData.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/WritePluralRulesData.java @@ -100,7 +100,7 @@ public class WritePluralRulesData { boolean[] isAvailable = new boolean[1]; for (ULocale locale : locales) { ULocale base = pluralRulesFactory.getFunctionalEquivalent(locale, isAvailable); - if (!locales.contains(base) && !base.toString().isEmpty()) { + if (!locales.contains(base) && base.toString().length() != 0) { System.out.println("**" + locales + " doesn't contain " + base); } } @@ -400,14 +400,14 @@ public class WritePluralRulesData { String skeleton = sample.replace(" ", "").replace("{0}", ""); String oldSkeletonKeyword = skeletonToKeyword.get(skeleton); if (oldSkeletonKeyword != null) { - if (!error.isEmpty()) { + if (error.length() != 0) { error += ", "; } error += "Duplicate keyword skeleton <" + keyword + ", " + skeleton + ">, same as for: <" + oldSkeletonKeyword + ">"; } else { skeletonToKeyword.put(skeleton, keyword); } - if (error.isEmpty()) { + if (error.length() == 0) { keywordToErrors.put(keyword, ""); } else { keywordToErrors.put(keyword, "\tERROR: " + error); diff --git a/icu4j/main/tests/translit/src/com/ibm/icu/dev/util/UnicodeProperty.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/util/UnicodeProperty.java index 9a2de6c9a98..c4b23c1575e 100644 --- a/icu4j/main/tests/translit/src/com/ibm/icu/dev/util/UnicodeProperty.java +++ b/icu4j/main/tests/translit/src/com/ibm/icu/dev/util/UnicodeProperty.java @@ -736,7 +736,7 @@ public abstract class UnicodeProperty extends UnicodeLabel { public final Factory add(UnicodeProperty sp) { String name2 = sp.getName(); - if (name2.isEmpty()) { + if (name2.length() == 0) { throw new IllegalArgumentException(); } canonicalNames.put(name2, sp);