From: Yoshito Umaoka <y.umaoka@gmail.com>
Date: Wed, 27 Sep 2017 15:49:01 +0000 (+0000)
Subject: ICU-13377 Proposed API status changes for ICU4J 60.
X-Git-Tag: release-60-rc~93^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=44bb4d8a272dec4ef4a8d749f68e19daf2f942a1;p=icu

ICU-13377 Proposed API status changes for ICU4J 60.

X-SVN-Rev: 40481
---

diff --git a/icu4j/APIChangeReport.html b/icu4j/APIChangeReport.html
index 177f279f983..19d326b1318 100644
--- a/icu4j/APIChangeReport.html
+++ b/icu4j/APIChangeReport.html
@@ -15,7 +15,16 @@
 
 <hr/>
 <h2>Deprecated or Obsoleted in ICU4J 60.0.1</h2>
-<p>(no API obsoleted)</p>
+
+<h3>Package com.ibm.icu.util</h3>
+<ul>
+Calendar
+<ul>
+<li><span style='color:gray'>(deprecated)</span> protected int <i>computeMillisInDay</i>()</li>
+<li><span style='color:gray'>(deprecated)</span> protected int <i>computeZoneOffset</i>(long, int)</li>
+</ul>
+</ul>
+
 
 <hr/>
 <h2>Changed in ICU4J 60.0.1 (old, new)</h2>
@@ -35,6 +44,92 @@ UProperty
 </ul>
 </ul>
 
