diff --git a/icu4j/main/classes/collate/src/com/ibm/icu/text/Collator.java b/icu4j/main/classes/collate/src/com/ibm/icu/text/Collator.java index b15a35f1951..bb42de2334b 100644 --- a/icu4j/main/classes/collate/src/com/ibm/icu/text/Collator.java +++ b/icu4j/main/classes/collate/src/com/ibm/icu/text/Collator.java @@ -1303,8 +1303,7 @@ public abstract class Collator implements Comparator, Freezable, FreezableThe base class implementation returns Collator.ReorderCodes.PUNCTUATION. * @return the maximum variable reordering group. * @see #setMaxVariable - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public int getMaxVariable() { return Collator.ReorderCodes.PUNCTUATION; diff --git a/icu4j/main/classes/collate/src/com/ibm/icu/text/RuleBasedCollator.java b/icu4j/main/classes/collate/src/com/ibm/icu/text/RuleBasedCollator.java index ca8ad4895e7..f9c9d3ff067 100644 --- a/icu4j/main/classes/collate/src/com/ibm/icu/text/RuleBasedCollator.java +++ b/icu4j/main/classes/collate/src/com/ibm/icu/text/RuleBasedCollator.java @@ -739,8 +739,7 @@ public final class RuleBasedCollator extends Collator { * or Collator.ReorderCodes.DEFAULT to restore the default max variable group * @return this * @see #getMaxVariable - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ @Override public RuleBasedCollator setMaxVariable(int group) { @@ -781,8 +780,7 @@ public final class RuleBasedCollator extends Collator { * the alternate handling behavior. * @return the maximum variable reordering group. * @see #setMaxVariable - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ @Override public int getMaxVariable() { diff --git a/icu4j/main/classes/collate/src/com/ibm/icu/text/SearchIterator.java b/icu4j/main/classes/collate/src/com/ibm/icu/text/SearchIterator.java index 349c0ad016d..5b7e8d71869 100644 --- a/icu4j/main/classes/collate/src/com/ibm/icu/text/SearchIterator.java +++ b/icu4j/main/classes/collate/src/com/ibm/icu/text/SearchIterator.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 1996-2014, International Business Machines Corporation and * + * Copyright (C) 1996-2015, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -732,15 +732,13 @@ public abstract class SearchIterator * * @see #setElementComparisonType(ElementComparisonType) * @see #getElementComparisonType() - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public enum ElementComparisonType { /** * Standard collation element comparison at the specified collator strength. * - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ STANDARD_ELEMENT_COMPARISON, /** @@ -755,8 +753,7 @@ public abstract class SearchIterator * diacritic in the pattern will only match an e with the same diacritic in * the searched text. * - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ PATTERN_BASE_WEIGHT_IS_WILDCARD, @@ -772,8 +769,7 @@ public abstract class SearchIterator * diacritic in the pattern will only match an e with the same diacritic or a * plain e in the searched text. * - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ ANY_BASE_WEIGHT_IS_WILDCARD } @@ -785,8 +781,7 @@ public abstract class SearchIterator * * @see ElementComparisonType * @see #getElementComparisonType() - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public void setElementComparisonType(ElementComparisonType type) { search_.elementComparisonType_ = type; @@ -797,8 +792,7 @@ public abstract class SearchIterator * * @see ElementComparisonType * @see #setElementComparisonType(ElementComparisonType) - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public ElementComparisonType getElementComparisonType() { return search_.elementComparisonType_; diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/BreakIterator.java b/icu4j/main/classes/core/src/com/ibm/icu/text/BreakIterator.java index 969c8d437bc..adb01932875 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/text/BreakIterator.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/text/BreakIterator.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 1996-2014, International Business Machines Corporation and * + * Copyright (C) 1996-2015, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -382,72 +382,62 @@ public abstract class BreakIterator implements Cloneable /** * Tag value for "words" that do not fit into any of other categories. * Includes spaces and most punctuation. - * @draft ICU 53 - * @provisional This is a draft API and might change in a future release of ICU. + * @stable ICU 53 */ public static final int WORD_NONE = 0; /** * Upper bound for tags for uncategorized words. - * @draft ICU 53 - * @provisional This is a draft API and might change in a future release of ICU. + * @stable ICU 53 */ public static final int WORD_NONE_LIMIT = 100; /** * Tag value for words that appear to be numbers, lower limit. - * @draft ICU 53 - * @provisional This is a draft API and might change in a future release of ICU. + * @stable ICU 53 */ public static final int WORD_NUMBER = 100; /** * Tag value for words that appear to be numbers, upper limit. - * @draft ICU 53 - * @provisional This is a draft API and might change in a future release of ICU. + * @stable ICU 53 */ public static final int WORD_NUMBER_LIMIT = 200; /** * Tag value for words that contain letters, excluding * hiragana, katakana or ideographic characters, lower limit. - * @draft ICU 53 - * @provisional This is a draft API and might change in a future release of ICU. + * @stable ICU 53 */ public static final int WORD_LETTER = 200; /** * Tag value for words containing letters, upper limit - * @draft ICU 53 - * @provisional This is a draft API and might change in a future release of ICU. + * @stable ICU 53 */ public static final int WORD_LETTER_LIMIT = 300; /** * Tag value for words containing kana characters, lower limit - * @draft ICU 53 - * @provisional This is a draft API and might change in a future release of ICU. + * @stable ICU 53 */ public static final int WORD_KANA = 300; /** * Tag value for words containing kana characters, upper limit - * @draft ICU 53 - * @provisional This is a draft API and might change in a future release of ICU. + * @stable ICU 53 */ public static final int WORD_KANA_LIMIT = 400; /** * Tag value for words containing ideographic characters, lower limit - * @draft ICU 53 - * @provisional This is a draft API and might change in a future release of ICU. + * @stable ICU 53 */ public static final int WORD_IDEO = 400; /** * Tag value for words containing ideographic characters, upper limit - * @draft ICU 53 - * @provisional This is a draft API and might change in a future release of ICU. + * @stable ICU 53 */ public static final int WORD_IDEO_LIMIT = 500; diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/DateFormat.java b/icu4j/main/classes/core/src/com/ibm/icu/text/DateFormat.java index 9db986d9d59..c6df2232b25 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/text/DateFormat.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/text/DateFormat.java @@ -467,21 +467,18 @@ public abstract class DateFormat extends UFormat { /** * boolean attributes * - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public enum BooleanAttribute { /** * indicates whitespace tolerance. Also included is trailing dot tolerance. - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ PARSE_ALLOW_WHITESPACE, /** * indicates tolerance of numeric data when String data may be assumed. * e.g. YEAR_NAME_FIELD - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ PARSE_ALLOW_NUMERIC, /** @@ -1556,8 +1553,7 @@ public abstract class DateFormat extends UFormat { * inputs must match this object's format more closely. * @param lenient when true, Calendar parsing is lenient * @see com.ibm.icu.util.Calendar#setLenient - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public void setCalendarLenient(boolean lenient) { @@ -1567,8 +1563,7 @@ public abstract class DateFormat extends UFormat { /** * Returns whether date/time parsing in the encapsulated Calendar object is lenient. - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public boolean isCalendarLenient() { @@ -1580,8 +1575,7 @@ public abstract class DateFormat extends UFormat { * boolean attributes. * * @see BooleanAttribute - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public DateFormat setBooleanAttribute(BooleanAttribute key, boolean value) { @@ -1603,8 +1597,7 @@ public abstract class DateFormat extends UFormat { * if attribute is missing false is returned. * * @see BooleanAttribute - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public boolean getBooleanAttribute(BooleanAttribute key) { @@ -1617,8 +1610,7 @@ public abstract class DateFormat extends UFormat { * such as CAPITALIZATION_FOR_STANDALONE. * * @param context The DisplayContext value to set. - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public void setContext(DisplayContext context) { if (context.type() == DisplayContext.Type.CAPITALIZATION) { @@ -1632,8 +1624,7 @@ public abstract class DateFormat extends UFormat { * * @param type the DisplayContext.Type whose value to return * @return the current DisplayContext setting for the specified type - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public DisplayContext getContext(DisplayContext.Type type) { return (type == DisplayContext.Type.CAPITALIZATION && capitalizationSetting != null)? 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 7ca67fd711a..8cb16a22a3d 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 @@ -875,8 +875,7 @@ public class DateIntervalFormat extends UFormat { /** * Get the TimeZone * @return A copy of the TimeZone associated with this date interval formatter. - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public TimeZone getTimeZone() { @@ -894,8 +893,7 @@ public class DateIntervalFormat extends UFormat { /** * Set the TimeZone for the calendar used by this DateIntervalFormat object. * @param zone The new TimeZone, will be cloned for use by this DateIntervalFormat. - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public void setTimeZone(TimeZone zone) { 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 444a18fc6c5..74979a460c4 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 @@ -1,6 +1,6 @@ /* ********************************************************************** - * Copyright (c) 2004-2014, International Business Machines + * Copyright (c) 2004-2015, International Business Machines * Corporation and others. All Rights Reserved. ********************************************************************** * Author: Alan Liu @@ -156,8 +156,7 @@ public class MeasureFormat extends UFormat { /** * Formatting width enum. * - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ // Be sure to update MeasureUnitTest.TestSerialFormatWidthEnum // when adding an enum value. @@ -166,24 +165,21 @@ public class MeasureFormat extends UFormat { /** * Spell out everything. * - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ WIDE("units", ListFormatter.Style.DURATION, NumberFormat.PLURALCURRENCYSTYLE), /** * Abbreviate when possible. * - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ SHORT("unitsShort", ListFormatter.Style.DURATION_SHORT, NumberFormat.ISOCURRENCYSTYLE), /** * Brief. Use only a symbol for the unit when possible. * - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ NARROW("unitsNarrow", ListFormatter.Style.DURATION_NARROW, NumberFormat.CURRENCYSTYLE), @@ -192,8 +188,7 @@ public class MeasureFormat extends UFormat { * an hour and minute; minute and second; or hour, minute, and second Measures. * In these cases formatMeasures formats as 5:37:23 instead of 5h, 37m, 23s. * - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ NUMERIC("unitsNarrow", ListFormatter.Style.DURATION_NARROW, NumberFormat.CURRENCYSTYLE); @@ -225,8 +220,7 @@ public class MeasureFormat extends UFormat { * @param locale the locale. * @param formatWidth hints how long formatted strings should be. * @return The new MeasureFormat object. - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public static MeasureFormat getInstance(ULocale locale, FormatWidth formatWidth) { return getInstance(locale, formatWidth, NumberFormat.getInstance(locale)); @@ -252,8 +246,7 @@ public class MeasureFormat extends UFormat { * @param formatWidth hints how long formatted strings should be. * @param format This is defensively copied. * @return The new MeasureFormat object. - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public static MeasureFormat getInstance(ULocale locale, FormatWidth formatWidth, NumberFormat format) { PluralRules rules = PluralRules.forLocale(locale); @@ -317,8 +310,7 @@ public class MeasureFormat extends UFormat { * @param pos Identifies a field in the formatted text. * @see java.text.Format#format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition) * - * @draft ICU53 - * @provisional This API might change or be removed in a future release. + * @stable ICU53 */ @Override public StringBuffer format(Object obj, StringBuffer toAppendTo, FieldPosition pos) { @@ -354,7 +346,7 @@ public class MeasureFormat extends UFormat { * Parses text from a string to produce a Measure. * @see java.text.Format#parseObject(java.lang.String, java.text.ParsePosition) * @throws UnsupportedOperationException Not supported. - * @draft ICU 53 + * @draft ICU 53 (Retain) * @provisional This API might change or be removed in a future release. */ @Override @@ -373,8 +365,7 @@ public class MeasureFormat extends UFormat { * * @param measures a sequence of one or more measures. * @return the formatted string. - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public final String formatMeasures(Measure... measures) { return formatMeasures( @@ -546,8 +537,7 @@ public class MeasureFormat extends UFormat { * @param measures the measures to format. * @return appendTo. * @see MeasureFormat#formatMeasures(Measure...) - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public StringBuilder formatMeasures( StringBuilder appendTo, FieldPosition fieldPosition, Measure... measures) { @@ -587,8 +577,7 @@ public class MeasureFormat extends UFormat { /** * Two MeasureFormats, a and b, are equal if and only if they have the same formatWidth, * locale, and equal number formats. - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ @Override public final boolean equals(Object other) { @@ -607,8 +596,7 @@ public class MeasureFormat extends UFormat { /** * {@inheritDoc} - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ @Override public final int hashCode() { @@ -619,8 +607,7 @@ public class MeasureFormat extends UFormat { /** * Get the format width this instance is using. - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public MeasureFormat.FormatWidth getWidth() { return formatWidth; @@ -628,8 +615,7 @@ public class MeasureFormat extends UFormat { /** * Get the locale of this instance. - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public final ULocale getLocale() { return getLocale(ULocale.VALID_LOCALE); @@ -637,8 +623,7 @@ public class MeasureFormat extends UFormat { /** * Get a copy of the number format. - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public NumberFormat getNumberFormat() { return numberFormat.get(); diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/NumberFormat.java b/icu4j/main/classes/core/src/com/ibm/icu/text/NumberFormat.java index 41133537f16..93ef87af829 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/text/NumberFormat.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/text/NumberFormat.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 1996-2014, International Business Machines Corporation and * + * Copyright (C) 1996-2015, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -212,8 +212,7 @@ public abstract class NumberFormat extends UFormat { * {@icu} Constant to specify currency style of format which uses currency symbol * to represent currency for accounting, for example: "($3.00), instead of * "-$3.00" ({@link #CURRENCYSTYLE}). - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public static final int ACCOUNTINGCURRENCYSTYLE = 7; /** @@ -520,8 +519,7 @@ public abstract class NumberFormat extends UFormat { * such as CAPITALIZATION_FOR_STANDALONE. * * @param context The DisplayContext value to set. - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public void setContext(DisplayContext context) { if (context.type() == DisplayContext.Type.CAPITALIZATION) { @@ -535,8 +533,7 @@ public abstract class NumberFormat extends UFormat { * * @param type the DisplayContext.Type whose value to return * @return the current DisplayContext setting for the specified type - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public DisplayContext getContext(DisplayContext.Type type) { return (type == DisplayContext.Type.CAPITALIZATION && capitalizationSetting != null)? diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/RelativeDateTimeFormatter.java b/icu4j/main/classes/core/src/com/ibm/icu/text/RelativeDateTimeFormatter.java index ced58a0a0a5..0a3f8222dc5 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/text/RelativeDateTimeFormatter.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/text/RelativeDateTimeFormatter.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2013-2014, International Business Machines Corporation and + * Copyright (C) 2013-2015, International Business Machines Corporation and * others. All Rights Reserved. ******************************************************************************* */ @@ -61,8 +61,7 @@ import com.ibm.icu.util.UResourceBundle; * In the future, we may add more forms, such as abbreviated/short forms * (3 secs ago), and relative day periods ("yesterday afternoon"), etc. * - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public final class RelativeDateTimeFormatter { @@ -99,149 +98,128 @@ public final class RelativeDateTimeFormatter { /** * Represents the unit for formatting a relative date. e.g "in 5 days" * or "in 3 months" - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public static enum RelativeUnit { /** * Seconds - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ SECONDS, /** * Minutes - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ MINUTES, /** * Hours - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ HOURS, /** * Days - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ DAYS, /** * Weeks - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ WEEKS, /** * Months - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ MONTHS, /** * Years - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ YEARS, } /** * Represents an absolute unit. - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public static enum AbsoluteUnit { /** * Sunday - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ SUNDAY, /** * Monday - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ MONDAY, /** * Tuesday - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ TUESDAY, /** * Wednesday - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ WEDNESDAY, /** * Thursday - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ THURSDAY, /** * Friday - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ FRIDAY, /** * Saturday - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ SATURDAY, /** * Day - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ DAY, /** * Week - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ WEEK, /** * Month - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ MONTH, /** * Year - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ YEAR, /** * Now - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ NOW, } @@ -249,76 +227,66 @@ public final class RelativeDateTimeFormatter { /** * Represents a direction for an absolute unit e.g "Next Tuesday" * or "Last Tuesday" - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public static enum Direction { /** * Two before. Not fully supported in every locale - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ LAST_2, - /** * Last - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ - LAST, - - /** - * This - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ - THIS, - - /** - * Next - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ - NEXT, - - /** - * Two after. Not fully supported in every locale - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ - NEXT_2, - - /** - * Plain, which means the absence of a qualifier - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ - PLAIN; + LAST, + + /** + * This + * @stable ICU 53 + */ + THIS, + + /** + * Next + * @stable ICU 53 + */ + NEXT, + + /** + * Two after. Not fully supported in every locale + * @stable ICU 53 + */ + NEXT_2, + + /** + * Plain, which means the absence of a qualifier + * @stable ICU 53 + */ + PLAIN; } - + /** * Returns a RelativeDateTimeFormatter for the default locale. - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public static RelativeDateTimeFormatter getInstance() { return getInstance(ULocale.getDefault(), null, Style.LONG, DisplayContext.CAPITALIZATION_NONE); } - + /** * Returns a RelativeDateTimeFormatter for a particular locale. * * @param locale the locale. * @return An instance of RelativeDateTimeFormatter. - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public static RelativeDateTimeFormatter getInstance(ULocale locale) { return getInstance(locale, null, Style.LONG, DisplayContext.CAPITALIZATION_NONE); } - + /** * Returns a RelativeDateTimeFormatter for a particular JDK locale. * @@ -339,8 +307,7 @@ public final class RelativeDateTimeFormatter { * @param nf the number format object. It is defensively copied to ensure thread-safety * and immutability of this class. * @return An instance of RelativeDateTimeFormatter. - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public static RelativeDateTimeFormatter getInstance(ULocale locale, NumberFormat nf) { return getInstance(locale, nf, Style.LONG, DisplayContext.CAPITALIZATION_NONE); @@ -409,8 +376,7 @@ public final class RelativeDateTimeFormatter { * @return the formatted string * @throws IllegalArgumentException if direction is something other than * NEXT or LAST. - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public String format(double quantity, Direction direction, RelativeUnit unit) { if (direction != Direction.LAST && direction != Direction.NEXT) { @@ -437,8 +403,7 @@ public final class RelativeDateTimeFormatter { * return null to signal that no formatted string is available. * @throws IllegalArgumentException if the direction is incompatible with * unit this can occur with NOW which can only take PLAIN. - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public String format(Direction direction, AbsoluteUnit unit) { if (unit == AbsoluteUnit.NOW && direction != Direction.PLAIN) { @@ -456,8 +421,7 @@ public final class RelativeDateTimeFormatter { * @param timeString the time e.g '3:45' * @return the date and time concatenated according to the default * calendar in this locale e.g 'yesterday, 3:45' - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public String combineDateAndTime(String relativeDateString, String timeString) { return this.combinedDateAndTime.format( @@ -467,8 +431,7 @@ public final class RelativeDateTimeFormatter { /** * Returns a copy of the NumberFormat this object is using. * @return A copy of the NumberFormat. - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public NumberFormat getNumberFormat() { // This class is thread-safe, yet numberFormat is not. To ensure thread-safety of this diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/RuleBasedNumberFormat.java b/icu4j/main/classes/core/src/com/ibm/icu/text/RuleBasedNumberFormat.java index 979e0fdd47d..3fc93a668dc 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/text/RuleBasedNumberFormat.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/text/RuleBasedNumberFormat.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 1996-2014, International Business Machines Corporation and * + * Copyright (C) 1996-2015, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -1423,8 +1423,7 @@ public class RuleBasedNumberFormat extends NumberFormat { * NumberFormat. * * @param context The DisplayContext value to set. - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ // Here we override the NumberFormat implementation in order to // lazily initialize relevant items diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java b/icu4j/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java index e5f852e7730..05d3b888729 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java @@ -1259,8 +1259,7 @@ public class SimpleDateFormat extends DateFormat { * DateFormat. * * @param context The DisplayContext value to set. - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ // Here we override the DateFormat implementation in order to lazily initialize relevant items public void setContext(DisplayContext context) { 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 cff1120c084..276a5216605 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 @@ -148,22 +148,19 @@ public class SpoofChecker { /** * Constants from UAX 31 for use in setRestrictionLevel. - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public enum RestrictionLevel { /** * Only ASCII characters: U+0000..U+007F * - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ ASCII, /** * All characters in each identifier must be from a single script. * - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ SINGLE_SCRIPT_RESTRICTIVE, /** @@ -171,30 +168,26 @@ public class SpoofChecker { * Hiragana + Katakana; Latin + Han + Bopomofo; or Latin + Han + Hangul. Note that this level will satisfy the * vast majority of Latin-script users; also that TR36 has ASCII instead of Latin. * - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ - HIGHLY_RESTRICTIVE, + HIGHLY_RESTRICTIVE, /** * Allow Latin with other scripts except Cyrillic, Greek, Cherokee Otherwise, the same as Highly Restrictive * - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ MODERATELY_RESTRICTIVE, /** * Allow arbitrary mixtures of scripts, such as Ωmega, Teχ, HλLF-LIFE, Toys-Я-Us. Otherwise, the same as * Moderately Restrictive * - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ MINIMALLY_RESTRICTIVE, /** * Any valid identifiers, including characters outside of the Identifier Profile, such as I♥NY.org * - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ UNRESTRICTIVE } diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/ICUCloneNotSupportedException.java b/icu4j/main/classes/core/src/com/ibm/icu/util/ICUCloneNotSupportedException.java index 7be1b915171..91222c0ad2e 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/util/ICUCloneNotSupportedException.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/util/ICUCloneNotSupportedException.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2014, International Business Machines Corporation and + * Copyright (C) 2014-2015, International Business Machines Corporation and * others. All Rights Reserved. ******************************************************************************* */ @@ -11,8 +11,7 @@ package com.ibm.icu.util; * Some ICU APIs do not throw the standard exception but instead wrap it * into this unchecked version. * - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public class ICUCloneNotSupportedException extends ICUException { private static final long serialVersionUID = -4824446458488194964L; @@ -20,8 +19,7 @@ public class ICUCloneNotSupportedException extends ICUException { /** * Default constructor. * - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public ICUCloneNotSupportedException() { } @@ -30,8 +28,7 @@ public class ICUCloneNotSupportedException extends ICUException { * Constructor. * * @param message exception message string - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public ICUCloneNotSupportedException(String message) { super(message); @@ -41,8 +38,7 @@ public class ICUCloneNotSupportedException extends ICUException { * Constructor. * * @param cause original exception (normally a {@link CloneNotSupportedException}) - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public ICUCloneNotSupportedException(Throwable cause) { super(cause); @@ -53,8 +49,7 @@ public class ICUCloneNotSupportedException extends ICUException { * * @param message exception message string * @param cause original exception (normally a {@link CloneNotSupportedException}) - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public ICUCloneNotSupportedException(String message, Throwable cause) { super(message, cause); diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/ICUException.java b/icu4j/main/classes/core/src/com/ibm/icu/util/ICUException.java index e37a97bdb3c..63d929144f2 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/util/ICUException.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/util/ICUException.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2014, International Business Machines Corporation and + * Copyright (C) 2014-2015, International Business Machines Corporation and * others. All Rights Reserved. ******************************************************************************* */ @@ -9,8 +9,7 @@ package com.ibm.icu.util; /** * Base class for unchecked, ICU-specific exceptions. * - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public class ICUException extends RuntimeException { private static final long serialVersionUID = -3067399656455755650L; @@ -18,8 +17,7 @@ public class ICUException extends RuntimeException { /** * Default constructor. * - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public ICUException() { } @@ -28,8 +26,7 @@ public class ICUException extends RuntimeException { * Constructor. * * @param message exception message string - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public ICUException(String message) { super(message); @@ -39,8 +36,7 @@ public class ICUException extends RuntimeException { * Constructor. * * @param cause original exception - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public ICUException(Throwable cause) { super(cause); @@ -51,8 +47,7 @@ public class ICUException extends RuntimeException { * * @param message exception message string * @param cause original exception - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public ICUException(String message, Throwable cause) { super(message, cause); diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/ICUUncheckedIOException.java b/icu4j/main/classes/core/src/com/ibm/icu/util/ICUUncheckedIOException.java index fd2a162832c..a90c2c98dfb 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/util/ICUUncheckedIOException.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/util/ICUUncheckedIOException.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2014, International Business Machines Corporation and + * Copyright (C) 2014-2015, International Business Machines Corporation and * others. All Rights Reserved. ******************************************************************************* */ @@ -15,8 +15,7 @@ package com.ibm.icu.util; * but when ICU can rely on Java 8 this class should be changed to extend * java.io.UncheckedIOException instead. * - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public class ICUUncheckedIOException extends RuntimeException { private static final long serialVersionUID = 1210263498513384449L; @@ -24,8 +23,7 @@ public class ICUUncheckedIOException extends RuntimeException { /** * Default constructor. * - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public ICUUncheckedIOException() { } @@ -34,8 +32,7 @@ public class ICUUncheckedIOException extends RuntimeException { * Constructor. * * @param message exception message string - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public ICUUncheckedIOException(String message) { super(message); @@ -45,8 +42,7 @@ public class ICUUncheckedIOException extends RuntimeException { * Constructor. * * @param cause original exception (normally a {@link java.io.IOException}) - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public ICUUncheckedIOException(Throwable cause) { super(cause); @@ -57,8 +53,7 @@ public class ICUUncheckedIOException extends RuntimeException { * * @param message exception message string * @param cause original exception (normally a {@link java.io.IOException}) - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public ICUUncheckedIOException(String message, Throwable cause) { super(message, cause); 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 54552e6200a..58878430a51 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 @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2004-2014, Google Inc, International Business Machines * + * Copyright (C) 2004-2015, Google Inc, International Business Machines * * Corporation and others. All Rights Reserved. * ******************************************************************************* */ @@ -70,8 +70,7 @@ public class MeasureUnit implements Serializable { /** * Get the type, such as "length" * - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public String getType() { return type; @@ -81,8 +80,7 @@ public class MeasureUnit implements Serializable { /** * Get the subType, such as “foot”. * - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public String getSubtype() { return subType; @@ -91,8 +89,9 @@ public class MeasureUnit implements Serializable { /** - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * {@inheritDoc} + * + * @stable ICU 53 */ @Override public int hashCode() { @@ -100,8 +99,9 @@ public class MeasureUnit implements Serializable { } /** - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * {@inheritDoc} + * + * @stable ICU 53 */ @Override public boolean equals(Object rhs) { @@ -116,8 +116,9 @@ public class MeasureUnit implements Serializable { } /** - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * {@inheritDoc} + * + * @stable ICU 53 */ @Override public String toString() { @@ -127,8 +128,7 @@ public class MeasureUnit implements Serializable { /** * Get all of the available units' types. Returned set is unmodifiable. * - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public synchronized static Set getAvailableTypes() { return Collections.unmodifiableSet(cache.keySet()); @@ -138,8 +138,7 @@ public class MeasureUnit implements Serializable { * For the given type, return the available units. * @param type the type * @return the available units for type. Returned set is unmodifiable. - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public synchronized static Set getAvailable(String type) { Map units = cache.get(type); @@ -152,8 +151,7 @@ public class MeasureUnit implements Serializable { /** * Get all of the available units. Returned set is unmodifiable. * - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public synchronized static Set getAvailable() { Set result = new HashSet(); @@ -327,842 +325,804 @@ public class MeasureUnit implements Serializable { /** * Constant for unit of acceleration: g-force - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ + * @stable ICU 53 + */ public static final MeasureUnit G_FORCE = MeasureUnit.internalGetInstance("acceleration", "g-force"); /** * Constant for unit of acceleration: meter-per-second-squared * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit METER_PER_SECOND_SQUARED = MeasureUnit.internalGetInstance("acceleration", "meter-per-second-squared"); /** * Constant for unit of angle: arc-minute - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ + * @stable ICU 53 + */ public static final MeasureUnit ARC_MINUTE = MeasureUnit.internalGetInstance("angle", "arc-minute"); /** * Constant for unit of angle: arc-second - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ + * @stable ICU 53 + */ public static final MeasureUnit ARC_SECOND = MeasureUnit.internalGetInstance("angle", "arc-second"); /** * Constant for unit of angle: degree - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ + * @stable ICU 53 + */ public static final MeasureUnit DEGREE = MeasureUnit.internalGetInstance("angle", "degree"); /** * Constant for unit of angle: radian * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit RADIAN = MeasureUnit.internalGetInstance("angle", "radian"); /** * Constant for unit of area: acre - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ + * @stable ICU 53 + */ public static final MeasureUnit ACRE = MeasureUnit.internalGetInstance("area", "acre"); /** * Constant for unit of area: hectare - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ + * @stable ICU 53 + */ public static final MeasureUnit HECTARE = MeasureUnit.internalGetInstance("area", "hectare"); /** * Constant for unit of area: square-centimeter * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit SQUARE_CENTIMETER = MeasureUnit.internalGetInstance("area", "square-centimeter"); /** * Constant for unit of area: square-foot - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ + * @stable ICU 53 + */ public static final MeasureUnit SQUARE_FOOT = MeasureUnit.internalGetInstance("area", "square-foot"); /** * Constant for unit of area: square-inch * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit SQUARE_INCH = MeasureUnit.internalGetInstance("area", "square-inch"); /** * Constant for unit of area: square-kilometer - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ + * @stable ICU 53 + */ public static final MeasureUnit SQUARE_KILOMETER = MeasureUnit.internalGetInstance("area", "square-kilometer"); /** * Constant for unit of area: square-meter - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ + * @stable ICU 53 + */ public static final MeasureUnit SQUARE_METER = MeasureUnit.internalGetInstance("area", "square-meter"); /** * Constant for unit of area: square-mile - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ + * @stable ICU 53 + */ public static final MeasureUnit SQUARE_MILE = MeasureUnit.internalGetInstance("area", "square-mile"); /** * Constant for unit of area: square-yard * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit SQUARE_YARD = MeasureUnit.internalGetInstance("area", "square-yard"); /** * Constant for unit of consumption: liter-per-kilometer * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit LITER_PER_KILOMETER = MeasureUnit.internalGetInstance("consumption", "liter-per-kilometer"); /** * Constant for unit of consumption: mile-per-gallon * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit MILE_PER_GALLON = MeasureUnit.internalGetInstance("consumption", "mile-per-gallon"); /** * Constant for unit of digital: bit * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit BIT = MeasureUnit.internalGetInstance("digital", "bit"); /** * Constant for unit of digital: byte * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit BYTE = MeasureUnit.internalGetInstance("digital", "byte"); /** * Constant for unit of digital: gigabit * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit GIGABIT = MeasureUnit.internalGetInstance("digital", "gigabit"); /** * Constant for unit of digital: gigabyte * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit GIGABYTE = MeasureUnit.internalGetInstance("digital", "gigabyte"); /** * Constant for unit of digital: kilobit * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit KILOBIT = MeasureUnit.internalGetInstance("digital", "kilobit"); /** * Constant for unit of digital: kilobyte * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit KILOBYTE = MeasureUnit.internalGetInstance("digital", "kilobyte"); /** * Constant for unit of digital: megabit * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit MEGABIT = MeasureUnit.internalGetInstance("digital", "megabit"); /** * Constant for unit of digital: megabyte * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit MEGABYTE = MeasureUnit.internalGetInstance("digital", "megabyte"); /** * Constant for unit of digital: terabit * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit TERABIT = MeasureUnit.internalGetInstance("digital", "terabit"); /** * Constant for unit of digital: terabyte * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit TERABYTE = MeasureUnit.internalGetInstance("digital", "terabyte"); /** * Constant for unit of duration: day * @stable ICU 4.0 - */ + */ public static final TimeUnit DAY = (TimeUnit) MeasureUnit.internalGetInstance("duration", "day"); /** * Constant for unit of duration: hour * @stable ICU 4.0 - */ + */ public static final TimeUnit HOUR = (TimeUnit) MeasureUnit.internalGetInstance("duration", "hour"); /** * Constant for unit of duration: microsecond * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit MICROSECOND = MeasureUnit.internalGetInstance("duration", "microsecond"); /** * Constant for unit of duration: millisecond - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ + * @stable ICU 53 + */ public static final MeasureUnit MILLISECOND = MeasureUnit.internalGetInstance("duration", "millisecond"); /** * Constant for unit of duration: minute * @stable ICU 4.0 - */ + */ public static final TimeUnit MINUTE = (TimeUnit) MeasureUnit.internalGetInstance("duration", "minute"); /** * Constant for unit of duration: month + * * @stable ICU 4.0 - */ + */ public static final TimeUnit MONTH = (TimeUnit) MeasureUnit.internalGetInstance("duration", "month"); /** * Constant for unit of duration: nanosecond * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit NANOSECOND = MeasureUnit.internalGetInstance("duration", "nanosecond"); /** * Constant for unit of duration: second * @stable ICU 4.0 - */ + */ public static final TimeUnit SECOND = (TimeUnit) MeasureUnit.internalGetInstance("duration", "second"); /** * Constant for unit of duration: week * @stable ICU 4.0 - */ + */ public static final TimeUnit WEEK = (TimeUnit) MeasureUnit.internalGetInstance("duration", "week"); /** * Constant for unit of duration: year * @stable ICU 4.0 - */ + */ public static final TimeUnit YEAR = (TimeUnit) MeasureUnit.internalGetInstance("duration", "year"); /** * Constant for unit of electric: ampere * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit AMPERE = MeasureUnit.internalGetInstance("electric", "ampere"); /** * Constant for unit of electric: milliampere * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit MILLIAMPERE = MeasureUnit.internalGetInstance("electric", "milliampere"); /** * Constant for unit of electric: ohm * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit OHM = MeasureUnit.internalGetInstance("electric", "ohm"); /** * Constant for unit of electric: volt * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit VOLT = MeasureUnit.internalGetInstance("electric", "volt"); /** * Constant for unit of energy: calorie * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit CALORIE = MeasureUnit.internalGetInstance("energy", "calorie"); /** * Constant for unit of energy: foodcalorie * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit FOODCALORIE = MeasureUnit.internalGetInstance("energy", "foodcalorie"); /** * Constant for unit of energy: joule * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit JOULE = MeasureUnit.internalGetInstance("energy", "joule"); /** * Constant for unit of energy: kilocalorie * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit KILOCALORIE = MeasureUnit.internalGetInstance("energy", "kilocalorie"); /** * Constant for unit of energy: kilojoule * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit KILOJOULE = MeasureUnit.internalGetInstance("energy", "kilojoule"); /** * Constant for unit of energy: kilowatt-hour * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit KILOWATT_HOUR = MeasureUnit.internalGetInstance("energy", "kilowatt-hour"); /** * Constant for unit of frequency: gigahertz * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit GIGAHERTZ = MeasureUnit.internalGetInstance("frequency", "gigahertz"); /** * Constant for unit of frequency: hertz * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit HERTZ = MeasureUnit.internalGetInstance("frequency", "hertz"); /** * Constant for unit of frequency: kilohertz * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit KILOHERTZ = MeasureUnit.internalGetInstance("frequency", "kilohertz"); /** * Constant for unit of frequency: megahertz * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit MEGAHERTZ = MeasureUnit.internalGetInstance("frequency", "megahertz"); /** * Constant for unit of length: astronomical-unit * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit ASTRONOMICAL_UNIT = MeasureUnit.internalGetInstance("length", "astronomical-unit"); /** * Constant for unit of length: centimeter - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ + * @stable ICU 53 + */ public static final MeasureUnit CENTIMETER = MeasureUnit.internalGetInstance("length", "centimeter"); /** * Constant for unit of length: decimeter * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit DECIMETER = MeasureUnit.internalGetInstance("length", "decimeter"); /** * Constant for unit of length: fathom * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit FATHOM = MeasureUnit.internalGetInstance("length", "fathom"); /** * Constant for unit of length: foot - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ + * @stable ICU 53 + */ public static final MeasureUnit FOOT = MeasureUnit.internalGetInstance("length", "foot"); /** * Constant for unit of length: furlong * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit FURLONG = MeasureUnit.internalGetInstance("length", "furlong"); /** * Constant for unit of length: inch - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ + * @stable ICU 53 + */ public static final MeasureUnit INCH = MeasureUnit.internalGetInstance("length", "inch"); /** * Constant for unit of length: kilometer - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ + * @stable ICU 53 + */ public static final MeasureUnit KILOMETER = MeasureUnit.internalGetInstance("length", "kilometer"); /** * Constant for unit of length: light-year - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ + * @stable ICU 53 + */ public static final MeasureUnit LIGHT_YEAR = MeasureUnit.internalGetInstance("length", "light-year"); /** * Constant for unit of length: meter - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ + * @stable ICU 53 + */ public static final MeasureUnit METER = MeasureUnit.internalGetInstance("length", "meter"); /** * Constant for unit of length: micrometer * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit MICROMETER = MeasureUnit.internalGetInstance("length", "micrometer"); /** * Constant for unit of length: mile - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ + * @stable ICU 53 + */ public static final MeasureUnit MILE = MeasureUnit.internalGetInstance("length", "mile"); /** * Constant for unit of length: millimeter - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ + * @stable ICU 53 + */ public static final MeasureUnit MILLIMETER = MeasureUnit.internalGetInstance("length", "millimeter"); /** * Constant for unit of length: nanometer * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit NANOMETER = MeasureUnit.internalGetInstance("length", "nanometer"); /** * Constant for unit of length: nautical-mile * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit NAUTICAL_MILE = MeasureUnit.internalGetInstance("length", "nautical-mile"); /** * Constant for unit of length: parsec * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit PARSEC = MeasureUnit.internalGetInstance("length", "parsec"); /** * Constant for unit of length: picometer - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ + * @stable ICU 53 + */ public static final MeasureUnit PICOMETER = MeasureUnit.internalGetInstance("length", "picometer"); /** * Constant for unit of length: yard - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ + * @stable ICU 53 + */ public static final MeasureUnit YARD = MeasureUnit.internalGetInstance("length", "yard"); /** * Constant for unit of light: lux * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit LUX = MeasureUnit.internalGetInstance("light", "lux"); /** * Constant for unit of mass: carat * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit CARAT = MeasureUnit.internalGetInstance("mass", "carat"); /** * Constant for unit of mass: gram - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ + * @stable ICU 53 + */ public static final MeasureUnit GRAM = MeasureUnit.internalGetInstance("mass", "gram"); /** * Constant for unit of mass: kilogram - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ + * @stable ICU 53 + */ public static final MeasureUnit KILOGRAM = MeasureUnit.internalGetInstance("mass", "kilogram"); /** * Constant for unit of mass: metric-ton * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit METRIC_TON = MeasureUnit.internalGetInstance("mass", "metric-ton"); /** * Constant for unit of mass: microgram * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit MICROGRAM = MeasureUnit.internalGetInstance("mass", "microgram"); /** * Constant for unit of mass: milligram * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit MILLIGRAM = MeasureUnit.internalGetInstance("mass", "milligram"); /** * Constant for unit of mass: ounce - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ + * @stable ICU 53 + */ public static final MeasureUnit OUNCE = MeasureUnit.internalGetInstance("mass", "ounce"); /** * Constant for unit of mass: ounce-troy * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit OUNCE_TROY = MeasureUnit.internalGetInstance("mass", "ounce-troy"); /** * Constant for unit of mass: pound - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ + * @stable ICU 53 + */ public static final MeasureUnit POUND = MeasureUnit.internalGetInstance("mass", "pound"); /** * Constant for unit of mass: stone * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit STONE = MeasureUnit.internalGetInstance("mass", "stone"); /** * Constant for unit of mass: ton * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit TON = MeasureUnit.internalGetInstance("mass", "ton"); /** * Constant for unit of power: gigawatt * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit GIGAWATT = MeasureUnit.internalGetInstance("power", "gigawatt"); /** * Constant for unit of power: horsepower - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ + * @stable ICU 53 + */ public static final MeasureUnit HORSEPOWER = MeasureUnit.internalGetInstance("power", "horsepower"); /** * Constant for unit of power: kilowatt - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ + * @stable ICU 53 + */ public static final MeasureUnit KILOWATT = MeasureUnit.internalGetInstance("power", "kilowatt"); /** * Constant for unit of power: megawatt * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit MEGAWATT = MeasureUnit.internalGetInstance("power", "megawatt"); /** * Constant for unit of power: milliwatt * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit MILLIWATT = MeasureUnit.internalGetInstance("power", "milliwatt"); /** * Constant for unit of power: watt - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ + * @stable ICU 53 + */ public static final MeasureUnit WATT = MeasureUnit.internalGetInstance("power", "watt"); /** * Constant for unit of pressure: hectopascal - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ + * @stable ICU 53 + */ public static final MeasureUnit HECTOPASCAL = MeasureUnit.internalGetInstance("pressure", "hectopascal"); /** * Constant for unit of pressure: inch-hg - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ + * @stable ICU 53 + */ public static final MeasureUnit INCH_HG = MeasureUnit.internalGetInstance("pressure", "inch-hg"); /** * Constant for unit of pressure: millibar - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ + * @stable ICU 53 + */ public static final MeasureUnit MILLIBAR = MeasureUnit.internalGetInstance("pressure", "millibar"); /** * Constant for unit of pressure: millimeter-of-mercury * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit MILLIMETER_OF_MERCURY = MeasureUnit.internalGetInstance("pressure", "millimeter-of-mercury"); /** * Constant for unit of pressure: pound-per-square-inch * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit POUND_PER_SQUARE_INCH = MeasureUnit.internalGetInstance("pressure", "pound-per-square-inch"); /** * Constant for unit of proportion: karat * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit KARAT = MeasureUnit.internalGetInstance("proportion", "karat"); /** * Constant for unit of speed: kilometer-per-hour - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ + * @stable ICU 53 + */ public static final MeasureUnit KILOMETER_PER_HOUR = MeasureUnit.internalGetInstance("speed", "kilometer-per-hour"); /** * Constant for unit of speed: meter-per-second - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ + * @stable ICU 53 + */ public static final MeasureUnit METER_PER_SECOND = MeasureUnit.internalGetInstance("speed", "meter-per-second"); /** * Constant for unit of speed: mile-per-hour - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ + * @stable ICU 53 + */ public static final MeasureUnit MILE_PER_HOUR = MeasureUnit.internalGetInstance("speed", "mile-per-hour"); /** * Constant for unit of temperature: celsius - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ + * @stable ICU 53 + */ public static final MeasureUnit CELSIUS = MeasureUnit.internalGetInstance("temperature", "celsius"); /** * Constant for unit of temperature: fahrenheit - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ + * @stable ICU 53 + */ public static final MeasureUnit FAHRENHEIT = MeasureUnit.internalGetInstance("temperature", "fahrenheit"); /** * Constant for unit of temperature: kelvin * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit KELVIN = MeasureUnit.internalGetInstance("temperature", "kelvin"); /** * Constant for unit of volume: acre-foot * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit ACRE_FOOT = MeasureUnit.internalGetInstance("volume", "acre-foot"); /** * Constant for unit of volume: bushel * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit BUSHEL = MeasureUnit.internalGetInstance("volume", "bushel"); /** * Constant for unit of volume: centiliter * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit CENTILITER = MeasureUnit.internalGetInstance("volume", "centiliter"); /** * Constant for unit of volume: cubic-centimeter * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit CUBIC_CENTIMETER = MeasureUnit.internalGetInstance("volume", "cubic-centimeter"); /** * Constant for unit of volume: cubic-foot * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit CUBIC_FOOT = MeasureUnit.internalGetInstance("volume", "cubic-foot"); /** * Constant for unit of volume: cubic-inch * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit CUBIC_INCH = MeasureUnit.internalGetInstance("volume", "cubic-inch"); /** * Constant for unit of volume: cubic-kilometer - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ + * @stable ICU 53 + */ public static final MeasureUnit CUBIC_KILOMETER = MeasureUnit.internalGetInstance("volume", "cubic-kilometer"); /** * Constant for unit of volume: cubic-meter * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit CUBIC_METER = MeasureUnit.internalGetInstance("volume", "cubic-meter"); /** * Constant for unit of volume: cubic-mile - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ + * @stable ICU 53 + */ public static final MeasureUnit CUBIC_MILE = MeasureUnit.internalGetInstance("volume", "cubic-mile"); /** * Constant for unit of volume: cubic-yard * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit CUBIC_YARD = MeasureUnit.internalGetInstance("volume", "cubic-yard"); /** * Constant for unit of volume: cup * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit CUP = MeasureUnit.internalGetInstance("volume", "cup"); /** * Constant for unit of volume: deciliter * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit DECILITER = MeasureUnit.internalGetInstance("volume", "deciliter"); /** * Constant for unit of volume: fluid-ounce * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit FLUID_OUNCE = MeasureUnit.internalGetInstance("volume", "fluid-ounce"); /** * Constant for unit of volume: gallon * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit GALLON = MeasureUnit.internalGetInstance("volume", "gallon"); /** * Constant for unit of volume: hectoliter * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit HECTOLITER = MeasureUnit.internalGetInstance("volume", "hectoliter"); /** * Constant for unit of volume: liter - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. - */ + * @stable ICU 53 + */ public static final MeasureUnit LITER = MeasureUnit.internalGetInstance("volume", "liter"); /** * Constant for unit of volume: megaliter * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit MEGALITER = MeasureUnit.internalGetInstance("volume", "megaliter"); /** * Constant for unit of volume: milliliter * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit MILLILITER = MeasureUnit.internalGetInstance("volume", "milliliter"); /** * Constant for unit of volume: pint * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit PINT = MeasureUnit.internalGetInstance("volume", "pint"); /** * Constant for unit of volume: quart * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit QUART = MeasureUnit.internalGetInstance("volume", "quart"); /** * Constant for unit of volume: tablespoon * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit TABLESPOON = MeasureUnit.internalGetInstance("volume", "tablespoon"); /** * Constant for unit of volume: teaspoon * @draft ICU 54 * @provisional This API might change or be removed in a future release. - */ + */ public static final MeasureUnit TEASPOON = MeasureUnit.internalGetInstance("volume", "teaspoon"); private static HashMap, MeasureUnit>unitPerUnitToSingleUnit = diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/ULocale.java b/icu4j/main/classes/core/src/com/ibm/icu/util/ULocale.java index b45621451dd..9f65da438a6 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/util/ULocale.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/util/ULocale.java @@ -810,8 +810,7 @@ public final class ULocale implements Serializable, Comparable { * than the specified ULocale. * @throws NullPointerException if other is null. * - * @draft ICU 53 - * @provisional This API might change or be removed in a future release. + * @stable ICU 53 */ public int compareTo(ULocale other) { if (this == other) {