From 03eae5bec079b3c360866cc1ca897aaec51ee449 Mon Sep 17 00:00:00 2001
From: Shane Carr <shane@unicode.org>
Date: Fri, 28 Apr 2017 23:47:51 +0000
Subject: [PATCH] ICU-13177 Moving CompactType to public
 CompactDecimalFormat.java

X-SVN-Rev: 40088
---
 .../formatters/CompactDecimalFormat.java      |  7 +------
 .../ibm/icu/text/CompactDecimalFormat.java    | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/number/formatters/CompactDecimalFormat.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/number/formatters/CompactDecimalFormat.java
index 2c241e99378..dfe8f4f56f5 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/number/formatters/CompactDecimalFormat.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/number/formatters/CompactDecimalFormat.java
@@ -23,6 +23,7 @@ import com.ibm.icu.impl.number.modifiers.ConstantAffixModifier;
 import com.ibm.icu.impl.number.modifiers.PositiveNegativeAffixModifier;
 import com.ibm.icu.impl.number.rounders.SignificantDigitsRounder;
 import com.ibm.icu.text.CompactDecimalFormat.CompactStyle;
+import com.ibm.icu.text.CompactDecimalFormat.CompactType;
 import com.ibm.icu.text.DecimalFormat.SignificantDigitsMode;
 import com.ibm.icu.text.DecimalFormatSymbols;
 import com.ibm.icu.text.NumberFormat;
@@ -326,12 +327,6 @@ public class CompactDecimalFormat extends Format.BeforeFormat {
     }
   }
 
-  // Should this be public or internal?
-  static enum CompactType {
-    DECIMAL,
-    CURRENCY
-  }
-
   static class CompactDecimalFingerprint {
     // TODO: Add more stuff to the fingerprint, like the symbols used by PNAffixGenerator
     final CompactStyle compactStyle;
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/CompactDecimalFormat.java b/icu4j/main/classes/core/src/com/ibm/icu/text/CompactDecimalFormat.java
index 0aabcc8cd55..eaa5ca40d35 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/CompactDecimalFormat.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/CompactDecimalFormat.java
@@ -70,6 +70,26 @@ public class CompactDecimalFormat extends DecimalFormat {
     LONG
   }
 
+  /**
+   * Type parameter for CompactDecimalFormat.
+   *
+   * @draft ICU 60
+   */
+  public enum CompactType {
+    /**
+     * Standard compact format, like "1.2T"
+     *
+     * @draft ICU 60
+     */
+    DECIMAL,
+    /**
+     * Compact format with currency, like "$1.2T"
+     *
+     * @draft ICU 60
+     */
+    CURRENCY
+  }
+
   /**
    * Creates a CompactDecimalFormat appropriate for a locale. The result may be affected by the
    * number system in the locale, such as ar-u-nu-latn.
-- 
2.40.0