+<h3>Package com.ibm.icu.text</h3>
+<ul>
+<li><span style='color:green'>(stable)</span> public class <i>BidiTransform</i></li>
+<li><span style='color:green'>(stable)</span> public static enum <i>BidiTransform.Mirroring</i></li>
+<li><span style='color:green'>(stable)</span> public static enum <i>BidiTransform.Order</i></li>
+BidiTransform.Mirroring
+<ul>
+<li><span style='color:green'>(stable)</span> public static final BidiTransform.Mirroring OFF</li>
+<li><span style='color:green'>(stable)</span> public static final BidiTransform.Mirroring ON</li>
+</ul>
+BidiTransform.Order
+<ul>
+<li><span style='color:green'>(stable)</span> public static final BidiTransform.Order LOGICAL</li>
+<li><span style='color:green'>(stable)</span> public static final BidiTransform.Order VISUAL</li>
+</ul>
+DecimalFormatSymbols
+<ul>
+<li><span style='color:green'>(stable)</span> public java.lang.String <i>getDecimalSeparatorString</i>()</li>
+<li><span style='color:green'>(stable)</span> public java.lang.String[] <i>getDigitStrings</i>()</li>
+<li><span style='color:green'>(stable)</span> public java.lang.String <i>getGroupingSeparatorString</i>()</li>
+<li><span style='color:green'>(stable)</span> public java.lang.String <i>getMinusSignString</i>()</li>
+<li><span style='color:green'>(stable)</span> public java.lang.String <i>getMonetaryDecimalSeparatorString</i>()</li>
+<li><span style='color:green'>(stable)</span> public java.lang.String <i>getMonetaryGroupingSeparatorString</i>()</li>
+<li><span style='color:green'>(stable)</span> public java.lang.String <i>getPerMillString</i>()</li>
+<li><span style='color:green'>(stable)</span> public java.lang.String <i>getPercentString</i>()</li>
+<li><span style='color:green'>(stable)</span> public java.lang.String <i>getPlusSignString</i>()</li>
+<li><span style='color:green'>(stable)</span> public void <i>setDecimalSeparatorString</i>(java.lang.String)</li>
+<li><span style='color:green'>(stable)</span> public void <i>setDigitStrings</i>(java.lang.String[])</li>
+<li><span style='color:green'>(stable)</span> public void <i>setGroupingSeparatorString</i>(java.lang.String)</li>
+<li><span style='color:green'>(stable)</span> public void <i>setMinusSignString</i>(java.lang.String)</li>
+<li><span style='color:green'>(stable)</span> public void <i>setMonetaryDecimalSeparatorString</i>(java.lang.String)</li>
+<li><span style='color:green'>(stable)</span> public void <i>setMonetaryGroupingSeparatorString</i>(java.lang.String)</li>
+<li><span style='color:green'>(stable)</span> public void <i>setPerMillString</i>(java.lang.String)</li>
+<li><span style='color:green'>(stable)</span> public void <i>setPercentString</i>(java.lang.String)</li>
+<li><span style='color:green'>(stable)</span> public void <i>setPlusSignString</i>(java.lang.String)</li>
+</ul>
+DisplayContext
+<ul>
+<li><span style='color:green'>(stable)</span> public static final DisplayContext NO_SUBSTITUTE</li>
+<li><span style='color:green'>(stable)</span> public static final DisplayContext SUBSTITUTE</li>
+</ul>
+DisplayContext.Type
+<ul>
+<li><span style='color:green'>(stable)</span> public static final DisplayContext.Type SUBSTITUTE_HANDLING</li>
+</ul>
+MeasureFormat
+<ul>
+<li><span style='color:green'>(stable)</span> public java.lang.String <i>getUnitDisplayName</i>(MeasureUnit)</li>
+</ul>
+RuleBasedBreakIterator
+<ul>
+<li><span style='color:green'>(stable)</span> public int <i>getRuleStatus</i>()</li>
+<li><span style='color:green'>(stable)</span> public int <i>getRuleStatusVec</i>(int[])</li>
+</ul>
+SpoofChecker
+<ul>
+<li><span style='color:green'>(stable)</span> public static final int CONFUSABLE</li>
+<li><span style='color:green'>(stable)</span> public static final UnicodeSet INCLUSION</li>
+<li><span style='color:green'>(stable)</span> public static final int MIXED_NUMBERS</li>
+<li><span style='color:green'>(stable)</span> public static final UnicodeSet RECOMMENDED</li>
+<li><span style='color:green'>(stable)</span> public static final int RESTRICTION_LEVEL</li>
+<li><span style='color:green'>(stable)</span> public boolean <i>equals</i>(java.lang.Object)</li>
+<li><span style='color:green'>(stable)</span> public java.lang.String <i>getSkeleton</i>(java.lang.CharSequence)</li>
+<li><span style='color:green'>(stable)</span> public int <i>hashCode</i>()</li>
+</ul>
+SpoofChecker.Builder
+<ul>
+<li><span style='color:green'>(stable)</span> public SpoofChecker.Builder <i>setData</i>(java.io.Reader)</li>
+<li><span style='color:green'>(stable)</span> public SpoofChecker.Builder <i>setRestrictionLevel</i>(SpoofChecker.RestrictionLevel)</li>
+</ul>
+SpoofChecker.CheckResult
+<ul>
+<li><span style='color:green'>(stable)</span> public UnicodeSet numerics</li>
+<li><span style='color:green'>(stable)</span> public SpoofChecker.RestrictionLevel restrictionLevel</li>
+</ul>
+</ul>
+
+<h3>Package com.ibm.icu.util</h3>
+<ul>
+MeasureUnit
+<ul>
+<li><span style='color:green'>(stable)</span> public static final MeasureUnit MILLIMOLE_PER_LITER</li>
+<li><span style='color:green'>(stable)</span> public static final MeasureUnit PART_PER_MILLION</li>
+</ul>
+</ul>
+
 
 <hr/>
 <h2>Added in ICU4J 60.0.1</h2>
@@ -88,20 +183,60 @@ UScript
 
 <h3>Package com.ibm.icu.text</h3>
 <ul>
+<li><span style='color:orange'>(draft)</span> public abstract class <i>FilteredBreakIteratorBuilder</i></li>
 BreakIterator
 <ul>
 <li><span style='color:orange'>(draft)</span> public void <i>setText</i>(java.lang.CharSequence)</li>
 </ul>
+CaseMap.Fold
+<ul>
+<li><span style='color:orange'>(draft)</span> public java.lang.String <i>apply</i>(java.lang.CharSequence)</li>
+</ul>
+CaseMap.Lower
+<ul>
+<li><span style='color:orange'>(draft)</span> public java.lang.String <i>apply</i>(java.util.Locale, java.lang.CharSequence)</li>
+</ul>
 CaseMap.Title
 <ul>
 <li><span style='color:orange'>(draft)</span> public CaseMap.Title <i>adjustToCased</i>()</li>
+<li><span style='color:orange'>(draft)</span> public java.lang.String <i>apply</i>(java.util.Locale, BreakIterator, java.lang.CharSequence)</li>
 <li><span style='color:orange'>(draft)</span> public CaseMap.Title <i>sentences</i>()</li>
 <li><span style='color:orange'>(draft)</span> public CaseMap.Title <i>wholeString</i>()</li>
 </ul>
