ICU-9420 move ListFormatter to the .text package, add getInstance(no locale)

X-SVN-Rev: 32178

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/ListFormatter.java b/icu4j/main/classes/core/src/com/ibm/icu/text/ListFormatter.java
similarity index 92%
rename from icu4j/main/classes/core/src/com/ibm/icu/util/ListFormatter.java
rename to icu4j/main/classes/core/src/com/ibm/icu/text/ListFormatter.java
index 9f822ca988368d95aea6fd151f742c12c1a7056b..a91a6a3b8a609843efb5c57617625b2709b4680f 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/util/ListFormatter.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/ListFormatter.java
@@ -4,7 +4,7 @@
  * others. All Rights Reserved.
  *******************************************************************************
  */
-package com.ibm.icu.util;
+package com.ibm.icu.text;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -13,11 +13,13 @@ import java.util.Iterator;
 import java.util.Locale;
 import java.util.Map;
 
+import com.ibm.icu.util.ULocale;
+
 /**
  * Immutable class for formatting a list, using data from CLDR (or supplied
  * separately). The class is not subclassable.
  * 
- * @author markdavis
+ * @author Mark Davis
  * @draft ICU 50
  * @provisional This API might change or be removed in a future release.
  */
@@ -88,6 +90,17 @@ final public class ListFormatter {
         return getInstance(ULocale.forLocale(locale));
     }
 
+    /**
+     * Create a list formatter that is appropriate for the default FORMAT locale.
+     * 
+     * @return ListFormatter
+     * @draft ICU 50
+     * @provisional This API might change or be removed in a future release.
+     */
+    public static ListFormatter getInstance() {
+        return getInstance(ULocale.getDefault(ULocale.Category.FORMAT));
+    }
+
     /**
      * Format a list of objects.
      * 

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/ListFormatterData.java b/icu4j/main/classes/core/src/com/ibm/icu/text/ListFormatterData.java
similarity index 99%
rename from icu4j/main/classes/core/src/com/ibm/icu/util/ListFormatterData.java
rename to icu4j/main/classes/core/src/com/ibm/icu/text/ListFormatterData.java
index 77caa9e2e53a0457e42dc0fa0e7a6cf8494d2e37..508f03876c0db78b2a08428ae22f05adbe3556e3 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/util/ListFormatterData.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/ListFormatterData.java
@@ -4,7 +4,7 @@
  * others. All Rights Reserved.
  *******************************************************************************
  */
-package com.ibm.icu.util;
+package com.ibm.icu.text;
 
 class ListFormatterData {
     static void load() {

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ListFormatterTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/ListFormatterTest.java
similarity index 82%
rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ListFormatterTest.java
rename to icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/ListFormatterTest.java
index 16b4a42ace2dd229212619f218f9443ff9b8461a..eaf77ffeef3acbb7f1617c7870dc5146a36d7501 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ListFormatterTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/ListFormatterTest.java
@@ -1,13 +1,15 @@
 /*
  *******************************************************************************
  * Copyright (C) 2012-2012, Google, International Business Machines Corporation and
- * others. All Rights Reserved.                                                *
+ * others. All Rights Reserved.
  *******************************************************************************
  */
-package com.ibm.icu.dev.test.util;
+package com.ibm.icu.dev.test.format;
+
+import java.util.Locale;
 
 import com.ibm.icu.dev.test.TestFmwk;
-import com.ibm.icu.util.ListFormatter;
+import com.ibm.icu.text.ListFormatter;
 import com.ibm.icu.util.ULocale;
 
 public class ListFormatterTest extends TestFmwk {
@@ -41,6 +43,12 @@ public class ListFormatterTest extends TestFmwk {
     public void TestEnglish() {
         checkData(ListFormatter.getInstance(ULocale.ENGLISH), EnglishTestData);
         checkData(ListFormatter.getInstance(ULocale.US), EnglishTestData);
+        // Redundant tests for code coverage.
+        checkData(ListFormatter.getInstance(Locale.ENGLISH), EnglishTestData);
+        ULocale defaultLocale = ULocale.getDefault(ULocale.Category.FORMAT);
+        if (defaultLocale.equals(ULocale.ENGLISH) || defaultLocale.equals(ULocale.US)) {
+            checkData(ListFormatter.getInstance(), EnglishTestData);
+        }
     }
     
     String[] JapaneseTestData = {

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/TestAll.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/TestAll.java
index a5e4292f348b8d2d9fa5ef0e807a52925a7b3ef6..6d185bbf857e453eab50f4bce07971f5ff2eba10 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/TestAll.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/TestAll.java
@@ -28,6 +28,7 @@ public class TestAll extends TestGroup {
                   "TestAll$TimeUnitFormat",
                   "com.ibm.icu.dev.test.format.BigNumberFormatTest",
                   "DataDrivenFormatTest",
+                  "ListFormatterTest",
                   "TestAll$PluralFormat",
                   "TestAll$MessageFormat",
                   "TestAll$SelectFormat"

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/TestAll.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/TestAll.java
index b3d20f801ba725aa7314998ba884c145d7f8ac9b..9b69fd160009400f6cfd69603cedd565a969900f 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/TestAll.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/TestAll.java
@@ -1,7 +1,7 @@
 /*
  *******************************************************************************
- * Copyright (C) 1996-2012, International Business Machines Corporation and    *
- * others. All Rights Reserved.                                                *
+ * Copyright (C) 1996-2012, International Business Machines Corporation and
+ * others. All Rights Reserved.
  *******************************************************************************
  */
 package com.ibm.icu.dev.test.util;
@@ -31,7 +31,6 @@ public class TestAll extends TestGroup {
             "Trie2Test",
             "LocaleDataTest",
             "GenderInfoTest",
-            "ListFormatterTest",
             "ULocaleTest",
             "LocaleAliasTest",
             "DebugUtilitiesTest",
@@ -45,5 +44,3 @@ public class TestAll extends TestGroup {
 
     public static final String CLASS_TARGET_NAME = "Util";
 }
-
-