From 2339ae4c0d2b94716124fabb4f77fadd049189e7 Mon Sep 17 00:00:00 2001
From: Mihai Nita <nmihai_2000@yahoo.com>
Date: Thu, 20 Feb 2025 11:44:34 -0800
Subject: [PATCH] ICU-22922 Organize import statements

---
 .../java/com/ibm/icu/dev/test/format/MeasureUnitTest.java     | 2 +-
 .../core/src/main/java/com/ibm/icu/util/PersianCalendar.java  | 1 -
 .../src/test/java/com/ibm/icu/dev/test/impl/UnitsTest.java    | 2 +-
 .../src/test/java/com/ibm/icu/dev/test/message2/Args.java     | 4 ++--
 .../test/java/com/ibm/icu/dev/test/rbbi/SegmentationRule.java | 4 +---
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/MeasureUnitTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/MeasureUnitTest.java
index be54060cd74..817e0ebad21 100644
--- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/MeasureUnitTest.java
+++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/MeasureUnitTest.java
@@ -46,11 +46,11 @@ import com.ibm.icu.util.Currency;
 import com.ibm.icu.util.CurrencyAmount;
 import com.ibm.icu.util.Measure;
 import com.ibm.icu.util.MeasureUnit;
+import com.ibm.icu.util.MeasureUnit.Complexity;
 import com.ibm.icu.util.NoUnit;
 import com.ibm.icu.util.TimeUnit;
 import com.ibm.icu.util.TimeUnitAmount;
 import com.ibm.icu.util.ULocale;
-import com.ibm.icu.util.MeasureUnit.Complexity;
 
 /**
  * This file contains regular unit tests.
diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/util/PersianCalendar.java b/icu4j/main/core/src/main/java/com/ibm/icu/util/PersianCalendar.java
index 23a8d2303b8..a53af68a6d9 100644
--- a/icu4j/main/core/src/main/java/com/ibm/icu/util/PersianCalendar.java
+++ b/icu4j/main/core/src/main/java/com/ibm/icu/util/PersianCalendar.java
@@ -12,7 +12,6 @@ package com.ibm.icu.util;
 import java.util.BitSet;
 import java.util.Date;
 import java.util.Locale;
-import java.util.Set;
 
 import com.ibm.icu.util.ULocale.Category;
 
diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/impl/UnitsTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/impl/UnitsTest.java
index afc28b0dc06..2bf4e6e02af 100644
--- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/impl/UnitsTest.java
+++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/impl/UnitsTest.java
@@ -26,8 +26,8 @@ import com.ibm.icu.impl.units.UnitsData;
 import com.ibm.icu.impl.units.UnitsRouter;
 import com.ibm.icu.util.Measure;
 import com.ibm.icu.util.MeasureUnit;
-import com.ibm.icu.util.ULocale;
 import com.ibm.icu.util.MeasureUnit.Complexity;
+import com.ibm.icu.util.ULocale;
 
 public class UnitsTest {
 
diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/Args.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/Args.java
index 97e971e8c34..e097662b075 100644
--- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/Args.java
+++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/Args.java
@@ -11,8 +11,8 @@ import java.util.Map;
  * Convenience class that provides the same functionality as
  * <code>Map.of</code> introduced in JDK 11, which can't be used yet for ICU4J.
  *
- * <p>The returned Map is immutable, to prove that the {@link MessageFormatter}
- * does not change it</p>
+ * <p>The returned Map is immutable, to prove that the
+ * {@link com.ibm.icu.message2.MessageFormatter} does not change it</p>
  */
 @SuppressWarnings("javadoc")
 public class Args {
diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/SegmentationRule.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/SegmentationRule.java
index b9507d0ce3d..935763ab29b 100644
--- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/SegmentationRule.java
+++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/SegmentationRule.java
@@ -5,12 +5,10 @@ package com.ibm.icu.dev.test.rbbi;
 
 import java.text.ParsePosition;
 
-import javax.swing.RowFilter.Entry;
-
 import com.ibm.icu.impl.Utility;
+import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UnicodeSet;
 import com.ibm.icu.text.UnicodeSet.EntryRange;
-import com.ibm.icu.text.UTF16;
 
 /**
  * A segmentation rule expressed as in UAXes #14 and #29.