+CaseMap.Upper
+<ul>
+<li><span style='color:orange'>(draft)</span> public java.lang.String <i>apply</i>(java.util.Locale, java.lang.CharSequence)</li>
+</ul>
+DecimalFormatSymbols
+<ul>
+<li><span style='color:orange'>(draft)</span> public static DecimalFormatSymbols <i>forNumberingSystem</i>(ULocale, NumberingSystem)</li>
+<li><span style='color:orange'>(draft)</span> public static DecimalFormatSymbols <i>forNumberingSystem</i>(java.util.Locale, NumberingSystem)</li>
+</ul>
+Edits
+<ul>
+<li><span style='color:orange'>(draft)</span> public Edits <i>mergeAndAppend</i>(Edits, Edits)</li>
+<li><span style='color:orange'>(draft)</span> public int <i>numberOfChanges</i>()</li>
+</ul>
+Edits.Iterator
+<ul>
+<li><span style='color:orange'>(draft)</span> public int <i>destinationIndexFromSourceIndex</i>(int)</li>
+<li><span style='color:orange'>(draft)</span> public boolean <i>findDestinationIndex</i>(int)</li>
+<li><span style='color:orange'>(draft)</span> public int <i>sourceIndexFromDestinationIndex</i>(int)</li>
+</ul>
 </ul>
 
 <h3>Package com.ibm.icu.util</h3>
 <ul>
+Currency
+<ul>
+<li><span style='color:orange'>(draft)</span> public static Currency <i>fromJavaCurrency</i>(java.util.Currency)</li>
+<li><span style='color:orange'>(draft)</span> public java.util.Currency <i>toJavaCurrency</i>()</li>
+</ul>
+CurrencyAmount
+<ul>
+<li><span style='color:orange'>(draft)</span> public <i>CurrencyAmount</i>(double, java.util.Currency)</li>
+<li><span style='color:orange'>(draft)</span> public <i>CurrencyAmount</i>(java.lang.Number, java.util.Currency)</li>
+</ul>
 VersionInfo
 <ul>
 <li><span style='color:green'>(stable)</span> public static final VersionInfo UNICODE_10_0</li>
@@ -109,6 +244,6 @@ VersionInfo
 </ul>
 
 <hr/>
-<p><i><font size="-1">Contents generated by ReportAPI tool on Mon Jun 26 00:19:22 EDT 2017<br/>© 2017 and later: Unicode, Inc. and others. License & terms of use: <a href="http://www.unicode.org/copyright.html#License">http://www.unicode.org/copyright.html#License</a></font></i></p>
+<p><i><font size="-1">Contents generated by ReportAPI tool on Wed Sep 27 11:38:50 EDT 2017<br/>© 2017 and later: Unicode, Inc. and others. License & terms of use: <a href="http://www.unicode.org/copyright.html#License">http://www.unicode.org/copyright.html#License</a></font></i></p>
 </body>
 </html>
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/BidiTransform.java b/icu4j/main/classes/core/src/com/ibm/icu/text/BidiTransform.java
index 240ef442b91..e9318c34ef8 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/BidiTransform.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/BidiTransform.java
@@ -10,8 +10,7 @@ import com.ibm.icu.lang.UCharacter;
  *
  * @author Lina Kemmel
  *
