From 4e525e105a28114ecba52d0c963fb02074af6a76 Mon Sep 17 00:00:00 2001 From: Yoshito Umaoka Date: Wed, 4 Sep 2019 13:51:14 -0400 Subject: [PATCH] ICU-20795 BRS65 ICU4J API status promotion - Updating API status version for ICU4J 65 release - Fixed a few minor API doc issues in DecimalFormat and LocaleMatcher - Update ICU4J API change report --- icu4j/APIChangeReport.html | 369 ++++++++---------- .../com/ibm/icu/lang/CharacterProperties.java | 9 +- .../com/ibm/icu/number/CompactNotation.java | 3 +- .../com/ibm/icu/number/CurrencyPrecision.java | 6 +- .../com/ibm/icu/number/FormattedNumber.java | 15 +- .../ibm/icu/number/FormattedNumberRange.java | 21 +- .../com/ibm/icu/number/FractionPrecision.java | 9 +- .../src/com/ibm/icu/number/IntegerWidth.java | 9 +- .../icu/number/LocalizedNumberFormatter.java | 18 +- .../number/LocalizedNumberRangeFormatter.java | 12 +- .../core/src/com/ibm/icu/number/Notation.java | 18 +- .../com/ibm/icu/number/NumberFormatter.java | 84 ++-- .../icu/number/NumberFormatterSettings.java | 51 +-- .../ibm/icu/number/NumberRangeFormatter.java | 54 +-- .../number/NumberRangeFormatterSettings.java | 24 +- .../src/com/ibm/icu/number/Precision.java | 39 +- .../core/src/com/ibm/icu/number/Scale.java | 18 +- .../ibm/icu/number/ScientificNotation.java | 9 +- .../com/ibm/icu/number/SimpleNotation.java | 3 +- .../icu/number/SkeletonSyntaxException.java | 9 +- .../number/UnlocalizedNumberFormatter.java | 9 +- .../UnlocalizedNumberRangeFormatter.java | 9 +- .../src/com/ibm/icu/text/DecimalFormat.java | 7 +- .../src/com/ibm/icu/text/SpoofChecker.java | 3 +- .../src/com/ibm/icu/util/CodePointMap.java | 78 ++-- .../src/com/ibm/icu/util/CodePointTrie.java | 138 +++---- .../src/com/ibm/icu/util/LocaleMatcher.java | 4 +- .../src/com/ibm/icu/util/MeasureUnit.java | 12 +- .../ibm/icu/util/MutableCodePointTrie.java | 27 +- 29 files changed, 406 insertions(+), 661 deletions(-) diff --git a/icu4j/APIChangeReport.html b/icu4j/APIChangeReport.html index f22db68ce32..31795c375fc 100644 --- a/icu4j/APIChangeReport.html +++ b/icu4j/APIChangeReport.html @@ -4,271 +4,244 @@ -ICU4J API Comparison: ICU4J 63.1 with ICU4J 64.2 +ICU4J API Comparison: ICU4J 64.2 with ICU4J 65.1 -

ICU4J API Comparison: ICU4J 63.1 with ICU4J 64.2

+

ICU4J API Comparison: ICU4J 64.2 with ICU4J 65.1


-

Removed from ICU4J 63.1

- -

Package com.ibm.icu.number

- +

Removed from ICU4J 64.2

Package com.ibm.icu.util


-

Deprecated or Obsoleted in ICU4J 64.2

+

Deprecated or Obsoleted in ICU4J 65.1

-

Package com.ibm.icu.text

+

Package com.ibm.icu.util


-

Changed in ICU4J 64.2 (old, new)

+

Changed in ICU4J 65.1 (old, new)

+

(no API changed)

-

Package com.ibm.icu.number

+
+

Promoted to stable in ICU4J 65.1

+ +

Package com.ibm.icu.lang

-

Package com.ibm.icu.util

