From 3446660d27d71490999872271e60d06854747d60 Mon Sep 17 00:00:00 2001 From: Yoshito Umaoka Date: Thu, 28 Sep 2023 12:04:28 -0400 Subject: [PATCH] ICU-22325 BRS74 Clean up import statements --- icu4j/.gitignore | 6 +++++- .../dev/test/util/ICUResourceBundleTest.java | 2 +- .../ibm/icu/dev/test/util/ULocaleTest.java | 1 - .../java/com/ibm/icu/impl/locale/LSR.java | 1 + .../impl/personname/FieldModifierImpl.java | 1 - .../personname/PersonNameFormatterImpl.java | 6 +++++- .../ibm/icu/impl/units/UnitPreferences.java | 7 +++++-- .../com/ibm/icu/text/RBBITableBuilder.java | 2 -- .../main/java/com/ibm/icu/util/Calendar.java | 2 -- .../test/calendar/InTemporalLeapYearTest.java | 1 - .../dev/test/calendar/OrdinalMonthTest.java | 3 --- .../test/calendar/TemporalMonthCodeTest.java | 1 - .../test/format/DateIntervalFormatTest.java | 2 +- .../format/PersonNameConsistencyTest.java | 19 +++++++++++++------ .../dev/test/number/NumberSkeletonTest.java | 2 +- .../icu/dev/test/text/SpoofCheckerTest.java | 3 --- 16 files changed, 32 insertions(+), 27 deletions(-) diff --git a/icu4j/.gitignore b/icu4j/.gitignore index 11cee88cc3e..c79081034b9 100644 --- a/icu4j/.gitignore +++ b/icu4j/.gitignore @@ -1,3 +1,7 @@ /release_cldr -**/dependency-reduced-pom.xml +# Eclipse IDE generated files +dependency-reduced-pom.xml +.project +.settings +.classpath \ No newline at end of file diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/ICUResourceBundleTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/ICUResourceBundleTest.java index 031d39d9cc5..fc501299dda 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/ICUResourceBundleTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/ICUResourceBundleTest.java @@ -25,7 +25,6 @@ import java.util.Set; import java.util.TreeSet; import java.util.jar.JarEntry; -import com.ibm.icu.impl.UResource; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -33,6 +32,7 @@ import org.junit.runners.JUnit4; import com.ibm.icu.dev.test.TestFmwk; import com.ibm.icu.impl.ICUData; import com.ibm.icu.impl.ICUResourceBundle; +import com.ibm.icu.impl.UResource; import com.ibm.icu.impl.Utility; import com.ibm.icu.text.BreakIterator; import com.ibm.icu.text.UTF16; diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/ULocaleTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/ULocaleTest.java index a3dcb06a537..5f75bf64792 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/ULocaleTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/ULocaleTest.java @@ -32,7 +32,6 @@ import java.util.regex.Pattern; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; import com.ibm.icu.dev.test.TestFmwk; import com.ibm.icu.dev.test.TestUtil; diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/impl/locale/LSR.java b/icu4j/main/core/src/main/java/com/ibm/icu/impl/locale/LSR.java index 23ba620e72a..b61f80ea69f 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/impl/locale/LSR.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/impl/locale/LSR.java @@ -4,6 +4,7 @@ package com.ibm.icu.impl.locale; import java.util.List; import java.util.Objects; + import com.ibm.icu.lang.UScript; public final class LSR { diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/impl/personname/FieldModifierImpl.java b/icu4j/main/core/src/main/java/com/ibm/icu/impl/personname/FieldModifierImpl.java index e8657a9365f..b2d0d1a594c 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/impl/personname/FieldModifierImpl.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/impl/personname/FieldModifierImpl.java @@ -3,7 +3,6 @@ package com.ibm.icu.impl.personname; import java.util.Locale; -import java.util.StringTokenizer; import com.ibm.icu.lang.UCharacter; import com.ibm.icu.text.BreakIterator; diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/impl/personname/PersonNameFormatterImpl.java b/icu4j/main/core/src/main/java/com/ibm/icu/impl/personname/PersonNameFormatterImpl.java index 45772fe3c44..4b708f2a683 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/impl/personname/PersonNameFormatterImpl.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/impl/personname/PersonNameFormatterImpl.java @@ -5,7 +5,11 @@ package com.ibm.icu.impl.personname; import static com.ibm.icu.util.UResourceBundle.ARRAY; import static com.ibm.icu.util.UResourceBundle.STRING; -import java.util.*; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.Locale; +import java.util.Set; import com.ibm.icu.impl.ICUData; import com.ibm.icu.impl.ICUResourceBundle; diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/impl/units/UnitPreferences.java b/icu4j/main/core/src/main/java/com/ibm/icu/impl/units/UnitPreferences.java index 43fca24c10a..ec4d7fec718 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/impl/units/UnitPreferences.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/impl/units/UnitPreferences.java @@ -3,12 +3,15 @@ package com.ibm.icu.impl.units; import java.math.BigDecimal; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import com.ibm.icu.impl.ICUData; import com.ibm.icu.impl.ICUResourceBundle; import com.ibm.icu.impl.UResource; -import com.ibm.icu.util.MeasureUnit; import com.ibm.icu.util.ULocale; import com.ibm.icu.util.UResourceBundle; diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/text/RBBITableBuilder.java b/icu4j/main/core/src/main/java/com/ibm/icu/text/RBBITableBuilder.java index e6aa822c92a..a04ea6b4732 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/text/RBBITableBuilder.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/text/RBBITableBuilder.java @@ -20,8 +20,6 @@ import java.util.TreeSet; import com.ibm.icu.impl.Assert; import com.ibm.icu.impl.RBBIDataWrapper; -import com.ibm.icu.lang.UCharacter; -import com.ibm.icu.lang.UProperty; import com.ibm.icu.text.RBBIRuleBuilder.IntPair; /** diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/util/Calendar.java b/icu4j/main/core/src/main/java/com/ibm/icu/util/Calendar.java index e3c69174281..52fa70f26be 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/util/Calendar.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/util/Calendar.java @@ -12,11 +12,9 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.Serializable; import java.text.StringCharacterIterator; -import java.util.Arrays; import java.util.ArrayList; import java.util.Date; import java.util.Locale; -import java.util.List; import java.util.MissingResourceException; import com.ibm.icu.impl.CalType; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/InTemporalLeapYearTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/InTemporalLeapYearTest.java index 35a8bc655b4..2453aba85bf 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/InTemporalLeapYearTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/InTemporalLeapYearTest.java @@ -10,7 +10,6 @@ import com.ibm.icu.dev.test.TestFmwk; import com.ibm.icu.util.Calendar; import com.ibm.icu.util.GregorianCalendar; import com.ibm.icu.util.HebrewCalendar; -import com.ibm.icu.util.IslamicCalendar; import com.ibm.icu.util.ULocale; @RunWith(JUnit4.class) diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/OrdinalMonthTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/OrdinalMonthTest.java index ce866167194..fdab8639b8b 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/OrdinalMonthTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/OrdinalMonthTest.java @@ -7,11 +7,8 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; import com.ibm.icu.util.Calendar; -import com.ibm.icu.util.CopticCalendar; -import com.ibm.icu.util.EthiopicCalendar; import com.ibm.icu.util.GregorianCalendar; import com.ibm.icu.util.HebrewCalendar; -import com.ibm.icu.util.IslamicCalendar; import com.ibm.icu.util.ULocale; @RunWith(JUnit4.class) diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/TemporalMonthCodeTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/TemporalMonthCodeTest.java index 3eafc5e8345..6aa4fa7a8d4 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/TemporalMonthCodeTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/TemporalMonthCodeTest.java @@ -12,7 +12,6 @@ import com.ibm.icu.util.CopticCalendar; import com.ibm.icu.util.EthiopicCalendar; import com.ibm.icu.util.GregorianCalendar; import com.ibm.icu.util.HebrewCalendar; -import com.ibm.icu.util.IslamicCalendar; import com.ibm.icu.util.ULocale; @RunWith(JUnit4.class) diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DateIntervalFormatTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DateIntervalFormatTest.java index 9707c3cccb9..76384c4cdd4 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DateIntervalFormatTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DateIntervalFormatTest.java @@ -37,8 +37,8 @@ import com.ibm.icu.text.DateFormat; import com.ibm.icu.text.DateIntervalFormat; import com.ibm.icu.text.DateIntervalFormat.FormattedDateInterval; import com.ibm.icu.text.DateIntervalInfo; -import com.ibm.icu.text.DateTimePatternGenerator; import com.ibm.icu.text.DateIntervalInfo.PatternInfo; +import com.ibm.icu.text.DateTimePatternGenerator; import com.ibm.icu.text.DisplayContext; import com.ibm.icu.text.SimpleDateFormat; import com.ibm.icu.util.Calendar; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/PersonNameConsistencyTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/PersonNameConsistencyTest.java index 8df31afb8b2..58590135f25 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/PersonNameConsistencyTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/PersonNameConsistencyTest.java @@ -2,19 +2,26 @@ // License & terms of use: http://www.unicode.org/copyright.html package com.ibm.icu.dev.test.format; -import java.io.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.LineNumberReader; import java.nio.charset.StandardCharsets; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; + +import org.junit.Test; +import org.junit.runner.RunWith; import com.ibm.icu.dev.test.TestFmwk; import com.ibm.icu.dev.test.TestUtil; import com.ibm.icu.text.PersonName; import com.ibm.icu.text.PersonNameFormatter; import com.ibm.icu.text.SimplePersonName; -import com.ibm.icu.dev.test.rbbi.RBBITstUtils; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; import junitparams.JUnitParamsRunner; import junitparams.Parameters; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/number/NumberSkeletonTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/number/NumberSkeletonTest.java index 515e75fd5ab..9792d9f816e 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/number/NumberSkeletonTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/number/NumberSkeletonTest.java @@ -9,9 +9,9 @@ import static org.junit.Assert.fail; import java.math.RoundingMode; import java.util.Locale; -import com.ibm.icu.number.LocalizedNumberFormatter; import org.junit.Test; +import com.ibm.icu.number.LocalizedNumberFormatter; import com.ibm.icu.number.NumberFormatter; import com.ibm.icu.number.SkeletonSyntaxException; import com.ibm.icu.util.ULocale; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/text/SpoofCheckerTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/text/SpoofCheckerTest.java index dae06e22fbd..d6c8539e60b 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/text/SpoofCheckerTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/text/SpoofCheckerTest.java @@ -31,10 +31,7 @@ import org.junit.runners.JUnit4; import com.ibm.icu.dev.test.TestFmwk; import com.ibm.icu.dev.test.TestUtil; import com.ibm.icu.dev.test.TestUtil.JavaVendor; -import com.ibm.icu.impl.UCharacterProperty; import com.ibm.icu.impl.Utility; -import com.ibm.icu.lang.UCharacter; -import com.ibm.icu.lang.UProperty; import com.ibm.icu.lang.UScript; import com.ibm.icu.text.Bidi; import com.ibm.icu.text.Normalizer2;