diff --git a/icu4j/src/com/ibm/icu/dev/test/ModuleTest.java b/icu4j/src/com/ibm/icu/dev/test/ModuleTest.java index 418332f0e7..848ef3d250 100644 --- a/icu4j/src/com/ibm/icu/dev/test/ModuleTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/ModuleTest.java @@ -5,24 +5,19 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/ModuleTest.java,v $ - * $Date: 2003/02/05 05:45:15 $ - * $Revision: 1.4 $ + * $Date: 2003/05/14 19:03:16 $ + * $Revision: 1.5 $ * ******************************************************************************* */ package com.ibm.icu.dev.test; import java.lang.reflect.Method; -import java.util.Collections; -import java.util.HashMap; import java.util.Iterator; import java.util.List; -import java.util.Map; import com.ibm.icu.dev.test.TestDataModule.TestData; import com.ibm.icu.dev.test.TestDataModule.DataMap; -import com.ibm.icu.dev.test.TestFmwk.MethodTarget; -import com.ibm.icu.dev.test.TestFmwk.Target; /** * A convenience extension of TestFmwk for use by data module-driven diff --git a/icu4j/src/com/ibm/icu/dev/test/TestFmwk.java b/icu4j/src/com/ibm/icu/dev/test/TestFmwk.java index 63ee0a4452..7b51d555b5 100755 --- a/icu4j/src/com/ibm/icu/dev/test/TestFmwk.java +++ b/icu4j/src/com/ibm/icu/dev/test/TestFmwk.java @@ -5,29 +5,25 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/TestFmwk.java,v $ - * $Date: 2003/02/24 20:05:14 $ - * $Revision: 1.42 $ + * $Date: 2003/05/14 19:03:16 $ + * $Revision: 1.43 $ * ***************************************************************************************** */ package com.ibm.icu.dev.test; -import java.io.*; -import java.lang.reflect.*; -import java.text.*; +import java.io.IOException; +import java.io.OutputStream; +import java.io.PrintWriter; +import java.io.Writer; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.Iterator; import java.util.Locale; -import java.util.Map; import java.util.Random; -import java.util.Set; import java.util.TimeZone; -import java.util.TreeMap; -import java.util.TreeSet; -import java.util.Vector; + /** * TestFmwk is a base class for tests that can be run conveniently from @@ -500,7 +496,7 @@ public class TestFmwk extends AbstractTestLog { System.out.println(); } - String target = (String)targets.get(i); + //String target = (String)targets.get(i); params.init(); resolveTarget(params, (String)targets.get(i)).run(); } diff --git a/icu4j/src/com/ibm/icu/dev/test/bigdec/DiagBigDecimal.java b/icu4j/src/com/ibm/icu/dev/test/bigdec/DiagBigDecimal.java index fce8933958..20548e983a 100755 --- a/icu4j/src/com/ibm/icu/dev/test/bigdec/DiagBigDecimal.java +++ b/icu4j/src/com/ibm/icu/dev/test/bigdec/DiagBigDecimal.java @@ -2,7 +2,6 @@ /* Options: Binary Comments Crossref Format Java Logo Trace1 Verbose3 */ package com.ibm.icu.dev.test.bigdec; import java.math.BigInteger; -import com.ibm.icu.math.*; import com.ibm.icu.dev.test.TestFmwk; /* ------------------------------------------------------------------ */ diff --git a/icu4j/src/com/ibm/icu/dev/test/calendar/CalendarRegression.java b/icu4j/src/com/ibm/icu/dev/test/calendar/CalendarRegression.java index 5c7d39f4a2..e141b95e98 100755 --- a/icu4j/src/com/ibm/icu/dev/test/calendar/CalendarRegression.java +++ b/icu4j/src/com/ibm/icu/dev/test/calendar/CalendarRegression.java @@ -5,18 +5,16 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/calendar/CalendarRegression.java,v $ - * $Date: 2002/11/20 19:48:10 $ - * $Revision: 1.14 $ + * $Date: 2003/05/14 19:02:52 $ + * $Revision: 1.15 $ * ******************************************************************************* */ package com.ibm.icu.dev.test.calendar; import com.ibm.icu.util.*; + import java.util.Date; -import java.util.Iterator; import java.util.Locale; -import java.util.Set; -import com.ibm.icu.lang.*; import com.ibm.icu.text.*; /** @@ -443,14 +441,14 @@ public class CalendarRegression extends com.ibm.icu.dev.test.TestFmwk { Calendar cal1 = new GregorianCalendar(PST); cal1.setTime(new Date(880698639000L)); int p; - logln("PST 1 is: " + (p=cal1.get(cal1.HOUR_OF_DAY))); + logln("PST 1 is: " + (p=cal1.get(Calendar.HOUR_OF_DAY))); cal1.setTimeZone(GMT); // Issue 1: Changing the timezone doesn't change the // represented time. int h1,h2; - logln("GMT 1 is: " + (h1=cal1.get(cal1.HOUR_OF_DAY))); + logln("GMT 1 is: " + (h1=cal1.get(Calendar.HOUR_OF_DAY))); cal1.setTime(new Date(880698639000L)); - logln("GMT 2 is: " + (h2=cal1.get(cal1.HOUR_OF_DAY))); + logln("GMT 2 is: " + (h2=cal1.get(Calendar.HOUR_OF_DAY))); // Note: This test had a bug in it. It wanted h1!=h2, when // what was meant was h1!=p. Fixed this concurrent with fix // to 4177484. @@ -462,12 +460,12 @@ public class CalendarRegression extends com.ibm.icu.dev.test.TestFmwk { cal2.set(Calendar.MILLISECOND, 0); cal3.set(Calendar.MILLISECOND, 0); - cal2.set(cal1.get(cal1.YEAR), - cal1.get(cal1.MONTH), - cal1.get(cal1.DAY_OF_MONTH), - cal1.get(cal1.HOUR_OF_DAY), - cal1.get(cal1.MINUTE), - cal1.get(cal1.SECOND)); + cal2.set(cal1.get(Calendar.YEAR), + cal1.get(Calendar.MONTH), + cal1.get(Calendar.DAY_OF_MONTH), + cal1.get(Calendar.HOUR_OF_DAY), + cal1.get(Calendar.MINUTE), + cal1.get(Calendar.SECOND)); long t1,t2,t3,t4; logln("RGMT 1 is: " + (t1=cal2.getTime().getTime())); @@ -475,12 +473,12 @@ public class CalendarRegression extends com.ibm.icu.dev.test.TestFmwk { logln("RPST 1 is: " + (t2=cal3.getTime().getTime())); cal3.setTimeZone(GMT); logln("RGMT 2 is: " + (t3=cal3.getTime().getTime())); - cal3.set(cal1.get(cal1.YEAR), - cal1.get(cal1.MONTH), - cal1.get(cal1.DAY_OF_MONTH), - cal1.get(cal1.HOUR_OF_DAY), - cal1.get(cal1.MINUTE), - cal1.get(cal1.SECOND)); + cal3.set(cal1.get(Calendar.YEAR), + cal1.get(Calendar.MONTH), + cal1.get(Calendar.DAY_OF_MONTH), + cal1.get(Calendar.HOUR_OF_DAY), + cal1.get(Calendar.MINUTE), + cal1.get(Calendar.SECOND)); // Issue 2: Calendar continues to use the timezone in its // constructor for set() conversions, regardless // of calls to setTimeZone() diff --git a/icu4j/src/com/ibm/icu/dev/test/calendar/ChineseTest.java b/icu4j/src/com/ibm/icu/dev/test/calendar/ChineseTest.java index 33009d8394..664d332288 100755 --- a/icu4j/src/com/ibm/icu/dev/test/calendar/ChineseTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/calendar/ChineseTest.java @@ -3,15 +3,13 @@ * others. All Rights Reserved. ********************************************************************* * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/calendar/ChineseTest.java,v $ - * $Date: 2003/02/27 21:38:42 $ - * $Revision: 1.10 $ + * $Date: 2003/05/14 19:02:52 $ + * $Revision: 1.11 $ */ package com.ibm.icu.dev.test.calendar; import com.ibm.icu.util.*; -import com.ibm.icu.lang.*; import com.ibm.icu.text.*; import java.util.Date; -import java.util.Locale; /** * Test of ChineseCalendar. 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 1ce978af43..b4a28ed25b 100755 --- a/icu4j/src/com/ibm/icu/dev/test/calendar/CompatibilityTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/calendar/CompatibilityTest.java @@ -5,16 +5,16 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/calendar/CompatibilityTest.java,v $ - * $Date: 2003/03/17 17:14:48 $ - * $Revision: 1.9 $ + * $Date: 2003/05/14 19:02:52 $ + * $Revision: 1.10 $ * ******************************************************************************* */ package com.ibm.icu.dev.test.calendar; import com.ibm.icu.util.*; + import java.util.Date; import java.util.Locale; -import java.text.*; import java.io.*; public class CompatibilityTest extends com.ibm.icu.dev.test.TestFmwk { @@ -690,23 +690,23 @@ public class CompatibilityTest extends com.ibm.icu.dev.test.TestFmwk { GregorianCalendar temp = new GregorianCalendar( y, m, d ); check520(temp, y, m, d); - temp.add( temp.YEAR, 1 ); + temp.add( Calendar.YEAR, 1 ); y++; check520(temp, y, m, d); - temp.add( temp.MONTH, 1 ); + temp.add( Calendar.MONTH, 1 ); m++; check520(temp, y, m, d); - temp.add( temp.DATE, 1 ); + temp.add( Calendar.DATE, 1 ); d++; check520(temp, y, m, d); - temp.add( temp.DATE, 2 ); + temp.add( Calendar.DATE, 2 ); d += 2; check520(temp, y, m, d); - temp.add( temp.DATE, 28 ); + temp.add( Calendar.DATE, 28 ); d = 1; ++m; check520(temp, y, m, d); } 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 310dd264bd..16baa8eaff 100755 --- a/icu4j/src/com/ibm/icu/dev/test/calendar/HebrewTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/calendar/HebrewTest.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/calendar/HebrewTest.java,v $ - * $Date: 2003/02/27 18:48:38 $ - * $Revision: 1.7 $ + * $Date: 2003/05/14 19:02:52 $ + * $Revision: 1.8 $ * ***************************************************************************************** */ @@ -371,16 +371,25 @@ public class HebrewTest extends CalendarTest { { // new HebrewCalendar(TimeZone) HebrewCalendar cal = new HebrewCalendar(TimeZone.getDefault()); - } + if(cal == null){ + errln("could not create HebrewCalendar with TimeZone"); + } + } { // new HebrewCalendar(Locale) HebrewCalendar cal = new HebrewCalendar(Locale.getDefault()); - } + if(cal == null){ + errln("could not create HebrewCalendar with locale"); + } + } { // new HebrewCalendar(Date) HebrewCalendar cal = new HebrewCalendar(new Date()); + if(cal == null){ + errln("could not create HebrewCalendar with date"); + } } { diff --git a/icu4j/src/com/ibm/icu/dev/test/calendar/HolidayTest.java b/icu4j/src/com/ibm/icu/dev/test/calendar/HolidayTest.java index 21dbab6543..6bd9ab5859 100644 --- a/icu4j/src/com/ibm/icu/dev/test/calendar/HolidayTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/calendar/HolidayTest.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/calendar/HolidayTest.java,v $ - * $Date: 2002/12/18 21:20:52 $ - * $Revision: 1.3 $ + * $Date: 2003/05/14 19:02:52 $ + * $Revision: 1.4 $ * ***************************************************************************************** */ @@ -18,7 +18,6 @@ import java.util.Locale; import com.ibm.icu.dev.test.TestFmwk; import com.ibm.icu.impl.LocaleUtility; -import com.ibm.icu.text.DateFormat; import com.ibm.icu.util.Calendar; import com.ibm.icu.util.EasterHoliday; import com.ibm.icu.util.GregorianCalendar; @@ -26,7 +25,6 @@ import com.ibm.icu.util.Holiday; import com.ibm.icu.util.RangeDateRule; import com.ibm.icu.util.SimpleDateRule; import com.ibm.icu.util.SimpleHoliday; -import com.ibm.icu.util.TimeZone; /** * Tests for the Holiday class. 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 270aadc2de..678c94f019 100755 --- a/icu4j/src/com/ibm/icu/dev/test/calendar/IBMCalendarTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/calendar/IBMCalendarTest.java @@ -4,8 +4,8 @@ * others. All Rights Reserved. ******************************************************************************* * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/calendar/IBMCalendarTest.java,v $ - * $Date: 2003/05/09 18:46:44 $ - * $Revision: 1.17 $ + * $Date: 2003/05/14 19:02:51 $ + * $Revision: 1.18 $ ******************************************************************************* */ package com.ibm.icu.dev.test.calendar; @@ -200,32 +200,50 @@ public class IBMCalendarTest extends CalendarTest { { // new BuddhistCalendar(TimeZone) BuddhistCalendar cal = new BuddhistCalendar(TimeZone.getDefault()); - } + if(cal == null){ + errln("could not create BuddhistCalendar with TimeZone"); + } + } { // new BuddhistCalendar(Locale) BuddhistCalendar cal = new BuddhistCalendar(Locale.getDefault()); - } + if(cal == null){ + errln("could not create BuddhistCalendar with Locale"); + } + } { // new BuddhistCalendar(TimeZone, Locale) BuddhistCalendar cal = new BuddhistCalendar(TimeZone.getDefault(), Locale.getDefault()); - } + if(cal == null){ + errln("could not create BuddhistCalendar with TimeZone and Locale"); + } + } { // new BuddhistCalendar(Date) BuddhistCalendar cal = new BuddhistCalendar(new Date()); + if(cal == null){ + errln("could not create BuddhistCalendar with Date"); + } } { // new BuddhistCalendar(int year, int month, int date) BuddhistCalendar cal = new BuddhistCalendar(2543, Calendar.MAY, 22); - } + if(cal == null){ + errln("could not create BuddhistCalendar with year,month,data"); + } + } { // new BuddhistCalendar(int year, int month, int date, int hour, int minute, int second) BuddhistCalendar cal = new BuddhistCalendar(2543, Calendar.MAY, 22, 1, 1, 1); - } + if(cal == null){ + errln("could not create BuddhistCalendar with year,month,date,hour,minute,second"); + } + } { // data @@ -340,6 +358,9 @@ public class IBMCalendarTest extends CalendarTest { public void TestMalaysianInstance() { Locale loc = new Locale("ms", "MY"); // Malay (Malaysia) Calendar cal = Calendar.getInstance(loc); + if(cal == null){ + errln("could not create Malaysian instance"); + } } /** @@ -453,10 +474,10 @@ public class IBMCalendarTest extends CalendarTest { public void TestCoverage() { // BuddhistCalendar BuddhistCalendar bcal = new BuddhistCalendar(); - int i = bcal.getMinimum(Calendar.ERA); + /*int i =*/ bcal.getMinimum(Calendar.ERA); bcal.add(Calendar.YEAR, 1); bcal.add(Calendar.MONTH, 1); - Date d = bcal.getTime(); + /*Date d = */bcal.getTime(); // CalendarAstronomer // (This class should probably be made package-private.) @@ -470,6 +491,6 @@ public class IBMCalendarTest extends CalendarTest { ccal.add(Calendar.YEAR, 1); ccal.roll(Calendar.MONTH, 1); ccal.roll(Calendar.YEAR, 1); - d = ccal.getTime(); + ccal.getTime(); } } 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 f7fd31c257..f5c5be8fa7 100755 --- a/icu4j/src/com/ibm/icu/dev/test/calendar/IslamicTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/calendar/IslamicTest.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/calendar/IslamicTest.java,v $ - * $Date: 2002/08/07 03:10:18 $ - * $Revision: 1.5 $ + * $Date: 2003/05/14 19:02:52 $ + * $Revision: 1.6 $ * ***************************************************************************************** */ @@ -143,27 +143,42 @@ public class IslamicTest extends CalendarTest { { // new IslamicCalendar(TimeZone) IslamicCalendar cal = new IslamicCalendar(TimeZone.getDefault()); - } + if(cal == null){ + errln("could not create IslamicCalendar with TimeZone"); + } + } { // new IslamicCalendar(Locale) IslamicCalendar cal = new IslamicCalendar(Locale.getDefault()); - } + if(cal == null){ + errln("could not create IslamicCalendar with Locale"); + } + } { // new IslamicCalendar(Date) IslamicCalendar cal = new IslamicCalendar(new Date()); + if(cal == null){ + errln("could not create IslamicCalendar with Date"); + } } { // new IslamicCalendar(int year, int month, int date) IslamicCalendar cal = new IslamicCalendar(800, IslamicCalendar.RAMADAN, 1); - } + if(cal == null){ + errln("could not create IslamicCalendar with year,month,date"); + } + } { // new IslamicCalendar(int year, int month, int date, int hour, int minute, int second) IslamicCalendar cal = new IslamicCalendar(800, IslamicCalendar.RAMADAN, 1, 1, 1, 1); - } + if(cal == null){ + errln("could not create IslamicCalendar with year,month,date,hour,minute,second"); + } + } { // setCivil/isCivil @@ -184,9 +199,9 @@ public class IslamicTest extends CalendarTest { logln(then.toString()); - cal.add(cal.MONTH, 1); - cal.add(cal.DAY_OF_MONTH, 1); - cal.add(cal.YEAR, 1); + cal.add(Calendar.MONTH, 1); + cal.add(Calendar.DAY_OF_MONTH, 1); + cal.add(Calendar.YEAR, 1); logln(cal.getTime().toString()); } diff --git a/icu4j/src/com/ibm/icu/dev/test/calendar/JapaneseTest.java b/icu4j/src/com/ibm/icu/dev/test/calendar/JapaneseTest.java index 7d294591d4..d520a875ad 100644 --- a/icu4j/src/com/ibm/icu/dev/test/calendar/JapaneseTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/calendar/JapaneseTest.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/calendar/JapaneseTest.java,v $ - * $Date: 2002/08/08 23:06:09 $ - * $Revision: 1.1 $ + * $Date: 2003/05/14 19:02:52 $ + * $Revision: 1.2 $ * ***************************************************************************************** */ @@ -33,50 +33,71 @@ public class JapaneseTest extends CalendarTest { { // new JapaneseCalendar(TimeZone) JapaneseCalendar cal = new JapaneseCalendar(TimeZone.getDefault()); - } + if(cal == null){ + errln("could not create JapaneseCalendar with TimeZone"); + } + } { // new JapaneseCalendar(Locale) JapaneseCalendar cal = new JapaneseCalendar(Locale.getDefault()); + if(cal == null){ + errln("could not create JapaneseCalendar with Locale"); + } } { // new JapaneseCalendar(TimeZone, Locale) JapaneseCalendar cal = new JapaneseCalendar(TimeZone.getDefault(), Locale.getDefault()); + if(cal == null){ + errln("could not create JapaneseCalendar with TimeZone Locale"); + } } { // new JapaneseCalendar(Date) JapaneseCalendar cal = new JapaneseCalendar(new Date()); - } + if(cal == null){ + errln("could not create JapaneseCalendar with Date"); + } + } { // new JapaneseCalendar(int year, int month, int date) JapaneseCalendar cal = new JapaneseCalendar(1868, Calendar.JANUARY, 1); + if(cal == null){ + errln("could not create JapaneseCalendar with year,month,date"); + } } { // new JapaneseCalendar(int era, int year, int month, int date) JapaneseCalendar cal = new JapaneseCalendar(JapaneseCalendar.MEIJI, 43, Calendar.JANUARY, 1); - } + if(cal == null){ + errln("could not create JapaneseCalendar with era,year,month,date"); + } + } { // new JapaneseCalendar(int year, int month, int date, int hour, int minute, int second) JapaneseCalendar cal = new JapaneseCalendar(1868, Calendar.JANUARY, 1, 1, 1, 1); - } + if(cal == null){ + errln("could not create JapaneseCalendar with year,month,date,hour,min,second"); + } + } { // limits JapaneseCalendar cal = new JapaneseCalendar(); DateFormat fmt = cal.getDateTimeFormat(DateFormat.FULL, DateFormat.FULL, Locale.ENGLISH); - cal.set(cal.ERA, cal.MEIJI); + cal.set(Calendar.ERA, JapaneseCalendar.MEIJI); logln("date: " + cal.getTime()); - logln("min era: " + cal.getMinimum(cal.ERA)); - logln("min year: " + cal.getMinimum(cal.YEAR)); - cal.set(cal.YEAR, cal.getActualMaximum(cal.YEAR)); + logln("min era: " + cal.getMinimum(Calendar.ERA)); + logln("min year: " + cal.getMinimum(Calendar.YEAR)); + cal.set(Calendar.YEAR, cal.getActualMaximum(Calendar.YEAR)); logln("date: " + fmt.format(cal.getTime())); - cal.add(cal.YEAR, 1); + cal.add(Calendar.YEAR, 1); logln("date: " + fmt.format(cal.getTime())); } 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 bac3d90d64..18e280dcbe 100644 --- a/icu4j/src/com/ibm/icu/dev/test/collator/CollationMiscTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/collator/CollationMiscTest.java @@ -1632,7 +1632,7 @@ public class CollationMiscTest extends TestFmwk{ CollationKey key1 = coll.getCollationKey(tokens[i]); for (int j = 0; j < i; j ++) { CollationKey key2 = coll.getCollationKey(tokens[j]); - if (key2.compareTo(key2) < 0) { + if (key2.compareTo(key1) < 0) { errln("Setting variable top shouldn't change the comparison sequence"); } byte sortorder[] = key2.toByteArray(); @@ -1644,7 +1644,7 @@ public class CollationMiscTest extends TestFmwk{ } catch (Exception e) { CollationElementIterator iter = coll.getCollationElementIterator(tokens[i]); - int ce = iter.next(); + /*int ce =*/ iter.next(); int ce2 = iter.next(); if (ce2 == CollationElementIterator.NULLORDER) { errln("Token " + tokens[i] + " not expected to fail"); diff --git a/icu4j/src/com/ibm/icu/dev/test/collator/CollationServiceTest.java b/icu4j/src/com/ibm/icu/dev/test/collator/CollationServiceTest.java index 1f4016497c..808428dc78 100644 --- a/icu4j/src/com/ibm/icu/dev/test/collator/CollationServiceTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/collator/CollationServiceTest.java @@ -4,8 +4,8 @@ * others. All Rights Reserved. * ******************************************************************************* * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/collator/CollationServiceTest.java,v $ - * $Date: 2003/04/21 21:00:23 $ - * $Revision: 1.2 $ + * $Date: 2003/05/14 19:03:18 $ + * $Revision: 1.3 $ * ***************************************************************************************** */ @@ -169,7 +169,7 @@ public class CollationServiceTest extends TestFmwk { fuFUNames.put(Locale.US, "little bunny Foo Foo"); Collator frcol = Collator.getInstance(Locale.FRANCE); - Collator uscol = Collator.getInstance(Locale.US); + /* Collator uscol = */Collator.getInstance(Locale.US); Collator gecol = Collator.getInstance(Locale.GERMANY); Collator jpcol = Collator.getInstance(Locale.JAPAN); Collator fucol = Collator.getInstance(fu_FU); diff --git a/icu4j/src/com/ibm/icu/dev/test/compression/DecompressionTest.java b/icu4j/src/com/ibm/icu/dev/test/compression/DecompressionTest.java index 65d14b33d4..e65e049af2 100755 --- a/icu4j/src/com/ibm/icu/dev/test/compression/DecompressionTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/compression/DecompressionTest.java @@ -5,14 +5,13 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/compression/DecompressionTest.java,v $ - * $Date: 2002/02/16 03:05:07 $ - * $Revision: 1.3 $ + * $Date: 2003/05/14 19:03:19 $ + * $Revision: 1.4 $ * ***************************************************************************************** */ package com.ibm.icu.dev.test.compression; -import com.ibm.icu.text.UnicodeCompressor; import com.ibm.icu.text.UnicodeDecompressor; import com.ibm.icu.dev.test.TestFmwk; diff --git a/icu4j/src/com/ibm/icu/dev/test/format/BigNumberFormatTest.java b/icu4j/src/com/ibm/icu/dev/test/format/BigNumberFormatTest.java index 18739cf2b2..552674439c 100755 --- a/icu4j/src/com/ibm/icu/dev/test/format/BigNumberFormatTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/format/BigNumberFormatTest.java @@ -5,19 +5,17 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/format/BigNumberFormatTest.java,v $ - * $Date: 2002/02/25 22:43:59 $ - * $Revision: 1.14 $ + * $Date: 2003/05/14 19:03:16 $ + * $Revision: 1.15 $ * ***************************************************************************************** */ package com.ibm.icu.dev.test.format; import com.ibm.icu.dev.test.*; -import com.ibm.icu.lang.*; import com.ibm.icu.text.*; import java.text.ParseException; import java.util.*; -import java.math.BigInteger; import com.ibm.icu.impl.Utility; /** diff --git a/icu4j/src/com/ibm/icu/dev/test/format/DateFormatMiscTests.java b/icu4j/src/com/ibm/icu/dev/test/format/DateFormatMiscTests.java index c787853df7..4d1a935471 100755 --- a/icu4j/src/com/ibm/icu/dev/test/format/DateFormatMiscTests.java +++ b/icu4j/src/com/ibm/icu/dev/test/format/DateFormatMiscTests.java @@ -4,8 +4,8 @@ * others. All Rights Reserved. * ******************************************************************************* * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/format/DateFormatMiscTests.java,v $ - * $Date: 2002/02/16 03:05:08 $ - * $Revision: 1.5 $ + * $Date: 2003/05/14 19:03:15 $ + * $Revision: 1.6 $ * ***************************************************************************************** */ @@ -17,9 +17,7 @@ package com.ibm.icu.dev.test.format; -import com.ibm.icu.lang.*; import com.ibm.icu.text.*; -import com.ibm.icu.util.*; import java.text.FieldPosition; import java.text.ParseException; import java.util.Locale; diff --git a/icu4j/src/com/ibm/icu/dev/test/format/DateFormatRegressionTest.java b/icu4j/src/com/ibm/icu/dev/test/format/DateFormatRegressionTest.java index 2cf8036028..9db0f0ed59 100755 --- a/icu4j/src/com/ibm/icu/dev/test/format/DateFormatRegressionTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/format/DateFormatRegressionTest.java @@ -4,8 +4,8 @@ * others. All Rights Reserved. * ******************************************************************************* * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/format/DateFormatRegressionTest.java,v $ - * $Date: 2002/03/10 19:40:13 $ - * $Revision: 1.5 $ + * $Date: 2003/05/14 19:03:16 $ + * $Revision: 1.6 $ * ***************************************************************************************** */ @@ -17,8 +17,6 @@ package com.ibm.icu.dev.test.format; -import com.ibm.icu.impl.ICULocaleData; -import com.ibm.icu.lang.*; import com.ibm.icu.text.*; import com.ibm.icu.util.*; @@ -29,7 +27,6 @@ import java.text.ParseException; import java.text.ParsePosition; import java.util.Date; import java.util.Locale; -import java.util.ResourceBundle; /** * Performs regression test for DateFormat diff --git a/icu4j/src/com/ibm/icu/dev/test/format/DateFormatRegressionTestJ.java b/icu4j/src/com/ibm/icu/dev/test/format/DateFormatRegressionTestJ.java index 1e65bf263c..ae2937cbbd 100755 --- a/icu4j/src/com/ibm/icu/dev/test/format/DateFormatRegressionTestJ.java +++ b/icu4j/src/com/ibm/icu/dev/test/format/DateFormatRegressionTestJ.java @@ -4,8 +4,8 @@ * others. All Rights Reserved. * ******************************************************************************* * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/format/DateFormatRegressionTestJ.java,v $ - * $Date: 2002/02/16 03:05:08 $ - * $Revision: 1.4 $ + * $Date: 2003/05/14 19:03:15 $ + * $Revision: 1.5 $ * ***************************************************************************************** */ @@ -16,14 +16,12 @@ package com.ibm.icu.dev.test.format; -import com.ibm.icu.lang.*; import com.ibm.icu.text.*; import com.ibm.icu.util.*; import java.util.Date; import java.text.ParseException; import java.text.ParsePosition; import java.util.Locale; -import java.text.FieldPosition; public class DateFormatRegressionTestJ extends com.ibm.icu.dev.test.TestFmwk { @@ -73,7 +71,7 @@ public class DateFormatRegressionTestJ extends com.ibm.icu.dev.test.TestFmwk { //DateFormat getDateTimeInstance(int, int), invalid styles no exception public void Test4213086() { Date someDate = new Date(); - String d; + String d=null; try { DateFormat df2 = DateFormat.getDateTimeInstance(2, -2); d = df2.format(someDate); @@ -112,6 +110,10 @@ public class DateFormatRegressionTestJ extends com.ibm.icu.dev.test.TestFmwk { logln("Exception caught!"); logln("********************************************"); } + //read the value in d to get rid of the warning + if(d!=null){ + logln("The value of d: " + d); + } } //DateFormat.format works wrongly? diff --git a/icu4j/src/com/ibm/icu/dev/test/format/DateFormatRoundTripTest.java b/icu4j/src/com/ibm/icu/dev/test/format/DateFormatRoundTripTest.java index bfde429e3f..f48b858ade 100755 --- a/icu4j/src/com/ibm/icu/dev/test/format/DateFormatRoundTripTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/format/DateFormatRoundTripTest.java @@ -4,8 +4,8 @@ * others. All Rights Reserved. * ******************************************************************************* * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/format/DateFormatRoundTripTest.java,v $ - * $Date: 2002/02/16 03:05:08 $ - * $Revision: 1.3 $ + * $Date: 2003/05/14 19:03:15 $ + * $Revision: 1.4 $ * ***************************************************************************************** */ @@ -17,7 +17,6 @@ package com.ibm.icu.dev.test.format; -import com.ibm.icu.lang.*; import com.ibm.icu.text.*; import com.ibm.icu.util.*; import java.util.Locale; diff --git a/icu4j/src/com/ibm/icu/dev/test/format/DateFormatTest.java b/icu4j/src/com/ibm/icu/dev/test/format/DateFormatTest.java index 3d320da43f..75d9157072 100755 --- a/icu4j/src/com/ibm/icu/dev/test/format/DateFormatTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/format/DateFormatTest.java @@ -4,8 +4,8 @@ * others. All Rights Reserved. * ******************************************************************************* * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/format/DateFormatTest.java,v $ - * $Date: 2003/04/24 22:59:13 $ - * $Revision: 1.15 $ + * $Date: 2003/05/14 19:03:16 $ + * $Revision: 1.16 $ * ***************************************************************************************** */ @@ -17,7 +17,6 @@ package com.ibm.icu.dev.test.format; -import com.ibm.icu.lang.*; import com.ibm.icu.text.*; import com.ibm.icu.util.*; import com.ibm.icu.impl.*; @@ -208,16 +207,16 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk { dateFormats[2] = new SimpleDateFormat("G, y, M, d, k, H, m, s, S, E, D, F, w, W, a, h, K, z, y, E", Locale.US); dateFormats[3] = new SimpleDateFormat("GGGG, yyyy, MMMM, dddd, kkkk, HHHH, mmmm, ssss, SSSS, EEEE, DDDD, FFFF, wwww, WWWW, aaaa, hhhh, KKKK, zzzz, yyyy, EEEE", Locale.US); //fix the jdk resources differences between jdk 1.2 and jdk 1.3 - String javaVersion = System.getProperty("java.version"); + // String javaVersion = System.getProperty("java.version"); for (j = 0, exp = 0; j < dateFormats_length; ++j) { - String str; + // String str; DateFormat df = dateFormats[j]; TimeZone tz = TimeZone.getTimeZone("PST"); ((SimpleTimeZone)tz).setDSTSavings(3600000); df.setTimeZone(tz); logln(" Pattern = " + ((SimpleDateFormat) df).toPattern()); - str = ""; + // str = ""; try { logln(" Result = " + df.format(someDate)); } catch (Exception e) { @@ -900,11 +899,14 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk { logln("time: " + f.format(now)); int hash = f.hashCode(); // sigh, everyone overrides this - + f = DateFormat.getInstance(cal); + if(hash == f.hashCode()){ + errln("FAIL: hashCode equal for inequal objects"); + } logln("time again: " + f.format(now)); - f = DateFormat.getTimeInstance(cal, f.FULL); + f = DateFormat.getTimeInstance(cal, DateFormat.FULL); logln("time yet again: " + f.format(now)); ResourceBundle rb = ICULocaleData.getLocaleElements("de_DE"); diff --git a/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDateFormat.java b/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDateFormat.java index 9c60005c1d..76cbc41e70 100755 --- a/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDateFormat.java +++ b/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDateFormat.java @@ -1,7 +1,7 @@ /*************************************************************************************** * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDateFormat.java,v $ - * $Date: 2002/08/01 20:27:21 $ - * $Revision: 1.5 $ + * $Date: 2003/05/14 19:03:15 $ + * $Revision: 1.6 $ * ***************************************************************************************** */ @@ -24,9 +24,7 @@ package com.ibm.icu.dev.test.format; -import com.ibm.icu.lang.*; import com.ibm.icu.text.*; -import com.ibm.icu.util.*; import java.text.FieldPosition; import java.text.ParseException; import java.util.Locale; @@ -143,7 +141,7 @@ public class IntlTestDateFormat extends com.ibm.icu.dev.test.TestFmwk { SimpleDateFormat s = (SimpleDateFormat) fFormat; logln(fTestName + " Pattern " + s.toPattern()); } - + private void tryDate(Date theDate) { final int DEPTH = 10; Date[] date = new Date[DEPTH]; diff --git a/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDateFormatAPI.java b/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDateFormatAPI.java index d82abda264..a83ce38fb6 100755 --- a/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDateFormatAPI.java +++ b/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDateFormatAPI.java @@ -1,7 +1,7 @@ /***************************************************************************************** * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDateFormatAPI.java,v $ - * $Date: 2002/08/01 20:27:21 $ - * $Revision: 1.6 $ + * $Date: 2003/05/14 19:03:16 $ + * $Revision: 1.7 $ * ***************************************************************************************** **/ @@ -25,7 +25,6 @@ package com.ibm.icu.dev.test.format; import com.ibm.icu.util.*; -import com.ibm.icu.lang.*; import com.ibm.icu.text.*; import java.util.Locale; import java.util.Date; diff --git a/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDateFormatAPIC.java b/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDateFormatAPIC.java index 97ae941165..7b97874ed2 100755 --- a/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDateFormatAPIC.java +++ b/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDateFormatAPIC.java @@ -4,8 +4,8 @@ * others. All Rights Reserved. * ******************************************************************************* * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDateFormatAPIC.java,v $ - * $Date: 2002/02/16 03:05:10 $ - * $Revision: 1.2 $ + * $Date: 2003/05/14 19:03:16 $ + * $Revision: 1.3 $ * ***************************************************************************************** */ @@ -17,9 +17,7 @@ package com.ibm.icu.dev.test.format; -import com.ibm.icu.lang.*; import com.ibm.icu.text.*; -import com.ibm.icu.util.*; import java.util.Date; import java.text.FieldPosition; import java.text.ParsePosition; @@ -109,6 +107,9 @@ public class IntlTestDateFormatAPIC extends com.ibm.icu.dev.test.TestFmwk { Number obj = fmt.parse(str, ppos); try { obj = fmt.parse(str); + if(obj==null){ + errln("FAIL: The format object could parse the string : "+str); + } } catch (java.text.ParseException pe) { System.out.println(pe); } diff --git a/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDateFormatSymbols.java b/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDateFormatSymbols.java index 0a1389c1b7..6c8afbe618 100755 --- a/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDateFormatSymbols.java +++ b/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDateFormatSymbols.java @@ -1,7 +1,7 @@ /***************************************************************************************** * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDateFormatSymbols.java,v $ - * $Date: 2002/08/01 20:27:21 $ - * $Revision: 1.4 $ + * $Date: 2003/05/14 19:03:16 $ + * $Revision: 1.5 $ * ***************************************************************************************** **/ @@ -25,9 +25,7 @@ package com.ibm.icu.dev.test.format; -import com.ibm.icu.lang.*; import com.ibm.icu.text.*; -import com.ibm.icu.util.*; import java.util.Locale; public class IntlTestDateFormatSymbols extends com.ibm.icu.dev.test.TestFmwk diff --git a/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDecimalFormatAPIC.java b/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDecimalFormatAPIC.java index b23af7b8f8..17ebac6fc5 100755 --- a/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDecimalFormatAPIC.java +++ b/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDecimalFormatAPIC.java @@ -4,8 +4,8 @@ * others. All Rights Reserved. * ******************************************************************************* * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDecimalFormatAPIC.java,v $ - * $Date: 2002/02/16 03:05:10 $ - * $Revision: 1.2 $ + * $Date: 2003/05/14 19:03:16 $ + * $Revision: 1.3 $ * ***************************************************************************************** */ @@ -17,11 +17,9 @@ package com.ibm.icu.dev.test.format; -import com.ibm.icu.util.*; import java.util.Locale; import java.text.ParsePosition; import java.text.Format; -import com.ibm.icu.lang.*; import com.ibm.icu.text.*; import java.text.FieldPosition; diff --git a/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDecimalFormatSymbols.java b/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDecimalFormatSymbols.java index e7bf2ed967..d96bbbbd97 100755 --- a/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDecimalFormatSymbols.java +++ b/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDecimalFormatSymbols.java @@ -1,7 +1,7 @@ /***************************************************************************************** * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDecimalFormatSymbols.java,v $ - * $Date: 2002/08/01 20:27:21 $ - * $Revision: 1.4 $ + * $Date: 2003/05/14 19:03:16 $ + * $Revision: 1.5 $ * ***************************************************************************************** **/ @@ -25,11 +25,8 @@ package com.ibm.icu.dev.test.format; -import com.ibm.icu.lang.*; import com.ibm.icu.text.*; -import com.ibm.icu.util.*; import java.util.Locale; -import java.text.FieldPosition; public class IntlTestDecimalFormatSymbols extends com.ibm.icu.dev.test.TestFmwk { diff --git a/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDecimalFormatSymbolsC.java b/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDecimalFormatSymbolsC.java index c37f7a2b33..9ea9f2f992 100755 --- a/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDecimalFormatSymbolsC.java +++ b/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDecimalFormatSymbolsC.java @@ -4,8 +4,8 @@ * others. All Rights Reserved. * ******************************************************************************* * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDecimalFormatSymbolsC.java,v $ - * $Date: 2002/02/16 03:05:11 $ - * $Revision: 1.3 $ + * $Date: 2003/05/14 19:03:16 $ + * $Revision: 1.4 $ * ***************************************************************************************** */ @@ -18,9 +18,7 @@ package com.ibm.icu.dev.test.format; import java.text.FieldPosition; -import com.ibm.icu.util.*; import java.util.Locale; -import com.ibm.icu.lang.*; import com.ibm.icu.text.*; /** diff --git a/icu4j/src/com/ibm/icu/dev/test/format/IntlTestNumberFormat.java b/icu4j/src/com/ibm/icu/dev/test/format/IntlTestNumberFormat.java index 3562388d29..d907a1c4de 100755 --- a/icu4j/src/com/ibm/icu/dev/test/format/IntlTestNumberFormat.java +++ b/icu4j/src/com/ibm/icu/dev/test/format/IntlTestNumberFormat.java @@ -4,8 +4,8 @@ * others. All Rights Reserved. * ******************************************************************************* * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/format/IntlTestNumberFormat.java,v $ - * $Date: 2002/02/16 03:05:11 $ - * $Revision: 1.3 $ + * $Date: 2003/05/14 19:03:16 $ + * $Revision: 1.4 $ * ***************************************************************************************** */ @@ -17,9 +17,7 @@ package com.ibm.icu.dev.test.format; -import com.ibm.icu.lang.*; import com.ibm.icu.text.*; -import com.ibm.icu.util.*; /** * This test does round-trip testing (format -> parse -> format -> parse -> etc.) of diff --git a/icu4j/src/com/ibm/icu/dev/test/format/IntlTestNumberFormatAPI.java b/icu4j/src/com/ibm/icu/dev/test/format/IntlTestNumberFormatAPI.java index 8ec4399ac2..22e7b93a41 100755 --- a/icu4j/src/com/ibm/icu/dev/test/format/IntlTestNumberFormatAPI.java +++ b/icu4j/src/com/ibm/icu/dev/test/format/IntlTestNumberFormatAPI.java @@ -1,7 +1,7 @@ /***************************************************************************************** * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/format/IntlTestNumberFormatAPI.java,v $ - * $Date: 2002/08/01 20:27:21 $ - * $Revision: 1.4 $ + * $Date: 2003/05/14 19:03:15 $ + * $Revision: 1.5 $ * ***************************************************************************************** **/ @@ -24,9 +24,7 @@ package com.ibm.icu.dev.test.format; -import com.ibm.icu.lang.*; import com.ibm.icu.text.*; -import com.ibm.icu.util.*; import java.util.Locale; import java.text.FieldPosition; import java.text.ParsePosition; diff --git a/icu4j/src/com/ibm/icu/dev/test/format/IntlTestSimpleDateFormatAPI.java b/icu4j/src/com/ibm/icu/dev/test/format/IntlTestSimpleDateFormatAPI.java index 39c2d115e3..0474e51fc7 100755 --- a/icu4j/src/com/ibm/icu/dev/test/format/IntlTestSimpleDateFormatAPI.java +++ b/icu4j/src/com/ibm/icu/dev/test/format/IntlTestSimpleDateFormatAPI.java @@ -1,7 +1,7 @@ /***************************************************************************************** * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/format/IntlTestSimpleDateFormatAPI.java,v $ - * $Date: 2002/02/16 03:05:11 $ - * $Revision: 1.3 $ + * $Date: 2003/05/14 19:03:15 $ + * $Revision: 1.4 $ * ***************************************************************************************** **/ @@ -29,8 +29,6 @@ attribution to Taligent may not be removed. package com.ibm.icu.dev.test.format; -import com.ibm.icu.util.*; -import com.ibm.icu.lang.*; import com.ibm.icu.text.*; import java.util.Locale; import java.util.Date; diff --git a/icu4j/src/com/ibm/icu/dev/test/format/NumberFormatRegressionTest.java b/icu4j/src/com/ibm/icu/dev/test/format/NumberFormatRegressionTest.java index d4b2d7e887..103ecdfbcf 100755 --- a/icu4j/src/com/ibm/icu/dev/test/format/NumberFormatRegressionTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/format/NumberFormatRegressionTest.java @@ -4,8 +4,8 @@ * others. All Rights Reserved. * ******************************************************************************* * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/format/NumberFormatRegressionTest.java,v $ - * $Date: 2002/02/16 03:05:11 $ - * $Revision: 1.3 $ + * $Date: 2003/05/14 19:03:15 $ + * $Revision: 1.4 $ * ***************************************************************************************** */ @@ -17,7 +17,6 @@ package com.ibm.icu.dev.test.format; -import com.ibm.icu.lang.*; import com.ibm.icu.text.*; import com.ibm.icu.util.*; import java.util.Locale; diff --git a/icu4j/src/com/ibm/icu/dev/test/format/NumberFormatRoundTripTest.java b/icu4j/src/com/ibm/icu/dev/test/format/NumberFormatRoundTripTest.java index 89a480a0f8..f3730a0613 100755 --- a/icu4j/src/com/ibm/icu/dev/test/format/NumberFormatRoundTripTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/format/NumberFormatRoundTripTest.java @@ -4,8 +4,8 @@ * others. All Rights Reserved. * ******************************************************************************* * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/format/NumberFormatRoundTripTest.java,v $ - * $Date: 2002/02/16 03:05:12 $ - * $Revision: 1.2 $ + * $Date: 2003/05/14 19:03:16 $ + * $Revision: 1.3 $ * ***************************************************************************************** */ @@ -17,9 +17,7 @@ package com.ibm.icu.dev.test.format; -import com.ibm.icu.lang.*; import com.ibm.icu.text.*; -import com.ibm.icu.util.*; import java.util.Locale; /** diff --git a/icu4j/src/com/ibm/icu/dev/test/format/NumberFormatTest.java b/icu4j/src/com/ibm/icu/dev/test/format/NumberFormatTest.java index 71027b49fe..a76c8d9144 100755 --- a/icu4j/src/com/ibm/icu/dev/test/format/NumberFormatTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/format/NumberFormatTest.java @@ -4,8 +4,8 @@ * others. All Rights Reserved. * ******************************************************************************* * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/format/NumberFormatTest.java,v $ - * $Date: 2003/04/19 06:32:17 $ - * $Revision: 1.13 $ + * $Date: 2003/05/14 19:03:16 $ + * $Revision: 1.14 $ * ***************************************************************************************** */ @@ -17,14 +17,12 @@ package com.ibm.icu.dev.test.format; -import com.ibm.icu.lang.*; import com.ibm.icu.text.*; import com.ibm.icu.text.NumberFormat.*; import com.ibm.icu.util.*; import java.util.Locale; import java.text.ParsePosition; -import java.text.ParseException; import java.text.FieldPosition; public class NumberFormatTest extends com.ibm.icu.dev.test.TestFmwk { diff --git a/icu4j/src/com/ibm/icu/dev/test/format/NumberRegression.java b/icu4j/src/com/ibm/icu/dev/test/format/NumberRegression.java index cc0b22d56a..7adef11e1a 100755 --- a/icu4j/src/com/ibm/icu/dev/test/format/NumberRegression.java +++ b/icu4j/src/com/ibm/icu/dev/test/format/NumberRegression.java @@ -1,7 +1,7 @@ /***************************************************************************************** * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/format/NumberRegression.java,v $ - * $Date: 2003/04/19 05:51:09 $ - * $Revision: 1.13 $ + * $Date: 2003/05/14 19:03:14 $ + * $Revision: 1.14 $ * ***************************************************************************************** **/ @@ -263,9 +263,9 @@ public class NumberRegression extends com.ibm.icu.dev.test.TestFmwk { public void Test4068693() { logln("----- Test Application -----"); - ParsePosition pos; + //ParsePosition pos; DecimalFormat df = new DecimalFormat(); - Number d = df.parse("123.55456", pos=new ParsePosition(0)); + Number d = df.parse("123.55456", new ParsePosition(0)); if (!d.toString().equals("123.55456")) { errln("Result -> " + d.doubleValue()); } diff --git a/icu4j/src/com/ibm/icu/dev/test/format/RbnfRoundTripTest.java b/icu4j/src/com/ibm/icu/dev/test/format/RbnfRoundTripTest.java index 6de74c4c68..ecdf8c012e 100755 --- a/icu4j/src/com/ibm/icu/dev/test/format/RbnfRoundTripTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/format/RbnfRoundTripTest.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/format/RbnfRoundTripTest.java,v $ - * $Date: 2002/02/22 03:43:32 $ - * $Revision: 1.4 $ + * $Date: 2003/05/14 19:03:15 $ + * $Revision: 1.5 $ * ***************************************************************************************** */ @@ -16,7 +16,6 @@ import com.ibm.icu.text.RuleBasedNumberFormat; import com.ibm.icu.dev.test.TestFmwk; import java.util.Locale; -import java.text.NumberFormat; public class RbnfRoundTripTest extends TestFmwk { /** diff --git a/icu4j/src/com/ibm/icu/dev/test/format/WriteNumberFormatSerialTestData.java b/icu4j/src/com/ibm/icu/dev/test/format/WriteNumberFormatSerialTestData.java index 770456e0af..e29d962aaf 100755 --- a/icu4j/src/com/ibm/icu/dev/test/format/WriteNumberFormatSerialTestData.java +++ b/icu4j/src/com/ibm/icu/dev/test/format/WriteNumberFormatSerialTestData.java @@ -4,15 +4,14 @@ * others. All Rights Reserved. * ******************************************************************************* * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/format/WriteNumberFormatSerialTestData.java,v $ - * $Date: 2002/02/22 00:28:11 $ - * $Revision: 1.1 $ + * $Date: 2003/05/14 19:03:16 $ + * $Revision: 1.2 $ * ***************************************************************************************** */ package com.ibm.icu.dev.test.format; -import com.ibm.icu.lang.*; import com.ibm.icu.text.*; import java.util.Locale; import java.io.*; @@ -28,8 +27,8 @@ public class WriteNumberFormatSerialTestData { " * others. All Rights Reserved. *\n"+ " *******************************************************************************\n"+ " * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/format/WriteNumberFormatSerialTestData.java,v $\n"+ - " * $Date: 2002/02/22 00:28:11 $\n"+ - " * $Revision: 1.1 $\n"+ + " * $Date: 2003/05/14 19:03:16 $\n"+ + " * $Revision: 1.2 $\n"+ " *\n"+ " *****************************************************************************************\n"+ " */\n\n"+ @@ -71,7 +70,7 @@ public class WriteNumberFormatSerialTestData { os.flush(); os.close(); byte[] myArr = bts.toByteArray(); - String temp = new String(myArr); + //String temp = new String(myArr); System.out.println(" "+comment+ " :"); /*System.out.println("minimumIntegerDigits : " + (temp.indexOf("minimumIntegerDigits")+"minimumIntegerDigits".length())); System.out.println("maximumIntegerDigits : " + (temp.indexOf("maximumIntegerDigits")+"maximumIntegerDigits".length())); diff --git a/icu4j/src/com/ibm/icu/dev/test/iterator/TestUCharacterIterator.java b/icu4j/src/com/ibm/icu/dev/test/iterator/TestUCharacterIterator.java index 01b658ed84..a6045c424f 100644 --- a/icu4j/src/com/ibm/icu/dev/test/iterator/TestUCharacterIterator.java +++ b/icu4j/src/com/ibm/icu/dev/test/iterator/TestUCharacterIterator.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/iterator/TestUCharacterIterator.java,v $ - * $Date: 2002/11/22 00:21:03 $ - * $Revision: 1.8 $ + * $Date: 2003/05/14 19:03:19 $ + * $Revision: 1.9 $ * ******************************************************************************* */ @@ -14,6 +14,7 @@ package com.ibm.icu.dev.test.iterator; import com.ibm.icu.dev.test.TestFmwk; import com.ibm.icu.text.UCharacterIterator; +import com.ibm.icu.text.UForwardCharacterIterator; import com.ibm.icu.text.UTF16; import com.ibm.icu.text.ReplaceableString; import com.ibm.icu.impl.UnicodeCharacterIterator; @@ -478,13 +479,13 @@ public class TestUCharacterIterator extends TestFmwk{ int ch; // this should never go into a infinite loop // if it does then we have a problem - while((ch=iter1.previousCodePoint())!=iter.DONE_CODEPOINT){ + while((ch=iter1.previousCodePoint())!=UnicodeCharacterIterator.DONE_CODEPOINT){ if(ch!=0xDc00){ errln("iter.previousCodePoint() failed"); } } iter1.setIndex(5); - while((ch=iter1.nextCodePoint()) !=iter.DONE_CODEPOINT){ + while((ch=iter1.nextCodePoint()) !=UnicodeCharacterIterator.DONE_CODEPOINT){ if(ch!= 0xDC03){ errln("iter.nextCodePoint() failed"); } @@ -570,13 +571,13 @@ public class TestUCharacterIterator extends TestFmwk{ int ch; // this should never go into a infinite loop // if it does then we have a problem - while((ch=iter.previousCodePoint())!=iter.DONE){ + while((ch=iter.previousCodePoint())!=UCharacterIterator.DONE){ if(ch!=0xDc00){ errln("iter.previousCodePoint() failed"); } } iter.setIndex(5); - while((ch=iter.nextCodePoint()) !=iter.DONE){ + while((ch=iter.nextCodePoint()) !=UForwardCharacterIterator.DONE){ if(ch!= 0xDC03){ errln("iter.nextCodePoint() failed"); } diff --git a/icu4j/src/com/ibm/icu/dev/test/lang/TestUScript.java b/icu4j/src/com/ibm/icu/dev/test/lang/TestUScript.java index f6c18b5b4e..400477a154 100755 --- a/icu4j/src/com/ibm/icu/dev/test/lang/TestUScript.java +++ b/icu4j/src/com/ibm/icu/dev/test/lang/TestUScript.java @@ -8,10 +8,7 @@ package com.ibm.icu.dev.test.lang; import com.ibm.icu.lang.UScript; -import com.ibm.icu.lang.UScriptRun; -import com.ibm.icu.text.UnicodeSet; import com.ibm.icu.dev.test.TestFmwk; -import com.ibm.icu.dev.test.TestUtil; import java.util.Locale; import java.util.MissingResourceException; @@ -313,8 +310,8 @@ public class TestUScript extends TestFmwk{ } public void TestAllCodepoints(){ int code; - String oldId=""; - String oldAbbrId=""; + //String oldId=""; + //String oldAbbrId=""; for( int i =0; i <= 0x10ffff; i++){ code =UScript.INVALID_CODE; code = UScript.getScript(i); diff --git a/icu4j/src/com/ibm/icu/dev/test/lang/TestUScriptRun.java b/icu4j/src/com/ibm/icu/dev/test/lang/TestUScriptRun.java index 3f8ca94aa5..1c2e50330d 100644 --- a/icu4j/src/com/ibm/icu/dev/test/lang/TestUScriptRun.java +++ b/icu4j/src/com/ibm/icu/dev/test/lang/TestUScriptRun.java @@ -186,6 +186,9 @@ public class TestUScriptRun extends TestFmwk errln("new UScriptRun(dummy, -100, 0) did not produce an IllegalArgumentException!"); } catch (IllegalArgumentException iae) { } + if(scriptRun!=null){ + errln("Did not get the expected Exception"); + } } public void TestReset() diff --git a/icu4j/src/com/ibm/icu/dev/test/lang/UCharacterTest.java b/icu4j/src/com/ibm/icu/dev/test/lang/UCharacterTest.java index c63f11f0bb..3e52abcdfc 100755 --- a/icu4j/src/com/ibm/icu/dev/test/lang/UCharacterTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/lang/UCharacterTest.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/lang/UCharacterTest.java,v $ -* $Date: 2003/04/04 19:37:00 $ -* $Revision: 1.54 $ +* $Date: 2003/05/14 19:03:16 $ +* $Revision: 1.55 $ * ******************************************************************************* */ @@ -29,8 +29,6 @@ import com.ibm.icu.impl.UCharacterName; import com.ibm.icu.impl.Utility; import com.ibm.icu.impl.USerializedSet; import com.ibm.icu.impl.NormalizerImpl; -import com.ibm.icu.text.Normalizer; - import java.io.BufferedReader; import java.util.Arrays; @@ -1926,7 +1924,7 @@ public final class UCharacterTest extends TestFmwk } /* add characters from a serialized set to a normal one */ private static void _setAddSerialized(UnicodeSet set, USerializedSet sset) { - int start, end; + // int start, end; int i, count; count=sset.countSerializedRanges(); diff --git a/icu4j/src/com/ibm/icu/dev/test/normalizer/BasicTest.java b/icu4j/src/com/ibm/icu/dev/test/normalizer/BasicTest.java index e81160958e..17f987f86c 100755 --- a/icu4j/src/com/ibm/icu/dev/test/normalizer/BasicTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/normalizer/BasicTest.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/normalizer/BasicTest.java,v $ - * $Date: 2003/04/10 08:02:00 $ - * $Revision: 1.28 $ + * $Date: 2003/05/14 19:03:17 $ + * $Revision: 1.29 $ * ***************************************************************************************** */ @@ -629,13 +629,13 @@ public class BasicTest extends TestFmwk { // Run through the iterator forwards and stick it into a StringBuffer StringBuffer forward = new StringBuffer(); - for (int ch = iter.first(); ch != iter.DONE; ch = iter.next()) { + for (int ch = iter.first(); ch != Normalizer.DONE; ch = iter.next()) { forward.append(ch); } // Now do it backwards StringBuffer reverse = new StringBuffer(); - for (int ch = iter.last(); ch != iter.DONE; ch = iter.previous()) { + for (int ch = iter.last(); ch != Normalizer.DONE; ch = iter.previous()) { reverse.insert(0, ch); } @@ -657,13 +657,13 @@ public class BasicTest extends TestFmwk { // Run through the iterator forwards and stick it into a // StringBuffer StringBuffer forward = new StringBuffer(); - for (int ch = iter.first(); ch != iter.DONE; ch = iter.next()) { + for (int ch = iter.first(); ch != Normalizer.DONE; ch = iter.next()) { forward.append(ch); } // Now do it backwards StringBuffer reverse = new StringBuffer(); - for (int ch = iter.last(); ch != iter.DONE; ch = iter.previous()) { + for (int ch = iter.last(); ch != Normalizer.DONE; ch = iter.previous()) { reverse.insert(0, ch); } @@ -834,7 +834,7 @@ public class BasicTest extends TestFmwk { int ch; UCharacterIterator cIter = UCharacterIterator.getInstance(expected); - while ((ch=iter.next())!= iter.DONE){ + while ((ch=iter.next())!= Normalizer.DONE){ if (index >= expected.length()) { errln("FAIL: " + msg + "Unexpected character '" + (char)ch + "' (" + hex(ch) + ")" @@ -856,7 +856,7 @@ public class BasicTest extends TestFmwk { } cIter.setToLimit(); - while((ch=iter.previous())!=iter.DONE){ + while((ch=iter.previous())!=Normalizer.DONE){ int want = cIter.previousCodePoint(); if (ch != want ) { errln("FAIL: " + msg + "got '" + (char)ch @@ -933,7 +933,7 @@ public class BasicTest extends TestFmwk { int ch; UCharacterIterator cIter = UCharacterIterator.getInstance(expected); - while ((ch=iter.next())!= iter.DONE){ + while ((ch=iter.next())!= Normalizer.DONE){ if (index >= expected.length()) { errln("FAIL: " + "Unexpected character '" + (char)ch + "' (" + hex(ch) + ")" @@ -955,7 +955,7 @@ public class BasicTest extends TestFmwk { } cIter.setToLimit(); - while((ch=iter.previous())!=iter.DONE){ + while((ch=iter.previous())!=Normalizer.DONE){ int want = cIter.previousCodePoint(); if (ch != want ) { errln("FAIL: " + "got '" + (char)ch @@ -974,7 +974,7 @@ public class BasicTest extends TestFmwk { Normalizer iter = new Normalizer(new StringCharacterIterator(Utility.unescape(input)), Normalizer.NFKC,0); StringBuffer got = new StringBuffer(); - for (ch = iter.first();ch!=iter.DONE;ch=iter.next()) + for (ch = iter.first();ch!=Normalizer.DONE;ch=iter.next()) { if (index >= expected.length()) { errln("FAIL: " + "Unexpected character '" + (char)ch + @@ -997,7 +997,7 @@ public class BasicTest extends TestFmwk { logln("Reverse Iteration\n"); iter.setIndexOnly(iter.endIndex()); got.setLength(0); - for(ch=iter.previous();ch!=iter.DONE;ch=iter.previous()){ + for(ch=iter.previous();ch!=Normalizer.DONE;ch=iter.previous()){ if (index >= expected.length()) { errln("FAIL: " + "Unexpected character '" + (char)ch + "' (" + hex(ch) + ")" + " at index " + index); @@ -1869,7 +1869,7 @@ public class BasicTest extends TestFmwk { // test all of these precomposed characters UnicodeSetIterator it = new UnicodeSetIterator(set); - while(it.nextRange() && it.codepoint!=it.IS_STRING) { + while(it.nextRange() && it.codepoint!=UnicodeSetIterator.IS_STRING) { start=it.codepoint; end=it.codepointEnd; while(start<=end) { @@ -2101,7 +2101,7 @@ public class BasicTest extends TestFmwk { for(int i=0x3000; i<0x3100;i++){ String input = ((char)i)+troublesome; try{ - String result = Normalizer.compose(input,false); + /* String result =*/ Normalizer.compose(input,false); }catch(IndexOutOfBoundsException e){ errln("compose() failed for input: " + Utility.hex(input) + " Exception: " + e.toString()); } @@ -2494,7 +2494,7 @@ public class BasicTest extends TestFmwk { } public void TestSkippable() { - UnicodeSet starts, diff; + UnicodeSet starts; UnicodeSet[] skipSets = new UnicodeSet[]{ new UnicodeSet(), //NFD new UnicodeSet(), //NFC @@ -2512,7 +2512,7 @@ public class BasicTest extends TestFmwk { new UnicodeSet(), }; StringBuffer s, pattern; - int start, limit, rangeStart, rangeEnd; + int start, limit, rangeEnd; int i, range, count; starts = new UnicodeSet(); /* @@ -2543,7 +2543,7 @@ public class BasicTest extends TestFmwk { count=starts.getRangeCount(); start=limit=0; - rangeStart=rangeEnd=0; + rangeEnd=0; range=0; for(;;) { if(startrangeEnd) { if(range", rule); + Transliterator t = Transliterator.createFromRules("", rule,Transliterator.FORWARD); t = null; } catch (IllegalArgumentException e) { logln("OK: Got exception for " + rule + ", as expected: " + @@ -2102,6 +2102,9 @@ public class TransliteratorTest extends TestFmwk { "d << b;"; try { Transliterator t = Transliterator.createFromRules("ID", rule, Transliterator.FORWARD); + if(t!=null){ + errln("FAIL: Did not get expected exception"); + } } catch (IllegalArgumentException e) { String err = e.getMessage(); if (err.indexOf("d << b") >= 0) { @@ -2122,6 +2125,9 @@ public class TransliteratorTest extends TestFmwk { Transliterator t = null; try { t = Transliterator.createFromRules("ID", rule, Transliterator.FORWARD); + if(t!=null){ + errln("FAIL: Did not get the expected exception"); + } } catch (IllegalArgumentException e) { logln("Ok: " + e.getMessage()); return; @@ -2138,6 +2144,9 @@ public class TransliteratorTest extends TestFmwk { try { Transliterator t = Transliterator.createFromRules("ID", rule, Transliterator.FORWARD); + if(t!=null){ + errln("FAIL: Did not get the expected exception"); + } } catch (IllegalArgumentException e) { logln("Ok: " + e.getMessage()); return; @@ -2152,6 +2161,9 @@ public class TransliteratorTest extends TestFmwk { try { Transliterator t = Transliterator.createFromRules("ID", "a}b{c>d;", Transliterator.FORWARD); + if(t!=null){ + errln("FAIL: Did not get the expected exception"); + } } catch (IllegalArgumentException e) { String msg = e.getMessage(); if (msg.indexOf("a}b{c") >= 0) { @@ -2344,6 +2356,9 @@ public class TransliteratorTest extends TestFmwk { String rule = "^a > Q; a > q;"; try { Transliterator t = Transliterator.createFromRules("ID", rule, Transliterator.FORWARD); + if(t==null){ + errln("FAIL: Did not get the expected exception"); + } } catch (IllegalArgumentException e) { errln("FAIL: " + rule + " => " + e); } @@ -2597,6 +2612,9 @@ public class TransliteratorTest extends TestFmwk { errln("Incomplete, " + t.getID() + ": " + UtilityExtensions.formatInput(test, pos)); gotError = true; } + if(!gotError){ + //errln("FAIL: Did not get expected error"); + } } public void TestFunction() { diff --git a/icu4j/src/com/ibm/icu/dev/test/translit/UnicodeFilterLogicTest.java b/icu4j/src/com/ibm/icu/dev/test/translit/UnicodeFilterLogicTest.java index 9c96d5099b..87e7e290b9 100755 --- a/icu4j/src/com/ibm/icu/dev/test/translit/UnicodeFilterLogicTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/translit/UnicodeFilterLogicTest.java @@ -5,18 +5,17 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/translit/Attic/UnicodeFilterLogicTest.java,v $ - * $Date: 2002/08/28 16:45:19 $ - * $Revision: 1.6 $ + * $Date: 2003/05/14 19:03:18 $ + * $Revision: 1.7 $ * ***************************************************************************************** */ package com.ibm.icu.dev.test.translit; -import com.ibm.icu.lang.*; + import com.ibm.icu.text.*; import com.ibm.icu.dev.test.*; import com.ibm.icu.impl.Utility; -import java.text.*; -import java.util.*; + /** * @test diff --git a/icu4j/src/com/ibm/icu/dev/test/translit/WriteCharts.java b/icu4j/src/com/ibm/icu/dev/test/translit/WriteCharts.java index e70ef10798..0cc0aed091 100755 --- a/icu4j/src/com/ibm/icu/dev/test/translit/WriteCharts.java +++ b/icu4j/src/com/ibm/icu/dev/test/translit/WriteCharts.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/translit/WriteCharts.java,v $ - * $Date: 2002/06/20 01:16:48 $ - * $Revision: 1.15 $ + * $Date: 2003/05/14 19:03:18 $ + * $Revision: 1.16 $ * ***************************************************************************************** */ @@ -14,9 +14,6 @@ package com.ibm.icu.dev.test.translit; import com.ibm.icu.lang.*; import com.ibm.icu.text.*; -import com.ibm.icu.dev.test.*; -import com.ibm.icu.impl.Utility; -//import java.text.*; import java.util.*; import java.io.*; @@ -177,7 +174,7 @@ public class WriteCharts { int end = sourceSet.getRangeEnd(i); for (int j = sourceSet.getRangeStart(i); j <= end; ++j) { */ - String flag = ""; + // String flag = ""; String ss = UTF16.valueOf(j); String ts = t.transliterate(ss); char group = 0; @@ -252,7 +249,7 @@ public class WriteCharts { // if (!decomp.equals(ts)) continue; String rt = inverse.transliterate(ts); - String flag = ""; + // String flag = ""; char group = 0x80; if (!sourceSetPlusAnyways.containsAll(rt)) { @@ -323,7 +320,7 @@ public class WriteCharts { } out.println(tableFooter); - String title = ""; + // String title = ""; if ((group & 0x100) != 0) out.println("

Duals

"); else if ((group & 0x80) != 0) out.println("

Completeness

"); else out.println("

Round Trip

"); diff --git a/icu4j/src/com/ibm/icu/dev/test/util/CurrencyTest.java b/icu4j/src/com/ibm/icu/dev/test/util/CurrencyTest.java index f67f62a8a1..e4e13787b2 100644 --- a/icu4j/src/com/ibm/icu/dev/test/util/CurrencyTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/util/CurrencyTest.java @@ -28,7 +28,7 @@ public class CurrencyTest extends TestFmwk { */ public void TestAPI() { Currency usd = Currency.getInstance("USD"); - int hash = usd.hashCode(); + /*int hash = */usd.hashCode(); Currency jpy = Currency.getInstance("JPY"); if (usd.equals(jpy)) { errln("FAIL: USD == JPY"); @@ -44,5 +44,8 @@ public class CurrencyTest extends TestFmwk { } Locale[] avail = Currency.getAvailableLocales(); + if(avail==null){ + errln("FAIL: getAvailableLocales returned null"); + } } } diff --git a/icu4j/src/com/ibm/icu/dev/test/util/ICUListResourceBundleTest.java b/icu4j/src/com/ibm/icu/dev/test/util/ICUListResourceBundleTest.java index 221d60d47d..36b02f64af 100644 --- a/icu4j/src/com/ibm/icu/dev/test/util/ICUListResourceBundleTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/util/ICUListResourceBundleTest.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/util/ICUListResourceBundleTest.java,v $ - * $Date: 2002/08/13 22:10:20 $ - * $Revision: 1.4 $ + * $Date: 2003/05/14 19:03:17 $ + * $Revision: 1.5 $ * ******************************************************************************* */ @@ -51,15 +51,15 @@ public final class ICUListResourceBundleTest extends TestFmwk } public void TestAliases(){ ResourceBundle rb = ICULocaleData.getResourceBundle("com.ibm.icu.dev.data","TestDataElements","testaliases"); - Object o = rb.getObject("CollationElements"); - Object o1 = rb.getObject("zoneTests"); - + /* Object o =*/ rb.getObject("CollationElements"); + /* Object o1 = */rb.getObject("zoneTests"); + // should not get an exception } public void TestCircularAliases(){ try{ ResourceBundle rb = ICULocaleData.getResourceBundle("com.ibm.icu.dev.data","TestDataElements","testcircularalias"); - Object o = rb.getObject("aaa"); + /* Object o =*/ rb.getObject("aaa"); }catch(java.util.MissingResourceException e){ if(e.toString().indexOf("ircular")==-1){ errln("Did not get the expected Exception for circular aliases"); diff --git a/icu4j/src/com/ibm/icu/dev/test/util/ICUServiceTest.java b/icu4j/src/com/ibm/icu/dev/test/util/ICUServiceTest.java index bac4051e55..2dc492074f 100644 --- a/icu4j/src/com/ibm/icu/dev/test/util/ICUServiceTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/util/ICUServiceTest.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/util/ICUServiceTest.java,v $ - * $Date: 2003/02/05 05:45:16 $ - * $Revision: 1.12 $ + * $Date: 2003/05/14 19:03:17 $ + * $Revision: 1.13 $ * ******************************************************************************* */ @@ -39,10 +39,8 @@ import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Map.Entry; -import java.util.ResourceBundle; import java.util.Set; import java.util.SortedMap; -import java.util.TreeSet; public class ICUServiceTest extends TestFmwk { @@ -458,7 +456,7 @@ public class ICUServiceTest extends TestFmwk logln("californio language factory"); StringBuffer buf = new StringBuffer("{"); String[] idNames = { - califactory.californio, califactory.valley, califactory.surfer, califactory.geek + CalifornioLanguageFactory.californio, CalifornioLanguageFactory.valley, CalifornioLanguageFactory.surfer, CalifornioLanguageFactory.geek }; for (int i = 0; i < idNames.length; ++i) { String idName = idNames[i]; diff --git a/icu4j/src/com/ibm/icu/dev/test/util/ICUServiceTestSample.java b/icu4j/src/com/ibm/icu/dev/test/util/ICUServiceTestSample.java index 296b4d36d2..129ab1df1b 100644 --- a/icu4j/src/com/ibm/icu/dev/test/util/ICUServiceTestSample.java +++ b/icu4j/src/com/ibm/icu/dev/test/util/ICUServiceTestSample.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/util/ICUServiceTestSample.java,v $ - * $Date: 2003/01/28 18:55:35 $ - * $Revision: 1.3 $ + * $Date: 2003/05/14 19:03:17 $ + * $Revision: 1.4 $ * ******************************************************************************* */ @@ -37,6 +37,8 @@ public class ICUServiceTestSample { catch (InterruptedException e) { } System.out.println("done"); + if(client==null){ + } } /** diff --git a/icu4j/src/com/ibm/icu/dev/test/util/ICUServiceThreadTest.java b/icu4j/src/com/ibm/icu/dev/test/util/ICUServiceThreadTest.java index 5b88f5b4f9..14526bb383 100644 --- a/icu4j/src/com/ibm/icu/dev/test/util/ICUServiceThreadTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/util/ICUServiceThreadTest.java @@ -5,26 +5,20 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/util/ICUServiceThreadTest.java,v $ - * $Date: 2003/02/05 05:45:16 $ - * $Revision: 1.7 $ + * $Date: 2003/05/14 19:03:17 $ + * $Revision: 1.8 $ * ******************************************************************************* */ package com.ibm.icu.dev.test.util; -import com.ibm.icu.dev.test.AbstractTestLog; -import com.ibm.icu.dev.test.AbstractTestLog.DelegatingLog; import com.ibm.icu.dev.test.TestFmwk; import com.ibm.icu.dev.test.TestLog; import com.ibm.icu.impl.ICUService; import com.ibm.icu.impl.ICUService.Factory; import com.ibm.icu.impl.ICUService.SimpleFactory; -import com.ibm.icu.impl.ICUService.Key; import com.ibm.icu.impl.LocaleUtility; -import com.ibm.icu.impl.ICULocaleData; import com.ibm.icu.impl.ICULocaleService; -import com.ibm.icu.impl.ICULocaleService.LocaleKey; -import com.ibm.icu.impl.ICULocaleService.ICUResourceBundleFactory; import com.ibm.icu.text.Collator; import java.util.Arrays; @@ -38,9 +32,7 @@ import java.util.Locale; import java.util.Map; import java.util.Map.Entry; import java.util.Random; -import java.util.ResourceBundle; import java.util.Set; -import java.util.TreeSet; import java.util.SortedMap; public class ICUServiceThreadTest extends TestFmwk diff --git a/icu4j/src/com/ibm/icu/dev/test/util/TrieTest.java b/icu4j/src/com/ibm/icu/dev/test/util/TrieTest.java index 29c05909da..12f200aa3f 100755 --- a/icu4j/src/com/ibm/icu/dev/test/util/TrieTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/util/TrieTest.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/util/TrieTest.java,v $ -* $Date: 2002/04/02 21:00:08 $ -* $Revision: 1.4 $ +* $Date: 2003/05/14 19:03:17 $ +* $Revision: 1.5 $ * ******************************************************************************* */ @@ -67,14 +67,14 @@ public final class TrieTest extends TestFmwk IntDataManipulate datamanipulate = new IntDataManipulate(); // chartrie should fail with int data try { - CharTrie chartrie = new CharTrie(inputStream, datamanipulate); + /*CharTrie chartrie = */new CharTrie(inputStream, datamanipulate); errln("CharTrie should fail with Int data during construction"); } catch (Exception e) { } // inttrie should pass with int data try { inputStream.reset(); - IntTrie m_trie_ = new IntTrie(inputStream, datamanipulate); + /*IntTrie m_trie_ = */new IntTrie(inputStream, datamanipulate); } catch (Exception e) { errln("Failed reading IntTrie data"); } diff --git a/icu4j/src/com/ibm/icu/dev/test/util/VersionInfoTest.java b/icu4j/src/com/ibm/icu/dev/test/util/VersionInfoTest.java index d4ce8e9d9c..fe850a0dd9 100644 --- a/icu4j/src/com/ibm/icu/dev/test/util/VersionInfoTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/util/VersionInfoTest.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/util/VersionInfoTest.java,v $ -* $Date: 2002/03/27 01:59:46 $ -* $Revision: 1.5 $ +* $Date: 2003/05/14 19:03:17 $ +* $Revision: 1.6 $ * ******************************************************************************* */ @@ -52,7 +52,7 @@ public final class VersionInfoTest extends TestFmwk */ public void TestInstance() { - VersionInfo version; + VersionInfo version=null; for (int i = 0; i < INSTANCE_INVALID_STRING_.length; i ++) { try { version = @@ -84,6 +84,7 @@ public final class VersionInfoTest extends TestFmwk errln("valid ints should not produce an exception"); } } + if(version==null){}; } /** diff --git a/icu4j/src/com/ibm/icu/text/BreakIterator.java b/icu4j/src/com/ibm/icu/text/BreakIterator.java index ba0360085f..596752f4a0 100755 --- a/icu4j/src/com/ibm/icu/text/BreakIterator.java +++ b/icu4j/src/com/ibm/icu/text/BreakIterator.java @@ -5,15 +5,14 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/text/BreakIterator.java,v $ - * $Date: 2003/05/05 23:42:17 $ - * $Revision: 1.17 $ + * $Date: 2003/05/14 19:03:31 $ + * $Revision: 1.18 $ * ***************************************************************************************** */ package com.ibm.icu.text; import java.lang.ref.SoftReference; -import java.lang.reflect.Method; import java.text.CharacterIterator; import java.text.StringCharacterIterator; import java.util.Locale; diff --git a/icu4j/src/com/ibm/icu/text/BreakIteratorFactory.java b/icu4j/src/com/ibm/icu/text/BreakIteratorFactory.java index 52c41da4c1..fa1df5b228 100644 --- a/icu4j/src/com/ibm/icu/text/BreakIteratorFactory.java +++ b/icu4j/src/com/ibm/icu/text/BreakIteratorFactory.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/text/BreakIteratorFactory.java,v $ - * $Date: 2003/05/05 23:42:17 $ - * $Revision: 1.3 $ + * $Date: 2003/05/14 19:03:30 $ + * $Revision: 1.4 $ * ***************************************************************************************** */ @@ -21,13 +21,8 @@ import java.util.ResourceBundle; import com.ibm.icu.impl.ICULocaleData; import com.ibm.icu.impl.ICULocaleService; -import com.ibm.icu.impl.ICULocaleService.LocaleKey; -import com.ibm.icu.impl.ICULocaleService.ICUResourceBundleFactory; import com.ibm.icu.impl.ICUService; import com.ibm.icu.impl.ICUService.Factory; -import com.ibm.icu.impl.ICUService.Key; -import com.ibm.icu.impl.LocaleUtility; - /** * @author Ram * diff --git a/icu4j/src/com/ibm/icu/text/BreakTransliterator.java b/icu4j/src/com/ibm/icu/text/BreakTransliterator.java index 64c4f4296f..f0f7299655 100644 --- a/icu4j/src/com/ibm/icu/text/BreakTransliterator.java +++ b/icu4j/src/com/ibm/icu/text/BreakTransliterator.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/text/BreakTransliterator.java,v $ - * $Date: 2003/01/28 18:55:41 $ - * $Revision: 1.4 $ + * $Date: 2003/05/14 19:03:31 $ + * $Revision: 1.5 $ * ***************************************************************************************** */ @@ -79,7 +79,7 @@ final class BreakTransliterator extends Transliterator { // To make things much easier, we will stack the boundaries, and then insert at the end. // generally, we won't need too many, since we will be filtered. - for(boundary = bi.first(); boundary != bi.DONE && boundary < pos.limit; boundary = bi.next()) { + for(boundary = bi.first(); boundary != BreakIterator.DONE && boundary < pos.limit; boundary = bi.next()) { if (boundary == 0) continue; // HACK: Check to see that preceeding item was a letter diff --git a/icu4j/src/com/ibm/icu/text/CanonicalIterator.java b/icu4j/src/com/ibm/icu/text/CanonicalIterator.java index 98b9daa310..5132dd40e9 100755 --- a/icu4j/src/com/ibm/icu/text/CanonicalIterator.java +++ b/icu4j/src/com/ibm/icu/text/CanonicalIterator.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/text/CanonicalIterator.java,v $ - * $Date: 2003/01/28 18:55:41 $ - * $Revision: 1.13 $ + * $Date: 2003/05/14 19:03:30 $ + * $Revision: 1.14 $ * ***************************************************************************************** */ @@ -315,7 +315,7 @@ public final class CanonicalIterator { // there were some matches, so add all the possibilities to the set. String prefix= segment.substring(0,i); prefix += UTF16.valueOf(cp); - int el = -1; + //int el = -1; Iterator iter = remainder.iterator(); while (iter.hasNext()) { String item = (String) iter.next(); diff --git a/icu4j/src/com/ibm/icu/text/CollationElementIterator.java b/icu4j/src/com/ibm/icu/text/CollationElementIterator.java index 1f531943a9..61566b209f 100755 --- a/icu4j/src/com/ibm/icu/text/CollationElementIterator.java +++ b/icu4j/src/com/ibm/icu/text/CollationElementIterator.java @@ -286,10 +286,10 @@ public final class CollationElementIterator // couldn't find a good CE in the tailoring // if we got here, the codepoint MUST be over 0xFF - so we look // directly in the UCA - result = m_collator_.UCA_.m_trie_.getLeadValue(ch); + result = RuleBasedCollator.UCA_.m_trie_.getLeadValue(ch); if (RuleBasedCollator.isSpecial(result)) { // UCA also gives us a special CE - result = nextSpecial(m_collator_.UCA_, result, ch); + result = nextSpecial(RuleBasedCollator.UCA_, result, ch); } } } diff --git a/icu4j/src/com/ibm/icu/text/CollationRuleParser.java b/icu4j/src/com/ibm/icu/text/CollationRuleParser.java index edca590bbf..ad7b94f0d5 100644 --- a/icu4j/src/com/ibm/icu/text/CollationRuleParser.java +++ b/icu4j/src/com/ibm/icu/text/CollationRuleParser.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/text/CollationRuleParser.java,v $ -* $Date: 2003/04/09 20:03:43 $ -* $Revision: 1.12 $ +* $Date: 2003/05/14 19:03:30 $ +* $Revision: 1.13 $ * ******************************************************************************* */ @@ -1687,9 +1687,9 @@ final class CollationRuleParser } current++; } - int nextBrace = -1; + //int nextBrace = -1; - if(noOpenBraces != 0 || (nextBrace = source.indexOf("]", start+current) /*']'*/) == -1) { + if(noOpenBraces != 0 || (/*nextBrace =*/ source.indexOf("]", start+current) /*']'*/) == -1) { throwParseException(m_rules_, start); } return new UnicodeSet(source.substring(start, start+current)); //uset_openPattern(start, current); @@ -1878,7 +1878,7 @@ final class CollationRuleParser m_parsedToken_.m_strength_ = TOKEN_UNSET_; int sourcelimit = m_source_.length(); - int expandNext = 0; + //int expandNext = 0; while (m_current_ < sourcelimit) { m_parsedToken_.m_prefixOffset_ = 0; diff --git a/icu4j/src/com/ibm/icu/text/CollatorServiceShim.java b/icu4j/src/com/ibm/icu/text/CollatorServiceShim.java index 410c01a386..377f081bde 100644 --- a/icu4j/src/com/ibm/icu/text/CollatorServiceShim.java +++ b/icu4j/src/com/ibm/icu/text/CollatorServiceShim.java @@ -5,22 +5,20 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/text/CollatorServiceShim.java,v $ -* $Date: 2003/05/13 16:33:01 $ -* $Revision: 1.3 $ +* $Date: 2003/05/14 19:03:31 $ +* $Revision: 1.4 $ * ******************************************************************************* */ package com.ibm.icu.text; -import java.util.Comparator; import java.util.Locale; import java.util.Map; import java.util.Set; import com.ibm.icu.impl.ICULocaleData; import com.ibm.icu.impl.ICULocaleService; -import com.ibm.icu.impl.ICULocaleService.ICUResourceBundleFactory; import com.ibm.icu.impl.ICULocaleService.LocaleKeyFactory; import com.ibm.icu.impl.ICUService; import com.ibm.icu.impl.ICUService.Factory; diff --git a/icu4j/src/com/ibm/icu/text/ComposedCharIter.java b/icu4j/src/com/ibm/icu/text/ComposedCharIter.java index 4a18d7fbfd..847efa65fc 100755 --- a/icu4j/src/com/ibm/icu/text/ComposedCharIter.java +++ b/icu4j/src/com/ibm/icu/text/ComposedCharIter.java @@ -5,14 +5,13 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/text/ComposedCharIter.java,v $ - * $Date: 2002/12/11 23:36:58 $ - * $Revision: 1.6 $ + * $Date: 2003/05/14 19:03:31 $ + * $Revision: 1.7 $ * ***************************************************************************************** */ package com.ibm.icu.text; import com.ibm.icu.impl.NormalizerImpl; -import com.ibm.icu.impl.Utility; /** * ComposedCharIter is an iterator class that returns all diff --git a/icu4j/src/com/ibm/icu/text/CompoundTransliterator.java b/icu4j/src/com/ibm/icu/text/CompoundTransliterator.java index 47fa35b284..25d226cc13 100755 --- a/icu4j/src/com/ibm/icu/text/CompoundTransliterator.java +++ b/icu4j/src/com/ibm/icu/text/CompoundTransliterator.java @@ -5,15 +5,14 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/text/CompoundTransliterator.java,v $ - * $Date: 2003/01/28 18:55:41 $ - * $Revision: 1.32 $ + * $Date: 2003/05/14 19:03:30 $ + * $Revision: 1.33 $ * ***************************************************************************************** */ package com.ibm.icu.text; import com.ibm.icu.impl.Utility; import com.ibm.icu.impl.UtilityExtensions; -import java.util.Enumeration; import java.util.Vector; /** diff --git a/icu4j/src/com/ibm/icu/text/DateFormat.java b/icu4j/src/com/ibm/icu/text/DateFormat.java index 8f917db300..e83482862d 100755 --- a/icu4j/src/com/ibm/icu/text/DateFormat.java +++ b/icu4j/src/com/ibm/icu/text/DateFormat.java @@ -7,7 +7,6 @@ package com.ibm.icu.text; import com.ibm.icu.impl.ICULocaleData; import com.ibm.icu.util.Calendar; -import com.ibm.icu.util.GregorianCalendar; import com.ibm.icu.util.TimeZone; import java.text.FieldPosition; @@ -17,7 +16,6 @@ import java.text.ParsePosition; import java.util.Date; import java.util.Locale; import java.util.MissingResourceException; -import java.util.ResourceBundle; /** * DateFormat is an abstract class for date/time formatting subclasses which diff --git a/icu4j/src/com/ibm/icu/text/DateFormatSymbols.java b/icu4j/src/com/ibm/icu/text/DateFormatSymbols.java index 242252e99d..1bca907784 100755 --- a/icu4j/src/com/ibm/icu/text/DateFormatSymbols.java +++ b/icu4j/src/com/ibm/icu/text/DateFormatSymbols.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/text/DateFormatSymbols.java,v $ - * $Date: 2003/03/07 01:05:48 $ - * $Revision: 1.16 $ + * $Date: 2003/05/14 19:03:30 $ + * $Revision: 1.17 $ * ***************************************************************************************** */ @@ -20,13 +20,9 @@ import com.ibm.icu.util.GregorianCalendar; import com.ibm.icu.util.TimeZone; import java.io.Serializable; -import java.lang.ref.SoftReference; -import java.util.Enumeration; -import java.util.Hashtable; import java.util.Locale; import java.util.MissingResourceException; import java.util.ResourceBundle; -import java.util.Vector; /** * DateFormatSymbols is a public class for encapsulating diff --git a/icu4j/src/com/ibm/icu/text/DecimalFormat.java b/icu4j/src/com/ibm/icu/text/DecimalFormat.java index 36a768e841..1438952710 100755 --- a/icu4j/src/com/ibm/icu/text/DecimalFormat.java +++ b/icu4j/src/com/ibm/icu/text/DecimalFormat.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/text/DecimalFormat.java,v $ - * $Date: 2003/04/24 22:58:04 $ - * $Revision: 1.29 $ + * $Date: 2003/05/14 19:03:31 $ + * $Revision: 1.30 $ * ***************************************************************************************** */ @@ -1592,7 +1592,7 @@ public class DecimalFormat extends NumberFormat { pos = match(text, pos, getCurrency().getCurrencyCode()); } else { ParsePosition ppos = new ParsePosition(pos); - Number n = currencyChoice.parse(text, ppos); + /* Number n = */currencyChoice.parse(text, ppos); pos = (ppos.getIndex() == pos) ? -1 : ppos.getIndex(); } continue; diff --git a/icu4j/src/com/ibm/icu/text/FunctionReplacer.java b/icu4j/src/com/ibm/icu/text/FunctionReplacer.java index f30739080b..a7860f437d 100755 --- a/icu4j/src/com/ibm/icu/text/FunctionReplacer.java +++ b/icu4j/src/com/ibm/icu/text/FunctionReplacer.java @@ -9,7 +9,6 @@ */ package com.ibm.icu.text; -import com.ibm.icu.impl.Utility; /** * A replacer that calls a transliterator to generate its output text. diff --git a/icu4j/src/com/ibm/icu/text/HexToUnicodeTransliterator.java b/icu4j/src/com/ibm/icu/text/HexToUnicodeTransliterator.java index 0a6920d87e..b41d2775c1 100755 --- a/icu4j/src/com/ibm/icu/text/HexToUnicodeTransliterator.java +++ b/icu4j/src/com/ibm/icu/text/HexToUnicodeTransliterator.java @@ -5,13 +5,12 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/text/Attic/HexToUnicodeTransliterator.java,v $ - * $Date: 2002/12/03 18:56:44 $ - * $Revision: 1.14 $ + * $Date: 2003/05/14 19:03:31 $ + * $Revision: 1.15 $ * ***************************************************************************************** */ package com.ibm.icu.text; -import java.util.*; import com.ibm.icu.impl.Utility; /** diff --git a/icu4j/src/com/ibm/icu/text/NameUnicodeTransliterator.java b/icu4j/src/com/ibm/icu/text/NameUnicodeTransliterator.java index adce980002..9831288de9 100755 --- a/icu4j/src/com/ibm/icu/text/NameUnicodeTransliterator.java +++ b/icu4j/src/com/ibm/icu/text/NameUnicodeTransliterator.java @@ -3,11 +3,10 @@ * others. All Rights Reserved. * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/text/NameUnicodeTransliterator.java,v $ - * $Date: 2002/09/19 23:17:02 $ - * $Revision: 1.13 $ + * $Date: 2003/05/14 19:03:30 $ + * $Revision: 1.14 $ */ package com.ibm.icu.text; -import java.util.*; import com.ibm.icu.lang.*; import com.ibm.icu.impl.Utility; import com.ibm.icu.impl.UCharacterProperty; diff --git a/icu4j/src/com/ibm/icu/text/Normalizer.java b/icu4j/src/com/ibm/icu/text/Normalizer.java index 9922e42edb..325640ec37 100755 --- a/icu4j/src/com/ibm/icu/text/Normalizer.java +++ b/icu4j/src/com/ibm/icu/text/Normalizer.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/text/Normalizer.java,v $ - * $Date: 2003/04/09 21:38:57 $ - * $Revision: 1.30 $ + * $Date: 2003/05/14 19:03:30 $ + * $Revision: 1.31 $ * ******************************************************************************* */ @@ -2659,7 +2659,7 @@ public final class Normalizer implements Cloneable{ char[] fcd1 = new char[300]; char[] fcd2 = new char[300]; - int f1Index, f2Index, d1Index, d2Index; + Normalizer.Mode mode; int result; @@ -2671,7 +2671,6 @@ public final class Normalizer implements Cloneable{ } UnicodeSet nx=NormalizerImpl.getNX((int)(options>>Normalizer.COMPARE_NORM_OPTIONS_SHIFT)); - d1Index=d2Index=0; options|= NormalizerImpl.COMPARE_EQUIV; result=0; @@ -2705,7 +2704,6 @@ public final class Normalizer implements Cloneable{ if((options& Normalizer.INPUT_IS_FCD)==0) { char[] dest; int fcdLen1, fcdLen2; - int foldLen1, foldLen2; boolean isFCD1, isFCD2; // check if s1 and/or s2 fulfill the FCD conditions diff --git a/icu4j/src/com/ibm/icu/text/NullTransliterator.java b/icu4j/src/com/ibm/icu/text/NullTransliterator.java index 236f165a59..d94b184a04 100755 --- a/icu4j/src/com/ibm/icu/text/NullTransliterator.java +++ b/icu4j/src/com/ibm/icu/text/NullTransliterator.java @@ -5,13 +5,12 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/text/NullTransliterator.java,v $ - * $Date: 2002/12/03 18:57:36 $ - * $Revision: 1.11 $ + * $Date: 2003/05/14 19:03:31 $ + * $Revision: 1.12 $ * ***************************************************************************************** */ package com.ibm.icu.text; -import java.util.*; /** * A transliterator that leaves text unchanged. diff --git a/icu4j/src/com/ibm/icu/text/NumberFormatServiceShim.java b/icu4j/src/com/ibm/icu/text/NumberFormatServiceShim.java index f8d8ba7453..cc2d41138b 100644 --- a/icu4j/src/com/ibm/icu/text/NumberFormatServiceShim.java +++ b/icu4j/src/com/ibm/icu/text/NumberFormatServiceShim.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/text/NumberFormatServiceShim.java,v $ - * $Date: 2003/05/13 16:33:01 $ - * $Revision: 1.3 $ + * $Date: 2003/05/14 19:03:30 $ + * $Revision: 1.4 $ * ******************************************************************************* */ @@ -21,7 +21,6 @@ import com.ibm.icu.impl.ICUService; import com.ibm.icu.impl.ICUService.Factory; import com.ibm.icu.impl.ICUService.Key; import com.ibm.icu.impl.ICULocaleService; -import com.ibm.icu.impl.ICULocaleService.ICUResourceBundleFactory; import com.ibm.icu.impl.ICULocaleService.LocaleKey; import com.ibm.icu.impl.ICULocaleService.LocaleKeyFactory; import com.ibm.icu.text.NumberFormat; diff --git a/icu4j/src/com/ibm/icu/text/RemoveTransliterator.java b/icu4j/src/com/ibm/icu/text/RemoveTransliterator.java index 825f99617a..4f338e4954 100755 --- a/icu4j/src/com/ibm/icu/text/RemoveTransliterator.java +++ b/icu4j/src/com/ibm/icu/text/RemoveTransliterator.java @@ -5,13 +5,13 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/text/RemoveTransliterator.java,v $ - * $Date: 2002/02/16 03:06:12 $ - * $Revision: 1.6 $ + * $Date: 2003/05/14 19:03:30 $ + * $Revision: 1.7 $ * ***************************************************************************************** */ package com.ibm.icu.text; -import java.util.*; + /** * A transliterator that removes characters. This is useful in conjunction diff --git a/icu4j/src/com/ibm/icu/text/RuleBasedNumberFormat.java b/icu4j/src/com/ibm/icu/text/RuleBasedNumberFormat.java index 2d7e08002f..a2471cd132 100755 --- a/icu4j/src/com/ibm/icu/text/RuleBasedNumberFormat.java +++ b/icu4j/src/com/ibm/icu/text/RuleBasedNumberFormat.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/text/RuleBasedNumberFormat.java,v $ - * $Date: 2003/04/15 14:58:17 $ - * $Revision: 1.12 $ + * $Date: 2003/05/14 19:03:31 $ + * $Revision: 1.13 $ * ***************************************************************************************** */ @@ -21,7 +21,7 @@ import java.text.FieldPosition; import java.text.ParsePosition; import java.util.Locale; import java.util.ResourceBundle; -import java.util.Vector; + /** *

A class that formats numbers according to a set of rules. This number formatter is @@ -472,7 +472,7 @@ import java.util.Vector; * using these features.

* * @author Richard Gillam - * $RCSfile: RuleBasedNumberFormat.java,v $ $Revision: 1.12 $ $Date: 2003/04/15 14:58:17 $ + * $RCSfile: RuleBasedNumberFormat.java,v $ $Revision: 1.13 $ $Date: 2003/05/14 19:03:31 $ * @see NumberFormat * @see DecimalFormat * @stable ICU 2.0 @@ -1058,7 +1058,7 @@ public final class RuleBasedNumberFormat extends NumberFormat { // then pull out that collator's rules, append any additional // rules specified in the description, and create a _new_ // collator based on the combinaiton of those rules - RuleBasedCollator temp = (RuleBasedCollator)collator.getInstance(locale); + RuleBasedCollator temp = (RuleBasedCollator)Collator.getInstance(locale); String rules = temp.getRules() + lenientParseRules; collator = new RuleBasedCollator(rules); diff --git a/icu4j/src/com/ibm/icu/text/RuleBasedTransliterator.java b/icu4j/src/com/ibm/icu/text/RuleBasedTransliterator.java index 9912330c58..ff9ec16fba 100755 --- a/icu4j/src/com/ibm/icu/text/RuleBasedTransliterator.java +++ b/icu4j/src/com/ibm/icu/text/RuleBasedTransliterator.java @@ -5,18 +5,15 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/text/RuleBasedTransliterator.java,v $ - * $Date: 2002/12/03 18:57:36 $ - * $Revision: 1.58 $ + * $Date: 2003/05/14 19:03:30 $ + * $Revision: 1.59 $ * ***************************************************************************************** */ package com.ibm.icu.text; import java.util.Hashtable; -import java.util.Vector; -import java.text.ParsePosition; -import com.ibm.icu.impl.Utility; -import com.ibm.icu.impl.data.ResourceReader; + /** * RuleBasedTransliterator is a transliterator @@ -474,6 +471,9 @@ public class RuleBasedTransliterator extends Transliterator { /** * $Log: RuleBasedTransliterator.java,v $ + * Revision 1.59 2003/05/14 19:03:30 rviswanadha + * jitterbug 2836: fix compiler warnings + * * Revision 1.58 2002/12/03 18:57:36 alan * jitterbug 2087: fix @ tags * diff --git a/icu4j/src/com/ibm/icu/text/SimpleDateFormat.java b/icu4j/src/com/ibm/icu/text/SimpleDateFormat.java index 8d08885e94..61c4d49f40 100755 --- a/icu4j/src/com/ibm/icu/text/SimpleDateFormat.java +++ b/icu4j/src/com/ibm/icu/text/SimpleDateFormat.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/text/SimpleDateFormat.java,v $ - * $Date: 2003/04/04 19:20:52 $ - * $Revision: 1.20 $ + * $Date: 2003/05/14 19:03:31 $ + * $Revision: 1.21 $ * ***************************************************************************************** */ @@ -22,8 +22,6 @@ import com.ibm.icu.impl.UCharacterProperty; import java.io.IOException; import java.io.ObjectInputStream; -import java.lang.ClassNotFoundException; -import java.lang.StringIndexOutOfBoundsException; import java.text.FieldPosition; import java.text.MessageFormat; import java.text.ParsePosition; @@ -511,7 +509,7 @@ public class SimpleDateFormat extends DateFormat { int maxIntCount = Integer.MAX_VALUE; String current = ""; - if ((patternCharIndex=formatData.patternChars.indexOf(ch)) == -1) { + if ((patternCharIndex=DateFormatSymbols.patternChars.indexOf(ch)) == -1) { throw new IllegalArgumentException("Illegal pattern character " + "'" + ch + "'"); } @@ -1027,7 +1025,7 @@ public class SimpleDateFormat extends DateFormat { ParsePosition pos = new ParsePosition(0); int patternCharIndex = -1; - if ((patternCharIndex=formatData.patternChars.indexOf(ch)) == -1) { + if ((patternCharIndex=DateFormatSymbols.patternChars.indexOf(ch)) == -1) { return -start; } @@ -1355,7 +1353,7 @@ public class SimpleDateFormat extends DateFormat { */ public String toLocalizedPattern() { return translatePattern(pattern, - formatData.patternChars, + DateFormatSymbols.patternChars, formatData.localPatternChars); } @@ -1375,7 +1373,7 @@ public class SimpleDateFormat extends DateFormat { public void applyLocalizedPattern(String pattern) { this.pattern = translatePattern(pattern, formatData.localPatternChars, - formatData.patternChars); + DateFormatSymbols.patternChars); } /** diff --git a/icu4j/src/com/ibm/icu/text/StringSearch.java b/icu4j/src/com/ibm/icu/text/StringSearch.java index cb4c3b10fd..8de4abdab5 100755 --- a/icu4j/src/com/ibm/icu/text/StringSearch.java +++ b/icu4j/src/com/ibm/icu/text/StringSearch.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/text/StringSearch.java,v $ - * $Date: 2003/04/09 20:03:43 $ - * $Revision: 1.20 $ + * $Date: 2003/05/14 19:03:31 $ + * $Revision: 1.21 $ * ***************************************************************************************** */ @@ -2417,7 +2417,7 @@ public final class StringSearch extends SearchIterator */ private int doPreviousCanonicalPrefixMatch(int textoffset) { - int safelength = 0; + // int safelength = 0; StringBuffer safetext; int safeoffset = textoffset; @@ -2425,7 +2425,7 @@ public final class StringSearch extends SearchIterator && m_collator_.isUnsafe(m_canonicalPrefixAccents_.charAt( m_canonicalPrefixAccents_.length() - 1))) { safeoffset = getNextSafeOffset(textoffset, m_textLimitOffset_); - safelength = safeoffset - textoffset; + //safelength = safeoffset - textoffset; safetext = merge(m_canonicalPrefixAccents_, targetText, textoffset, safeoffset, null); } diff --git a/icu4j/src/com/ibm/icu/text/TransformTransliterator.java b/icu4j/src/com/ibm/icu/text/TransformTransliterator.java index e09dd1acc5..5fc74c9705 100755 --- a/icu4j/src/com/ibm/icu/text/TransformTransliterator.java +++ b/icu4j/src/com/ibm/icu/text/TransformTransliterator.java @@ -3,11 +3,11 @@ * others. All Rights Reserved. * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/text/TransformTransliterator.java,v $ - * $Date: 2002/02/16 03:06:16 $ - * $Revision: 1.5 $ + * $Date: 2003/05/14 19:03:30 $ + * $Revision: 1.6 $ */ package com.ibm.icu.text; -import java.util.*; +//import java.util.*; abstract class TransformTransliterator { // Currently unused diff --git a/icu4j/src/com/ibm/icu/text/TransliterationRule.java b/icu4j/src/com/ibm/icu/text/TransliterationRule.java index 8a9fe2819d..418c42e42f 100755 --- a/icu4j/src/com/ibm/icu/text/TransliterationRule.java +++ b/icu4j/src/com/ibm/icu/text/TransliterationRule.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/text/TransliterationRule.java,v $ - * $Date: 2003/01/28 18:55:42 $ - * $Revision: 1.48 $ + * $Date: 2003/05/14 19:03:30 $ + * $Revision: 1.49 $ * ***************************************************************************************** */ @@ -46,7 +46,7 @@ import com.ibm.icu.impl.Utility; *

Copyright © IBM Corporation 1999. All rights reserved. * * @author Alan Liu - * @version $RCSfile: TransliterationRule.java,v $ $Revision: 1.48 $ $Date: 2003/01/28 18:55:42 $ + * @version $RCSfile: TransliterationRule.java,v $ $Revision: 1.49 $ $Date: 2003/05/14 19:03:30 $ */ class TransliterationRule { @@ -495,7 +495,7 @@ class TransliterationRule { * given string. */ public String toRule(boolean escapeUnprintable) { - int i; + // int i; StringBuffer rule = new StringBuffer(); @@ -583,6 +583,9 @@ class TransliterationRule { /** * $Log: TransliterationRule.java,v $ + * Revision 1.49 2003/05/14 19:03:30 rviswanadha + * jitterbug 2836: fix compiler warnings + * * Revision 1.48 2003/01/28 18:55:42 rviswanadha * jitterbug 2309: Modularize ICU4J big bang commit * diff --git a/icu4j/src/com/ibm/icu/text/UnescapeTransliterator.java b/icu4j/src/com/ibm/icu/text/UnescapeTransliterator.java index 23ee2c5b88..4e205ee102 100755 --- a/icu4j/src/com/ibm/icu/text/UnescapeTransliterator.java +++ b/icu4j/src/com/ibm/icu/text/UnescapeTransliterator.java @@ -8,7 +8,6 @@ ********************************************************************** */ package com.ibm.icu.text; -import com.ibm.icu.impl.Utility; import com.ibm.icu.lang.*; /** @@ -20,7 +19,7 @@ import com.ibm.icu.lang.*; * variants with the system which are then accessed via their IDs. * * @author Alan Liu - * @version $RCSfile: UnescapeTransliterator.java,v $ $Revision: 1.5 $ $Date: 2002/02/25 22:43:58 $ + * @version $RCSfile: UnescapeTransliterator.java,v $ $Revision: 1.6 $ $Date: 2003/05/14 19:03:30 $ */ class UnescapeTransliterator extends Transliterator { diff --git a/icu4j/src/com/ibm/icu/text/UnicodeNameTransliterator.java b/icu4j/src/com/ibm/icu/text/UnicodeNameTransliterator.java index d735b67863..40a196ad2e 100755 --- a/icu4j/src/com/ibm/icu/text/UnicodeNameTransliterator.java +++ b/icu4j/src/com/ibm/icu/text/UnicodeNameTransliterator.java @@ -3,11 +3,10 @@ * others. All Rights Reserved. * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/text/UnicodeNameTransliterator.java,v $ - * $Date: 2002/09/09 16:11:07 $ - * $Revision: 1.9 $ + * $Date: 2003/05/14 19:03:30 $ + * $Revision: 1.10 $ */ package com.ibm.icu.text; -import java.util.*; import com.ibm.icu.lang.*; /** diff --git a/icu4j/src/com/ibm/icu/text/UnicodeSetIterator.java b/icu4j/src/com/ibm/icu/text/UnicodeSetIterator.java index f28b8ad997..c6816cf14e 100755 --- a/icu4j/src/com/ibm/icu/text/UnicodeSetIterator.java +++ b/icu4j/src/com/ibm/icu/text/UnicodeSetIterator.java @@ -5,16 +5,14 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/text/UnicodeSetIterator.java,v $ - * $Date: 2002/12/09 16:40:00 $ - * $Revision: 1.12 $ + * $Date: 2003/05/14 19:03:31 $ + * $Revision: 1.13 $ * ***************************************************************************************** */ package com.ibm.icu.text; -import com.ibm.icu.impl.Utility; import java.util.*; -import java.io.*; /** * UnicodeSetIterator iterates over the contents of a UnicodeSet. It diff --git a/icu4j/src/com/ibm/icu/text/UnicodeToHexTransliterator.java b/icu4j/src/com/ibm/icu/text/UnicodeToHexTransliterator.java index b205a03611..c1635e73a6 100755 --- a/icu4j/src/com/ibm/icu/text/UnicodeToHexTransliterator.java +++ b/icu4j/src/com/ibm/icu/text/UnicodeToHexTransliterator.java @@ -5,13 +5,13 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/text/Attic/UnicodeToHexTransliterator.java,v $ - * $Date: 2002/12/03 18:56:46 $ - * $Revision: 1.13 $ + * $Date: 2003/05/14 19:03:31 $ + * $Revision: 1.14 $ * ***************************************************************************************** */ package com.ibm.icu.text; -import java.util.*; + /** * A transliterator that converts from Unicode characters to diff --git a/icu4j/src/com/ibm/icu/util/ChineseCalendar.java b/icu4j/src/com/ibm/icu/util/ChineseCalendar.java index fb18462961..cec52d7d04 100755 --- a/icu4j/src/com/ibm/icu/util/ChineseCalendar.java +++ b/icu4j/src/com/ibm/icu/util/ChineseCalendar.java @@ -3,13 +3,11 @@ * others. All Rights Reserved. ********************************************************************* * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/util/ChineseCalendar.java,v $ - * $Date: 2002/12/18 19:35:06 $ - * $Revision: 1.14 $ + * $Date: 2003/05/14 19:03:48 $ + * $Revision: 1.15 $ */ package com.ibm.icu.util; -import com.ibm.icu.lang.*; import com.ibm.icu.text.*; -import java.util.Date; import java.util.Locale; /** diff --git a/icu4j/src/com/ibm/icu/util/Currency.java b/icu4j/src/com/ibm/icu/util/Currency.java index a0a3ea407d..05af560ddb 100644 --- a/icu4j/src/com/ibm/icu/util/Currency.java +++ b/icu4j/src/com/ibm/icu/util/Currency.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/util/Currency.java,v $ - * $Date: 2003/04/21 21:02:42 $ - * $Revision: 1.13 $ + * $Date: 2003/05/14 19:03:48 $ + * $Revision: 1.14 $ * ******************************************************************************* */ @@ -19,7 +19,6 @@ import java.util.ResourceBundle; import com.ibm.icu.impl.ICULocaleData; import com.ibm.icu.impl.LocaleUtility; -import com.ibm.icu.text.DecimalFormatSymbols; /** * A class encapsulating a currency, as defined by ISO 4217. A diff --git a/icu4j/src/com/ibm/icu/util/CurrencyServiceShim.java b/icu4j/src/com/ibm/icu/util/CurrencyServiceShim.java index a488bee318..f7a9bb5731 100644 --- a/icu4j/src/com/ibm/icu/util/CurrencyServiceShim.java +++ b/icu4j/src/com/ibm/icu/util/CurrencyServiceShim.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/util/CurrencyServiceShim.java,v $ - * $Date: 2003/05/05 23:42:18 $ - * $Revision: 1.2 $ + * $Date: 2003/05/14 19:03:48 $ + * $Revision: 1.3 $ * ******************************************************************************* */ @@ -17,10 +17,8 @@ import java.util.Locale; import com.ibm.icu.impl.ICULocaleData; import com.ibm.icu.impl.ICUService; -import com.ibm.icu.impl.ICUService.Key; import com.ibm.icu.impl.ICUService.Factory; import com.ibm.icu.impl.ICULocaleService; -import com.ibm.icu.impl.ICULocaleService.ICUResourceBundleFactory; /** * This is a package-access implementation of registration for diff --git a/icu4j/src/com/ibm/icu/util/IslamicCalendar.java b/icu4j/src/com/ibm/icu/util/IslamicCalendar.java index f37ec0d72f..82480b214e 100755 --- a/icu4j/src/com/ibm/icu/util/IslamicCalendar.java +++ b/icu4j/src/com/ibm/icu/util/IslamicCalendar.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/util/IslamicCalendar.java,v $ - * $Date: 2002/12/18 19:35:07 $ - * $Revision: 1.16 $ + * $Date: 2003/05/14 19:03:48 $ + * $Revision: 1.17 $ * ***************************************************************************************** */ @@ -14,9 +14,7 @@ package com.ibm.icu.util; import com.ibm.icu.util.Calendar; import java.util.Date; -import com.ibm.icu.util.GregorianCalendar; import java.util.Locale; -import com.ibm.icu.util.CalendarAstronomer; /** * IslamicCalendar is a subclass of Calendar diff --git a/icu4j/src/com/ibm/icu/util/TimeZone.java b/icu4j/src/com/ibm/icu/util/TimeZone.java index abc445d81e..a9a29e1b53 100755 --- a/icu4j/src/com/ibm/icu/util/TimeZone.java +++ b/icu4j/src/com/ibm/icu/util/TimeZone.java @@ -10,16 +10,12 @@ package com.ibm.icu.util; import java.io.Serializable; import java.lang.ref.SoftReference; -import java.security.AccessController; -import java.security.PrivilegedAction; import com.ibm.icu.text.SimpleDateFormat; import com.ibm.icu.text.NumberFormat; import java.text.ParsePosition; -import sun.security.action.GetPropertyAction; import java.util.Date; import java.util.Hashtable; import java.util.Locale; -import java.util.Vector; /** * TimeZone represents a time zone offset, and also figures out daylight diff --git a/icu4j/src/com/ibm/icu/util/VersionInfo.java b/icu4j/src/com/ibm/icu/util/VersionInfo.java index c9f4074bdd..184e502d57 100644 --- a/icu4j/src/com/ibm/icu/util/VersionInfo.java +++ b/icu4j/src/com/ibm/icu/util/VersionInfo.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/util/VersionInfo.java,v $ - * $Date: 2003/04/25 19:33:05 $ - * $Revision: 1.11 $ + * $Date: 2003/05/14 19:03:48 $ + * $Revision: 1.12 $ * * jitterbug 1741 ***************************************************************************************** @@ -95,6 +95,13 @@ public final class VersionInfo * @draft ICU 2.1 */ public static final VersionInfo UNICODE_3_2; + + /** + * Unicode 4.0 version + * @draft ICU 2.6 + */ + public static final VersionInfo UNICODE_4_0; + /** * ICU4J current release version * @draft ICU 2.2 @@ -352,6 +359,7 @@ public final class VersionInfo UNICODE_3_1_0 = getInstance(3, 1, 0, 0); UNICODE_3_1_1 = getInstance(3, 1, 1, 0); UNICODE_3_2 = getInstance(3, 2, 0, 0); + UNICODE_4_0 = getInstance(4, 0, 0, 0); ICU_VERSION = getInstance(2, 6, 0, 0); } diff --git a/icu4j/src/com/ibm/richtext/awtui/ObjectDialog.java b/icu4j/src/com/ibm/richtext/awtui/ObjectDialog.java index de866233ff..f672c7c502 100755 --- a/icu4j/src/com/ibm/richtext/awtui/ObjectDialog.java +++ b/icu4j/src/com/ibm/richtext/awtui/ObjectDialog.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: ObjectDialog.java,v $ $Revision: 1.2 $ $Date: 2002/02/16 03:06:32 $ + * @(#)$RCSfile: ObjectDialog.java,v $ $Revision: 1.3 $ $Date: 2003/05/14 19:04:02 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -16,7 +16,6 @@ package com.ibm.richtext.awtui; import java.util.Hashtable; -import com.ibm.richtext.textlayout.attributes.AttributeMap; import com.ibm.richtext.textlayout.attributes.AttributeSet; import com.ibm.richtext.styledtext.StyleModifier; import com.ibm.richtext.textpanel.MTextPanel; @@ -30,7 +29,6 @@ import java.awt.Frame; import java.awt.Button; import java.awt.Choice; import java.awt.Label; -import java.awt.BorderLayout; import java.awt.FlowLayout; import java.awt.Panel; import java.awt.GridLayout; diff --git a/icu4j/src/com/ibm/richtext/awtui/TextFrame.java b/icu4j/src/com/ibm/richtext/awtui/TextFrame.java index 2396fd8bf0..0b373dced4 100755 --- a/icu4j/src/com/ibm/richtext/awtui/TextFrame.java +++ b/icu4j/src/com/ibm/richtext/awtui/TextFrame.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: TextFrame.java,v $ $Revision: 1.1 $ $Date: 2000/04/20 17:41:49 $ + * @(#)$RCSfile: TextFrame.java,v $ $Revision: 1.2 $ $Date: 2003/05/14 19:04:02 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -17,13 +17,9 @@ package com.ibm.richtext.awtui; import com.ibm.richtext.textpanel.MTextPanel; import com.ibm.richtext.textpanel.TextPanel; import com.ibm.richtext.styledtext.MConstText; -import com.ibm.richtext.styledtext.StyleModifier; - -import com.ibm.richtext.uiimpl.ResourceUtils; import java.awt.BorderLayout; import java.awt.Frame; -import java.awt.Menu; import java.awt.MenuBar; import java.awt.Toolkit; diff --git a/icu4j/src/com/ibm/richtext/demo/AwtDocumentWindow.java b/icu4j/src/com/ibm/richtext/demo/AwtDocumentWindow.java index ab0400ff60..750b5e006c 100755 --- a/icu4j/src/com/ibm/richtext/demo/AwtDocumentWindow.java +++ b/icu4j/src/com/ibm/richtext/demo/AwtDocumentWindow.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: AwtDocumentWindow.java,v $ $Revision: 1.2 $ $Date: 2002/02/16 03:06:33 $ + * @(#)$RCSfile: AwtDocumentWindow.java,v $ $Revision: 1.3 $ $Date: 2003/05/14 19:03:59 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -20,12 +20,6 @@ import com.ibm.richtext.textpanel.TextPanel; import com.ibm.richtext.textpanel.TextPanelListener; import com.ibm.richtext.textpanel.TextPanelSettings; -import com.ibm.richtext.styledtext.MConstText; -import com.ibm.richtext.styledtext.StyledText; -import com.ibm.richtext.styledtext.StyleModifier; - -import com.ibm.richtext.textlayout.attributes.AttributeMap; - import com.ibm.richtext.awtui.AwtMenuBuilder; import com.ibm.richtext.print.PrintingUtils; diff --git a/icu4j/src/com/ibm/richtext/demo/CodeEdit.java b/icu4j/src/com/ibm/richtext/demo/CodeEdit.java index 3a8e88c40a..519dea47cb 100755 --- a/icu4j/src/com/ibm/richtext/demo/CodeEdit.java +++ b/icu4j/src/com/ibm/richtext/demo/CodeEdit.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: CodeEdit.java,v $ $Revision: 1.3 $ $Date: 2002/02/16 03:06:33 $ + * @(#)$RCSfile: CodeEdit.java,v $ $Revision: 1.4 $ $Date: 2003/05/14 19:03:59 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -16,8 +16,6 @@ package com.ibm.richtext.demo; import java.awt.FileDialog; import java.awt.Frame; -import java.awt.Menu; -import java.awt.MenuBar; import java.awt.Toolkit; import java.io.File; @@ -25,7 +23,6 @@ import java.io.File; import com.ibm.richtext.textlayout.attributes.AttributeMap; import com.ibm.richtext.textlayout.attributes.TextAttribute; -import com.ibm.richtext.textpanel.MTextPanel; import com.ibm.richtext.textpanel.TextPanel; import com.ibm.richtext.textpanel.TextPanelSettings; import com.ibm.richtext.awtui.AwtMenuBuilder; diff --git a/icu4j/src/com/ibm/richtext/demo/EditApplication.java b/icu4j/src/com/ibm/richtext/demo/EditApplication.java index 2204797948..b195fffda6 100755 --- a/icu4j/src/com/ibm/richtext/demo/EditApplication.java +++ b/icu4j/src/com/ibm/richtext/demo/EditApplication.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: EditApplication.java,v $ $Revision: 1.2 $ $Date: 2002/02/16 03:06:33 $ + * @(#)$RCSfile: EditApplication.java,v $ $Revision: 1.3 $ $Date: 2003/05/14 19:03:59 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -15,19 +15,12 @@ package com.ibm.richtext.demo; import java.awt.Frame; -import java.awt.MenuBar; - import java.awt.datatransfer.Clipboard; import java.text.MessageFormat; import java.util.Vector; -import com.ibm.richtext.textlayout.attributes.AttributeMap; - -import com.ibm.richtext.textpanel.MTextPanel; -import com.ibm.richtext.textpanel.TextPanelSettings; - public abstract class EditApplication { private Clipboard fClipboard; diff --git a/icu4j/src/com/ibm/richtext/demo/EditDemo.java b/icu4j/src/com/ibm/richtext/demo/EditDemo.java index a4bdb67ff2..ebb327646a 100755 --- a/icu4j/src/com/ibm/richtext/demo/EditDemo.java +++ b/icu4j/src/com/ibm/richtext/demo/EditDemo.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: EditDemo.java,v $ $Revision: 1.3 $ $Date: 2002/02/16 03:06:33 $ + * @(#)$RCSfile: EditDemo.java,v $ $Revision: 1.4 $ $Date: 2003/05/14 19:03:59 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -16,17 +16,11 @@ package com.ibm.richtext.demo; import java.awt.FileDialog; import java.awt.Frame; -import java.awt.Menu; -import java.awt.MenuBar; import java.awt.Toolkit; import java.io.File; import java.io.StreamCorruptedException; - -import com.ibm.richtext.textlayout.attributes.AttributeMap; -import com.ibm.richtext.textpanel.MTextPanel; import com.ibm.richtext.textpanel.TextPanel; -import com.ibm.richtext.textpanel.TextPanelSettings; /** * EditDemo is the main class for a simple, multiple-document diff --git a/icu4j/src/com/ibm/richtext/demo/SyntaxColorer.java b/icu4j/src/com/ibm/richtext/demo/SyntaxColorer.java index 8546d69a39..40c9bfa9b7 100755 --- a/icu4j/src/com/ibm/richtext/demo/SyntaxColorer.java +++ b/icu4j/src/com/ibm/richtext/demo/SyntaxColorer.java @@ -1,5 +1,5 @@ /* - * $RCSfile: SyntaxColorer.java,v $ $Revision: 1.2 $ $Date: 2002/02/16 03:06:33 $ + * $RCSfile: SyntaxColorer.java,v $ $Revision: 1.3 $ $Date: 2003/05/14 19:03:59 $ * * (C) Copyright IBM Corp. 1999. All Rights Reserved. * @@ -216,8 +216,8 @@ public final class SyntaxColorer implements TextPanelListener { } if (limit < text.length()) { fBreakIter.following(limit); - int l; - if ((l=fBreakIter.previous()) <= limit) { + //int l; + if ((fBreakIter.previous()) <= limit) { limit = fBreakIter.next(); } } diff --git a/icu4j/src/com/ibm/richtext/print/PrintContext.java b/icu4j/src/com/ibm/richtext/print/PrintContext.java index 42836e820d..dbf8e85415 100755 --- a/icu4j/src/com/ibm/richtext/print/PrintContext.java +++ b/icu4j/src/com/ibm/richtext/print/PrintContext.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: PrintContext.java,v $ $Revision: 1.2 $ $Date: 2002/02/16 03:06:34 $ + * @(#)$RCSfile: PrintContext.java,v $ $Revision: 1.3 $ $Date: 2003/05/14 19:04:02 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -53,7 +53,7 @@ final class PrintContext implements Printable { if (false) throw new PrinterException("save trees"); - if (fPrintable.print(graphics, pageIndex) == fPrintable.PAGE_EXISTS) { + if (fPrintable.print(graphics, pageIndex) == MConstTextPrintable.PAGE_EXISTS) { return PAGE_EXISTS; } else { diff --git a/icu4j/src/com/ibm/richtext/styledtext/MParagraphBuffer.java b/icu4j/src/com/ibm/richtext/styledtext/MParagraphBuffer.java index 8a018ffdfd..0ffd6c9c1d 100755 --- a/icu4j/src/com/ibm/richtext/styledtext/MParagraphBuffer.java +++ b/icu4j/src/com/ibm/richtext/styledtext/MParagraphBuffer.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: MParagraphBuffer.java,v $ $Revision: 1.2 $ $Date: 2002/02/16 03:06:35 $ + * @(#)$RCSfile: MParagraphBuffer.java,v $ $Revision: 1.3 $ $Date: 2003/05/14 19:04:03 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -14,7 +14,6 @@ */ package com.ibm.richtext.styledtext; -import java.io.Serializable; import com.ibm.richtext.textlayout.attributes.AttributeMap; abstract class MParagraphBuffer diff --git a/icu4j/src/com/ibm/richtext/swingdemo/SwingDocumentWindow.java b/icu4j/src/com/ibm/richtext/swingdemo/SwingDocumentWindow.java index 693f6e7ea6..a2025e2850 100755 --- a/icu4j/src/com/ibm/richtext/swingdemo/SwingDocumentWindow.java +++ b/icu4j/src/com/ibm/richtext/swingdemo/SwingDocumentWindow.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: SwingDocumentWindow.java,v $ $Revision: 1.2 $ $Date: 2002/02/16 03:06:37 $ + * @(#)$RCSfile: SwingDocumentWindow.java,v $ $Revision: 1.3 $ $Date: 2003/05/14 19:04:02 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -18,12 +18,6 @@ import com.ibm.richtext.textpanel.JTextPanel; import com.ibm.richtext.textpanel.TextPanelListener; import com.ibm.richtext.textpanel.TextPanelSettings; -import com.ibm.richtext.styledtext.MConstText; -import com.ibm.richtext.styledtext.StyledText; -import com.ibm.richtext.styledtext.StyleModifier; - -import com.ibm.richtext.textlayout.attributes.AttributeMap; - import com.ibm.richtext.swingui.JTabRuler; import com.ibm.richtext.swingui.SwingMenuBuilder; @@ -38,7 +32,6 @@ import com.ibm.richtext.demo.TextDocument; import java.awt.BorderLayout; import java.awt.FileDialog; -import java.awt.Frame; import javax.swing.JFrame; import javax.swing.JMenu; diff --git a/icu4j/src/com/ibm/richtext/swingui/JObjectDialog.java b/icu4j/src/com/ibm/richtext/swingui/JObjectDialog.java index 3fc5fe2544..b3a0bdc3db 100755 --- a/icu4j/src/com/ibm/richtext/swingui/JObjectDialog.java +++ b/icu4j/src/com/ibm/richtext/swingui/JObjectDialog.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: JObjectDialog.java,v $ $Revision: 1.2 $ $Date: 2002/02/16 03:06:37 $ + * @(#)$RCSfile: JObjectDialog.java,v $ $Revision: 1.3 $ $Date: 2003/05/14 19:04:00 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -35,7 +35,6 @@ import java.awt.Container; import java.awt.Dimension; import java.awt.Frame; import java.awt.FlowLayout; -import java.awt.GridLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -44,7 +43,6 @@ import java.awt.event.MouseAdapter; import java.awt.event.WindowEvent; import java.awt.event.WindowAdapter; -import com.ibm.richtext.textlayout.attributes.AttributeMap; import com.ibm.richtext.textlayout.attributes.AttributeSet; import com.ibm.richtext.styledtext.MConstText; import com.ibm.richtext.styledtext.StyleModifier; diff --git a/icu4j/src/com/ibm/richtext/swingui/JTextFrame.java b/icu4j/src/com/ibm/richtext/swingui/JTextFrame.java index 7dd42070ed..5f9aa78307 100755 --- a/icu4j/src/com/ibm/richtext/swingui/JTextFrame.java +++ b/icu4j/src/com/ibm/richtext/swingui/JTextFrame.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: JTextFrame.java,v $ $Revision: 1.1 $ $Date: 2000/04/20 17:46:22 $ + * @(#)$RCSfile: JTextFrame.java,v $ $Revision: 1.2 $ $Date: 2003/05/14 19:04:00 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -18,9 +18,6 @@ import com.ibm.richtext.textpanel.MTextPanel; import com.ibm.richtext.textpanel.JTextPanel; import com.ibm.richtext.styledtext.MConstText; -import com.ibm.richtext.uiimpl.resources.FrameResources; -import com.ibm.richtext.uiimpl.ResourceUtils; - import java.awt.BorderLayout; import java.awt.Toolkit; import java.awt.datatransfer.Clipboard; diff --git a/icu4j/src/com/ibm/richtext/swingui/SwingMenuFactory.java b/icu4j/src/com/ibm/richtext/swingui/SwingMenuFactory.java index 0c19ae44a9..1186e53a1f 100755 --- a/icu4j/src/com/ibm/richtext/swingui/SwingMenuFactory.java +++ b/icu4j/src/com/ibm/richtext/swingui/SwingMenuFactory.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: SwingMenuFactory.java,v $ $Revision: 1.1 $ $Date: 2000/04/20 17:46:22 $ + * @(#)$RCSfile: SwingMenuFactory.java,v $ $Revision: 1.2 $ $Date: 2003/05/14 19:04:00 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -26,7 +26,6 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import com.ibm.richtext.uiimpl.resources.MenuData; -import com.ibm.richtext.uiimpl.EventListener; import com.ibm.richtext.uiimpl.MItem; import com.ibm.richtext.uiimpl.MItem.ItemFactory; diff --git a/icu4j/src/com/ibm/richtext/test/ITestTextPanel.java b/icu4j/src/com/ibm/richtext/test/ITestTextPanel.java index 6b80b96514..41da792cdc 100755 --- a/icu4j/src/com/ibm/richtext/test/ITestTextPanel.java +++ b/icu4j/src/com/ibm/richtext/test/ITestTextPanel.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: ITestTextPanel.java,v $ $Revision: 1.3 $ $Date: 2002/02/16 03:06:38 $ + * @(#)$RCSfile: ITestTextPanel.java,v $ $Revision: 1.4 $ $Date: 2003/05/14 19:04:02 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -27,7 +27,6 @@ import java.util.Date; import java.text.DateFormat; import com.ibm.richtext.textpanel.MTextPanel; -import com.ibm.richtext.textpanel.TextPanel; import com.ibm.richtext.awtui.TextFrame; public class ITestTextPanel extends Frame implements ActionListener { @@ -155,7 +154,7 @@ public class ITestTextPanel extends Frame implements ActionListener { break; case 1: - fTest._testModifications(fTest.MOD_TEXT, + fTest._testModifications(TestTextPanel.MOD_TEXT, true); break; diff --git a/icu4j/src/com/ibm/richtext/test/TestTextPanel.java b/icu4j/src/com/ibm/richtext/test/TestTextPanel.java index 27c26f7b2a..9c740746b2 100755 --- a/icu4j/src/com/ibm/richtext/test/TestTextPanel.java +++ b/icu4j/src/com/ibm/richtext/test/TestTextPanel.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: TestTextPanel.java,v $ $Revision: 1.8 $ $Date: 2002/02/16 03:06:38 $ + * @(#)$RCSfile: TestTextPanel.java,v $ $Revision: 1.9 $ $Date: 2003/05/14 19:04:02 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -38,8 +38,6 @@ import com.ibm.richtext.textlayout.attributes.AttributeMap; import com.ibm.richtext.styledtext.StyleModifier; import com.ibm.richtext.textlayout.attributes.AttributeSet; -import com.ibm.richtext.textlayout.attributes.TextAttribute; -import com.ibm.richtext.textlayout.attributes.AttributeMap; // Note: this used to be a TestFmwk test. If you add // more tests to it, be sure to add them to diff --git a/icu4j/src/com/ibm/richtext/test/TypingPerfTest.java b/icu4j/src/com/ibm/richtext/test/TypingPerfTest.java index 0d7a927a7a..3054b3df0d 100755 --- a/icu4j/src/com/ibm/richtext/test/TypingPerfTest.java +++ b/icu4j/src/com/ibm/richtext/test/TypingPerfTest.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: TypingPerfTest.java,v $ $Revision: 1.4 $ $Date: 2002/02/16 03:06:39 $ + * @(#)$RCSfile: TypingPerfTest.java,v $ $Revision: 1.5 $ $Date: 2003/05/14 19:04:02 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -17,7 +17,6 @@ package com.ibm.richtext.test; import java.awt.Button; import java.awt.GridLayout; import java.awt.Frame; -import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -26,8 +25,6 @@ import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.io.File; -import java.io.FileOutputStream; -import java.io.OutputStream; import java.io.PrintWriter; import java.io.IOException; diff --git a/icu4j/src/com/ibm/richtext/test/unit/TestAttributeMap.java b/icu4j/src/com/ibm/richtext/test/unit/TestAttributeMap.java index 37f7bfd300..0eb3c186a8 100755 --- a/icu4j/src/com/ibm/richtext/test/unit/TestAttributeMap.java +++ b/icu4j/src/com/ibm/richtext/test/unit/TestAttributeMap.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: TestAttributeMap.java,v $ $Revision: 1.4 $ $Date: 2002/02/16 03:06:39 $ + * @(#)$RCSfile: TestAttributeMap.java,v $ $Revision: 1.5 $ $Date: 2003/05/14 19:04:00 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -18,7 +18,6 @@ import com.ibm.icu.dev.test.TestFmwk; import com.ibm.richtext.textlayout.attributes.AttributeSet; import com.ibm.richtext.textlayout.attributes.TextAttribute; -import com.ibm.richtext.textlayout.attributes.Map; import com.ibm.richtext.textlayout.attributes.AttributeMap; import java.util.Enumeration; diff --git a/icu4j/src/com/ibm/richtext/test/unit/TestFormatter.java b/icu4j/src/com/ibm/richtext/test/unit/TestFormatter.java index f520212148..ced08f8a74 100755 --- a/icu4j/src/com/ibm/richtext/test/unit/TestFormatter.java +++ b/icu4j/src/com/ibm/richtext/test/unit/TestFormatter.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: TestFormatter.java,v $ $Revision: 1.3 $ $Date: 2002/02/16 03:06:40 $ + * @(#)$RCSfile: TestFormatter.java,v $ $Revision: 1.4 $ $Date: 2003/05/14 19:04:00 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -27,12 +27,9 @@ import com.ibm.richtext.textformat.TextOffset; import com.ibm.richtext.textformat.MFormatter; import java.awt.Color; -import java.awt.Frame; import java.awt.Graphics; -import java.awt.Image; import java.awt.Point; import java.awt.Rectangle; -import java.awt.Toolkit; import java.awt.image.BufferedImage; import java.util.Hashtable; diff --git a/icu4j/src/com/ibm/richtext/test/unit/TestMText.java b/icu4j/src/com/ibm/richtext/test/unit/TestMText.java index d1301f71a2..a55e2caa86 100755 --- a/icu4j/src/com/ibm/richtext/test/unit/TestMText.java +++ b/icu4j/src/com/ibm/richtext/test/unit/TestMText.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: TestMText.java,v $ $Revision: 1.5 $ $Date: 2003/02/05 06:48:52 $ + * @(#)$RCSfile: TestMText.java,v $ $Revision: 1.6 $ $Date: 2003/05/14 19:03:59 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -160,7 +160,7 @@ public class TestMText extends TestFmwk { ts = buf.getTimeStamp(); CharacterIterator cIter = buf.createCharacterIterator(); - for (char ch = cIter.first(); ch != cIter.DONE; ch = cIter.next()) { + for (char ch = cIter.first(); ch != CharacterIterator.DONE; ch = cIter.next()) { if (ch != allBold.at(0)) { errln("Character is wrong."); } diff --git a/icu4j/src/com/ibm/richtext/textapps/BidiDemo.java b/icu4j/src/com/ibm/richtext/textapps/BidiDemo.java index 10d411064c..6454081dbb 100755 --- a/icu4j/src/com/ibm/richtext/textapps/BidiDemo.java +++ b/icu4j/src/com/ibm/richtext/textapps/BidiDemo.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: BidiDemo.java,v $ $Revision: 1.3 $ $Date: 2002/12/12 23:26:57 $ + * @(#)$RCSfile: BidiDemo.java,v $ $Revision: 1.4 $ $Date: 2003/05/14 19:04:01 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -19,14 +19,11 @@ import com.ibm.richtext.styledtext.StyledText; import com.ibm.richtext.textlayout.attributes.AttributeMap; import com.ibm.richtext.awtui.TextFrame; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; import java.awt.Toolkit; import java.io.*; import java.net.URL; import java.util.ResourceBundle; -import java.util.Date; public class BidiDemo { diff --git a/icu4j/src/com/ibm/richtext/textapps/resources/Sample.java b/icu4j/src/com/ibm/richtext/textapps/resources/Sample.java index 111960a47e..b4be4d458a 100755 --- a/icu4j/src/com/ibm/richtext/textapps/resources/Sample.java +++ b/icu4j/src/com/ibm/richtext/textapps/resources/Sample.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/richtext/textapps/resources/Sample.java,v $ - * $Date: 2002/12/12 23:26:56 $ - * $Revision: 1.3 $ + * $Date: 2003/05/14 19:04:02 $ + * $Revision: 1.4 $ * ******************************************************************************* */ @@ -18,7 +18,7 @@ public final class Sample extends ListResourceBundle { public Object[][] getContents() { - Object sample = this.getClass().getResource("hagan"); + /*Object sample =*/ this.getClass().getResource("hagan"); return new Object[][] { { "default.sample", this.getClass().getResource("unicode.hebrew.red") }, diff --git a/icu4j/src/com/ibm/richtext/textformat/BidiParagraphRenderer.java b/icu4j/src/com/ibm/richtext/textformat/BidiParagraphRenderer.java index f6b2413024..b7d9cccef1 100755 --- a/icu4j/src/com/ibm/richtext/textformat/BidiParagraphRenderer.java +++ b/icu4j/src/com/ibm/richtext/textformat/BidiParagraphRenderer.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: BidiParagraphRenderer.java,v $ $Revision: 1.3 $ $Date: 2002/02/16 03:06:42 $ + * @(#)$RCSfile: BidiParagraphRenderer.java,v $ $Revision: 1.4 $ $Date: 2003/05/14 19:04:02 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -20,7 +20,6 @@ import java.awt.Rectangle; import java.awt.Shape; import java.util.Vector; -import java.util.Hashtable; import com.ibm.richtext.styledtext.MConstText; import com.ibm.richtext.styledtext.MTabRuler; @@ -1074,7 +1073,7 @@ final class BidiParagraphRenderer extends ParagraphRenderer { TextLayout layout = segment.fLayout; int offsetInLayout = charOffset - currentStart; TextHitInfo hit = TextHitInfo.afterOffset(offsetInLayout); - hit = layout.DEFAULT_CARET_POLICY.getStrongCaret(hit, hit.getOtherHit(), layout); + hit = TextLayout.DEFAULT_CARET_POLICY.getStrongCaret(hit, hit.getOtherHit(), layout); float[] info = layout.getCaretInfo(hit); int layoutPos = line.fLeadingMargin + segment.fDistanceFromLeadingMargin; if (line.fLeftToRight) { diff --git a/icu4j/src/com/ibm/richtext/textformat/MTextIterator.java b/icu4j/src/com/ibm/richtext/textformat/MTextIterator.java index a71a3bf751..7b4fafbe92 100755 --- a/icu4j/src/com/ibm/richtext/textformat/MTextIterator.java +++ b/icu4j/src/com/ibm/richtext/textformat/MTextIterator.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: MTextIterator.java,v $ $Revision: 1.5 $ $Date: 2002/12/13 00:19:49 $ + * @(#)$RCSfile: MTextIterator.java,v $ $Revision: 1.6 $ $Date: 2003/05/14 19:04:02 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -22,7 +22,6 @@ import com.ibm.richtext.textlayout.attributes.AttributeMap; ///*JDK12IMPORTS import java.text.AttributedCharacterIterator; -import java.text.AttributedCharacterIterator.Attribute; import java.util.Map; import java.util.Set; //JDK12IMPORTS*/ diff --git a/icu4j/src/com/ibm/richtext/textformat/ParagraphRenderer.java b/icu4j/src/com/ibm/richtext/textformat/ParagraphRenderer.java index 6ebb056caf..7d2658648a 100755 --- a/icu4j/src/com/ibm/richtext/textformat/ParagraphRenderer.java +++ b/icu4j/src/com/ibm/richtext/textformat/ParagraphRenderer.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: ParagraphRenderer.java,v $ $Revision: 1.2 $ $Date: 2002/02/16 03:06:44 $ + * @(#)$RCSfile: ParagraphRenderer.java,v $ $Revision: 1.3 $ $Date: 2003/05/14 19:04:02 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -16,16 +16,13 @@ package com.ibm.richtext.textformat; import com.ibm.richtext.textlayout.attributes.AttributeMap; -import com.ibm.richtext.textlayout.attributes.TextAttribute; import com.ibm.richtext.styledtext.MConstText; -import java.awt.Color; ///*JDK12IMPORTS import java.awt.font.FontRenderContext; import java.awt.font.LineBreakMeasurer; -import java.awt.Graphics2D; //JDK12IMPORTS*/ /*JDK11IMPORTS diff --git a/icu4j/src/com/ibm/richtext/textformat/TestMTextIterator.java b/icu4j/src/com/ibm/richtext/textformat/TestMTextIterator.java index e1a5b438b8..a7d2bcd4c6 100755 --- a/icu4j/src/com/ibm/richtext/textformat/TestMTextIterator.java +++ b/icu4j/src/com/ibm/richtext/textformat/TestMTextIterator.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: TestMTextIterator.java,v $ $Revision: 1.3 $ $Date: 2002/12/13 00:19:08 $ + * @(#)$RCSfile: TestMTextIterator.java,v $ $Revision: 1.4 $ $Date: 2003/05/14 19:04:02 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -54,7 +54,7 @@ class TestMTextIterator { ch = iter.next(); } - if (ch != iter.DONE) { + if (ch != MTextIterator.DONE) { throw new Error("Iterator is not done."); } diff --git a/icu4j/src/com/ibm/richtext/textpanel/ATextPanelImpl.java b/icu4j/src/com/ibm/richtext/textpanel/ATextPanelImpl.java index fe2fede767..f5965776d0 100755 --- a/icu4j/src/com/ibm/richtext/textpanel/ATextPanelImpl.java +++ b/icu4j/src/com/ibm/richtext/textpanel/ATextPanelImpl.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: ATextPanelImpl.java,v $ $Revision: 1.3 $ $Date: 2002/02/16 03:06:46 $ + * @(#)$RCSfile: ATextPanelImpl.java,v $ $Revision: 1.4 $ $Date: 2003/05/14 19:04:00 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -16,11 +16,9 @@ package com.ibm.richtext.textpanel; import java.awt.Adjustable; import java.awt.Component; -import java.awt.Graphics; import java.awt.datatransfer.Clipboard; import com.ibm.richtext.textlayout.attributes.AttributeMap; -import com.ibm.richtext.textlayout.attributes.AttributeSet; import com.ibm.richtext.styledtext.StyleModifier; import com.ibm.richtext.styledtext.MConstText; diff --git a/icu4j/src/com/ibm/richtext/textpanel/JTextPanel.java b/icu4j/src/com/ibm/richtext/textpanel/JTextPanel.java index a77837f318..c1e7547743 100755 --- a/icu4j/src/com/ibm/richtext/textpanel/JTextPanel.java +++ b/icu4j/src/com/ibm/richtext/textpanel/JTextPanel.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: JTextPanel.java,v $ $Revision: 1.4 $ $Date: 2002/02/16 03:06:47 $ + * @(#)$RCSfile: JTextPanel.java,v $ $Revision: 1.5 $ $Date: 2003/05/14 19:04:00 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -30,7 +30,6 @@ import com.ibm.richtext.textlayout.attributes.AttributeMap; import com.ibm.richtext.styledtext.StyleModifier; import com.ibm.richtext.styledtext.MConstText; -import com.ibm.richtext.styledtext.StyledText; /** * JTextPanel is an implementation of MTextPanel in a Swing JPanel. diff --git a/icu4j/src/com/ibm/richtext/textpanel/Scroller.java b/icu4j/src/com/ibm/richtext/textpanel/Scroller.java index 6bb404dc25..e7f7e16983 100755 --- a/icu4j/src/com/ibm/richtext/textpanel/Scroller.java +++ b/icu4j/src/com/ibm/richtext/textpanel/Scroller.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: Scroller.java,v $ $Revision: 1.4 $ $Date: 2001/10/30 02:42:48 $ + * @(#)$RCSfile: Scroller.java,v $ $Revision: 1.5 $ $Date: 2003/05/14 19:04:00 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -28,7 +28,6 @@ package com.ibm.richtext.textpanel; import java.awt.Component; import java.awt.Rectangle; -import java.awt.Dimension; import java.awt.event.AdjustmentListener; import java.awt.event.AdjustmentEvent; diff --git a/icu4j/src/com/ibm/richtext/textpanel/SelectionDragInteractor.java b/icu4j/src/com/ibm/richtext/textpanel/SelectionDragInteractor.java index 7f9ed1f65a..4ccbbd7ed9 100755 --- a/icu4j/src/com/ibm/richtext/textpanel/SelectionDragInteractor.java +++ b/icu4j/src/com/ibm/richtext/textpanel/SelectionDragInteractor.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: SelectionDragInteractor.java,v $ $Revision: 1.1 $ $Date: 2000/04/20 17:51:23 $ + * @(#)$RCSfile: SelectionDragInteractor.java,v $ $Revision: 1.2 $ $Date: 2003/05/14 19:04:00 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -14,9 +14,6 @@ */ package com.ibm.richtext.textpanel; -import java.text.BreakIterator; - -import java.awt.event.ActionEvent; import java.awt.event.FocusEvent; import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; diff --git a/icu4j/src/com/ibm/richtext/textpanel/StyleChangeCommand.java b/icu4j/src/com/ibm/richtext/textpanel/StyleChangeCommand.java index 84771ab5be..2f843a80f0 100755 --- a/icu4j/src/com/ibm/richtext/textpanel/StyleChangeCommand.java +++ b/icu4j/src/com/ibm/richtext/textpanel/StyleChangeCommand.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: StyleChangeCommand.java,v $ $Revision: 1.1 $ $Date: 2000/04/20 17:51:23 $ + * @(#)$RCSfile: StyleChangeCommand.java,v $ $Revision: 1.2 $ $Date: 2003/05/14 19:04:00 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -15,7 +15,6 @@ package com.ibm.richtext.textpanel; import com.ibm.richtext.styledtext.StyleModifier; -import com.ibm.richtext.styledtext.MConstText; import com.ibm.richtext.styledtext.MText; import com.ibm.richtext.textformat.TextOffset; diff --git a/icu4j/src/com/ibm/richtext/textpanel/TextCommand.java b/icu4j/src/com/ibm/richtext/textpanel/TextCommand.java index 4a5c5734aa..a0925bae2a 100755 --- a/icu4j/src/com/ibm/richtext/textpanel/TextCommand.java +++ b/icu4j/src/com/ibm/richtext/textpanel/TextCommand.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: TextCommand.java,v $ $Revision: 1.1 $ $Date: 2000/04/20 17:51:23 $ + * @(#)$RCSfile: TextCommand.java,v $ $Revision: 1.2 $ $Date: 2003/05/14 19:04:00 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -14,7 +14,6 @@ */ package com.ibm.richtext.textpanel; -import com.ibm.richtext.styledtext.MConstText; import com.ibm.richtext.styledtext.MText; import com.ibm.richtext.textformat.TextOffset; diff --git a/icu4j/src/com/ibm/richtext/textpanel/TextComponent.java b/icu4j/src/com/ibm/richtext/textpanel/TextComponent.java index bbc3b91b5c..ea6f55be08 100755 --- a/icu4j/src/com/ibm/richtext/textpanel/TextComponent.java +++ b/icu4j/src/com/ibm/richtext/textpanel/TextComponent.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: TextComponent.java,v $ $Revision: 1.5 $ $Date: 2002/02/16 03:06:47 $ + * @(#)$RCSfile: TextComponent.java,v $ $Revision: 1.6 $ $Date: 2003/05/14 19:04:00 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -16,7 +16,6 @@ package com.ibm.richtext.textpanel; import java.awt.Color; import java.awt.Component; -import java.awt.Dimension; import java.awt.Graphics; import java.awt.Image; import java.awt.Point; @@ -32,7 +31,6 @@ import java.awt.event.ComponentEvent; import java.awt.event.FocusEvent; import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; -import java.awt.event.WindowEvent; import com.ibm.richtext.styledtext.MConstText; import com.ibm.richtext.styledtext.MText; @@ -835,7 +833,7 @@ class TextComponent extends FakeComponent if (selStart != null && selEnd != null) { haveSelection = true; - redrawRect.add(fFormatter.getBoundingRect(selStart, selEnd, fOrigin, fFormatter.LOOSE)); + redrawRect.add(fFormatter.getBoundingRect(selStart, selEnd, fOrigin, MFormatter.LOOSE)); //System.out.println("[3] redrawRect: " + redrawRect); } else { @@ -963,7 +961,7 @@ class TextComponent extends FakeComponent Rectangle getBoundingRect(TextOffset offset1, TextOffset offset2) { - Rectangle r = fFormatter.getBoundingRect(offset1, offset2, fOrigin, fFormatter.TIGHT); + Rectangle r = fFormatter.getBoundingRect(offset1, offset2, fOrigin, MFormatter.TIGHT); //r.width += CARET_SLOP; //System.out.println("offset1="+offset1+"; offset2="+offset2); //System.out.println("bounds width="+r.width+"; host width="+(fHost.getBounds().width)); diff --git a/icu4j/src/com/ibm/richtext/textpanel/TextEditBehavior.java b/icu4j/src/com/ibm/richtext/textpanel/TextEditBehavior.java index 24aa02ee38..63cf4534ea 100755 --- a/icu4j/src/com/ibm/richtext/textpanel/TextEditBehavior.java +++ b/icu4j/src/com/ibm/richtext/textpanel/TextEditBehavior.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: TextEditBehavior.java,v $ $Revision: 1.2 $ $Date: 2002/02/16 03:06:48 $ + * @(#)$RCSfile: TextEditBehavior.java,v $ $Revision: 1.3 $ $Date: 2003/05/14 19:04:00 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -18,7 +18,6 @@ import java.awt.Rectangle; import com.ibm.richtext.textlayout.attributes.AttributeMap; -import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; diff --git a/icu4j/src/com/ibm/richtext/textpanel/TextPanel.java b/icu4j/src/com/ibm/richtext/textpanel/TextPanel.java index 73f14bec36..d13493e1ab 100755 --- a/icu4j/src/com/ibm/richtext/textpanel/TextPanel.java +++ b/icu4j/src/com/ibm/richtext/textpanel/TextPanel.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: TextPanel.java,v $ $Revision: 1.3 $ $Date: 2002/02/16 03:06:48 $ + * @(#)$RCSfile: TextPanel.java,v $ $Revision: 1.4 $ $Date: 2003/05/14 19:04:00 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -26,7 +26,6 @@ import com.ibm.richtext.textlayout.attributes.AttributeMap; import com.ibm.richtext.styledtext.StyleModifier; import com.ibm.richtext.styledtext.MConstText; -import com.ibm.richtext.styledtext.StyledText; /** * TextPanel is an implementation of MTextPanel in an AWT Panel. diff --git a/icu4j/src/com/ibm/richtext/textpanel/TextSelection.java b/icu4j/src/com/ibm/richtext/textpanel/TextSelection.java index 44a7a3874d..ec67151229 100755 --- a/icu4j/src/com/ibm/richtext/textpanel/TextSelection.java +++ b/icu4j/src/com/ibm/richtext/textpanel/TextSelection.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: TextSelection.java,v $ $Revision: 1.2 $ $Date: 2001/10/30 02:42:48 $ + * @(#)$RCSfile: TextSelection.java,v $ $Revision: 1.3 $ $Date: 2003/05/14 19:04:00 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -24,10 +24,8 @@ package com.ibm.richtext.textpanel; import java.awt.Graphics; import java.awt.Color; import java.awt.Rectangle; -import java.awt.Point; import java.text.BreakIterator; -import java.text.CharacterIterator; import java.awt.event.MouseEvent; import java.awt.event.KeyEvent; @@ -189,7 +187,7 @@ class TextSelection extends Behavior implements Runnable { // leave it unchanged. Otherwise move to next boundary. int nextPos = fBoundaries.following(position); if (fBoundaries.previous() == position && - offset.fPlacement==offset.BEFORE_OFFSET) { + offset.fPlacement==TextOffset.BEFORE_OFFSET) { return; } @@ -226,7 +224,7 @@ class TextSelection extends Behavior implements Runnable { int prevPos = fBoundaries.previous(); if (prevPos == position) { - if (!alwaysMove && offset.fPlacement==offset.AFTER_OFFSET) { + if (!alwaysMove && offset.fPlacement==TextOffset.AFTER_OFFSET) { return; } @@ -508,7 +506,7 @@ class TextSelection extends Behavior implements Runnable { */ public static boolean keyAffectsSelection(KeyEvent e) { - if (e.getID() != e.KEY_PRESSED) { + if (e.getID() != KeyEvent.KEY_PRESSED) { return false; } diff --git a/icu4j/src/com/ibm/richtext/textpanel/TransferableText.java b/icu4j/src/com/ibm/richtext/textpanel/TransferableText.java index 4081ac660a..e31a34b9ae 100755 --- a/icu4j/src/com/ibm/richtext/textpanel/TransferableText.java +++ b/icu4j/src/com/ibm/richtext/textpanel/TransferableText.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: TransferableText.java,v $ $Revision: 1.1 $ $Date: 2000/04/20 17:51:23 $ + * @(#)$RCSfile: TransferableText.java,v $ $Revision: 1.2 $ $Date: 2003/05/14 19:04:00 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -18,7 +18,6 @@ import java.awt.datatransfer.StringSelection; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.UnsupportedFlavorException; import java.io.IOException; -import java.io.ByteArrayInputStream; import com.ibm.richtext.styledtext.MConstText; diff --git a/icu4j/src/com/ibm/richtext/textpanel/TypingInteractor.java b/icu4j/src/com/ibm/richtext/textpanel/TypingInteractor.java index 1a07fe8908..adecb86428 100755 --- a/icu4j/src/com/ibm/richtext/textpanel/TypingInteractor.java +++ b/icu4j/src/com/ibm/richtext/textpanel/TypingInteractor.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: TypingInteractor.java,v $ $Revision: 1.2 $ $Date: 2002/02/16 03:06:48 $ + * @(#)$RCSfile: TypingInteractor.java,v $ $Revision: 1.3 $ $Date: 2003/05/14 19:04:00 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -83,7 +83,7 @@ final class TypingInteractor extends Behavior { final int id = event.getID(); - if (id == event.KEY_TYPED) { + if (id == KeyEvent.KEY_TYPED) { return isTypingInteractorChar(event.getKeyChar()); } else { diff --git a/icu4j/src/com/ibm/richtext/uiimpl/ChoiceMenuItemSet.java b/icu4j/src/com/ibm/richtext/uiimpl/ChoiceMenuItemSet.java index ec36a0e2ae..f4e4999b35 100755 --- a/icu4j/src/com/ibm/richtext/uiimpl/ChoiceMenuItemSet.java +++ b/icu4j/src/com/ibm/richtext/uiimpl/ChoiceMenuItemSet.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: ChoiceMenuItemSet.java,v $ $Revision: 1.2 $ $Date: 2002/02/16 03:06:49 $ + * @(#)$RCSfile: ChoiceMenuItemSet.java,v $ $Revision: 1.3 $ $Date: 2003/05/14 19:04:00 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -18,11 +18,7 @@ import java.util.EventObject; import java.util.Hashtable; -import com.ibm.richtext.textlayout.attributes.AttributeSet; -import com.ibm.richtext.styledtext.StyleModifier; - import com.ibm.richtext.textpanel.MTextPanel; -import com.ibm.richtext.textpanel.TextPanelEvent; import com.ibm.richtext.uiimpl.resources.MenuData; public abstract class ChoiceMenuItemSet extends MenuItemSet { diff --git a/icu4j/src/com/ibm/richtext/uiimpl/DialogItem.java b/icu4j/src/com/ibm/richtext/uiimpl/DialogItem.java index 073ae2b316..02e2429ef5 100755 --- a/icu4j/src/com/ibm/richtext/uiimpl/DialogItem.java +++ b/icu4j/src/com/ibm/richtext/uiimpl/DialogItem.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: DialogItem.java,v $ $Revision: 1.1 $ $Date: 2000/04/20 17:52:32 $ + * @(#)$RCSfile: DialogItem.java,v $ $Revision: 1.2 $ $Date: 2003/05/14 19:04:00 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -19,7 +19,6 @@ import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import com.ibm.richtext.textpanel.MTextPanel; -import com.ibm.richtext.textpanel.TextPanelEvent; import com.ibm.richtext.uiimpl.resources.MenuData; public final class DialogItem extends CommandMenuItem { diff --git a/icu4j/src/com/ibm/richtext/uiimpl/MenuBuilder.java b/icu4j/src/com/ibm/richtext/uiimpl/MenuBuilder.java index db1e79a0aa..d28ab04044 100755 --- a/icu4j/src/com/ibm/richtext/uiimpl/MenuBuilder.java +++ b/icu4j/src/com/ibm/richtext/uiimpl/MenuBuilder.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: MenuBuilder.java,v $ $Revision: 1.3 $ $Date: 2002/02/16 03:06:50 $ + * @(#)$RCSfile: MenuBuilder.java,v $ $Revision: 1.4 $ $Date: 2003/05/14 19:04:00 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -17,12 +17,8 @@ package com.ibm.richtext.uiimpl; import java.awt.Color; import java.awt.Frame; -import java.awt.Window; import java.text.NumberFormat; -import com.ibm.richtext.styledtext.MConstText; - -import com.ibm.richtext.textlayout.attributes.AttributeMap; import com.ibm.richtext.textlayout.attributes.TextAttribute; import com.ibm.richtext.textpanel.MTextPanel; import com.ibm.richtext.textpanel.KeyRemap; diff --git a/icu4j/src/com/ibm/richtext/uiimpl/MenuItemSet.java b/icu4j/src/com/ibm/richtext/uiimpl/MenuItemSet.java index 0cd96d450c..864ddb07ff 100755 --- a/icu4j/src/com/ibm/richtext/uiimpl/MenuItemSet.java +++ b/icu4j/src/com/ibm/richtext/uiimpl/MenuItemSet.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: MenuItemSet.java,v $ $Revision: 1.1 $ $Date: 2000/04/20 17:52:32 $ + * @(#)$RCSfile: MenuItemSet.java,v $ $Revision: 1.2 $ $Date: 2003/05/14 19:04:00 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -17,7 +17,6 @@ package com.ibm.richtext.uiimpl; import com.ibm.richtext.textpanel.MTextPanel; import com.ibm.richtext.textpanel.TextPanelEvent; import com.ibm.richtext.textpanel.TextPanelListener; -import com.ibm.richtext.uiimpl.resources.MenuData; public abstract class MenuItemSet implements TextPanelListener { diff --git a/icu4j/src/com/ibm/richtext/uiimpl/SingleCheckMenuItem.java b/icu4j/src/com/ibm/richtext/uiimpl/SingleCheckMenuItem.java index be5ac8754b..1341c6402e 100755 --- a/icu4j/src/com/ibm/richtext/uiimpl/SingleCheckMenuItem.java +++ b/icu4j/src/com/ibm/richtext/uiimpl/SingleCheckMenuItem.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: SingleCheckMenuItem.java,v $ $Revision: 1.1 $ $Date: 2000/04/20 17:52:32 $ + * @(#)$RCSfile: SingleCheckMenuItem.java,v $ $Revision: 1.2 $ $Date: 2003/05/14 19:04:00 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -15,7 +15,6 @@ package com.ibm.richtext.uiimpl; import com.ibm.richtext.textpanel.MTextPanel; -import com.ibm.richtext.textpanel.TextPanelEvent; import com.ibm.richtext.uiimpl.resources.MenuData; public abstract class SingleCheckMenuItem extends MenuItemSet { diff --git a/icu4j/src/com/ibm/richtext/uiimpl/TabRulerImpl.java b/icu4j/src/com/ibm/richtext/uiimpl/TabRulerImpl.java index 1729327826..e3a2faaef7 100755 --- a/icu4j/src/com/ibm/richtext/uiimpl/TabRulerImpl.java +++ b/icu4j/src/com/ibm/richtext/uiimpl/TabRulerImpl.java @@ -1,5 +1,5 @@ /* - * @(#)$RCSfile: TabRulerImpl.java,v $ $Revision: 1.3 $ $Date: 2002/02/16 03:06:50 $ + * @(#)$RCSfile: TabRulerImpl.java,v $ $Revision: 1.4 $ $Date: 2003/05/14 19:04:00 $ * * (C) Copyright IBM Corp. 1998-1999. All Rights Reserved. * @@ -18,16 +18,12 @@ import java.awt.Color; import java.awt.Component; import java.awt.Dimension; import java.awt.FontMetrics; -import java.awt.Frame; import java.awt.Graphics; import java.awt.Image; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; import java.awt.event.MouseMotionListener; import java.awt.event.MouseListener; import java.awt.event.MouseEvent; -import java.awt.event.InputEvent; import com.ibm.richtext.textlayout.attributes.AttributeMap; import com.ibm.richtext.textlayout.attributes.TextAttribute; @@ -227,8 +223,8 @@ public final class TabRulerImpl implements MouseListener, MouseMotionListener int changeCode = event.getID(); - if (changeCode == event.SELECTION_STYLES_CHANGED || - changeCode == event.TEXT_CHANGED) { + if (changeCode == TextPanelEvent.SELECTION_STYLES_CHANGED || + changeCode == TextPanelEvent.TEXT_CHANGED) { int offset = fTextPanel.getSelectionStart(); AttributeMap style = fTextPanel.getText().paragraphStyleAt(offset); @@ -236,7 +232,7 @@ public final class TabRulerImpl implements MouseListener, MouseMotionListener fTabRuler.set(style, false); fTabRuler.setLeftToRight(leftToRight, true); } - else if (changeCode == event.FORMAT_WIDTH_CHANGED) { + else if (changeCode == TextPanelEvent.FORMAT_WIDTH_CHANGED) { fTabRuler.setFormatWidth(fTextPanel.getFormatWidth(), true); }