- * - * @draft ICU 60 - * @provisional This API might change or be removed in a future release. + * @stable ICU 60 * @see NumberFormatter */ public static enum DecimalSeparatorDisplay { @@ -385,8 +363,7 @@ public final class NumberFormatter { * Show the decimal separator when there are one or more digits to display after the separator, * and do not show it otherwise. This is the default behavior. * - * @draft ICU 60 - * @provisional This API might change or be removed in a future release. + * @stable ICU 60 * @see NumberFormatter */ AUTO, @@ -394,8 +371,7 @@ public final class NumberFormatter { /** * Always show the decimal separator, even if there are no digits to display after the separator. * - * @draft ICU 60 - * @provisional This API might change or be removed in a future release. + * @stable ICU 60 * @see NumberFormatter */ ALWAYS, @@ -419,8 +395,7 @@ public final class NumberFormatter { * currently known at the call site. * * @return An {@link UnlocalizedNumberFormatter}, to be used for chaining. - * @draft ICU 60 - * @provisional This API might change or be removed in a future release. + * @stable ICU 60 */ public static UnlocalizedNumberFormatter with() { return BASE; @@ -433,8 +408,7 @@ public final class NumberFormatter { * @param locale * The locale from which to load formats and symbols for number formatting. * @return A {@link LocalizedNumberFormatter}, to be used for chaining. - * @draft ICU 60 - * @provisional This API might change or be removed in a future release. + * @stable ICU 60 */ public static LocalizedNumberFormatter withLocale(Locale locale) { return BASE.locale(locale); @@ -447,8 +421,7 @@ public final class NumberFormatter { * @param locale * The locale from which to load formats and symbols for number formatting. * @return A {@link LocalizedNumberFormatter}, to be used for chaining. - * @draft ICU 60 - * @provisional This API might change or be removed in a future release. + * @stable ICU 60 */ public static LocalizedNumberFormatter withLocale(ULocale locale) { return BASE.locale(locale); @@ -462,8 +435,7 @@ public final class NumberFormatter { * The skeleton string off of which to base this NumberFormatter. * @return An {@link UnlocalizedNumberFormatter}, to be used for chaining. * @throws SkeletonSyntaxException If the given string is not a valid number formatting skeleton. - * @draft ICU 62 - * @provisional This API might change or be removed in a future release. + * @stable ICU 62 */ public static UnlocalizedNumberFormatter forSkeleton(String skeleton) { return NumberSkeletonImpl.getOrCreate(skeleton); 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 cbc93c122e2..fd510fad3b8 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 @@ -23,8 +23,7 @@ import com.ibm.icu.util.ULocale; * by {@link UnlocalizedNumberFormatter} and {@link LocalizedNumberFormatter}. This class is not intended * for public subclassing. * - * @draft ICU 60 - * @provisional This API might change or be removed in a future release. + * @stable ICU 60 * @see NumberFormatter */ public abstract class NumberFormatterSettings> { @@ -84,8 +83,7 @@ public abstract class NumberFormatterSettingsfluent design pattern popularized by libraries such as Google's Guava. * * @author sffc - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 * @see NumberFormatter */ public abstract class NumberRangeFormatter { @@ -35,8 +34,7 @@ public abstract class NumberRangeFormatter { /** * Defines how to merge fields that are identical across the range sign. * - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 * @see NumberRangeFormatter */ public enum RangeCollapse { @@ -46,8 +44,7 @@ public abstract class NumberRangeFormatter { *

* The heuristics used for this option are subject to change over time. * - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 * @see NumberRangeFormatter */ AUTO, @@ -55,8 +52,7 @@ public abstract class NumberRangeFormatter { /** * Do not collapse any part of the number. Example: "3.2 thousand kilograms – 5.3 thousand kilograms" * - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 * @see NumberRangeFormatter */ NONE, @@ -65,8 +61,7 @@ public abstract class NumberRangeFormatter { * Collapse the unit part of the number, but not the notation, if present. Example: "3.2 thousand – 5.3 thousand * kilograms" * - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 * @see NumberRangeFormatter */ UNIT, @@ -75,8 +70,7 @@ public abstract class NumberRangeFormatter { * Collapse any field that is equal across the range sign. May introduce ambiguity on the magnitude of the * number. Example: "3.2 – 5.3 thousand kilograms" * - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 * @see NumberRangeFormatter */ ALL @@ -86,16 +80,14 @@ public abstract class NumberRangeFormatter { * Defines the behavior when the two numbers in the range are identical after rounding. To programmatically detect * when the identity fallback is used, compare the lower and upper BigDecimals via FormattedNumber. * - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 * @see NumberRangeFormatter */ public static enum RangeIdentityFallback { /** * Show the number as a single value rather than a range. Example: "$5" * - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 * @see NumberRangeFormatter */ SINGLE_VALUE, @@ -104,8 +96,7 @@ public abstract class NumberRangeFormatter { * Show the number using a locale-sensitive approximation pattern. If the numbers were the same before rounding, * show the single value. Example: "~$5" or "$5" * - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 * @see NumberRangeFormatter */ APPROXIMATELY_OR_SINGLE_VALUE, @@ -114,8 +105,7 @@ public abstract class NumberRangeFormatter { * Show the number using a locale-sensitive approximation pattern. Use the range pattern always, even if the * inputs are the same. Example: "~$5" * - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 * @see NumberRangeFormatter */ APPROXIMATELY, @@ -124,8 +114,7 @@ public abstract class NumberRangeFormatter { * Show the number as the range of two equal values. Use the range pattern always, even if the inputs are the * same. Example (with RangeCollapse.NONE): "$5 – $5" * - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 * @see NumberRangeFormatter */ RANGE @@ -135,16 +124,14 @@ public abstract class NumberRangeFormatter { * Used in the result class FormattedNumberRange to indicate to the user whether the numbers formatted in the range * were equal or not, and whether or not the identity fallback was applied. * - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 * @see NumberRangeFormatter */ public static enum RangeIdentityResult { /** * Used to indicate that the two numbers in the range were equal, even before any rounding rules were applied. * - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 * @see NumberRangeFormatter */ EQUAL_BEFORE_ROUNDING, @@ -152,8 +139,7 @@ public abstract class NumberRangeFormatter { /** * Used to indicate that the two numbers in the range were equal, but only after rounding rules were applied. * - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 * @see NumberRangeFormatter */ EQUAL_AFTER_ROUNDING, @@ -161,8 +147,7 @@ public abstract class NumberRangeFormatter { /** * Used to indicate that the two numbers in the range were not equal, even after rounding rules were applied. * - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 * @see NumberRangeFormatter */ NOT_EQUAL @@ -175,8 +160,7 @@ public abstract class NumberRangeFormatter { * known at the call site. * * @return An {@link UnlocalizedNumberRangeFormatter}, to be used for chaining. - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public static UnlocalizedNumberRangeFormatter with() { return BASE; @@ -189,8 +173,7 @@ public abstract class NumberRangeFormatter { * @param locale * The locale from which to load formats and symbols for number range formatting. * @return A {@link LocalizedNumberRangeFormatter}, to be used for chaining. - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public static LocalizedNumberRangeFormatter withLocale(Locale locale) { return BASE.locale(locale); @@ -203,8 +186,7 @@ public abstract class NumberRangeFormatter { * @param locale * The locale from which to load formats and symbols for number range formatting. * @return A {@link LocalizedNumberRangeFormatter}, to be used for chaining. - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public static LocalizedNumberRangeFormatter withLocale(ULocale locale) { return BASE.locale(locale); diff --git a/icu4j/main/classes/core/src/com/ibm/icu/number/NumberRangeFormatterSettings.java b/icu4j/main/classes/core/src/com/ibm/icu/number/NumberRangeFormatterSettings.java index 50df9af21bc..642aec5775d 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/number/NumberRangeFormatterSettings.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/number/NumberRangeFormatterSettings.java @@ -13,8 +13,7 @@ import com.ibm.icu.util.ULocale; * public subclassing. * * @author sffc - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 * @see NumberRangeFormatter */ public abstract class NumberRangeFormatterSettings> { @@ -49,8 +48,7 @@ public abstract class NumberRangeFormatterSettings * To create a Precision, use one of the factory methods. * - * @draft ICU 62 - * @provisional This API might change or be removed in a future release. + * @stable ICU 62 * @see NumberFormatter */ public abstract class Precision implements Cloneable { @@ -45,8 +44,7 @@ public abstract class Precision implements Cloneable { * http://www.serpentine.com/blog/2011/06/29/here-be-dragons-advances-in-problems-you-didnt-even-know-you-had/ * * @return A Precision for chaining or passing to the NumberFormatter precision() setter. - * @draft ICU 60 - * @provisional This API might change or be removed in a future release. + * @stable ICU 60 * @see NumberFormatter */ public static Precision unlimited() { @@ -57,8 +55,7 @@ public abstract class Precision implements Cloneable { * Show numbers rounded if necessary to the nearest integer. * * @return A FractionPrecision for chaining or passing to the NumberFormatter precision() setter. - * @draft ICU 60 - * @provisional This API might change or be removed in a future release. + * @stable ICU 60 * @see NumberFormatter */ public static FractionPrecision integer() { @@ -91,8 +88,7 @@ public abstract class Precision implements Cloneable { * The minimum and maximum number of numerals to display after the decimal separator * (rounding if too long or padding with zeros if too short). * @return A FractionPrecision for chaining or passing to the NumberFormatter precision() setter. - * @draft ICU 60 - * @provisional This API might change or be removed in a future release. + * @stable ICU 60 * @see NumberFormatter */ public static FractionPrecision fixedFraction(int minMaxFractionPlaces) { @@ -117,8 +113,7 @@ public abstract class Precision implements Cloneable { * The minimum number of numerals to display after the decimal separator (padding with * zeros if necessary). * @return A FractionPrecision for chaining or passing to the NumberFormatter precision() setter. - * @draft ICU 60 - * @provisional This API might change or be removed in a future release. + * @stable ICU 60 * @see NumberFormatter */ public static FractionPrecision minFraction(int minFractionPlaces) { @@ -140,8 +135,7 @@ public abstract class Precision implements Cloneable { * The maximum number of numerals to display after the decimal mark (rounding if * necessary). * @return A FractionPrecision for chaining or passing to the NumberFormatter precision() setter. - * @draft ICU 60 - * @provisional This API might change or be removed in a future release. + * @stable ICU 60 * @see NumberFormatter */ public static FractionPrecision maxFraction(int maxFractionPlaces) { @@ -166,8 +160,7 @@ public abstract class Precision implements Cloneable { * The maximum number of numerals to display after the decimal separator (rounding if * necessary). * @return A FractionPrecision for chaining or passing to the NumberFormatter precision() setter. - * @draft ICU 60 - * @provisional This API might change or be removed in a future release. + * @stable ICU 60 * @see NumberFormatter */ public static FractionPrecision minMaxFraction(int minFractionPlaces, int maxFractionPlaces) { @@ -194,8 +187,7 @@ public abstract class Precision implements Cloneable { * The minimum and maximum number of significant digits to display (rounding if too long * or padding with zeros if too short). * @return A Precision for chaining or passing to the NumberFormatter precision() setter. - * @draft ICU 62 - * @provisional This API might change or be removed in a future release. + * @stable ICU 62 * @see NumberFormatter */ public static Precision fixedSignificantDigits(int minMaxSignificantDigits) { @@ -219,8 +211,7 @@ public abstract class Precision implements Cloneable { * @param minSignificantDigits * The minimum number of significant digits to display (padding with zeros if too short). * @return A Precision for chaining or passing to the NumberFormatter precision() setter. - * @draft ICU 62 - * @provisional This API might change or be removed in a future release. + * @stable ICU 62 * @see NumberFormatter */ public static Precision minSignificantDigits(int minSignificantDigits) { @@ -239,8 +230,7 @@ public abstract class Precision implements Cloneable { * @param maxSignificantDigits * The maximum number of significant digits to display (rounding if too long). * @return A Precision for chaining or passing to the NumberFormatter precision() setter. - * @draft ICU 62 - * @provisional This API might change or be removed in a future release. + * @stable ICU 62 * @see NumberFormatter */ public static Precision maxSignificantDigits(int maxSignificantDigits) { @@ -262,8 +252,7 @@ public abstract class Precision implements Cloneable { * @param maxSignificantDigits * The maximum number of significant digits to display (rounding if necessary). * @return A Precision for chaining or passing to the NumberFormatter precision() setter. - * @draft ICU 62 - * @provisional This API might change or be removed in a future release. + * @stable ICU 62 * @see NumberFormatter */ public static Precision minMaxSignificantDigits(int minSignificantDigits, int maxSignificantDigits) { @@ -298,8 +287,7 @@ public abstract class Precision implements Cloneable { * @param roundingIncrement * The increment to which to round numbers. * @return A Precision for chaining or passing to the NumberFormatter precision() setter. - * @draft ICU 60 - * @provisional This API might change or be removed in a future release. + * @stable ICU 60 * @see NumberFormatter */ public static Precision increment(BigDecimal roundingIncrement) { @@ -326,8 +314,7 @@ public abstract class Precision implements Cloneable { * Either STANDARD (for digital transactions) or CASH (for transactions where the rounding * increment may be limited by the available denominations of cash or coins). * @return A CurrencyPrecision for chaining or passing to the NumberFormatter precision() setter. - * @draft ICU 60 - * @provisional This API might change or be removed in a future release. + * @stable ICU 60 * @see NumberFormatter */ public static CurrencyPrecision currency(CurrencyUsage currencyUsage) { diff --git a/icu4j/main/classes/core/src/com/ibm/icu/number/Scale.java b/icu4j/main/classes/core/src/com/ibm/icu/number/Scale.java index cdcf8259c64..dceda2e59ad 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/number/Scale.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/number/Scale.java @@ -15,8 +15,7 @@ import com.ibm.icu.impl.number.RoundingUtils; *

* To create a Multiplier, use one of the factory methods. * - * @draft ICU 62 - * @provisional This API might change or be removed in a future release. + * @stable ICU 62 * @see NumberFormatter */ public class Scale { @@ -68,8 +67,7 @@ public class Scale { * Do not change the value of numbers when formatting or parsing. * * @return A Multiplier to prevent any multiplication. - * @draft ICU 62 - * @provisional This API might change or be removed in a future release. + * @stable ICU 62 * @see NumberFormatter */ public static Scale none() { @@ -84,8 +82,7 @@ public class Scale { * * * @return A Multiplier for passing to the setter in NumberFormatter. - * @draft ICU 62 - * @provisional This API might change or be removed in a future release. + * @stable ICU 62 * @see NumberFormatter */ public static Scale powerOfTen(int power) { @@ -106,8 +103,7 @@ public class Scale { * This method takes a BigDecimal; also see the version that takes a double. * * @return A Multiplier for passing to the setter in NumberFormatter. - * @draft ICU 62 - * @provisional This API might change or be removed in a future release. + * @stable ICU 62 * @see NumberFormatter */ public static Scale byBigDecimal(BigDecimal multiplicand) { @@ -128,8 +124,7 @@ public class Scale { * This method takes a double; also see the version that takes a BigDecimal. * * @return A Multiplier for passing to the setter in NumberFormatter. - * @draft ICU 62 - * @provisional This API might change or be removed in a future release. + * @stable ICU 62 * @see NumberFormatter */ public static Scale byDouble(double multiplicand) { @@ -148,8 +143,7 @@ public class Scale { * Multiply a number by both a power of ten and by an arbitrary double value before formatting. * * @return A Multiplier for passing to the setter in NumberFormatter. - * @draft ICU 62 - * @provisional This API might change or be removed in a future release. + * @stable ICU 62 * @see NumberFormatter */ public static Scale byDoubleAndPowerOfTen(double multiplicand, int power) { diff --git a/icu4j/main/classes/core/src/com/ibm/icu/number/ScientificNotation.java b/icu4j/main/classes/core/src/com/ibm/icu/number/ScientificNotation.java index 8246af9fc84..10945cd8589 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/number/ScientificNotation.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/number/ScientificNotation.java @@ -24,8 +24,7 @@ import com.ibm.icu.text.NumberFormat; *

* To create a ScientificNotation, use one of the factory methods in {@link Notation}. * - * @draft ICU 60 - * @provisional This API might change or be removed in a future release. + * @stable ICU 60 * @see NumberFormatter */ public class ScientificNotation extends Notation implements Cloneable { @@ -57,8 +56,7 @@ public class ScientificNotation extends Notation implements Cloneable { * @param minExponentDigits * The minimum number of digits to show in the exponent. * @return A ScientificNotation, for chaining. - * @draft ICU 60 - * @provisional This API might change or be removed in a future release. + * @stable ICU 60 * @see NumberFormatter */ public ScientificNotation withMinExponentDigits(int minExponentDigits) { @@ -84,8 +82,7 @@ public class ScientificNotation extends Notation implements Cloneable { * @param exponentSignDisplay * The strategy for displaying the sign in the exponent. * @return A ScientificNotation, for chaining. - * @draft ICU 60 - * @provisional This API might change or be removed in a future release. + * @stable ICU 60 * @see NumberFormatter */ public ScientificNotation withExponentSignDisplay(SignDisplay exponentSignDisplay) { diff --git a/icu4j/main/classes/core/src/com/ibm/icu/number/SimpleNotation.java b/icu4j/main/classes/core/src/com/ibm/icu/number/SimpleNotation.java index bd9ca6e5b61..85f1afe191a 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/number/SimpleNotation.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/number/SimpleNotation.java @@ -9,8 +9,7 @@ package com.ibm.icu.number; * This class exposes no public functionality. To create a SimpleNotation, use one of the factory methods * in {@link Notation}. * - * @draft ICU 60 - * @provisional This API might change or be removed in a future release. + * @stable ICU 60 * @see NumberFormatter */ public class SimpleNotation extends Notation { diff --git a/icu4j/main/classes/core/src/com/ibm/icu/number/SkeletonSyntaxException.java b/icu4j/main/classes/core/src/com/ibm/icu/number/SkeletonSyntaxException.java index d749c659435..53a93023ee5 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/number/SkeletonSyntaxException.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/number/SkeletonSyntaxException.java @@ -5,8 +5,7 @@ package com.ibm.icu.number; /** * Exception used for illegal number skeleton strings. * - * @draft ICU 62 - * @provisional This API might change or be removed in a future release. + * @stable ICU 62 * @see NumberFormatter */ public class SkeletonSyntaxException extends IllegalArgumentException { @@ -15,8 +14,7 @@ public class SkeletonSyntaxException extends IllegalArgumentException { /** * Construct a new SkeletonSyntaxException with information about the token at the point of failure. * - * @draft ICU 62 - * @provisional This API might change or be removed in a future release. + * @stable ICU 62 * @see NumberFormatter */ public SkeletonSyntaxException(String message, CharSequence token) { @@ -26,8 +24,7 @@ public class SkeletonSyntaxException extends IllegalArgumentException { /** * Construct a new SkeletonSyntaxException with information about the token at the point of failure. * - * @draft ICU 62 - * @provisional This API might change or be removed in a future release. + * @stable ICU 62 * @see NumberFormatter */ public SkeletonSyntaxException(String message, CharSequence token, Throwable cause) { diff --git a/icu4j/main/classes/core/src/com/ibm/icu/number/UnlocalizedNumberFormatter.java b/icu4j/main/classes/core/src/com/ibm/icu/number/UnlocalizedNumberFormatter.java index 0f49a5a459d..f89f5ecbb1d 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/number/UnlocalizedNumberFormatter.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/number/UnlocalizedNumberFormatter.java @@ -13,8 +13,7 @@ import com.ibm.icu.util.ULocale; * Instances of this class are immutable and thread-safe. * * @see NumberFormatter - * @draft ICU 60 - * @provisional This API might change or be removed in a future release. + * @stable ICU 60 */ public class UnlocalizedNumberFormatter extends NumberFormatterSettings { @@ -41,8 +40,7 @@ public class UnlocalizedNumberFormatter extends NumberFormatterSettings { @@ -41,8 +40,7 @@ public class UnlocalizedNumberRangeFormatter extends NumberRangeFormatterSetting * @param locale * The locale to use when loading data for number range formatting. * @return The fluent chain - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public LocalizedNumberRangeFormatter locale(Locale locale) { return new LocalizedNumberRangeFormatter(this, KEY_LOCALE, ULocale.forLocale(locale)); @@ -55,8 +53,7 @@ public class UnlocalizedNumberRangeFormatter extends NumberRangeFormatterSetting * The locale to use when loading data for number range formatting. * @return The fluent chain * @see #locale(Locale) - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public LocalizedNumberRangeFormatter locale(ULocale locale) { return new LocalizedNumberRangeFormatter(this, KEY_LOCALE, locale); 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 57e4708184d..1bfeff4c8c8 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 @@ -2197,8 +2197,10 @@ public class DecimalFormat extends NumberFormat { /** * Android libcore uses this internal method to set {@link ParseMode#JAVA_COMPATIBILITY}. * @internal + * @deprecated This API is ICU internal only. */ - public synchronized void setParseStrictMode(ParseMode parseMode) { + @Deprecated +public synchronized void setParseStrictMode(ParseMode parseMode) { properties.setParseMode(parseMode); refreshFormatter(); } @@ -2484,8 +2486,7 @@ public class DecimalFormat extends NumberFormat { * @return An instance of {@link LocalizedNumberFormatter} with the same behavior as this instance of * DecimalFormat. * @see NumberFormatter - * @provisional This API might change or be removed in a future release. - * @draft ICU 60 + * @stable ICU 60 */ public LocalizedNumberFormatter toNumberFormatter() { return formatter; 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 d4a9e7db225..8fa702d9abc 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 @@ -471,8 +471,7 @@ public class SpoofChecker { *

* This list and the number of combing characters considered by this check may grow over time. * - * @draft ICU 62 - * @provisional This API might change or be removed in a future release. + * @stable ICU 62 */ public static final int HIDDEN_OVERLAY = 256; diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/CodePointMap.java b/icu4j/main/classes/core/src/com/ibm/icu/util/CodePointMap.java index 7277053bd8a..856689a48f5 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/util/CodePointMap.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/util/CodePointMap.java @@ -12,8 +12,7 @@ import java.util.NoSuchElementException; * Abstract map from Unicode code points (U+0000..U+10FFFF) to integer values. * This does not implement java.util.Map. * - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public abstract class CodePointMap implements Iterable { /** @@ -21,16 +20,14 @@ public abstract class CodePointMap implements Iterable { * Most users should use NORMAL. * * @see #getRange - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public enum RangeOption { /** * getRange() enumerates all same-value ranges as stored in the map. * Most users should use this option. * - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ NORMAL, /** @@ -47,8 +44,7 @@ public abstract class CodePointMap implements Iterable { * or for special error behavior for unpaired surrogates, * but those values are not to be associated with the lead surrogate code *points*. * - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ FIXED_LEAD_SURROGATES, /** @@ -65,8 +61,7 @@ public abstract class CodePointMap implements Iterable { * or for special error behavior for unpaired surrogates, * but those values are not to be associated with the lead surrogate code *points*. * - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ FIXED_ALL_SURROGATES } @@ -82,8 +77,7 @@ public abstract class CodePointMap implements Iterable { * * @see #getRange * @see #iterator - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public interface ValueFilter { /** @@ -91,8 +85,7 @@ public abstract class CodePointMap implements Iterable { * * @param value map value * @return modified value - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public int apply(int value); } @@ -105,8 +98,7 @@ public abstract class CodePointMap implements Iterable { * * @see #getRange * @see #iterator - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public static final class Range { private int start; @@ -116,8 +108,7 @@ public abstract class CodePointMap implements Iterable { /** * Constructor. Sets start and end to -1 and value to 0. * - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public Range() { start = end = -1; @@ -126,20 +117,17 @@ public abstract class CodePointMap implements Iterable { /** * @return the start code point - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public int getStart() { return start; } /** * @return the (inclusive) end code point - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public int getEnd() { return end; } /** * @return the range value - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public int getValue() { return value; } /** @@ -149,8 +137,7 @@ public abstract class CodePointMap implements Iterable { * @param start new start code point * @param end new end code point * @param value new value - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public void set(int start, int end, int value) { this.start = start; @@ -199,8 +186,7 @@ public abstract class CodePointMap implements Iterable { * *

This class is not intended for public subclassing. * - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public class StringIterator { /** @@ -245,8 +231,7 @@ public abstract class CodePointMap implements Iterable { * * @param s string to iterate over * @param sIndex string index where the iteration will start - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public void reset(CharSequence s, int sIndex) { this.s = s; @@ -262,8 +247,7 @@ public abstract class CodePointMap implements Iterable { * * @return true if the string index was not yet at the end of the string; * otherwise the iterator did not advance - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public boolean next() { if (sIndex >= s.length()) { @@ -282,8 +266,7 @@ public abstract class CodePointMap implements Iterable { * * @return true if the string index was not yet at the start of the string; * otherwise the iterator did not advance - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public boolean previous() { if (sIndex <= 0) { @@ -296,22 +279,19 @@ public abstract class CodePointMap implements Iterable { } /** * @return the string index - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public final int getIndex() { return sIndex; } /** * @return the code point - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public final int getCodePoint() { return c; } /** * @return the map value, * or an implementation-defined error value if * the code point is an unpaired surrogate - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public final int getValue() { return value; } } @@ -319,8 +299,7 @@ public abstract class CodePointMap implements Iterable { /** * Protected no-args constructor. * - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ protected CodePointMap() { } @@ -333,8 +312,7 @@ public abstract class CodePointMap implements Iterable { * @return the map value, * or an implementation-defined error value if * the code point is not in the range 0..U+10FFFF - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public abstract int get(int c); @@ -371,8 +349,7 @@ public abstract class CodePointMap implements Iterable { * or null if the values from the map are to be used unmodified * @param range the range object that will be set to the code point range and value * @return true if start is 0..U+10FFFF; otherwise no new range is fetched - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public abstract boolean getRange(int start, ValueFilter filter, Range range); @@ -395,8 +372,7 @@ public abstract class CodePointMap implements Iterable { * or null if the values from the map are to be used unmodified * @param range the range object that will be set to the code point range and value * @return true if start is 0..U+10FFFF; otherwise no new range is fetched - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public boolean getRange(int start, RangeOption option, int surrogateValue, ValueFilter filter, Range range) { @@ -453,8 +429,7 @@ public abstract class CodePointMap implements Iterable { *

The iterator always returns the same Range object. * * @return a Range iterator - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ @Override public Iterator iterator() { @@ -468,8 +443,7 @@ public abstract class CodePointMap implements Iterable { * @param s string to iterate over * @param sIndex string index where the iteration will start * @return the iterator - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public StringIterator stringIterator(CharSequence s, int sIndex) { return new StringIterator(s, sIndex); diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/CodePointTrie.java b/icu4j/main/classes/core/src/com/ibm/icu/util/CodePointTrie.java index 904b971df31..d5ee8ab0b0f 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/util/CodePointTrie.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/util/CodePointTrie.java @@ -22,8 +22,7 @@ import com.ibm.icu.impl.Normalizer2Impl.UTF16Plus; *

This class is not intended for public subclassing. * * @see MutableCodePointTrie - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public abstract class CodePointTrie extends CodePointMap { /** @@ -36,8 +35,7 @@ public abstract class CodePointTrie extends CodePointMap { * @see MutableCodePointTrie#buildImmutable(CodePointTrie.Type, CodePointTrie.ValueWidth) * @see #fromBinary * @see #getType - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public enum Type { /** @@ -45,16 +43,14 @@ public abstract class CodePointTrie extends CodePointMap { * The {@link Fast} subclasses have additional functions for lookup for BMP and supplementary code points. * * @see Fast - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ FAST, /** * Small/slower BMP data structure. * * @see Small - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ SMALL } @@ -65,31 +61,27 @@ public abstract class CodePointTrie extends CodePointMap { *

Use null for {@link #fromBinary} to accept any data value width; * {@link #getValueWidth} will return the actual data value width. * - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public enum ValueWidth { /** * The trie stores 16 bits per data value. * It returns them as unsigned values 0..0xffff=65535. * - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ BITS_16, /** * The trie stores 32 bits per data value. * - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ BITS_32, /** * The trie stores 8 bits per data value. * It returns them as unsigned values 0..0xff=255. * - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ BITS_8 } @@ -135,8 +127,7 @@ public abstract class CodePointTrie extends CodePointMap { * @see MutableCodePointTrie#MutableCodePointTrie(int, int) * @see MutableCodePointTrie#buildImmutable(CodePointTrie.Type, CodePointTrie.ValueWidth) * @see #toBinary(OutputStream) - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public static CodePointTrie fromBinary(Type type, ValueWidth valueWidth, ByteBuffer bytes) { ByteOrder outerByteOrder = bytes.order(); @@ -279,23 +270,20 @@ public abstract class CodePointTrie extends CodePointMap { * Returns the trie type. * * @return the trie type - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public abstract Type getType(); /** * Returns the number of bits in a trie data value. * * @return the number of bits in a trie data value - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public final ValueWidth getValueWidth() { return data.getValueWidth(); } /** * {@inheritDoc} - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ @Override public int get(int c) { @@ -307,8 +295,7 @@ public abstract class CodePointTrie extends CodePointMap { * * @param c the input code point; must be U+0000..U+007F * @return The ASCII code point's trie value. - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public final int asciiGet(int c) { return ascii[c]; @@ -330,8 +317,7 @@ public abstract class CodePointTrie extends CodePointMap { /** * {@inheritDoc} - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ @Override public final boolean getRange(int start, ValueFilter filter, Range range) { @@ -488,8 +474,7 @@ public abstract class CodePointTrie extends CodePointMap { * * @param os the output stream * @return the number of bytes written - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public final int toBinary(OutputStream os) { try { @@ -754,8 +739,7 @@ public abstract class CodePointTrie extends CodePointMap { /** * A CodePointTrie with {@link Type#FAST}. * - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public static abstract class Fast extends CodePointTrie { private Fast(char[] index, Data data, int highStart, @@ -773,8 +757,7 @@ public abstract class CodePointTrie extends CodePointMap { * use null to accept any data value width * @param bytes a buffer containing the binary data of a CodePointTrie * @return the trie - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public static Fast fromBinary(ValueWidth valueWidth, ByteBuffer bytes) { return (Fast) CodePointTrie.fromBinary(Type.FAST, valueWidth, bytes); @@ -782,8 +765,7 @@ public abstract class CodePointTrie extends CodePointMap { /** * @return {@link Type#FAST} - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ @Override public final Type getType() { return Type.FAST; } @@ -795,8 +777,7 @@ public abstract class CodePointTrie extends CodePointMap { * * @param c the input code point, must be U+0000..U+FFFF * @return The BMP code point's trie value. - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public abstract int bmpGet(int c); @@ -806,8 +787,7 @@ public abstract class CodePointTrie extends CodePointMap { * * @param c the input code point, must be U+10000..U+10FFFF * @return The supplementary code point's trie value. - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public abstract int suppGet(int c); @@ -830,8 +810,7 @@ public abstract class CodePointTrie extends CodePointMap { /** * {@inheritDoc} - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ @Override public final StringIterator stringIterator(CharSequence s, int sIndex) { @@ -898,8 +877,7 @@ public abstract class CodePointTrie extends CodePointMap { /** * A CodePointTrie with {@link Type#SMALL}. * - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public static abstract class Small extends CodePointTrie { private Small(char[] index, Data data, int highStart, @@ -917,8 +895,7 @@ public abstract class CodePointTrie extends CodePointMap { * use null to accept any data value width * @param bytes a buffer containing the binary data of a CodePointTrie * @return the trie - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public static Small fromBinary(ValueWidth valueWidth, ByteBuffer bytes) { return (Small) CodePointTrie.fromBinary(Type.SMALL, valueWidth, bytes); @@ -926,8 +903,7 @@ public abstract class CodePointTrie extends CodePointMap { /** * @return {@link Type#SMALL} - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ @Override public final Type getType() { return Type.SMALL; } @@ -951,8 +927,7 @@ public abstract class CodePointTrie extends CodePointMap { /** * {@inheritDoc} - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ @Override public final StringIterator stringIterator(CharSequence s, int sIndex) { @@ -1019,8 +994,7 @@ public abstract class CodePointTrie extends CodePointMap { /** * A CodePointTrie with {@link Type#FAST} and {@link ValueWidth#BITS_16}. * - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public static final class Fast16 extends Fast { private final char[] dataArray; @@ -1038,8 +1012,7 @@ public abstract class CodePointTrie extends CodePointMap { * * @param bytes a buffer containing the binary data of a CodePointTrie * @return the trie - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public static Fast16 fromBinary(ByteBuffer bytes) { return (Fast16) CodePointTrie.fromBinary(Type.FAST, ValueWidth.BITS_16, bytes); @@ -1047,8 +1020,7 @@ public abstract class CodePointTrie extends CodePointMap { /** * {@inheritDoc} - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ @Override public final int get(int c) { @@ -1057,8 +1029,7 @@ public abstract class CodePointTrie extends CodePointMap { /** * {@inheritDoc} - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ @Override public final int bmpGet(int c) { @@ -1068,8 +1039,7 @@ public abstract class CodePointTrie extends CodePointMap { /** * {@inheritDoc} - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ @Override public final int suppGet(int c) { @@ -1081,8 +1051,7 @@ public abstract class CodePointTrie extends CodePointMap { /** * A CodePointTrie with {@link Type#FAST} and {@link ValueWidth#BITS_32}. * - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public static final class Fast32 extends Fast { private final int[] dataArray; @@ -1100,8 +1069,7 @@ public abstract class CodePointTrie extends CodePointMap { * * @param bytes a buffer containing the binary data of a CodePointTrie * @return the trie - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public static Fast32 fromBinary(ByteBuffer bytes) { return (Fast32) CodePointTrie.fromBinary(Type.FAST, ValueWidth.BITS_32, bytes); @@ -1109,8 +1077,7 @@ public abstract class CodePointTrie extends CodePointMap { /** * {@inheritDoc} - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ @Override public final int get(int c) { @@ -1119,8 +1086,7 @@ public abstract class CodePointTrie extends CodePointMap { /** * {@inheritDoc} - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ @Override public final int bmpGet(int c) { @@ -1130,8 +1096,7 @@ public abstract class CodePointTrie extends CodePointMap { /** * {@inheritDoc} - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ @Override public final int suppGet(int c) { @@ -1143,8 +1108,7 @@ public abstract class CodePointTrie extends CodePointMap { /** * A CodePointTrie with {@link Type#FAST} and {@link ValueWidth#BITS_8}. * - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public static final class Fast8 extends Fast { private final byte[] dataArray; @@ -1162,8 +1126,7 @@ public abstract class CodePointTrie extends CodePointMap { * * @param bytes a buffer containing the binary data of a CodePointTrie * @return the trie - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public static Fast8 fromBinary(ByteBuffer bytes) { return (Fast8) CodePointTrie.fromBinary(Type.FAST, ValueWidth.BITS_8, bytes); @@ -1171,8 +1134,7 @@ public abstract class CodePointTrie extends CodePointMap { /** * {@inheritDoc} - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ @Override public final int get(int c) { @@ -1181,8 +1143,7 @@ public abstract class CodePointTrie extends CodePointMap { /** * {@inheritDoc} - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ @Override public final int bmpGet(int c) { @@ -1192,8 +1153,7 @@ public abstract class CodePointTrie extends CodePointMap { /** * {@inheritDoc} - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ @Override public final int suppGet(int c) { @@ -1205,8 +1165,7 @@ public abstract class CodePointTrie extends CodePointMap { /** * A CodePointTrie with {@link Type#SMALL} and {@link ValueWidth#BITS_16}. * - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public static final class Small16 extends Small { Small16(char[] index, char[] data16, int highStart, @@ -1221,8 +1180,7 @@ public abstract class CodePointTrie extends CodePointMap { * * @param bytes a buffer containing the binary data of a CodePointTrie * @return the trie - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public static Small16 fromBinary(ByteBuffer bytes) { return (Small16) CodePointTrie.fromBinary(Type.SMALL, ValueWidth.BITS_16, bytes); @@ -1232,8 +1190,7 @@ public abstract class CodePointTrie extends CodePointMap { /** * A CodePointTrie with {@link Type#SMALL} and {@link ValueWidth#BITS_32}. * - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public static final class Small32 extends Small { Small32(char[] index, int[] data32, int highStart, @@ -1248,8 +1205,7 @@ public abstract class CodePointTrie extends CodePointMap { * * @param bytes a buffer containing the binary data of a CodePointTrie * @return the trie - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public static Small32 fromBinary(ByteBuffer bytes) { return (Small32) CodePointTrie.fromBinary(Type.SMALL, ValueWidth.BITS_32, bytes); @@ -1259,8 +1215,7 @@ public abstract class CodePointTrie extends CodePointMap { /** * A CodePointTrie with {@link Type#SMALL} and {@link ValueWidth#BITS_8}. * - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public static final class Small8 extends Small { Small8(char[] index, byte[] data8, int highStart, @@ -1275,8 +1230,7 @@ public abstract class CodePointTrie extends CodePointMap { * * @param bytes a buffer containing the binary data of a CodePointTrie * @return the trie - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public static Small8 fromBinary(ByteBuffer bytes) { return (Small8) CodePointTrie.fromBinary(Type.SMALL, ValueWidth.BITS_8, bytes); 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 f15a44b2025..e0fd56909d2 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 @@ -88,7 +88,7 @@ public final class LocaleMatcher { /** * Builder option for whether the language subtag or the script subtag is most important. * - * @see Builder#setFavorSubtag(FavorSubtag) + * @see LocaleMatcher.Builder#setFavorSubtag(LocaleMatcher.FavorSubtag) * @draft ICU 65 * @provisional This API might change or be removed in a future release. */ @@ -114,7 +114,7 @@ public final class LocaleMatcher { * Builder option for whether all desired locales are treated equally or * earlier ones are preferred. * - * @see Builder#setDemotionPerDesiredLocale(Demotion) + * @see LocaleMatcher.Builder#setDemotionPerDesiredLocale(LocaleMatcher.Demotion) * @draft ICU 65 * @provisional This API might change or be removed in a future release. */ 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 2e80a5dfdb5..4e670d22e19 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 @@ -509,15 +509,13 @@ public class MeasureUnit implements Serializable { /** * Constant for unit of concentr: percent - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public static final MeasureUnit PERCENT = MeasureUnit.internalGetInstance("concentr", "percent"); /** * Constant for unit of concentr: permille - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public static final MeasureUnit PERMILLE = MeasureUnit.internalGetInstance("concentr", "permille"); @@ -602,8 +600,7 @@ public class MeasureUnit implements Serializable { /** * Constant for unit of digital: petabyte - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public static final MeasureUnit PETABYTE = MeasureUnit.internalGetInstance("digital", "petabyte"); @@ -1090,8 +1087,7 @@ public class MeasureUnit implements Serializable { /** * Constant for unit of pressure: atmosphere - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public static final MeasureUnit ATMOSPHERE = MeasureUnit.internalGetInstance("pressure", "atmosphere"); diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/MutableCodePointTrie.java b/icu4j/main/classes/core/src/com/ibm/icu/util/MutableCodePointTrie.java index b9c171eeee6..33262c075aa 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/util/MutableCodePointTrie.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/util/MutableCodePointTrie.java @@ -22,8 +22,7 @@ import java.util.Arrays; * Iterate over those source ranges; for each of them iterate over this trie; * add the source value into the value of each trie range. * - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public final class MutableCodePointTrie extends CodePointMap implements Cloneable { /** @@ -36,8 +35,7 @@ public final class MutableCodePointTrie extends CodePointMap implements Cloneabl * * @param initialValue the initial value that is set for all code points * @param errorValue the value for out-of-range code points and ill-formed UTF-8/16 - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public MutableCodePointTrie(int initialValue, int errorValue) { index = new int[BMP_I_LIMIT]; @@ -54,8 +52,7 @@ public final class MutableCodePointTrie extends CodePointMap implements Cloneabl * Clones this mutable trie. * * @return the clone - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ @Override public MutableCodePointTrie clone() { @@ -90,8 +87,7 @@ public final class MutableCodePointTrie extends CodePointMap implements Cloneabl * * @param map the source map or trie * @return the mutable trie - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public static MutableCodePointTrie fromCodePointMap(CodePointMap map) { // TODO: Consider special code branch for map instanceof CodePointTrie? @@ -126,8 +122,7 @@ public final class MutableCodePointTrie extends CodePointMap implements Cloneabl /** * {@inheritDoc} - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ @Override public int get(int c) { @@ -160,8 +155,7 @@ public final class MutableCodePointTrie extends CodePointMap implements Cloneabl * *

The trie can be modified between calls to this function. * - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ @Override public boolean getRange(int start, CodePointTrie.ValueFilter filter, @@ -253,8 +247,7 @@ public final class MutableCodePointTrie extends CodePointMap implements Cloneabl * * @param c the code point * @param value the value - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public void set(int c, int value) { if (c < 0 || MAX_UNICODE < c) { @@ -277,8 +270,7 @@ public final class MutableCodePointTrie extends CodePointMap implements Cloneabl * @param start the first code point to get the value * @param end the last code point to get the value (inclusive) * @param value the value - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public void setRange(int start, int end, int value) { if (start < 0 || MAX_UNICODE < start || end < 0 || MAX_UNICODE < end || start > end) { @@ -353,8 +345,7 @@ public final class MutableCodePointTrie extends CodePointMap implements Cloneabl * then the values stored in the trie will be truncated first * * @see #fromCodePointMap(CodePointMap) - * @draft ICU 63 - * @provisional This API might change or be removed in a future release. + * @stable ICU 63 */ public CodePointTrie buildImmutable(CodePointTrie.Type type, CodePointTrie.ValueWidth valueWidth) { if (type == null || valueWidth == null) { -- 2.40.0