diff --git a/icu4j/src/com/ibm/icu/dev/test/calendar/CompatibilityTest.java b/icu4j/src/com/ibm/icu/dev/test/calendar/CompatibilityTest.java index 9a71133a5c..df5d404c65 100755 --- a/icu4j/src/com/ibm/icu/dev/test/calendar/CompatibilityTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/calendar/CompatibilityTest.java @@ -1,6 +1,6 @@ /** ******************************************************************************* - * Copyright (C) 2000-2004, International Business Machines Corporation and * + * Copyright (C) 2000-2005, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -209,7 +209,7 @@ public class CompatibilityTest extends com.ibm.icu.dev.test.TestFmwk { auxMapping(cal, 1582, Calendar.OCTOBER, 4); auxMapping(cal, 1582, Calendar.OCTOBER, 15); auxMapping(cal, 1582, Calendar.OCTOBER, 16); - for (int y=800; y<3000; y+=1+(int)100*Math.random()) { + for (int y=800; y<3000; y+=1+(int)(100*Math.random())) { for (int m=Calendar.JANUARY; m<=Calendar.DECEMBER; ++m) { auxMapping(cal, y, m, 15); } diff --git a/icu4j/src/com/ibm/icu/dev/test/calendar/HebrewTest.java b/icu4j/src/com/ibm/icu/dev/test/calendar/HebrewTest.java index 8ef39c9ae3..36e798bd84 100755 --- a/icu4j/src/com/ibm/icu/dev/test/calendar/HebrewTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/calendar/HebrewTest.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 1996-2004, International Business Machines Corporation and * + * Copyright (C) 1996-2005, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -420,4 +420,4 @@ public class HebrewTest extends CalendarTest { } } } -}; +} diff --git a/icu4j/src/com/ibm/icu/dev/test/calendar/IBMCalendarTest.java b/icu4j/src/com/ibm/icu/dev/test/calendar/IBMCalendarTest.java index c1d2f7c642..ea571c3d4a 100755 --- a/icu4j/src/com/ibm/icu/dev/test/calendar/IBMCalendarTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/calendar/IBMCalendarTest.java @@ -509,7 +509,7 @@ public class IBMCalendarTest extends CalendarTest { this.normalized = data; if (normalized != null) this.normalized = normalized; } - }; + } // July 2001 August 2001 January 2002 // Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa diff --git a/icu4j/src/com/ibm/icu/dev/test/calendar/IslamicTest.java b/icu4j/src/com/ibm/icu/dev/test/calendar/IslamicTest.java index 75ec8f0b62..15136d17ba 100755 --- a/icu4j/src/com/ibm/icu/dev/test/calendar/IslamicTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/calendar/IslamicTest.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 1996-2004, International Business Machines Corporation and * + * Copyright (C) 1996-2005, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -243,4 +243,4 @@ public class IslamicTest extends CalendarTest { return civilCalendar; } -}; +} diff --git a/icu4j/src/com/ibm/icu/dev/test/collator/CollationMiscTest.java b/icu4j/src/com/ibm/icu/dev/test/collator/CollationMiscTest.java index a1af93283d..c3a185cf9a 100644 --- a/icu4j/src/com/ibm/icu/dev/test/collator/CollationMiscTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/collator/CollationMiscTest.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2002-2004, International Business Machines Corporation and * + * Copyright (C) 2002-2005, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -38,7 +38,7 @@ public class CollationMiscTest extends TestFmwk { int u; String NFC; String NFD; - }; + } private static final boolean hasCollationElements(Locale locale) { @@ -1262,7 +1262,7 @@ public class CollationMiscTest extends TestFmwk { } public void TestIncrementalNormalize() { - Collator coll = null;; + Collator coll = null; // logln("Test 1 ...."); { /* Test 1. Run very long unnormalized strings, to force overflow of*/ diff --git a/icu4j/src/com/ibm/icu/dev/test/collator/CollationRegressionTest.java b/icu4j/src/com/ibm/icu/dev/test/collator/CollationRegressionTest.java index 3e831c7438..dbb01a113e 100644 --- a/icu4j/src/com/ibm/icu/dev/test/collator/CollationRegressionTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/collator/CollationRegressionTest.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2002-2004, International Business Machines Corporation and * + * Copyright (C) 2002-2005, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -388,7 +388,7 @@ public class CollationRegressionTest extends TestFmwk { c.setStrength(Collator.PRIMARY); compareArray(c, secondary); - }; + } // @bug 4062418 // diff --git a/icu4j/src/com/ibm/icu/dev/test/collator/G7CollationTest.java b/icu4j/src/com/ibm/icu/dev/test/collator/G7CollationTest.java index 7f9ca9702b..3b2f140dcc 100644 --- a/icu4j/src/com/ibm/icu/dev/test/collator/G7CollationTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/collator/G7CollationTest.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2002-2004, International Business Machines Corporation and * + * Copyright (C) 2002-2005, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -51,8 +51,8 @@ public class G7CollationTest extends TestFmwk{ { 19, 22, 21, 24, 23, 25, 12, 13, 9, 0, 17, 16, 28, 26, 27, 15, 18, 14, 1, 11, 2, 3, 4, 5, 20, 6, 8, 10, 7, 29 } }; - private static final int MAX_TOKEN_LEN = 16; - private static final int TESTLOCALES = 12; + //private static final int MAX_TOKEN_LEN = 16; + //private static final int TESTLOCALES = 12; private static final int FIXEDTESTSET = 15; private static final int TOTALTESTSET = 30; diff --git a/icu4j/src/com/ibm/icu/text/AnyTransliterator.java b/icu4j/src/com/ibm/icu/text/AnyTransliterator.java index 63711e9ae8..2e6ac809bb 100644 --- a/icu4j/src/com/ibm/icu/text/AnyTransliterator.java +++ b/icu4j/src/com/ibm/icu/text/AnyTransliterator.java @@ -1,6 +1,6 @@ /* ***************************************************************** -* Copyright (c) 2002-2004, International Business Machines Corporation +* Copyright (c) 2002-2005, International Business Machines Corporation * and others. All Rights Reserved. ***************************************************************** * Date Name Description @@ -119,8 +119,6 @@ class AnyTransliterator extends Transliterator { * there is no variant * @param theTargetScript the script code corresponding to * theTarget. - * @param ec error code, fails if the internal hashtable cannot be - * allocated */ private AnyTransliterator(String id, String theTarget, diff --git a/icu4j/src/com/ibm/icu/text/BreakTransliterator.java b/icu4j/src/com/ibm/icu/text/BreakTransliterator.java index 41ad07fe18..c0a95355bb 100644 --- a/icu4j/src/com/ibm/icu/text/BreakTransliterator.java +++ b/icu4j/src/com/ibm/icu/text/BreakTransliterator.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 1996-2004, International Business Machines Corporation and * + * Copyright (C) 1996-2005, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -10,7 +10,6 @@ import com.ibm.icu.lang.UCharacter; import com.ibm.icu.util.ULocale; import java.text.CharacterIterator; -import java.util.Locale; /** @@ -44,7 +43,7 @@ final class BreakTransliterator extends Transliterator { public BreakIterator getBreakIterator() { // Defer initialization of BreakIterator because it is slow, // typically over 2000 ms. - if (bi == null) bi = (BreakIterator) BreakIterator.getWordInstance(new ULocale("th_TH")); + if (bi == null) bi = BreakIterator.getWordInstance(new ULocale("th_TH")); return bi; } diff --git a/icu4j/src/com/ibm/icu/text/LowercaseTransliterator.java b/icu4j/src/com/ibm/icu/text/LowercaseTransliterator.java index 8cae0ab99e..a713a7eede 100755 --- a/icu4j/src/com/ibm/icu/text/LowercaseTransliterator.java +++ b/icu4j/src/com/ibm/icu/text/LowercaseTransliterator.java @@ -9,7 +9,6 @@ package com.ibm.icu.text; import java.io.IOException; import com.ibm.icu.impl.UCaseProps; -import com.ibm.icu.impl.UCharacterProperty; import com.ibm.icu.util.ULocale; diff --git a/icu4j/src/com/ibm/icu/text/Quantifier.java b/icu4j/src/com/ibm/icu/text/Quantifier.java index 523338acf6..d26d6071cc 100755 --- a/icu4j/src/com/ibm/icu/text/Quantifier.java +++ b/icu4j/src/com/ibm/icu/text/Quantifier.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2001-2004, International Business Machines Corporation and * + * Copyright (C) 2001-2005, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -103,7 +103,7 @@ class Quantifier implements UnicodeMatcher { * characters that may be matched by this object into the given * set. * @param toUnionTo the set into which to union the source characters - * @return a reference to toUnionTo + * @returns a reference to toUnionTo */ public void addMatchSetTo(UnicodeSet toUnionTo) { if (maxCount > 0) { diff --git a/icu4j/src/com/ibm/icu/text/TitlecaseTransliterator.java b/icu4j/src/com/ibm/icu/text/TitlecaseTransliterator.java index a6e2b50e34..689efe9e55 100755 --- a/icu4j/src/com/ibm/icu/text/TitlecaseTransliterator.java +++ b/icu4j/src/com/ibm/icu/text/TitlecaseTransliterator.java @@ -8,7 +8,6 @@ package com.ibm.icu.text; import java.io.IOException; import com.ibm.icu.impl.UCaseProps; -import com.ibm.icu.impl.UCharacterProperty; import com.ibm.icu.util.ULocale; diff --git a/icu4j/src/com/ibm/icu/text/TransliteratorParser.java b/icu4j/src/com/ibm/icu/text/TransliteratorParser.java index 218dc078d8..d42531c6e3 100755 --- a/icu4j/src/com/ibm/icu/text/TransliteratorParser.java +++ b/icu4j/src/com/ibm/icu/text/TransliteratorParser.java @@ -312,7 +312,7 @@ class TransliteratorParser { * Subclass method to return the next line of the source. */ abstract String handleNextLine(); - }; + } /** * RuleBody subclass for a String[] array. @@ -327,7 +327,7 @@ class TransliteratorParser { public void reset() { i = 0; } - }; + } /** * RuleBody subclass for a ResourceReader. @@ -344,7 +344,7 @@ class TransliteratorParser { public void reset() { reader.reset(); } - }; + } //---------------------------------------------------------------------- // class RuleHalf diff --git a/icu4j/src/com/ibm/icu/text/UppercaseTransliterator.java b/icu4j/src/com/ibm/icu/text/UppercaseTransliterator.java index 26c76951e3..3085ddb2a7 100755 --- a/icu4j/src/com/ibm/icu/text/UppercaseTransliterator.java +++ b/icu4j/src/com/ibm/icu/text/UppercaseTransliterator.java @@ -9,7 +9,6 @@ package com.ibm.icu.text; import java.io.IOException; import com.ibm.icu.impl.UCaseProps; -import com.ibm.icu.impl.UCharacterProperty; import com.ibm.icu.util.ULocale;