ICU-10993 Fixed javac/eclipse compiler warnings, and issues reported by FindBugs.

X-SVN-Rev: 36404

diff --git a/icu4j/main/classes/charset/src/com/ibm/icu/charset/CharsetMBCS.java b/icu4j/main/classes/charset/src/com/ibm/icu/charset/CharsetMBCS.java
index f4c42f570b056ea5f1ff79d725626ec3e05bdd04..39d585b10051d09b1447eb2bc814c101a3dcc905 100644 (file)
--- a/icu4j/main/classes/charset/src/com/ibm/icu/charset/CharsetMBCS.java
+++ b/icu4j/main/classes/charset/src/com/ibm/icu/charset/CharsetMBCS.java
@@ -3926,7 +3926,7 @@ class CharsetMBCS extends CharsetICU {
 
             /* no mapping */
             cr[0] = CoderResult.unmappableForLength(length);
-            return (int) cp;
+            return cp;
         }
 
         /*

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/UPropertyAliases.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/UPropertyAliases.java
index 8d010908d6a385f2bf81438136669d9a623d554b..dfb4d9d5b1c6150714a5f4206083e3d39c637830 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/UPropertyAliases.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/UPropertyAliases.java
@@ -308,8 +308,6 @@ public final class UPropertyAliases {
     
     /**
      * Returns a value enum given a property enum and one of its value names. Does not throw.
-     * @param property 
-     * @param alias
      * @return value enum, or UProperty.UNDEFINED if not defined for that property
      * @internal
      * @deprecated This API is ICU internal only.

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/lang/UCharacter.java b/icu4j/main/classes/core/src/com/ibm/icu/lang/UCharacter.java
index c451f1e84b15598532bc2d0aa190ede8e388f8c0..8d281533faba58b8d0d1b926db6a043662ad75cd 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/lang/UCharacter.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/lang/UCharacter.java
@@ -14,7 +14,6 @@ import java.util.Locale;
 import java.util.Map;
 
 import com.ibm.icu.impl.IllegalIcuArgumentException;
-import com.ibm.icu.impl.Norm2AllModes;
 import com.ibm.icu.impl.Trie2;
 import com.ibm.icu.impl.UBiDiProps;
 import com.ibm.icu.impl.UCaseProps;

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/MeasureFormat.java b/icu4j/main/classes/core/src/com/ibm/icu/text/MeasureFormat.java
index 4bbc5370e2d482c1618ea06bd82b7006caa53116..b9a1cf006aea238e8d853cb5cd5514adf78cdb90 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/MeasureFormat.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/MeasureFormat.java
@@ -16,7 +16,6 @@ import java.io.InvalidObjectException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
 import java.io.ObjectStreamException;
-import java.nio.Buffer;
 import java.text.FieldPosition;
 import java.text.ParsePosition;
 import java.util.Arrays;
@@ -467,13 +466,6 @@ public class MeasureFormat extends UFormat {
         }
     }
 
-    /**
-     * @param affix
-     * @param unit
-     * @param resolvedCategory 
-     * @param result 
-     * @return
-     */
     private void appendReplacingCurrency(String affix, Currency unit, StandardPluralCategories resolvedCategory, StringBuilder result) {
         String replacement = "¤";
         int pos = affix.indexOf(replacement);

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/PluralRanges.java b/icu4j/main/classes/core/src/com/ibm/icu/text/PluralRanges.java
index 543d06722bb6689d79664b78e283963d354ae239..e45edb89ab56fd25087930703357e5649997f59c 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/PluralRanges.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/PluralRanges.java
@@ -6,6 +6,7 @@
  */
 package com.ibm.icu.text;
 
+import java.util.Arrays;
 import java.util.EnumSet;
 
 import com.ibm.icu.text.PluralRules.StandardPluralCategories;
@@ -272,7 +273,14 @@ public final class PluralRanges implements Freezable<PluralRanges>, Comparable<P
 
     @Override
     public boolean equals(Object other) {
-        return other instanceof PluralRanges ? matrix.equals((PluralRanges) other) : false;
+        if (this == other) {
+            return true;
+        }
+        if (!(other instanceof PluralRanges)) {
+            return false;
+        }
+        PluralRanges otherPR = (PluralRanges)other;
+        return matrix.equals(otherPR.matrix) && Arrays.equals(explicit, otherPR.explicit);
     }
 
     @Override

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/UnicodeSetSpanner.java b/icu4j/main/classes/core/src/com/ibm/icu/text/UnicodeSetSpanner.java
index 80c637cdae5dbecceee152d2aa8f6709f844fa95..2ff4efee6fa93cfdc704b0510c7a9b74f2a6bd67 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/UnicodeSetSpanner.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/UnicodeSetSpanner.java
@@ -16,9 +16,9 @@ import com.ibm.icu.util.OutputInt;
  * its inverse. That is, the code spans, then spans for the inverse, then spans, and so on.
  * For the inverse, the following mapping is used:</p>
  * <ul>
- * <li>{@link SpanCondition.SIMPLE} → {@link SpanCondition.NOT_CONTAINED}</li>
- * <li>{@link SpanCondition.CONTAINED} → {@link SpanCondition.NOT_CONTAINED}</li>
- * <li>{@link SpanCondition.NOT_CONTAINED} → {@link SpanCondition.SIMPLE}</li>
+ * <li>{@link UnicodeSet.SpanCondition#SIMPLE} → {@link UnicodeSet.SpanCondition#NOT_CONTAINED}</li>
+ * <li>{@link UnicodeSet.SpanCondition#CONTAINED} → {@link UnicodeSet.SpanCondition#NOT_CONTAINED}</li>
+ * <li>{@link UnicodeSet.SpanCondition#NOT_CONTAINED} → {@link UnicodeSet.SpanCondition#SIMPLE}</li>
  * </ul>
  * These are actually not complete inverses. However, the alternating works because there are no gaps.
  * For example, with [a{ab}{bc}], you get the following behavior when scanning forward:

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/Calendar.java b/icu4j/main/classes/core/src/com/ibm/icu/util/Calendar.java
index 0141510c63f3b45a803a933dcaf21ed536af2f48..6c90cf7a3867c52e7bd260b618a1023cc5c94118 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/util/Calendar.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/util/Calendar.java
@@ -4567,6 +4567,12 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
         }
         @Override
         public boolean equals(Object other) {
+            if (this == other) {
+                return true;
+            }
+            if (!(other instanceof WeekData)) {
+                return false;
+            }
             WeekData that = (WeekData) other;
             return firstDayOfWeek == that.firstDayOfWeek
                     && minimalDaysInFirstWeek == that.minimalDaysInFirstWeek

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/LocaleData.java b/icu4j/main/classes/core/src/com/ibm/icu/util/LocaleData.java
index f4fc795ea62f9241d3e143d8c56fa53d14b59766..0b58f6385fc183e23f2042ddea22642cf996af62 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/util/LocaleData.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/util/LocaleData.java
@@ -6,7 +6,6 @@
  */
 package com.ibm.icu.util;
 
-import java.io.ObjectInputStream.GetField;
 import java.util.MissingResourceException;
 
 import com.ibm.icu.impl.ICUResourceBundle;

diff --git a/icu4j/main/tests/charset/src/com/ibm/icu/dev/test/charset/TestCharset.java b/icu4j/main/tests/charset/src/com/ibm/icu/dev/test/charset/TestCharset.java
index 22fff130f0569929643942218cba32a7e39ab027..807870d7e98de9514cecdafa8efe1294a6174415 100644 (file)
--- a/icu4j/main/tests/charset/src/com/ibm/icu/dev/test/charset/TestCharset.java
+++ b/icu4j/main/tests/charset/src/com/ibm/icu/dev/test/charset/TestCharset.java
@@ -5748,6 +5748,7 @@ public class TestCharset extends TestFmwk {
 
         int size = set.size();
         for (int i = 0; i < size; i++) {
+            @SuppressWarnings("unused")
             CharBuffer input = CharBuffer.wrap(Character.toChars(set.charAt(i)));
             encoder.reset();
             try {

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatSpecificationTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatSpecificationTest.java
index f719b4e2528cda425c2ce9f861a02816ba68638f..803b4af972ec52ee5d85d6dd00e0f14bf4da0cbe 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatSpecificationTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatSpecificationTest.java
@@ -11,7 +11,6 @@ import com.ibm.icu.text.DecimalFormat;
 import com.ibm.icu.text.DecimalFormatSymbols;
 import com.ibm.icu.text.NumberFormat;
 import com.ibm.icu.util.Currency;
-import com.ibm.icu.util.Currency.CurrencyUsage;
 import com.ibm.icu.util.ULocale;
 
 /**
@@ -37,7 +36,6 @@ public class NumberFormatSpecificationTest extends TestFmwk {
     }
     
     public void TestNfSetters() {
-        double num = 1234.567;
         NumberFormat nf = nfWithPattern("#,##0.##");
         nf.setMaximumIntegerDigits(5);
         nf.setMinimumIntegerDigits(4);

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/PluralRangesTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/PluralRangesTest.java
index f88e8d76835877d8997c18eabb653ce014af8a7f..c58335928ac18b8f068c96a766609433ac09f5d2 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/PluralRangesTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/PluralRangesTest.java
@@ -12,7 +12,6 @@ import com.ibm.icu.dev.test.TestFmwk;
 import com.ibm.icu.text.MeasureFormat;
 import com.ibm.icu.text.MeasureFormat.FormatWidth;
 import com.ibm.icu.text.PluralRanges;
-import com.ibm.icu.text.PluralRules;
 import com.ibm.icu.text.PluralRules.Factory;
 import com.ibm.icu.text.PluralRules.StandardPluralCategories;
 import com.ibm.icu.util.Currency;

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/lang/UnicodeSetTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/lang/UnicodeSetTest.java
index 8ba4cb4a060376902d4006f5e490e338900c95a6..3c67d089273626a9da74e57fd035760d63a33e76 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/lang/UnicodeSetTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/lang/UnicodeSetTest.java
@@ -11,7 +11,6 @@ import java.text.ParsePosition;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -36,11 +35,11 @@ import com.ibm.icu.text.UnicodeMatcher;
 import com.ibm.icu.text.UnicodeSet;
 import com.ibm.icu.text.UnicodeSet.ComparisonStyle;
 import com.ibm.icu.text.UnicodeSet.EntryRange;
+import com.ibm.icu.text.UnicodeSet.SpanCondition;
+import com.ibm.icu.text.UnicodeSetIterator;
 import com.ibm.icu.text.UnicodeSetSpanner;
 import com.ibm.icu.text.UnicodeSetSpanner.CountMethod;
-import com.ibm.icu.text.UnicodeSet.SpanCondition;
 import com.ibm.icu.text.UnicodeSetSpanner.TrimOption;
-import com.ibm.icu.text.UnicodeSetIterator;
 
 /**
  * @test
@@ -2408,10 +2407,10 @@ public class UnicodeSetTest extends TestFmwk {
         assertEquals("", "M, a-c", CollectionUtilities.join(us1.ranges(), ", "));
         
         // Sample code
-        for (EntryRange range : us1.ranges()) { 
+        for (@SuppressWarnings("unused") EntryRange range : us1.ranges()) { 
             // do something with code points between range.codepointEnd and range.codepointEnd; 
         }
-        for (String s : us1.strings()) { 
+        for (@SuppressWarnings("unused") String s : us1.strings()) { 
             // do something with each string;
         }
 

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ICUResourceBundleTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ICUResourceBundleTest.java
index 2ef2aee900230e729f83ecafd3cf202a0d98dd83..45d567df5e1b19ff86aae7c5353ddab6878ea1fa 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ICUResourceBundleTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ICUResourceBundleTest.java
@@ -848,6 +848,7 @@ public final class ICUResourceBundleTest extends TestFmwk {
         }        
     }
     
+    @SuppressWarnings("unused")
     private void assertDefaultLoadingStatus(String msg, int result) {
         assertEqualLoadingStatus(msg, ICUResourceBundle.FROM_DEFAULT, result);
     }