- * @draft ICU 58
- * @provisional This API might change or be removed in a future release.
+ * @stable ICU 58
  */
 public class BidiTransform
 {
@@ -52,22 +51,19 @@ public class BidiTransform
      * @see Bidi#REORDER_DEFAULT
      * @see Bidi#REORDER_INVERSE_LIKE_DIRECT
      * @see Bidi#REORDER_RUNS_ONLY
-     * @draft ICU 58
-     * @provisional This API might change or be removed in a future release.
+     * @stable ICU 58
      */
     public enum Order {
         /**
          * Constant indicating a logical order.
          *
-         * @draft ICU 58
-         * @provisional This API might change or be removed in a future release.
+         * @stable ICU 58
          */
         LOGICAL,
         /**
          * Constant indicating a visual order.
          *
-         * @draft ICU 58
-         * @provisional This API might change or be removed in a future release.
+         * @stable ICU 58
          */
         VISUAL;
     }
@@ -81,16 +77,14 @@ public class BidiTransform
      * @see Bidi#setReorderingOptions
      * @see Bidi#writeReordered
      * @see Bidi#writeReverse
-     * @draft ICU 58
-     * @provisional This API might change or be removed in a future release.
+     * @stable ICU 58
      */
     public enum Mirroring {
         /**
          * Constant indicating that character mirroring should not be
          * performed.
          *
-         * @draft ICU 58
-         * @provisional This API might change or be removed in a future release.
+         * @stable ICU 58
          */
         OFF,
         /**
@@ -100,8 +94,7 @@ public class BidiTransform
          * or <code>{@link Bidi#writeReverse}</code> with the
          * <code>{@link Bidi#DO_MIRRORING}</code> option bit set.
          *
-         * @draft ICU 58
-         * @provisional This API might change or be removed in a future release.
+         * @stable ICU 58
          */
         ON;
     }
@@ -114,8 +107,7 @@ public class BidiTransform
     /**
      * <code>{@link BidiTransform}</code> default constructor.
      *
-     * @draft ICU 58
-     * @provisional This API might change or be removed in a future release.
+     * @stable ICU 58
      */
     public BidiTransform()
     {
@@ -224,8 +216,7 @@ public class BidiTransform
      * @throws IllegalArgumentException if <code>text</code>,
      *        <code>inOrder</code>, <code>outOrder</code>, or
      *        <code>doMirroring</code> parameter is <code>null</code>.
-     * @draft ICU 58
-     * @provisional This API might change or be removed in a future release.
+     * @stable ICU 58
      */
     public String transform(CharSequence text,
             byte inParaLevel, Order inOrder,
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/DecimalFormatSymbols.java b/icu4j/main/classes/core/src/com/ibm/icu/text/DecimalFormatSymbols.java
index 147ca20c113..3dffb61c3a2 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/DecimalFormatSymbols.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/DecimalFormatSymbols.java
@@ -264,8 +264,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
     * {@icu} Returns the array of strings used as digits, in order from 0 through 9
     * @return The array of ten digit strings
     * @see #setDigitStrings(String[])
-    * @draft ICU 58
-    * @provisional This API might change or be removed in a future release.
+    * @stable ICU 58
     */
     public String[] getDigitStrings() {
         return digitStrings.clone();
@@ -297,8 +296,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
     * @throws NullPointerException if the <code>digitStrings</code> is null.
     * @throws IllegalArgumentException if the length of the array is not 10.
     * @see #getDigitStrings()
-    * @draft ICU 58
-    * @provisional This API might change or be removed in a future release.
+    * @stable ICU 58
     */
     public void setDigitStrings(String[] digitStrings) {
         if (digitStrings == null) {
@@ -379,8 +377,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
      * {@icu} Returns the string used for grouping separator. Different for French, etc.
      * @return the grouping separator string
      * @see #setGroupingSeparatorString(String)
-     * @draft ICU 58
-     * @provisional This API might change or be removed in a future release.
+     * @stable ICU 58
      */
     public String getGroupingSeparatorString() {
         return groupingSeparatorString;
@@ -396,8 +393,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
      * @param groupingSeparatorString the grouping separator string
      * @throws NullPointerException if <code>groupingSeparatorString</code> is null.
      * @see #getGroupingSeparatorString()
-     * @draft ICU 58
-     * @provisional This API might change or be removed in a future release.
+     * @stable ICU 58
      */
     public void setGroupingSeparatorString(String groupingSeparatorString) {
         if (groupingSeparatorString == null) {
@@ -436,8 +432,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
      * {@icu} Returns the string used for decimal sign.
      * @return the decimal sign string
      * @see #setDecimalSeparatorString(String)
-     * @draft ICU 58
-     * @provisional This API might change or be removed in a future release.
+     * @stable ICU 58
      */
     public String getDecimalSeparatorString() {
         return decimalSeparatorString;
@@ -453,8 +448,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
      * @param decimalSeparatorString the decimal sign string
      * @throws NullPointerException if <code>decimalSeparatorString</code> is null.
      * @see #getDecimalSeparatorString()
-     * @draft ICU 58
-     * @provisional This API might change or be removed in a future release.
+     * @stable ICU 58
      */
     public void setDecimalSeparatorString(String decimalSeparatorString) {
         if (decimalSeparatorString == null) {
@@ -493,8 +487,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
      * {@icu} Returns the string used for permille sign.
      * @return the permille string
      * @see #setPerMillString(String)
-     * @draft ICU 58
-     * @provisional This API might change or be removed in a future release.
+     * @stable ICU 58
      */
     public String getPerMillString() {
         return perMillString;
@@ -510,8 +503,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
      * @param perMillString the permille string
      * @throws NullPointerException if <code>perMillString</code> is null.
      * @see #getPerMillString()
-     * @draft ICU 58
-     * @provisional This API might change or be removed in a future release.
+     * @stable ICU 58
      */
     public void setPerMillString(String perMillString) {
         if (perMillString == null) {
@@ -550,8 +542,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
      * {@icu} Returns the string used for percent sign.
      * @return the percent string
      * @see #setPercentString(String)
-     * @draft ICU 58
-     * @provisional This API might change or be removed in a future release.
+     * @stable ICU 58
      */
     public String getPercentString() {
         return percentString;
@@ -567,8 +558,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
      * @param percentString the percent string
      * @throws NullPointerException if <code>percentString</code> is null.
      * @see #getPercentString()
-     * @draft ICU 58
-     * @provisional This API might change or be removed in a future release.
+     * @stable ICU 58
      */
     public void setPercentString(String percentString) {
         if (percentString == null) {
@@ -692,8 +682,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
      * {@icu} Returns the string used to represent minus sign.
      * @return the minus sign string
      * @see #setMinusSignString(String)
-     * @draft ICU 58
-     * @provisional This API might change or be removed in a future release.
+     * @stable ICU 58
      */
     public String getMinusSignString() {
         return minusString;
@@ -709,8 +698,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
      * @param minusSignString the minus sign string
      * @throws NullPointerException if <code>minusSignString</code> is null.
      * @see #getGroupingSeparatorString()
-     * @draft ICU 58
-     * @provisional This API might change or be removed in a future release.
+     * @stable ICU 58
      */
     public void setMinusSignString(String minusSignString) {
         if (minusSignString == null) {
@@ -756,8 +744,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
     /**
      * {@icu} Returns the string used to represent plus sign.
      * @return the plus sign string
-     * @draft ICU 58
-     * @provisional This API might change or be removed in a future release.
+     * @stable ICU 58
      */
     public String getPlusSignString() {
         return plusString;
@@ -774,8 +761,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
      * strings
      * @throws NullPointerException if <code>plusSignString</code> is null.
      * @see #getPlusSignString()
-     * @draft ICU 58
-     * @provisional This API might change or be removed in a future release.
+     * @stable ICU 58
      */
     public void setPlusSignString(String plusSignString) {
         if (plusSignString == null) {
@@ -886,8 +872,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
      * {@icu} Returns the monetary decimal separator string.
      * @return the monetary decimal separator string
      * @see #setMonetaryDecimalSeparatorString(String)
-     * @draft ICU 58
-     * @provisional This API might change or be removed in a future release.
+     * @stable ICU 58
      */
     public String getMonetaryDecimalSeparatorString() {
         return monetarySeparatorString;
@@ -903,8 +888,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
      * @param sep the monetary decimal separator string
      * @throws NullPointerException if <code>sep</code> is null.
      * @see #getMonetaryDecimalSeparatorString()
-     * @draft ICU 58
-     * @provisional This API might change or be removed in a future release.
+     * @stable ICU 58
      */
     public void setMonetaryDecimalSeparatorString(String sep) {
         if (sep == null) {
@@ -943,8 +927,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
      * {@icu} Returns the monetary grouping separator.
      * @return the monetary grouping separator string
      * @see #setMonetaryGroupingSeparatorString(String)
-     * @draft ICU 58
-     * @provisional This API might change or be removed in a future release.
+     * @stable ICU 58
      */
     public String getMonetaryGroupingSeparatorString() {
         return monetaryGroupingSeparatorString;
@@ -960,8 +943,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
      * @param sep the monetary grouping separator string
      * @throws NullPointerException if <code>sep</code> is null.
      * @see #getMonetaryGroupingSeparatorString()
-     * @draft ICU 58
-     * @provisional This API might change or be removed in a future release.
+     * @stable ICU 58
      */
     public void setMonetaryGroupingSeparatorString(String sep) {
         if (sep == null) {
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/DisplayContext.java b/icu4j/main/classes/core/src/com/ibm/icu/text/DisplayContext.java
index 751b4768540..fac0d70b099 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/DisplayContext.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/DisplayContext.java
@@ -97,15 +97,13 @@ public enum DisplayContext {
      * A possible setting for SUBSTITUTE_HANDLING:
      * Returns a fallback value (e.g., the input code) when no data is available.
      * This is the default behavior.
-     * @draft ICU 58
-     * @provisional This API might change or be removed in a future release.
+     * @stable ICU 58
      */
     SUBSTITUTE(Type.SUBSTITUTE_HANDLING, 0),
     /**
      * A possible setting for SUBSTITUTE_HANDLING:
      * Returns a null value when no data is available.
-     * @draft ICU 58
-     * @provisional This API might change or be removed in a future release.
+     * @stable ICU 58
      */
     NO_SUBSTITUTE(Type.SUBSTITUTE_HANDLING, 1);
 
@@ -132,8 +130,7 @@ public enum DisplayContext {
         DISPLAY_LENGTH,
         /**
          * SUBSTITUTE_HANDLING can be set to SUBSTITUTE or NO_SUBSTITUTE.
-         * @draft ICU 58
-         * @provisional This API might change or be removed in a future release.
+         * @stable ICU 58
          */
         SUBSTITUTE_HANDLING
     }
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/MeasureFormat.java b/icu4j/main/classes/core/src/com/ibm/icu/text/MeasureFormat.java
index ad4fa241989..a22c18bedc3 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/MeasureFormat.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/MeasureFormat.java
@@ -576,8 +576,7 @@ public class MeasureFormat extends UFormat {
      *          {@link MeasureFormat#getInstance}, or null if there is no display name available
      *          for the specified unit.
      *
-     * @draft ICU 58
-     * @provisional This API might change or be removed in a future release.
+     * @stable ICU 58
      */
     public String getUnitDisplayName(MeasureUnit unit) {
         FormatWidth width = getRegularWidth(formatWidth);
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/SpoofChecker.java b/icu4j/main/classes/core/src/com/ibm/icu/text/SpoofChecker.java
index e1f2aa58080..28afb1adbd4 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/SpoofChecker.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/SpoofChecker.java
@@ -270,8 +270,7 @@ public class SpoofChecker {
     /**
      * Security Profile constant from UTS 39 for use in {@link SpoofChecker.Builder#setAllowedChars}.
      *
-     * @draft ICU 58
-     * @provisional This API might change or be removed in a future release.
+     * @stable ICU 58
      */
     public static final UnicodeSet INCLUSION = new UnicodeSet(
             "['\\-.\\:\\u00B7\\u0375\\u058A\\u05F3\\u05F4\\u06FD\\u06FE\\u0F0B\\u200C\\u200D\\u2010\\u"
@@ -284,8 +283,7 @@ public class SpoofChecker {
     /**
      * Security Profile constant from UTS 39 for use in {@link SpoofChecker.Builder#setAllowedChars}.
      *
-     * @draft ICU 58
-     * @provisional This API might change or be removed in a future release.
+     * @stable ICU 58
      */
     public static final UnicodeSet RECOMMENDED = new UnicodeSet(
             "[0-9A-Z_a-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u0131\\u0134-\\u013E\\u0141-\\u014"
@@ -386,8 +384,7 @@ public class SpoofChecker {
      * checks to some subset of SINGLE_SCRIPT_CONFUSABLE, MIXED_SCRIPT_CONFUSABLE, or WHOLE_SCRIPT_CONFUSABLE to make
      * {@link SpoofChecker#areConfusable} return only those types of confusables.
      *
-     * @draft ICU 58
-     * @provisional This API might change or be removed in a future release.
+     * @stable ICU 58
      */
     public static final int CONFUSABLE = SINGLE_SCRIPT_CONFUSABLE | MIXED_SCRIPT_CONFUSABLE | WHOLE_SCRIPT_CONFUSABLE;
 
@@ -405,8 +402,7 @@ public class SpoofChecker {
      * {@link SpoofChecker.Builder#setRestrictionLevel}. The default restriction level is
      * {@link RestrictionLevel#HIGHLY_RESTRICTIVE}.
      *
-     * @draft ICU 58
-     * @provisional This API might change or be removed in a future release.
+     * @stable ICU 58
      */
     public static final int RESTRICTION_LEVEL = 16;
 
@@ -441,8 +437,7 @@ public class SpoofChecker {
      * Check that an identifier does not mix numbers from different numbering systems. For more information, see UTS 39
      * section 5.3.
      *
-     * @draft ICU 58
-     * @provisional This API might change or be removed in a future release.
+     * @stable ICU 58
      */
     public static final int MIXED_NUMBERS = 128;
 
@@ -552,8 +547,7 @@ public class SpoofChecker {
          * @throws ParseException
          *             To report syntax errors in the input.
          *
-         * @draft ICU 58
-         * @provisional This API might change or be removed in a future release.
+         * @stable ICU 58
          */
         public Builder setData(Reader confusables) throws ParseException, IOException {
 
@@ -759,7 +753,7 @@ public class SpoofChecker {
          *            The loosest restriction level allowed.
          * @return self
          * @provisional This API might change or be removed in a future release.
-         * @draft ICU 58
+         * @stable ICU 58
          */
         public Builder setRestrictionLevel(RestrictionLevel restrictionLevel) {
             fRestrictionLevel = restrictionLevel;
@@ -1197,16 +1191,14 @@ public class SpoofChecker {
          * The numerics found in the string, if MIXED_NUMBERS was set; otherwise null.  The set will contain the zero
          * digit from each decimal number system found in the input string.
          *
-         * @draft ICU 58
-         * @provisional This API might change or be removed in a future release.
+         * @stable ICU 58
          */
         public UnicodeSet numerics;
 
         /**
          * The restriction level that the text meets, if RESTRICTION_LEVEL is set; otherwise null.
          *
-         * @draft ICU 58
-         * @provisional This API might change or be removed in a future release.
+         * @stable ICU 58
          */
         public RestrictionLevel restrictionLevel;
 
@@ -1458,8 +1450,7 @@ public class SpoofChecker {
      *            The input string whose skeleton will be generated.
      * @return The output skeleton string.
      *
-     * @draft ICU 58
-     * @provisional This API might change or be removed in a future release.
+     * @stable ICU 58
      */
     public String getSkeleton(CharSequence str) {
         // Apply the skeleton mapping to the NFD normalized input string
@@ -1501,8 +1492,7 @@ public class SpoofChecker {
      * @param other
      *            the SpoofChecker being compared with.
      * @return true if the two SpoofCheckers are equal.
-     * @draft ICU 58
-     * @provisional This API might change or be removed in a future release.
+     * @stable ICU 58
      */
     @Override
     public boolean equals(Object other) {
@@ -1531,8 +1521,8 @@ public class SpoofChecker {
     }
 
     /**
-     * @draft ICU 58
-     * @provisional This API might change or be removed in a future release.
+     * Overrides {@link Object#hashCode()}.
+     * @stable ICU 58
      */
     @Override
     public int hashCode() {
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 17513d01bea..a18b2b9c3c1 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
@@ -472,15 +472,13 @@ public class MeasureUnit implements Serializable {
 
     /**
      * Constant for unit of concentr: millimole-per-liter
-     * @draft ICU 57
-     * @provisional This API might change or be removed in a future release.
+     * @stable ICU 57
      */
     public static final MeasureUnit MILLIMOLE_PER_LITER = MeasureUnit.internalGetInstance("concentr", "millimole-per-liter");
 
     /**
      * Constant for unit of concentr: part-per-million
-     * @draft ICU 57
-     * @provisional This API might change or be removed in a future release.
+     * @stable ICU 57
      */
     public static final MeasureUnit PART_PER_MILLION = MeasureUnit.internalGetInstance("concentr", "part-per-million");
 
@@ -508,8 +506,8 @@ public class MeasureUnit implements Serializable {
      */
     public static final MeasureUnit MILE_PER_GALLON_IMPERIAL = MeasureUnit.internalGetInstance("consumption", "mile-per-gallon-imperial");
 
-    /**
-     * @draft ICU 58, withdrawn
+    /*
+     * at-draft ICU 58, withdrawn
      * public static final MeasureUnit EAST = MeasureUnit.internalGetInstance("coordinate", "east");
      * public static final MeasureUnit NORTH = MeasureUnit.internalGetInstance("coordinate", "north");
      * public static final MeasureUnit SOUTH = MeasureUnit.internalGetInstance("coordinate", "south");