From 49e8b992962c048a31bc542d915a9daa6f4b3dc5 Mon Sep 17 00:00:00 2001 From: Yoshito Umaoka Date: Tue, 21 Mar 2023 14:26:16 -0400 Subject: [PATCH] ICU-22220 BRS73 Clean up Java import statements --- .../com/ibm/icu/impl/breakiter/MlBreakEngine.java | 12 ++++++------ .../impl/personname/PersonNameFormatterImpl.java | 6 +++++- .../ibm/icu/impl/personname/PersonNamePattern.java | 10 +++++++++- .../src/com/ibm/icu/text/PersonNameFormatter.java | 2 -- .../format/ExhaustivePersonNameFormatterTest.java | 13 ++++++++++--- .../icu/dev/test/translit/TransliteratorTest.java | 2 +- 6 files changed, 31 insertions(+), 14 deletions(-) diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/breakiter/MlBreakEngine.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/breakiter/MlBreakEngine.java index e09c1763d5f..0c7b4dad2b5 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/impl/breakiter/MlBreakEngine.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/breakiter/MlBreakEngine.java @@ -8,17 +8,17 @@ import static com.ibm.icu.impl.CharacterIteration.current32; import static com.ibm.icu.impl.CharacterIteration.next32; import static com.ibm.icu.impl.CharacterIteration.previous32; +import java.text.CharacterIterator; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; + import com.ibm.icu.impl.ICUData; import com.ibm.icu.text.UnicodeSet; import com.ibm.icu.util.UResourceBundle; import com.ibm.icu.util.UResourceBundleIterator; -import java.text.CharacterIterator; -import java.util.Arrays; -import java.util.ArrayList; -import java.util.List; -import java.util.HashMap; - enum ModelIndex { kUWStart(0), kBWStart(6), kTWStart(9); private final int value; diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/personname/PersonNameFormatterImpl.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/personname/PersonNameFormatterImpl.java index 2cb3bb5094d..743287c7c0e 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/impl/personname/PersonNameFormatterImpl.java +++ b/icu4j/main/classes/core/src/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/classes/core/src/com/ibm/icu/impl/personname/PersonNamePattern.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/personname/PersonNamePattern.java index 409fe83c4ce..14810debe7e 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/impl/personname/PersonNamePattern.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/personname/PersonNamePattern.java @@ -2,7 +2,15 @@ // License & terms of use: http://www.unicode.org/copyright.html package com.ibm.icu.impl.personname; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; +import java.util.StringTokenizer; import com.ibm.icu.text.PersonName; diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/PersonNameFormatter.java b/icu4j/main/classes/core/src/com/ibm/icu/text/PersonNameFormatter.java index 517e2565f5d..f71cf54310e 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/text/PersonNameFormatter.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/text/PersonNameFormatter.java @@ -2,9 +2,7 @@ // License & terms of use: http://www.unicode.org/copyright.html package com.ibm.icu.text; -import java.util.HashSet; import java.util.Locale; -import java.util.Set; import com.ibm.icu.impl.personname.PersonNameFormatterImpl; diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/ExhaustivePersonNameFormatterTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/ExhaustivePersonNameFormatterTest.java index 2bed7b3ac42..8641c5ece32 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/ExhaustivePersonNameFormatterTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/ExhaustivePersonNameFormatterTest.java @@ -2,13 +2,20 @@ // License & terms of use: http://www.unicode.org/copyright.html package com.ibm.icu.dev.test.format; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.LineNumberReader; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Locale; + import com.ibm.icu.text.PersonName; import com.ibm.icu.text.PersonNameFormatter; import com.ibm.icu.text.SimplePersonName; -import java.io.*; -import java.util.*; - /** * This is a test designed to parse the files generated by GeneratePersonNameTestData.java in * the CLDR project. It takes one command-line parameter-- the path to the directory that diff --git a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/TransliteratorTest.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/TransliteratorTest.java index 90dd3753405..42a364a7219 100644 --- a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/TransliteratorTest.java +++ b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/TransliteratorTest.java @@ -22,6 +22,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.rbbi.RBBITstUtils; import com.ibm.icu.impl.Utility; import com.ibm.icu.impl.UtilityExtensions; import com.ibm.icu.lang.CharSequences; @@ -37,7 +38,6 @@ import com.ibm.icu.text.UnicodeSet; import com.ibm.icu.text.UnicodeSetIterator; import com.ibm.icu.util.CaseInsensitiveString; import com.ibm.icu.util.ULocale; -import com.ibm.icu.dev.test.rbbi.RBBITstUtils; /***********************************************************************