From 75a1514889083c7be6c3367be15b6c9f6c3a426f Mon Sep 17 00:00:00 2001
From: Craig Cornelius <cwcornelius@gmail.com>
Date: Tue, 17 Aug 2021 00:10:46 +0000
Subject: [PATCH] ICU-21581 BRS#18 Promote @draft ICU4J API elements from
 version 68 to @stable

See #1788
---
 .../icu/util/GlobalizationPreferences.java    |  1 -
 .../com/ibm/icu/number/FormattedNumber.java   |  2 +-
 .../icu/number/NumberFormatterSettings.java   |  2 +-
 .../com/ibm/icu/text/DateIntervalFormat.java  |  4 +-
 .../src/com/ibm/icu/text/DecimalFormat.java   |  4 +-
 .../src/com/ibm/icu/text/PluralRules.java     |  2 +-
 .../icu/util/ICUInputTooLongException.java    | 10 +--
 .../src/com/ibm/icu/util/LocaleMatcher.java   | 10 +--
 .../src/com/ibm/icu/util/MeasureUnit.java     | 90 +++++++++----------
 .../core/src/com/ibm/icu/util/NoUnit.java     |  8 +-
 10 files changed, 66 insertions(+), 67 deletions(-)

diff --git a/icu4j/main/classes/collate/src/com/ibm/icu/util/GlobalizationPreferences.java b/icu4j/main/classes/collate/src/com/ibm/icu/util/GlobalizationPreferences.java
index e458c0bcc2e..d5c05dfea78 100644
--- a/icu4j/main/classes/collate/src/com/ibm/icu/util/GlobalizationPreferences.java
+++ b/icu4j/main/classes/collate/src/com/ibm/icu/util/GlobalizationPreferences.java
@@ -1466,4 +1466,3 @@ public class GlobalizationPreferences implements Freezable<GlobalizationPreferen
         }
     }
 }
