From 4f6acc7e64da2bf585d75995d28f069fc8a34782 Mon Sep 17 00:00:00 2001 From: John Vu Date: Tue, 18 Aug 2009 17:09:22 +0000 Subject: [PATCH] ICU-6237 After upgrading to Eclipse 3.5, added back @SupressWarnings and comment out "dead code". X-SVN-Rev: 26507 --- .../src/com/ibm/icu/charset/CharsetEncoderICU.java | 14 +++++++------- .../src/com/ibm/icu/charset/CharsetISCII.java | 3 ++- .../src/com/ibm/icu/charset/CharsetISO2022.java | 1 + .../src/com/ibm/icu/charset/CharsetSCSU.java | 3 ++- .../ibm/icu/text/CollationParsedRuleBuilder.java | 2 ++ .../com/ibm/icu/text/RbnfScannerProviderImpl.java | 1 + .../com/ibm/icu/text/DateTimePatternGenerator.java | 6 ++++-- .../core/src/com/ibm/icu/text/DigitList.java | 5 +++-- .../core/src/com/ibm/icu/text/MessageFormat.java | 5 +++-- .../core/src/com/ibm/icu/text/PluralRules.java | 2 ++ .../core/src/com/ibm/icu/text/UnicodeSet.java | 4 +++- .../core/src/com/ibm/icu/util/Calendar.java | 5 +++-- .../core/src/com/ibm/icu/util/SimpleTimeZone.java | 12 +++++++----- .../com/ibm/icu/dev/test/util/BagFormatter.java | 1 + .../src/com/ibm/icu/dev/test/util/Pick.java | 4 ++++ 15 files changed, 45 insertions(+), 23 deletions(-) diff --git a/icu4j/main/classes/charset/src/com/ibm/icu/charset/CharsetEncoderICU.java b/icu4j/main/classes/charset/src/com/ibm/icu/charset/CharsetEncoderICU.java index f9dd3803b1a..c38554f2b5a 100644 --- a/icu4j/main/classes/charset/src/com/ibm/icu/charset/CharsetEncoderICU.java +++ b/icu4j/main/classes/charset/src/com/ibm/icu/charset/CharsetEncoderICU.java @@ -187,7 +187,7 @@ public abstract class CharsetEncoderICU extends CharsetEncoder { * Sets fromUContext used in callbacks. * * @param newContext Object - * @exception IllegalArgumentException + * @exception IllegalArgumentException The object is an illegal argument for UContext. * @stable ICU 4.0 */ public final void setFromUContext(Object newContext) { @@ -849,9 +849,9 @@ public abstract class CharsetEncoderICU extends CharsetEncoder { * @return CoderResult.malformedForLength(1) or * CoderResult.UNDERFLOW if there is a problem, or * null if there isn't. - * @see handleSurrogates(CharBuffer, char) - * @see handleSurrogates(CharBuffer, int, char) - * @see handleSurrogates(char[], int, int, char) + * @see #handleSurrogates(CharBuffer, char) + * @see #handleSurrogates(CharBuffer, int, char) + * @see #handleSurrogates(char[], int, int, char) */ final CoderResult handleSurrogates(CharBuffer source, char lead) { if (!UTF16.isLeadSurrogate(lead)) { @@ -891,9 +891,9 @@ public abstract class CharsetEncoderICU extends CharsetEncoder { * @return CoderResult.malformedForLength(1) or * CoderResult.UNDERFLOW if there is a problem, or null if * there isn't. - * @see handleSurrogates(CharBuffer, char) - * @see handleSurrogates(CharBuffer, int, char) - * @see handleSurrogates(char[], int, int, char) + * @see #handleSurrogates(CharBuffer, char) + * @see #handleSurrogates(CharBuffer, int, char) + * @see #handleSurrogates(char[], int, int, char) */ final CoderResult handleSurrogates(char[] sourceArray, int sourceIndex, int sourceLimit, char lead) { diff --git a/icu4j/main/classes/charset/src/com/ibm/icu/charset/CharsetISCII.java b/icu4j/main/classes/charset/src/com/ibm/icu/charset/CharsetISCII.java index 0218b762ef1..890942abd84 100644 --- a/icu4j/main/classes/charset/src/com/ibm/icu/charset/CharsetISCII.java +++ b/icu4j/main/classes/charset/src/com/ibm/icu/charset/CharsetISCII.java @@ -72,7 +72,7 @@ class CharsetISCII extends CharsetICU { static final short MALAYALAM = KANNADA + 1; static final short DELTA = 0x80; } - + @SuppressWarnings("unused") private static final class ISCIILang { static final short DEF = 0x40; static final short RMN = 0x41; @@ -108,6 +108,7 @@ class CharsetISCII extends CharsetICU { private final String ISCII_CNV_PREFIX = "ISCII,version="; + @SuppressWarnings("unused") private final class UConverterDataISCII { int option; int contextCharToUnicode; /* previous Unicode codepoint for contextual analysis */ diff --git a/icu4j/main/classes/charset/src/com/ibm/icu/charset/CharsetISO2022.java b/icu4j/main/classes/charset/src/com/ibm/icu/charset/CharsetISO2022.java index 56ffdee6f1c..e23c2bd7249 100644 --- a/icu4j/main/classes/charset/src/com/ibm/icu/charset/CharsetISO2022.java +++ b/icu4j/main/classes/charset/src/com/ibm/icu/charset/CharsetISO2022.java @@ -336,6 +336,7 @@ class CharsetISO2022 extends CharsetICU { // private static final byte UCNV_OPTIONS_VERSION_MASK = 0xf; private static final byte UCNV_2022_MAX_CONVERTERS = 10; + @SuppressWarnings("unused") private class UConverterDataISO2022 { UConverterSharedData []myConverterArray; CharsetEncoderMBCS currentEncoder; diff --git a/icu4j/main/classes/charset/src/com/ibm/icu/charset/CharsetSCSU.java b/icu4j/main/classes/charset/src/com/ibm/icu/charset/CharsetSCSU.java index 9ac0c42e19d..7bc31c75e68 100644 --- a/icu4j/main/classes/charset/src/com/ibm/icu/charset/CharsetSCSU.java +++ b/icu4j/main/classes/charset/src/com/ibm/icu/charset/CharsetSCSU.java @@ -108,7 +108,8 @@ class CharsetSCSU extends CharsetICU{ private static final int definePairTwo=5; private static final int defineOne=6; // }; - + + @SuppressWarnings("unused") private final class SCSUData{ /* dynamic window offsets, intitialize to default values from initialDynamicOffsets */ int toUDynamicOffsets[] = new int[8] ; diff --git a/icu4j/main/classes/collate/src/com/ibm/icu/text/CollationParsedRuleBuilder.java b/icu4j/main/classes/collate/src/com/ibm/icu/text/CollationParsedRuleBuilder.java index 0fb7b84abe0..7a99dc17e4f 100644 --- a/icu4j/main/classes/collate/src/com/ibm/icu/text/CollationParsedRuleBuilder.java +++ b/icu4j/main/classes/collate/src/com/ibm/icu/text/CollationParsedRuleBuilder.java @@ -687,6 +687,7 @@ final class CollationParsedRuleBuilder { // private inner classes ------------------------------------------------- + @SuppressWarnings("unused") private static class CEGenerator { // package private data members -------------------------------------- @@ -893,6 +894,7 @@ final class CollationParsedRuleBuilder { * Private class for combining mark table. The table is indexed by the class * value(0-255). */ + @SuppressWarnings("unused") private static class CombinClassTable { /** * accumulated numbers of combining marks. diff --git a/icu4j/main/classes/collate/src/com/ibm/icu/text/RbnfScannerProviderImpl.java b/icu4j/main/classes/collate/src/com/ibm/icu/text/RbnfScannerProviderImpl.java index e0bd5d3a31f..44a384a7523 100644 --- a/icu4j/main/classes/collate/src/com/ibm/icu/text/RbnfScannerProviderImpl.java +++ b/icu4j/main/classes/collate/src/com/ibm/icu/text/RbnfScannerProviderImpl.java @@ -140,6 +140,7 @@ public class RbnfScannerProviderImpl implements RbnfLenientScannerProvider { ///CLOVER:OFF // The following method contains the same signature as findText // and has never been used by anything once. + @SuppressWarnings("unused") public int[] findText2(String str, String key, int startingAt) { CollationElementIterator strIter = collator.getCollationElementIterator(str); diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/DateTimePatternGenerator.java b/icu4j/main/classes/core/src/com/ibm/icu/text/DateTimePatternGenerator.java index b5c79dd5eda..f2a5f874345 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/text/DateTimePatternGenerator.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/text/DateTimePatternGenerator.java @@ -620,7 +620,8 @@ public class DateTimePatternGenerator implements Freezable, Cloneable { } ///CLOVER:OFF //The following would never be called since the parameter is false - if (false) { // ordered + //Eclipse stated the following is "dead code" + /*if (false) { // ordered DateTimePatternGenerator results = new DateTimePatternGenerator(); PatternInfo pinfo = new PatternInfo(); for (DateTimeMatcher cur : skeleton2pattern.keySet()) { @@ -636,7 +637,7 @@ public class DateTimePatternGenerator implements Freezable, Cloneable { results.addPattern(pattern, false, pinfo); } } - } + }*/ ///CLOVER:ON return output; } @@ -1733,6 +1734,7 @@ public class DateTimePatternGenerator implements Freezable, Cloneable { /** * */ + @SuppressWarnings("unused") void extractFrom(DateTimeMatcher source, int fieldMask) { for (int i = 0; i < type.length; ++i) { if ((fieldMask & (1< count ? decimalAt : count; if (!isPositive) { len += 1; diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/MessageFormat.java b/icu4j/main/classes/core/src/com/ibm/icu/text/MessageFormat.java index 5a364d09012..90b02874ae2 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/text/MessageFormat.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/text/MessageFormat.java @@ -1676,10 +1676,11 @@ public class MessageFormat extends UFormat implements BaseFormat> (argumentNumber*2)) & 0x3); - if (false) { // if (argRecursion == 3){ + //Eclipse stated the following is "dead code" + /*if (false) { // if (argRecursion == 3){ // prevent loop!!! result.append('\uFFFD'); - } else { + } else*/ { Object obj = arguments.get(argumentName); String arg = null; Format subFormatter = null; diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/PluralRules.java b/icu4j/main/classes/core/src/com/ibm/icu/text/PluralRules.java index 68fe8b7dc0c..e86905b6543 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/text/PluralRules.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/text/PluralRules.java @@ -555,10 +555,12 @@ public class PluralRules implements Serializable { this.constraint = constraint; } + @SuppressWarnings("unused") public Rule and(Constraint c) { return new ConstrainedRule(keyword, new AndConstraint(constraint, c)); } + @SuppressWarnings("unused") public Rule or(Constraint c) { return new ConstrainedRule(keyword, new OrConstraint(constraint, c)); } diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/UnicodeSet.java b/icu4j/main/classes/core/src/com/ibm/icu/text/UnicodeSet.java index 61fb1443388..9a01973029b 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/text/UnicodeSet.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/text/UnicodeSet.java @@ -2383,6 +2383,8 @@ public class UnicodeSet extends UnicodeFilter implements Iterable, Compa clear(); while (mode != 2 && !chars.atEnd()) { + //Eclipse stated the following is "dead code" + /* if (false) { // Debugging assertion if (!((lastItem == 0 && op == 0) || @@ -2390,7 +2392,7 @@ public class UnicodeSet extends UnicodeFilter implements Iterable, Compa (lastItem == 2 && (op == 0 || op == '-' || op == '&')))) { throw new IllegalArgumentException(); } - } + }*/ int c = 0; boolean literal = false; 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 ae6ca8b41f0..e57471a4d41 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/util/Calendar.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/util/Calendar.java @@ -3693,13 +3693,14 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable targetMs) { - if (false) { + //Eclipse stated the following is "dead code" + /*if (false) { // This works, and makes the code smaller, but costs // an extra object creation and an extra couple cycles // of calendar computation. setTimeInMillis(targetMs); min = -fieldDifference(new Date(startMs), field); - } + }*/ int max = -1; // Find a value that is too small for (;;) { diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/SimpleTimeZone.java b/icu4j/main/classes/core/src/com/ibm/icu/util/SimpleTimeZone.java index 0ed31b890ab..aefc6762235 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/util/SimpleTimeZone.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/util/SimpleTimeZone.java @@ -652,10 +652,12 @@ public class SimpleTimeZone extends BasicTimeZone { || prevMonthLength > 31) { throw new IllegalArgumentException(); } - } else { - /* This parameter checking code is better for debugging, but - * overkill for normal operation. Only one of these two blocks - * should actually get compiled into the class file. */ + } + //Eclipse stated the following is "dead code" + /*else { + // This parameter checking code is better for debugging, but + // overkill for normal operation. Only one of these two blocks + // should actually get compiled into the class file. if (era != GregorianCalendar.AD && era != GregorianCalendar.BC) { throw new IllegalArgumentException("Illegal era " + era); } @@ -683,7 +685,7 @@ public class SimpleTimeZone extends BasicTimeZone { || prevMonthLength > 31) { throw new IllegalArgumentException("Illegal previous month length " + prevMonthLength); } - } + }*/ int result = raw; diff --git a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/BagFormatter.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/BagFormatter.java index 7a85c1a2043..bec4e39583f 100644 --- a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/BagFormatter.java +++ b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/BagFormatter.java @@ -552,6 +552,7 @@ public class BagFormatter { doAt(c); } + @SuppressWarnings("unused") public String format(Object o) { StringWriter sw = new StringWriter(); PrintWriter pw = new PrintWriter(sw); diff --git a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/Pick.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/Pick.java index 5c2b470d51a..67222ba42c4 100644 --- a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/Pick.java +++ b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/Pick.java @@ -571,20 +571,24 @@ abstract public class Pick { private abstract static class ListPick extends Pick { protected Pick[] items = new Pick[0]; + @SuppressWarnings("unused") Pick simplify() { if (items.length > 1) return this; if (items.length == 1) return items[0]; return null; } + @SuppressWarnings("unused") int size() { return items.length; } + @SuppressWarnings("unused") Pick getLast() { return items[items.length-1]; } + @SuppressWarnings("unused") void setLast(Pick newOne) { items[items.length-1] = newOne; }