From b62f044d82e3054a0f68713956154f0a1d1e4103 Mon Sep 17 00:00:00 2001
From: Mark Davis <mark@macchiato.com>
Date: Wed, 3 Jul 2013 08:58:32 +0000
Subject: [PATCH] ICU-8474 cleanup, moving some test code to CLDR.

X-SVN-Rev: 33882
---
 .../core/src/com/ibm/icu/impl/PluralRulesLoader.java   |  8 ++++++++
 .../classes/core/src/com/ibm/icu/text/PluralRules.java |  7 +++++++
 .../ibm/icu/dev/test/format/PluralRulesFactory.java    | 10 +---------
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/PluralRulesLoader.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/PluralRulesLoader.java
index 8aa9b1d57d..24e23875af 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/PluralRulesLoader.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/PluralRulesLoader.java
@@ -245,4 +245,12 @@ public class PluralRulesLoader extends PluralRules.Factory {
      * The only instance of the loader.
      */
     public static final PluralRulesLoader loader = new PluralRulesLoader();
+
+    /* (non-Javadoc)
+     * @see com.ibm.icu.text.PluralRules.Factory#hasOverride(com.ibm.icu.util.ULocale)
+     */
+    @Override
+    public boolean hasOverride(ULocale locale) {
+        return false;
+    }
 }
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/PluralRules.java b/icu4j/main/classes/core/src/com/ibm/icu/text/PluralRules.java
index 90413bbcea..00e3b9e7be 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/PluralRules.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/PluralRules.java
@@ -265,6 +265,13 @@ public class PluralRules implements Serializable {
         public static PluralRulesLoader getDefaultFactory() {
             return PluralRulesLoader.loader;
         }
+        
+        /**
+         * Returns whether or not there are overrides.
+         * @deprecated This API is ICU internal only.
+         * @internal
+         */
+        public abstract boolean hasOverride(ULocale locale);
     }
     // Standard keywords.
 
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/PluralRulesFactory.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/PluralRulesFactory.java
index 114c226da9..e43064b0bb 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/PluralRulesFactory.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/PluralRulesFactory.java
@@ -16,21 +16,13 @@ import com.ibm.icu.util.ULocale;
  */
 public abstract class PluralRulesFactory extends PluralRules.Factory {
 
-    abstract boolean hasOverride(ULocale locale);
-
-    public abstract PluralRules forLocale(ULocale locale, PluralType ordinal);
-
-    public abstract ULocale[] getAvailableULocales();
-
-    public abstract ULocale getFunctionalEquivalent(ULocale locale, boolean[] isAvailable);
-
     static final PluralRulesFactory NORMAL = new PluralRulesFactoryVanilla();
 
     private PluralRulesFactory() {}
 
     static class PluralRulesFactoryVanilla extends PluralRulesFactory {
         @Override
-        boolean hasOverride(ULocale locale) {
+        public boolean hasOverride(ULocale locale) {
             return false;
         }
         @Override