-
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/number/FormattedNumber.java b/icu4j/main/classes/core/src/com/ibm/icu/number/FormattedNumber.java
index 5f0cb47c798..258788f8294 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/number/FormattedNumber.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/number/FormattedNumber.java
@@ -130,7 +130,7 @@ public class FormattedNumber implements FormattedValue {
      * as "foot-and-inch" or "hour-and-minute-and-second".
      *
      * @return `MeasureUnit`.
-     * @draft ICU 68
+     * @stable ICU 68
      */
     public MeasureUnit getOutputUnit() {
         return this.outputUnit;
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/number/NumberFormatterSettings.java b/icu4j/main/classes/core/src/com/ibm/icu/number/NumberFormatterSettings.java
index 5549bb46556..800048792ff 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/number/NumberFormatterSettings.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/number/NumberFormatterSettings.java
@@ -542,7 +542,7 @@ public abstract class NumberFormatterSettings<T extends NumberFormatterSettings<
      * @param usage A usage parameter from the units resource.
      * @return The fluent chain
      * @throws IllegalArgumentException in case of Setting a usage string but not a correct input unit.
-     * @draft ICU 68
+     * @stable ICU 68
      */
     public T usage(String usage) {
         if (usage != null && usage.isEmpty()) {
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/DateIntervalFormat.java b/icu4j/main/classes/core/src/com/ibm/icu/text/DateIntervalFormat.java
index 661fc790b80..47124017acd 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/DateIntervalFormat.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/DateIntervalFormat.java
@@ -1268,7 +1268,7 @@ public class DateIntervalFormat extends UFormat {
      * type of field at the beginning of the formatted result.
      *
      * @param context The DisplayContext value to set.
-     * @draft ICU 68
+     * @stable ICU 68
      */
     public void setContext(DisplayContext context)
     {
@@ -1283,7 +1283,7 @@ public class DateIntervalFormat extends UFormat {
      *
      * @param type the DisplayContext.Type whose value to return
      * @return the current DisplayContext setting for the specified type
-     * @draft ICU 68
+     * @stable ICU 68
      */
     public DisplayContext getContext(DisplayContext.Type type)
     {
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/DecimalFormat.java b/icu4j/main/classes/core/src/com/ibm/icu/text/DecimalFormat.java
index cc5dda4d88d..3a969dbaccc 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/DecimalFormat.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/DecimalFormat.java
@@ -2021,7 +2021,7 @@ public class DecimalFormat extends NumberFormat {
    * @see #setMinimumGroupingDigits(int)
    * @see #MINIMUM_GROUPING_DIGITS_MIN2
    * @category Separators
-   * @draft ICU 68
+   * @stable ICU 68
    */
   public static final int MINIMUM_GROUPING_DIGITS_AUTO = -2;
 
@@ -2033,7 +2033,7 @@ public class DecimalFormat extends NumberFormat {
    * @see #setMinimumGroupingDigits(int)
    * @see #MINIMUM_GROUPING_DIGITS_AUTO
    * @category Separators
-   * @draft ICU 68
+   * @stable ICU 68
    */
   public static final int MINIMUM_GROUPING_DIGITS_MIN2 = -3;
 
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 e1a1ab8c509..d8bdd3b0fbd 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
@@ -2207,7 +2207,7 @@ public class PluralRules implements Serializable {
      * @param range  The number range onto which the rules will be applied.
      * @return       The keyword of the selected rule.
      * @throws UnsupportedOperationException If called on an instance without plural ranges data.
-     * @draft ICU 68
+     * @stable ICU 68
      */
     public String select(FormattedNumberRange range) {
         if (standardPluralRanges == null) {
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/ICUInputTooLongException.java b/icu4j/main/classes/core/src/com/ibm/icu/util/ICUInputTooLongException.java
index 3e83692ab1b..020264a1650 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/util/ICUInputTooLongException.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/util/ICUInputTooLongException.java
@@ -7,7 +7,7 @@ package com.ibm.icu.util;
  * It is rejected because it may lead to problems such as excessive
  * processing time, stack depth, or heap memory requirements.
  *
- * @draft ICU 68
+ * @stable ICU 68
  */
 public class ICUInputTooLongException extends ICUException {
     private static final long serialVersionUID = -2602876786689338226L;
@@ -15,7 +15,7 @@ public class ICUInputTooLongException extends ICUException {
     /**
      * Default constructor.
      *
-     * @draft ICU 68
+     * @stable ICU 68
      */
     public ICUInputTooLongException() {
     }
@@ -24,7 +24,7 @@ public class ICUInputTooLongException extends ICUException {
      * Constructor.
      *
      * @param message exception message string
-     * @draft ICU 68
+     * @stable ICU 68
      */
     public ICUInputTooLongException(String message) {
         super(message);
@@ -34,7 +34,7 @@ public class ICUInputTooLongException extends ICUException {
      * Constructor.
      *
      * @param cause original exception
-     * @draft ICU 68
+     * @stable ICU 68
      */
     public ICUInputTooLongException(Throwable cause) {
         super(cause);
@@ -45,7 +45,7 @@ public class ICUInputTooLongException extends ICUException {
      *
      * @param message exception message string
      * @param cause original exception
-     * @draft ICU 68
+     * @stable ICU 68
      */
     public ICUInputTooLongException(String message, Throwable cause) {
         super(message, cause);
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/LocaleMatcher.java b/icu4j/main/classes/core/src/com/ibm/icu/util/LocaleMatcher.java
index 84bcc8876f3..35061f000f4 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/util/LocaleMatcher.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/util/LocaleMatcher.java
@@ -449,7 +449,7 @@ public final class LocaleMatcher {
          * If there is no good match, then the matcher will return null for the
          * best supported locale.
          *
-         * @draft ICU 68
+         * @stable ICU 68
          */
         public Builder setNoDefaultLocale() {
             this.defaultLocale = null;
@@ -548,7 +548,7 @@ public final class LocaleMatcher {
          * @param desired the desired locale for distance comparison.
          * @param supported the supported locale for distance comparison.
          * @return this Builder object
-         * @draft ICU 68
+         * @stable ICU 68
          */
         public Builder setMaxDistance(Locale desired, Locale supported) {
             if (desired == null || supported == null) {
@@ -576,7 +576,7 @@ public final class LocaleMatcher {
          * @param desired the desired locale for distance comparison.
          * @param supported the supported locale for distance comparison.
          * @return this Builder object
-         * @draft ICU 68
+         * @stable ICU 68
          */
         public Builder setMaxDistance(ULocale desired, ULocale supported) {
             if (desired == null || supported == null) {
@@ -1094,7 +1094,7 @@ public final class LocaleMatcher {
      * @param desired The desired locale.
      * @param supported The supported locale.
      * @return true if the pair of locales matches acceptably.
-     * @draft ICU 68
+     * @stable ICU 68
      */
     public boolean isMatch(Locale desired, Locale supported) {
         int indexAndDistance = LocaleDistance.INSTANCE.getBestIndexAndDistance(
@@ -1112,7 +1112,7 @@ public final class LocaleMatcher {
      * @param desired The desired locale.
      * @param supported The supported locale.
      * @return true if the pair of locales matches acceptably.
-     * @draft ICU 68
+     * @stable ICU 68
      */
     public boolean isMatch(ULocale desired, ULocale supported) {
         int indexAndDistance = LocaleDistance.INSTANCE.getBestIndexAndDistance(
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/MeasureUnit.java b/icu4j/main/classes/core/src/com/ibm/icu/util/MeasureUnit.java
index 0d48d63a0f6..d6bbd8bca72 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/util/MeasureUnit.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/util/MeasureUnit.java
@@ -86,27 +86,27 @@ public class MeasureUnit implements Serializable {
      * The complexity determines which operations are available. For example, you cannot set the power
      * or prefix of a compound unit.
      *
-     * @draft ICU 68
+     * @stable ICU 68
      */
     public enum Complexity {
         /**
          * A single unit, like kilojoule.
          *
-         * @draft ICU 68
+         * @stable ICU 68
          */
         SINGLE,
 
         /**
          * A compound unit, like meter-per-second.
          *
-         * @draft ICU 68
+         * @stable ICU 68
          */
         COMPOUND,
 
         /**
          * A mixed unit, like hour-and-minute.
          *
-         * @draft ICU 68
+         * @stable ICU 68
          */
         MIXED
     }
@@ -121,147 +121,147 @@ public class MeasureUnit implements Serializable {
         /**
          * SI prefix: yotta, 10^24.
          *
-         * @draft ICU 68
+         * @draft ICU 69
          */
         YOTTA(24, "yotta", 10),
 
         /**
          * SI prefix: zetta, 10^21.
          *
-         * @draft ICU 68
+         * @draft ICU 69
          */
         ZETTA(21, "zetta", 10),
 
         /**
          * SI prefix: exa, 10^18.
          *
-         * @draft ICU 68
+         * @draft ICU 69
          */
         EXA(18, "exa", 10),
 
         /**
          * SI prefix: peta, 10^15.
          *
-         * @draft ICU 68
+         * @draft ICU 69
          */
         PETA(15, "peta", 10),
 
         /**
          * SI prefix: tera, 10^12.
          *
-         * @draft ICU 68
+         * @draft ICU 69
          */
         TERA(12, "tera", 10),
 
         /**
          * SI prefix: giga, 10^9.
          *
-         * @draft ICU 68
+         * @draft ICU 69
          */
         GIGA(9, "giga", 10),
 
         /**
          * SI prefix: mega, 10^6.
          *
-         * @draft ICU 68
+         * @draft ICU 69
          */
         MEGA(6, "mega", 10),
 
         /**
          * SI prefix: kilo, 10^3.
          *
-         * @draft ICU 68
+         * @draft ICU 69
          */
         KILO(3, "kilo", 10),
 
         /**
          * SI prefix: hecto, 10^2.
          *
-         * @draft ICU 68
+         * @draft ICU 69
          */
         HECTO(2, "hecto", 10),
 
         /**
          * SI prefix: deka, 10^1.
          *
-         * @draft ICU 68
+         * @draft ICU 69
          */
         DEKA(1, "deka", 10),
 
         /**
          * The absence of an SI prefix.
          *
-         * @draft ICU 68
+         * @draft ICU 69
          */
         ONE(0, "", 10),
 
         /**
          * SI prefix: deci, 10^-1.
          *
-         * @draft ICU 68
+         * @draft ICU 69
          */
         DECI(-1, "deci", 10),
 
         /**
          * SI prefix: centi, 10^-2.
          *
-         * @draft ICU 68
+         * @draft ICU 69
          */
         CENTI(-2, "centi", 10),
 
         /**
          * SI prefix: milli, 10^-3.
          *
-         * @draft ICU 68
+         * @draft ICU 69
          */
         MILLI(-3, "milli", 10),
 
         /**
          * SI prefix: micro, 10^-6.
          *
-         * @draft ICU 68
+         * @draft ICU 69
          */
         MICRO(-6, "micro", 10),
 
         /**
          * SI prefix: nano, 10^-9.
          *
-         * @draft ICU 68
+         * @draft ICU 69
          */
         NANO(-9, "nano", 10),
 
         /**
          * SI prefix: pico, 10^-12.
          *
-         * @draft ICU 68
+         * @draft ICU 69
          */
         PICO(-12, "pico", 10),
 
         /**
          * SI prefix: femto, 10^-15.
          *
-         * @draft ICU 68
+         * @draft ICU 69
          */
         FEMTO(-15, "femto", 10),
 
         /**
          * SI prefix: atto, 10^-18.
          *
-         * @draft ICU 68
+         * @draft ICU 69
          */
         ATTO(-18, "atto", 10),
 
         /**
          * SI prefix: zepto, 10^-21.
          *
-         * @draft ICU 68
+         * @draft ICU 69
          */
         ZEPTO(-21, "zepto", 10),
 
         /**
          * SI prefix: yocto, 10^-24.
          *
-         * @draft ICU 68
+         * @draft ICU 69
          */
         YOCTO(-24, "yocto", 10),
 
@@ -388,7 +388,7 @@ public class MeasureUnit implements Serializable {
      *
      * @param identifier CLDR Unit Identifier
      * @throws IllegalArgumentException if the identifier is invalid.
-     * @draft ICU 68
+     * @stable ICU 68
      */
     public static MeasureUnit forIdentifier(String identifier) {
         if (identifier == null || identifier.isEmpty()) {
@@ -445,7 +445,7 @@ public class MeasureUnit implements Serializable {
      * Get CLDR Unit Identifier for this MeasureUnit, as defined in UTS 35.
      *
      * @return The string form of this unit.
-     * @draft ICU 68
+     * @stable ICU 68
      */
     public String getIdentifier() {
         String result = measureUnitImpl == null ? getSubtype() : measureUnitImpl.getIdentifier();
@@ -456,7 +456,7 @@ public class MeasureUnit implements Serializable {
      * Compute the complexity of the unit. See Complexity for more information.
      *
      * @return The unit complexity.
-     * @draft ICU 68
+     * @stable ICU 68
      */
     public Complexity getComplexity() {
         if (measureUnitImpl == null) {
@@ -511,7 +511,7 @@ public class MeasureUnit implements Serializable {
      *
      * @return The dimensionality (power) of this simple unit.
      * @throws UnsupportedOperationException if the unit is COMPOUND or MIXED.
-     * @draft ICU 68
+     * @stable ICU 68
      */
     public int getDimensionality() {
         return getSingleUnitImpl().getDimensionality();
@@ -527,7 +527,7 @@ public class MeasureUnit implements Serializable {
      * @param dimensionality The dimensionality (power).
      * @return A new SINGLE unit.
      * @throws UnsupportedOperationException if the unit is COMPOUND or MIXED.
-     * @draft ICU 68
+     * @stable ICU 68
      */
     public MeasureUnit withDimensionality(int dimensionality) {
         SingleUnitImpl singleUnit = getSingleUnitImpl();
@@ -545,7 +545,7 @@ public class MeasureUnit implements Serializable {
      *
      * @return The reciprocal of the target unit.
      * @throws UnsupportedOperationException if the unit is MIXED.
-     * @draft ICU 68
+     * @stable ICU 68
      */
     public MeasureUnit reciprocal() {
         MeasureUnitImpl measureUnit = getCopyOfMeasureUnitImpl();
@@ -568,7 +568,7 @@ public class MeasureUnit implements Serializable {
      * @param other The MeasureUnit to multiply with the target.
      * @return The product of the target unit with the provided unit.
      * @throws UnsupportedOperationException if the unit is MIXED.
-     * @draft ICU 68
+     * @stable ICU 68
      */
     public MeasureUnit product(MeasureUnit other) {
         MeasureUnitImpl implCopy = getCopyOfMeasureUnitImpl();
@@ -602,7 +602,7 @@ public class MeasureUnit implements Serializable {
      * If this is a SINGLE unit, a list of length 1 will be returned.
      *
      * @return An unmodifiable list of single units
-     * @draft ICU 68
+     * @stable ICU 68
      */
     public List<MeasureUnit> splitToSingleUnits() {
         final ArrayList<SingleUnitImpl> singleUnits =
@@ -1361,7 +1361,7 @@ public class MeasureUnit implements Serializable {
 
     /**
      * Constant for unit of graphics: dot
-     * @draft ICU 68
+     * @stable ICU 68
      */
     public static final MeasureUnit DOT = MeasureUnit.internalGetInstance("graphics", "dot");
 
@@ -1427,7 +1427,7 @@ public class MeasureUnit implements Serializable {
 
     /**
      * Constant for unit of length: earth-radius
-     * @draft ICU 68
+     * @stable ICU 68
      */
     public static final MeasureUnit EARTH_RADIUS = MeasureUnit.internalGetInstance("length", "earth-radius");
 
@@ -1541,13 +1541,13 @@ public class MeasureUnit implements Serializable {
 
     /**
      * Constant for unit of light: candela
-     * @draft ICU 68
+     * @stable ICU 68
      */
     public static final MeasureUnit CANDELA = MeasureUnit.internalGetInstance("light", "candela");
 
     /**
      * Constant for unit of light: lumen
-     * @draft ICU 68
+     * @stable ICU 68
      */
     public static final MeasureUnit LUMEN = MeasureUnit.internalGetInstance("light", "lumen");
 
@@ -1583,7 +1583,7 @@ public class MeasureUnit implements Serializable {
 
     /**
      * Constant for unit of mass: grain
-     * @draft ICU 68
+     * @stable ICU 68
      */
     public static final MeasureUnit GRAIN = MeasureUnit.internalGetInstance("mass", "grain");
 
@@ -1895,25 +1895,25 @@ public class MeasureUnit implements Serializable {
 
     /**
      * Constant for unit of volume: dessert-spoon
-     * @draft ICU 68
+     * @stable ICU 68
      */
     public static final MeasureUnit DESSERT_SPOON = MeasureUnit.internalGetInstance("volume", "dessert-spoon");
 
     /**
      * Constant for unit of volume: dessert-spoon-imperial
-     * @draft ICU 68
+     * @stable ICU 68
      */
     public static final MeasureUnit DESSERT_SPOON_IMPERIAL = MeasureUnit.internalGetInstance("volume", "dessert-spoon-imperial");
 
     /**
      * Constant for unit of volume: dram
-     * @draft ICU 68
+     * @stable ICU 68
      */
     public static final MeasureUnit DRAM = MeasureUnit.internalGetInstance("volume", "dram");
 
     /**
      * Constant for unit of volume: drop
-     * @draft ICU 68
+     * @stable ICU 68
      */
     public static final MeasureUnit DROP = MeasureUnit.internalGetInstance("volume", "drop");
 
@@ -1949,7 +1949,7 @@ public class MeasureUnit implements Serializable {
 
     /**
      * Constant for unit of volume: jigger
-     * @draft ICU 68
+     * @stable ICU 68
      */
     public static final MeasureUnit JIGGER = MeasureUnit.internalGetInstance("volume", "jigger");
 
@@ -1973,7 +1973,7 @@ public class MeasureUnit implements Serializable {
 
     /**
      * Constant for unit of volume: pinch
-     * @draft ICU 68
+     * @stable ICU 68
      */
     public static final MeasureUnit PINCH = MeasureUnit.internalGetInstance("volume", "pinch");
 
@@ -1997,7 +1997,7 @@ public class MeasureUnit implements Serializable {
 
     /**
      * Constant for unit of volume: quart-imperial
-     * @draft ICU 68
+     * @stable ICU 68
      */
     public static final MeasureUnit QUART_IMPERIAL = MeasureUnit.internalGetInstance("volume", "quart-imperial");
 
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/NoUnit.java b/icu4j/main/classes/core/src/com/ibm/icu/util/NoUnit.java
index e617f5241e8..d73e54bf8ab 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/util/NoUnit.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/util/NoUnit.java
@@ -7,7 +7,7 @@ import com.ibm.icu.number.NumberFormatter;
 /**
  * Dimensionless unit for percent and permille.
  * @see NumberFormatter
- * @draft ICU 68
+ * @stable ICU 68
  */
 public final class NoUnit {
     /**
@@ -17,7 +17,7 @@ public final class NoUnit {
      *
      * Since ICU 68, this constant equals null.
      *
-     * @draft ICU 68
+     * @stable ICU 68
      */
     public static final MeasureUnit BASE = null;
 
@@ -28,7 +28,7 @@ public final class NoUnit {
      *
      * Since ICU 68, this constant is equivalent to MeasureUnit.PERCENT.
      *
-     * @draft ICU 68
+     * @stable ICU 68
      */
     public static final MeasureUnit PERCENT = MeasureUnit.PERCENT;
 
@@ -39,7 +39,7 @@ public final class NoUnit {
      *
      * Since ICU 68, this constant is equivalent to MeasureUnit.PERMILLE.
      *
-     * @draft ICU 68
+     * @stable ICU 68
      */
     public static final MeasureUnit PERMILLE = MeasureUnit.PERMILLE;
 
-- 
2.40.0