diff --git a/icu4j/src/com/ibm/icu/dev/tool/docs/CheckTags.java b/icu4j/src/com/ibm/icu/dev/tool/docs/CheckTags.java index 5ce1747dbc7..3b7eb81348e 100644 --- a/icu4j/src/com/ibm/icu/dev/tool/docs/CheckTags.java +++ b/icu4j/src/com/ibm/icu/dev/tool/docs/CheckTags.java @@ -111,7 +111,7 @@ public class CheckTags { DocNode last = stack[ix]; if (error) { last.errorCount += 1; - } + } boolean show = !brief || last.reportError; // boolean nomsg = show && brief && error; @@ -253,7 +253,7 @@ public class CheckTags { void tagErr(Tag tag) { // Tag.position() requires JDK 1.4, build.xml tests for this - errln(tag.toString() + " [" + /* tag.position() + */ "]"); + errln(tag.toString() + " [" + tag.position() + "]"); } void doDocs(ProgramElementDoc[] docs, String header, boolean reportError) { @@ -311,6 +311,8 @@ public class CheckTags { boolean foundDeprecatedTag = false; boolean foundObsoleteTag = false; boolean foundInternalTag = false; + boolean foundStableTag = false; + boolean retainAll = false; for (int i = 0; i < tags.length; ++i) { Tag tag = tags[i]; @@ -331,15 +333,8 @@ public class CheckTags { case DRAFT: foundRequiredTag = true; foundDraftTag = true; - if (tag.text().indexOf("ICU 2.4") != -1) { - tagErr(tag); - break; - } - if (tag.text().indexOf("ICU 2.6") != -1) { - tagErr(tag); - break; - } - if (tag.text().indexOf("ICU 2.8") != -1) { + if (tag.text().indexOf("ICU 2.8") != -1 && + tag.text().indexOf("(retain") == -1) { // catch both retain and retainAll tagErr(tag); break; } @@ -347,6 +342,7 @@ public class CheckTags { tagErr(tag); break; } + retainAll |= (tag.text().indexOf("(retainAll)") != -1); break; case DEPRECATED: @@ -374,6 +370,7 @@ public class CheckTags { tagErr(tag); } foundRequiredTag = true; + foundStableTag = true; } break; @@ -409,6 +406,10 @@ public class CheckTags { if (foundObsoleteTag && !foundDeprecatedTag) { errln("obsolete tag missing deprecated"); } - return !foundInternalTag; + if (foundStableTag && foundDeprecatedTag) { + logln("stable deprecated"); + } + + return !foundInternalTag && !retainAll; } } diff --git a/icu4j/src/com/ibm/icu/lang/UCharacterEnums.java b/icu4j/src/com/ibm/icu/lang/UCharacterEnums.java index 431a2772151..dd57c00fb9e 100644 --- a/icu4j/src/com/ibm/icu/lang/UCharacterEnums.java +++ b/icu4j/src/com/ibm/icu/lang/UCharacterEnums.java @@ -213,8 +213,7 @@ public class UCharacterEnums { * Character type Pi * This name is compatible with java.lang.Character's name for this type. * @see #INITIAL_PUNCTUATION - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final byte INITIAL_QUOTE_PUNCTUATION = 28; @@ -229,8 +228,7 @@ public class UCharacterEnums { * Character type Pf * This name is compatible with java.lang.Character's name for this type. * @see #FINAL_PUNCTUATION - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final byte FINAL_QUOTE_PUNCTUATION = 29; diff --git a/icu4j/src/com/ibm/icu/text/BreakIterator.java b/icu4j/src/com/ibm/icu/text/BreakIterator.java index 663ebfc94e3..24b22695df7 100755 --- a/icu4j/src/com/ibm/icu/text/BreakIterator.java +++ b/icu4j/src/com/ibm/icu/text/BreakIterator.java @@ -822,7 +822,7 @@ public abstract class BreakIterator implements Cloneable * @see com.ibm.icu.util.ULocale * @see com.ibm.icu.util.ULocale#VALID_LOCALE * @see com.ibm.icu.util.ULocale#ACTUAL_LOCALE - * @draft ICU 2.8 + * @draft ICU 2.8 (retain) * @deprecated This is a draft API and might change in a future release of ICU. */ public final ULocale getLocale(ULocale.Type type) { diff --git a/icu4j/src/com/ibm/icu/text/CollationElementIterator.java b/icu4j/src/com/ibm/icu/text/CollationElementIterator.java index 23ab51000d6..1a3c7aa97e1 100755 --- a/icu4j/src/com/ibm/icu/text/CollationElementIterator.java +++ b/icu4j/src/com/ibm/icu/text/CollationElementIterator.java @@ -512,8 +512,7 @@ public final class CollationElementIterator *

The source iterator's integrity will be preserved since a new copy * will be created for use.

* @param source the new source string iterator for iteration. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public void setText(UCharacterIterator source) { diff --git a/icu4j/src/com/ibm/icu/text/CollationKey.java b/icu4j/src/com/ibm/icu/text/CollationKey.java index 8589901a5ec..798a6e8cf92 100755 --- a/icu4j/src/com/ibm/icu/text/CollationKey.java +++ b/icu4j/src/com/ibm/icu/text/CollationKey.java @@ -159,8 +159,7 @@ public final class CollationKey implements Comparable * argument source. * @see Collator * @see RawCollationKey - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public CollationKey(String source, RawCollationKey key) { diff --git a/icu4j/src/com/ibm/icu/text/Collator.java b/icu4j/src/com/ibm/icu/text/Collator.java index 7cfcc83e626..94eb62a55e5 100755 --- a/icu4j/src/com/ibm/icu/text/Collator.java +++ b/icu4j/src/com/ibm/icu/text/Collator.java @@ -870,8 +870,7 @@ public abstract class Collator implements Comparator, Cloneable * @see #compare(String, String) * @see #getCollationKey * @see RawCollationKey - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public abstract RawCollationKey getRawCollationKey(String source, RawCollationKey key); @@ -924,15 +923,14 @@ public abstract class Collator implements Comparator, Cloneable /** * Get the version of this collator object. * @return the version object associated with this collator - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public abstract VersionInfo getVersion(); - /** Get the UCA version of this collator object. - * @return the version object associated with this collator - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + /** + * Get the UCA version of this collator object. + * @return the version object associated with this collator + * @stable ICU 2.8 */ public abstract VersionInfo getUCAVersion(); @@ -989,7 +987,7 @@ public abstract class Collator implements Comparator, Cloneable * @see com.ibm.icu.util.ULocale * @see com.ibm.icu.util.ULocale#VALID_LOCALE * @see com.ibm.icu.util.ULocale#ACTUAL_LOCALE - * @draft ICU 2.8 + * @draft ICU 2.8 (retain) * @deprecated This is a draft API and might change in a future release of ICU. */ public final ULocale getLocale(ULocale.Type type) { diff --git a/icu4j/src/com/ibm/icu/text/DateFormatSymbols.java b/icu4j/src/com/ibm/icu/text/DateFormatSymbols.java index b51562152da..3ddbb856afa 100755 --- a/icu4j/src/com/ibm/icu/text/DateFormatSymbols.java +++ b/icu4j/src/com/ibm/icu/text/DateFormatSymbols.java @@ -868,7 +868,7 @@ public class DateFormatSymbols implements Serializable, Cloneable { * @see com.ibm.icu.util.ULocale * @see com.ibm.icu.util.ULocale#VALID_LOCALE * @see com.ibm.icu.util.ULocale#ACTUAL_LOCALE - * @draft ICU 2.8 + * @draft ICU 2.8 (retain) * @deprecated This is a draft API and might change in a future release of ICU. */ public final ULocale getLocale(ULocale.Type type) { diff --git a/icu4j/src/com/ibm/icu/text/DecimalFormatSymbols.java b/icu4j/src/com/ibm/icu/text/DecimalFormatSymbols.java index 0d70df6a809..1556114ad6b 100755 --- a/icu4j/src/com/ibm/icu/text/DecimalFormatSymbols.java +++ b/icu4j/src/com/ibm/icu/text/DecimalFormatSymbols.java @@ -892,7 +892,7 @@ final public class DecimalFormatSymbols implements Cloneable, Serializable { * @see com.ibm.icu.util.ULocale * @see com.ibm.icu.util.ULocale#VALID_LOCALE * @see com.ibm.icu.util.ULocale#ACTUAL_LOCALE - * @draft ICU 2.8 + * @draft ICU 2.8 (retain) * @deprecated This is a draft API and might change in a future release of ICU. */ public final ULocale getLocale(ULocale.Type type) { diff --git a/icu4j/src/com/ibm/icu/text/IDNA.java b/icu4j/src/com/ibm/icu/text/IDNA.java index 5699b87dbad..9f57ba25ddf 100644 --- a/icu4j/src/com/ibm/icu/text/IDNA.java +++ b/icu4j/src/com/ibm/icu/text/IDNA.java @@ -34,8 +34,7 @@ import com.ibm.icu.impl.ICUResourceBundle; * ToASCII(ToASCII(ToASCII...(ToASCII(string))) == ToASCII(string). * * @author Ram Viswanadha - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public final class IDNA { @@ -55,24 +54,21 @@ public final class IDNA { * do not check if the input conforms to STD-3 ASCII rules. * * @see #convertToASCII #convertToUnicode - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int DEFAULT = 0x0000; /** * Option to allow processing of unassigned codepoints in the input * * @see #convertToASCII #convertToUnicode - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int ALLOW_UNASSIGNED = 0x0001; /** * Option to check if input conforms to STD-3 ASCII rules * * @see #convertToASCII #convertToUnicode - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int USE_STD3_RULES = 0x0002; @@ -198,8 +194,7 @@ public final class IDNA { * * @param ch The code point to be ascertained * @return true if the char is a label separator - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ private static boolean isLabelSeparator(int ch){ switch(ch){ @@ -236,8 +231,7 @@ public final class IDNA { * the operation will fail with ParseException * @return StringBuffer the converted String * @throws ParseException - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static StringBuffer convertToASCII(String src, int options) throws StringPrepParseException{ @@ -268,8 +262,7 @@ public final class IDNA { * the operation will fail with ParseException * @return StringBuffer the converted String * @throws ParseException - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static StringBuffer convertToASCII(StringBuffer src, int options) throws StringPrepParseException{ @@ -300,8 +293,7 @@ public final class IDNA { * the operation will fail with ParseException * @return StringBuffer the converted String * @throws ParseException - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static StringBuffer convertToASCII(UCharacterIterator src, int options) throws StringPrepParseException{ @@ -440,8 +432,7 @@ public final class IDNA { * the operation will fail with ParseException * @return StringBuffer the converted String * @throws ParseException - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static StringBuffer convertIDNToASCII(UCharacterIterator src, int options) throws StringPrepParseException{ @@ -476,8 +467,7 @@ public final class IDNA { * the operation will fail with ParseException * @return StringBuffer the converted String * @throws ParseException - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static StringBuffer convertIDNToASCII(StringBuffer src, int options) throws StringPrepParseException{ @@ -512,8 +502,7 @@ public final class IDNA { * the operation will fail with ParseException * @return StringBuffer the converted String * @throws ParseException - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static StringBuffer convertIDNToASCII(String src,int options) throws StringPrepParseException{ @@ -561,8 +550,7 @@ public final class IDNA { * the operation will fail with ParseException * @return StringBuffer the converted String * @throws ParseException - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static StringBuffer convertToUnicode(String src, int options) throws StringPrepParseException{ @@ -593,8 +581,7 @@ public final class IDNA { * the operation will fail with ParseException * @return StringBuffer the converted String * @throws ParseException - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static StringBuffer convertToUnicode(StringBuffer src, int options) throws StringPrepParseException{ @@ -625,8 +612,7 @@ public final class IDNA { * the operation will fail with ParseException * @return StringBuffer the converted String * @throws ParseException - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static StringBuffer convertToUnicode(UCharacterIterator src, int options) throws StringPrepParseException{ @@ -746,8 +732,7 @@ public final class IDNA { * the operation will fail with ParseException * @return StringBuffer the converted String * @throws ParseException - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static StringBuffer convertIDNToUnicode(UCharacterIterator src, int options) throws StringPrepParseException{ @@ -779,8 +764,7 @@ public final class IDNA { * the operation will fail with ParseException * @return StringBuffer the converted String * @throws ParseException - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static StringBuffer convertIDNToUnicode(StringBuffer src, int options) throws StringPrepParseException{ @@ -812,8 +796,7 @@ public final class IDNA { * the operation will fail with ParseException * @return StringBuffer the converted String * @throws ParseException - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static StringBuffer convertIDNToUnicode(String src, int options) throws StringPrepParseException{ @@ -863,8 +846,7 @@ public final class IDNA { * the operation will fail with ParseException * @return 0 if the strings are equal, > 0 if s1 > s2 and < 0 if s1 < s2 * @throws ParseException - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ // TODO: optimize public static int compare(StringBuffer s1, StringBuffer s2, int options) @@ -903,8 +885,7 @@ public final class IDNA { * the operation will fail with ParseException * @return 0 if the strings are equal, > 0 if s1 > s2 and < 0 if s1 < s2 * @throws ParseException - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ // TODO: optimize public static int compare(String s1, String s2, int options) @@ -942,8 +923,7 @@ public final class IDNA { * the operation will fail with ParseException * @return 0 if the strings are equal, > 0 if i1 > i2 and < 0 if i1 < i2 * @throws ParseException - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ // TODO: optimize public static int compare(UCharacterIterator s1, UCharacterIterator s2, int options) diff --git a/icu4j/src/com/ibm/icu/text/RawCollationKey.java b/icu4j/src/com/ibm/icu/text/RawCollationKey.java index 96331176276..db9857e9909 100644 --- a/icu4j/src/com/ibm/icu/text/RawCollationKey.java +++ b/icu4j/src/com/ibm/icu/text/RawCollationKey.java @@ -1,6 +1,6 @@ /** ******************************************************************************* - * Copyright (C) 1996-2004, International Business Machines Corporation and * + * Copyright (C) 1996-2005, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -34,8 +34,7 @@ import com.ibm.icu.util.ByteArrayWrapper; *

Note: Comparison between RawCollationKeys created by * different Collators might return incorrect results. * See class documentation for Collator.

- * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 * @see RuleBasedCollator * @see CollationKey */ @@ -45,8 +44,7 @@ public final class RawCollationKey extends ByteArrayWrapper /** * Default constructor, internal byte array is null and its size set to 0. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public RawCollationKey() { @@ -56,8 +54,7 @@ public final class RawCollationKey extends ByteArrayWrapper * RawCollationKey created with an empty internal byte array of length * capacity. Size of the internal byte array will be set to 0. * @param capacity length of internal byte array - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public RawCollationKey(int capacity) { @@ -68,8 +65,7 @@ public final class RawCollationKey extends ByteArrayWrapper * RawCollationKey created, adopting bytes as the internal byte array. * Size of the internal byte array will be set to 0. * @param bytes byte array to be adopted by RawCollationKey - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public RawCollationKey(byte[] bytes) { @@ -82,8 +78,7 @@ public final class RawCollationKey extends ByteArrayWrapper * @param size the length of valid data in the byte array * @throws IndexOutOfBoundsException if bytesToAdopt == null and size != 0, or * size < 0, or size > bytesToAdopt.length. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public RawCollationKey(byte[] bytesToAdopt, int size) { diff --git a/icu4j/src/com/ibm/icu/text/RuleBasedCollator.java b/icu4j/src/com/ibm/icu/text/RuleBasedCollator.java index 1cca3f201f4..98c19aef44e 100755 --- a/icu4j/src/com/ibm/icu/text/RuleBasedCollator.java +++ b/icu4j/src/com/ibm/icu/text/RuleBasedCollator.java @@ -259,8 +259,7 @@ public final class RuleBasedCollator extends Collator * The source iterator's integrity will be preserved since a new copy * will be created for use. * @see CollationElementIterator - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public CollationElementIterator getCollationElementIterator( UCharacterIterator source) @@ -468,8 +467,7 @@ public final class RuleBasedCollator extends Collator * '100' to sort AFTER '2' * @see #getNumericCollation * @see #setNumericCollation - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public void setNumericCollationDefault() { @@ -664,8 +662,7 @@ public final class RuleBasedCollator extends Collator * @param flag true to turn numeric collation on and false to turn it off * @see #getNumericCollation * @see #setNumericCollationDefault - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public void setNumericCollation(boolean flag) { @@ -776,8 +773,7 @@ public final class RuleBasedCollator extends Collator * @see #getCollationKey * @see #compare(String, String) * @see RawCollationKey - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public RawCollationKey getRawCollationKey(String source, RawCollationKey key) @@ -951,8 +947,7 @@ public final class RuleBasedCollator extends Collator * @see #setNumericCollation * @see #setNumericCollationDefault * @return true if numeric collation is turned on, false otherwise - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public boolean getNumericCollation() { @@ -4430,10 +4425,10 @@ public final class RuleBasedCollator extends Collator } return 0; } - /** Get the version of this collator object. - * @return the version object associated with this collator - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + /** + * Get the version of this collator object. + * @return the version object associated with this collator + * @stable ICU 2.8 */ public VersionInfo getVersion() { /* RunTime version */ @@ -4465,8 +4460,7 @@ public final class RuleBasedCollator extends Collator /** * Get the UCA version of this collator object. * @return the version object associated with this collator - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public VersionInfo getUCAVersion() { return UCA_.m_UCA_version_; diff --git a/icu4j/src/com/ibm/icu/text/StringPrep.java b/icu4j/src/com/ibm/icu/text/StringPrep.java index 2038f7b78d0..50053ccfc48 100644 --- a/icu4j/src/com/ibm/icu/text/StringPrep.java +++ b/icu4j/src/com/ibm/icu/text/StringPrep.java @@ -53,16 +53,14 @@ import com.ibm.icu.lang.UCharacterDirection; * error. * * @author Ram Viswanadha - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public final class StringPrep { /** * Option to prohibit processing of unassigned code points in the input * * @see #prepare - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int DEFAULT = 0x0000; @@ -70,8 +68,7 @@ public final class StringPrep { * Option to allow processing of unassigned code points in the input * * @see #prepare - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int ALLOW_UNASSIGNED = 0x0001; @@ -150,8 +147,7 @@ public final class StringPrep { * * @param inputStream The stream for reading the StringPrep profile binarySun * @throws IOException - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public StringPrep(InputStream inputStream) throws IOException{ @@ -376,8 +372,7 @@ public final class StringPrep { * * @return StringBuffer A StringBuffer containing the output * @throws ParseException - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public StringBuffer prepare(UCharacterIterator src, int options) throws StringPrepParseException{ diff --git a/icu4j/src/com/ibm/icu/text/StringPrepParseException.java b/icu4j/src/com/ibm/icu/text/StringPrepParseException.java index 3c5b0bb196a..46c2e7d4b81 100644 --- a/icu4j/src/com/ibm/icu/text/StringPrepParseException.java +++ b/icu4j/src/com/ibm/icu/text/StringPrepParseException.java @@ -13,64 +13,52 @@ import java.text.ParseException; * input to StringPrep or IDNA. * * @author Ram Viswanadha - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public class StringPrepParseException extends ParseException { /** - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int INVALID_CHAR_FOUND = 0; /** - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int ILLEGAL_CHAR_FOUND = 1; /** - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int PROHIBITED_ERROR = 2; /** - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int UNASSIGNED_ERROR = 3; /** - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int CHECK_BIDI_ERROR = 4; /** - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int STD3_ASCII_RULES_ERROR = 5; /** - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int ACE_PREFIX_ERROR = 6; /** - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int VERIFICATION_ERROR = 7; /** - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int LABEL_TOO_LONG_ERROR = 8; /** - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int BUFFER_OVERFLOW_ERROR = 9; /** - * @draft ICU 2.2 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.2 */ public static final int ZERO_LENGTH_LABEL = 10; @@ -80,8 +68,7 @@ public class StringPrepParseException extends ParseException { * * @param message A string describing the type of error that occurred * @param error The error that has occurred - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public StringPrepParseException(String message,int error){ super(message, -1); @@ -97,8 +84,7 @@ public class StringPrepParseException extends ParseException { * @param error The error that has occurred * @param rules The input rules string * @param pos The position of error in the rules string - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public StringPrepParseException(String message,int error, String rules, int pos){ super(message, -1); @@ -118,8 +104,7 @@ public class StringPrepParseException extends ParseException { * it should be a positive integer. The default value of this field * is -1. It will be set to 0 if the code populating this struct is not * using line numbers. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public StringPrepParseException(String message, int error, String rules, int pos, int lineNumber){ super(message, -1); @@ -134,8 +119,7 @@ public class StringPrepParseException extends ParseException { * * @param other The exception that this object should be compared to * @return true if the objects are equal, false if unequal - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public boolean equals(Object other){ if(!(other instanceof StringPrepParseException)){ @@ -148,8 +132,7 @@ public class StringPrepParseException extends ParseException { * Returns the position of error in the rules string * * @return String - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public String toString(){ StringBuffer buf = new StringBuffer(); @@ -170,8 +153,7 @@ public class StringPrepParseException extends ParseException { * it should be a positive integer. The default value of this field * is -1. It will be set to 0 if the code populating this struct is not * using line numbers. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ private int line; @@ -179,23 +161,19 @@ public class StringPrepParseException extends ParseException { /** * Textual context before the error. Null-terminated. * May be the empty string if not implemented by parser. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ private StringBuffer preContext = new StringBuffer(); /** * Textual context after the error. Null-terminated. * May be the empty string if not implemented by parser. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ private StringBuffer postContext = new StringBuffer(); private static final int PARSE_CONTEXT_LEN = 16; - - private void setPreContext(String str, int pos){ setPreContext(str.toCharArray(),pos); } diff --git a/icu4j/src/com/ibm/icu/text/SymbolTable.java b/icu4j/src/com/ibm/icu/text/SymbolTable.java index 65d8a279bce..040e9fb16a2 100755 --- a/icu4j/src/com/ibm/icu/text/SymbolTable.java +++ b/icu4j/src/com/ibm/icu/text/SymbolTable.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 1996-2004, International Business Machines Corporation and * + * Copyright (C) 1996-2005, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -30,15 +30,13 @@ import java.text.ParsePosition; * with the position immediately following the SYMBOL_REF. The symbol * table parses the name, if there is one, and returns it. * - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public interface SymbolTable { /** * The character preceding a symbol reference name. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ static final char SYMBOL_REF = '$'; @@ -49,8 +47,7 @@ public interface SymbolTable { * @param s the symbolic name to lookup * @return a char array containing the name's value, or null if * there is no mapping for s. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ char[] lookup(String s); @@ -60,8 +57,7 @@ public interface SymbolTable { * @param ch a 32-bit code point from 0 to 0x10FFFF inclusive. * @return the UnicodeMatcher object represented by the given * character, or null if there is no mapping for ch. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ UnicodeMatcher lookupMatcher(int ch); @@ -80,8 +76,7 @@ public interface SymbolTable { * @param limit the index after the last character to be parsed. * @return the parsed name, or null if there is no valid symbolic * name at the given position. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ String parseReference(String text, ParsePosition pos, int limit); } diff --git a/icu4j/src/com/ibm/icu/text/UFormat.java b/icu4j/src/com/ibm/icu/text/UFormat.java index 6dfd8b4648b..b38bc8a262c 100644 --- a/icu4j/src/com/ibm/icu/text/UFormat.java +++ b/icu4j/src/com/ibm/icu/text/UFormat.java @@ -17,7 +17,7 @@ import com.ibm.icu.util.ULocale; * @see com.ibm.icu.util.ULocale * @author weiv * @author Alan Liu - * @draft ICU 2.8 + * @draft ICU 2.8 (retain) * @deprecated This is a draft API and might change in a future release of ICU. */ public abstract class UFormat extends Format { @@ -25,7 +25,7 @@ public abstract class UFormat extends Format { private static final long serialVersionUID = -4964390515840164416L; /** - * @draft ICU 2.8 + * @draft ICU 2.8 (retain) * @deprecated This is a draft API and might change in a future release of ICU. */ public UFormat() {} @@ -53,7 +53,7 @@ public abstract class UFormat extends Format { * @see com.ibm.icu.util.ULocale * @see com.ibm.icu.util.ULocale#VALID_LOCALE * @see com.ibm.icu.util.ULocale#ACTUAL_LOCALE - * @draft ICU 2.8 + * @draft ICU 2.8 (retain) * @deprecated This is a draft API and might change in a future release of ICU. */ public final ULocale getLocale(ULocale.Type type) { diff --git a/icu4j/src/com/ibm/icu/text/UnicodeSet.java b/icu4j/src/com/ibm/icu/text/UnicodeSet.java index c16db39aac7..87f872aeede 100755 --- a/icu4j/src/com/ibm/icu/text/UnicodeSet.java +++ b/icu4j/src/com/ibm/icu/text/UnicodeSet.java @@ -2369,8 +2369,7 @@ public class UnicodeSet extends UnicodeFilter { /** * Add the contents of the UnicodeSet (as strings) into a collection. * @param target collection to add into - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public void addAllTo(Collection target) { UnicodeSetIterator it = new UnicodeSetIterator(this); @@ -2382,8 +2381,7 @@ public class UnicodeSet extends UnicodeFilter { /** * Add the contents of the collection (as strings) into this UnicodeSet. * @param source the collection to add - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public void addAll(Collection source) { Iterator it = source.iterator(); diff --git a/icu4j/src/com/ibm/icu/util/BuddhistCalendar.java b/icu4j/src/com/ibm/icu/util/BuddhistCalendar.java index 1007202e40e..11575a23838 100755 --- a/icu4j/src/com/ibm/icu/util/BuddhistCalendar.java +++ b/icu4j/src/com/ibm/icu/util/BuddhistCalendar.java @@ -25,16 +25,12 @@ import java.util.Locale; * The Buddhist Calendar has only one allowable era: BE. If the * calendar is not in lenient mode (see setLenient), dates before * 1/1/1 BE are rejected with an IllegalArgumentException. - *

- * Note This API has not been promoted to @stable and instead has been left - * as @draft ICU 2.8. It may yet change or be removed in a future release. * * @see com.ibm.icu.util.GregorianCalendar * * @author Laura Werner * @author Alan Liu - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public class BuddhistCalendar extends GregorianCalendar { // jdk1.4.2 serialver @@ -50,16 +46,14 @@ public class BuddhistCalendar extends GregorianCalendar { * value for the Buddhist calendar. * * @see com.ibm.icu.util.Calendar#ERA - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int BE = 0; /** * Constructs a BuddhistCalendar using the current time * in the default time zone with the default locale. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public BuddhistCalendar() { super(); @@ -70,8 +64,7 @@ public class BuddhistCalendar extends GregorianCalendar { * in the given time zone with the default locale. * * @param zone the given time zone. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public BuddhistCalendar(TimeZone zone) { super(zone); @@ -82,8 +75,7 @@ public class BuddhistCalendar extends GregorianCalendar { * in the default time zone with the given locale. * * @param aLocale the given locale. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public BuddhistCalendar(Locale aLocale) { super(aLocale); @@ -108,8 +100,7 @@ public class BuddhistCalendar extends GregorianCalendar { * @param zone the given time zone. * * @param aLocale the given locale. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public BuddhistCalendar(TimeZone zone, Locale aLocale) { super(zone, aLocale); @@ -134,8 +125,7 @@ public class BuddhistCalendar extends GregorianCalendar { * in the default time zone with the default locale. * * @param date The date to which the new calendar is set. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public BuddhistCalendar(Date date) { this(); @@ -152,8 +142,7 @@ public class BuddhistCalendar extends GregorianCalendar { * The value is 0-based. e.g., 0 for January. * * @param date The value used to set the calendar's {@link #DATE DATE} time field. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public BuddhistCalendar(int year, int month, int date) { super(year, month, date); @@ -175,8 +164,7 @@ public class BuddhistCalendar extends GregorianCalendar { * @param minute The value used to set the calendar's {@link #MINUTE MINUTE} time field. * * @param second The value used to set the calendar's {@link #SECOND SECOND} time field. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public BuddhistCalendar(int year, int month, int date, int hour, int minute, int second) @@ -195,8 +183,7 @@ public class BuddhistCalendar extends GregorianCalendar { private static final int BUDDHIST_ERA_START = -543; /** - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ protected int handleGetExtendedYear() { int year; @@ -211,16 +198,14 @@ public class BuddhistCalendar extends GregorianCalendar { // Return JD of start of given month/year /** - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ protected int handleComputeMonthStart(int eyear, int month, boolean useMonth) { return super.handleComputeMonthStart(eyear + BUDDHIST_ERA_START, month, useMonth); } /** - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ protected void handleComputeFields(int julianDay) { super.handleComputeFields(julianDay); @@ -234,8 +219,7 @@ public class BuddhistCalendar extends GregorianCalendar { * Override GregorianCalendar. There is only one Buddhist ERA. We * should really handle YEAR, YEAR_WOY, and EXTENDED_YEAR here too to * implement the 1..5000000 range, but it's not critical. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ protected int handleGetLimit(int field, int limitType) { if (field == ERA) { diff --git a/icu4j/src/com/ibm/icu/util/ByteArrayWrapper.java b/icu4j/src/com/ibm/icu/util/ByteArrayWrapper.java index affd53ca826..723744f0304 100644 --- a/icu4j/src/com/ibm/icu/util/ByteArrayWrapper.java +++ b/icu4j/src/com/ibm/icu/util/ByteArrayWrapper.java @@ -1,6 +1,6 @@ /** ******************************************************************************* - * Copyright (C) 1996-2004, International Business Machines Corporation and * + * Copyright (C) 1996-2005, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -21,8 +21,7 @@ import com.ibm.icu.impl.Utility; * size when necessary. *

* @author syn wee - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public class ByteArrayWrapper implements Comparable { @@ -30,8 +29,7 @@ public class ByteArrayWrapper implements Comparable /** * Internal byte array. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public byte[] bytes; @@ -39,8 +37,7 @@ public class ByteArrayWrapper implements Comparable * Size of the internal byte array used. * Different from bytes.length, size will be <= bytes.length. * Semantics of size is similar to java.util.Vector.size(). - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public int size; @@ -48,8 +45,7 @@ public class ByteArrayWrapper implements Comparable /** * Construct a new ByteArrayWrapper with no data. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public ByteArrayWrapper() { // leave bytes null, don't allocate twice @@ -188,8 +184,7 @@ public class ByteArrayWrapper implements Comparable * Releases the internal byte array to the caller, resets the internal * byte array to null and its size to 0. * @return internal byte array. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public final byte[] releaseBytes() { diff --git a/icu4j/src/com/ibm/icu/util/Calendar.java b/icu4j/src/com/ibm/icu/util/Calendar.java index 3a27d37667e..57fe6526d1d 100755 --- a/icu4j/src/com/ibm/icu/util/Calendar.java +++ b/icu4j/src/com/ibm/icu/util/Calendar.java @@ -5118,7 +5118,7 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable { * @see com.ibm.icu.util.ULocale * @see com.ibm.icu.util.ULocale#VALID_LOCALE * @see com.ibm.icu.util.ULocale#ACTUAL_LOCALE - * @draft ICU 2.8 + * @draft ICU 2.8 (retain) * @deprecated This is a draft API and might change in a future release of ICU. */ public final ULocale getLocale(ULocale.Type type) { diff --git a/icu4j/src/com/ibm/icu/util/ChineseCalendar.java b/icu4j/src/com/ibm/icu/util/ChineseCalendar.java index adf8423c447..c8fcc740b1a 100755 --- a/icu4j/src/com/ibm/icu/util/ChineseCalendar.java +++ b/icu4j/src/com/ibm/icu/util/ChineseCalendar.java @@ -67,14 +67,9 @@ import java.util.Locale; * * * - *

- * Note This API has not been promoted to @stable and instead has been left - * as @draft ICU 2.8. It may yet change or be removed in a future release. - * * @see com.ibm.icu.text.ChineseDateFormat * @author Alan Liu - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public class ChineseCalendar extends Calendar { // jdk1.4.2 serialver @@ -128,8 +123,7 @@ public class ChineseCalendar extends Calendar { /** * Construct a Chinese calendar with the default time zone and locale. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public ChineseCalendar() { super(); @@ -139,8 +133,7 @@ public class ChineseCalendar extends Calendar { * Construct a Chinese calendar with the given time zone and locale. * @param zone time zone for this calendar * @param locale locale for this calendar - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public ChineseCalendar(TimeZone zone, Locale locale) { super(zone, locale); @@ -164,8 +157,7 @@ public class ChineseCalendar extends Calendar { /** * Field indicating whether or not the current month is a leap month. * Should have a value of 0 for non-leap months, and 1 for leap months. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static int IS_LEAP_MONTH = BASE_FIELD_COUNT; @@ -180,8 +172,7 @@ public class ChineseCalendar extends Calendar { /** * Override Calendar to allocate our additional field. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ protected int[] handleCreateFields() { return new int[FIELD_COUNT]; @@ -253,8 +244,7 @@ public class ChineseCalendar extends Calendar { /** * Override Calendar to return the limit value for the given field. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ protected int handleGetLimit(int field, int limitType) { return LIMITS[field][limitType]; @@ -265,8 +255,7 @@ public class ChineseCalendar extends Calendar { * defined by the current fields. This will use either the ERA and * YEAR field as the cycle and year-of-cycle, or the EXTENDED_YEAR * field as the continuous year count, depending on which is newer. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ protected int handleGetExtendedYear() { int year; @@ -285,8 +274,7 @@ public class ChineseCalendar extends Calendar { * *

Note: This method also reads the IS_LEAP_MONTH field to determine * whether or not the given month is a leap month. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ protected int handleGetMonthLength(int extendedYear, int month) { int thisStart = handleComputeMonthStart(extendedYear, month, true) - @@ -300,8 +288,7 @@ public class ChineseCalendar extends Calendar { * using the the given pattern. This method is responsible for * creating the calendar- specific DateFormat and DateFormatSymbols * objects as needed. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ protected DateFormat handleGetDateFormat(String pattern, ULocale locale) { return new ChineseDateFormat(pattern, locale); @@ -334,8 +321,7 @@ public class ChineseCalendar extends Calendar { /** * Override Calendar to add IS_LEAP_MONTH to the field resolution * table. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ protected int[][][] getFieldResolutionTable() { return CHINESE_DATE_PRECEDENCE; @@ -381,8 +367,7 @@ public class ChineseCalendar extends Calendar { /** * Override Calendar to handle leap months properly. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public void add(int field, int amount) { switch (field) { @@ -402,8 +387,7 @@ public class ChineseCalendar extends Calendar { /** * Override Calendar to handle leap months properly. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public void roll(int field, int amount) { switch (field) { @@ -644,8 +628,7 @@ public class ChineseCalendar extends Calendar { * calendar equivalents for the given Julian day. * *

Compute the ChineseCalendar-specific field IS_LEAP_MONTH. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ protected void handleComputeFields(int julianDay) { @@ -786,8 +769,7 @@ public class ChineseCalendar extends Calendar { * by reading the IS_LEAP_MONTH field. * @return the Julian day number of the day before the first * day of the given month and year - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ protected int handleComputeMonthStart(int eyear, int month, boolean useMonth) { diff --git a/icu4j/src/com/ibm/icu/util/DateRule.java b/icu4j/src/com/ibm/icu/util/DateRule.java index 78eb192efbb..c6725b9f186 100755 --- a/icu4j/src/com/ibm/icu/util/DateRule.java +++ b/icu4j/src/com/ibm/icu/util/DateRule.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 1996-2004, International Business Machines Corporation and * + * Copyright (C) 1996-2005, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -16,7 +16,7 @@ import java.util.Date; * Daylight Savings Time rules, and other events such as meetings. * * @see SimpleDateRule - * @draft ICU 2.8 + * @draft ICU 2.8 (retainAll) * @deprecated This is a draft API and might change in a future release of ICU. */ public interface DateRule diff --git a/icu4j/src/com/ibm/icu/util/EasterHoliday.java b/icu4j/src/com/ibm/icu/util/EasterHoliday.java index 8b6fc3c9ef7..ddd06f12033 100755 --- a/icu4j/src/com/ibm/icu/util/EasterHoliday.java +++ b/icu4j/src/com/ibm/icu/util/EasterHoliday.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 1996-2004, International Business Machines Corporation and * + * Copyright (C) 1996-2005, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -13,7 +13,7 @@ import java.util.Date; * A Holiday subclass which represents holidays that occur * a fixed number of days before or after Easter. Supports both the * Western and Orthodox methods for calculating Easter. - * @draft ICU 2.8 + * @draft ICU 2.8 (retainAll) * @deprecated This is a draft API and might change in a future release of ICU. */ public class EasterHoliday extends Holiday diff --git a/icu4j/src/com/ibm/icu/util/HebrewCalendar.java b/icu4j/src/com/ibm/icu/util/HebrewCalendar.java index 90fa5f43f1e..8d6977b1fea 100755 --- a/icu4j/src/com/ibm/icu/util/HebrewCalendar.java +++ b/icu4j/src/com/ibm/icu/util/HebrewCalendar.java @@ -56,15 +56,12 @@ import java.util.Locale; * http://www.faqs.org/faqs/calendars/faq/ * *

- * Note This API has not been promoted to @stable and instead has been left - * as @draft ICU 2.8. It may yet change or be removed in a future release. * * @see com.ibm.icu.util.GregorianCalendar * * @author Laura Werner * @author Alan Liu - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public class HebrewCalendar extends Calendar { // jdk1.4.2 serialver @@ -79,36 +76,31 @@ public class HebrewCalendar extends Calendar { /** * Constant for Tishri, the 1st month of the Hebrew year. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int TISHRI = 0; /** * Constant for Heshvan, the 2nd month of the Hebrew year. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int HESHVAN = 1; /** * Constant for Kislev, the 3rd month of the Hebrew year. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int KISLEV = 2; /** * Constant for Tevet, the 4th month of the Hebrew year. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int TEVET = 3; /** * Constant for Shevat, the 5th month of the Hebrew year. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int SHEVAT = 4; @@ -116,57 +108,49 @@ public class HebrewCalendar extends Calendar { * Constant for Adar I, the 6th month of the Hebrew year * (present in leap years only). In non-leap years, the calendar * jumps from Shevat (5th month) to Adar (7th month). - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int ADAR_1 = 5; /** * Constant for the Adar, the 7th month of the Hebrew year. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int ADAR = 6; /** * Constant for Nisan, the 8th month of the Hebrew year. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int NISAN = 7; /** * Constant for Iyar, the 9th month of the Hebrew year. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int IYAR = 8; /** * Constant for Sivan, the 10th month of the Hebrew year. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int SIVAN = 9; /** * Constant for Tammuz, the 11th month of the Hebrew year. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int TAMUZ = 10; /** * Constant for Av, the 12th month of the Hebrew year. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int AV = 11; /** * Constant for Elul, the 13th month of the Hebrew year. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int ELUL = 12; @@ -286,8 +270,7 @@ public class HebrewCalendar extends Calendar { /** * Constructs a default HebrewCalendar using the current time * in the default time zone with the default locale. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public HebrewCalendar() { this(TimeZone.getDefault(), ULocale.getDefault()); @@ -298,8 +281,7 @@ public class HebrewCalendar extends Calendar { * in the given time zone with the default locale. * * @param zone The time zone for the new calendar. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public HebrewCalendar(TimeZone zone) { this(zone, ULocale.getDefault()); @@ -310,8 +292,7 @@ public class HebrewCalendar extends Calendar { * in the default time zone with the given locale. * * @param aLocale The locale for the new calendar. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public HebrewCalendar(Locale aLocale) { this(TimeZone.getDefault(), aLocale); @@ -336,8 +317,7 @@ public class HebrewCalendar extends Calendar { * @param zone The time zone for the new calendar. * * @param aLocale The locale for the new calendar. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public HebrewCalendar(TimeZone zone, Locale aLocale) { super(zone, aLocale); @@ -369,8 +349,7 @@ public class HebrewCalendar extends Calendar { * The value is 0-based. e.g., 0 for Tishri. * * @param date The value used to set the calendar's {@link #DATE DATE} time field. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public HebrewCalendar(int year, int month, int date) { super(TimeZone.getDefault(), ULocale.getDefault()); @@ -384,8 +363,7 @@ public class HebrewCalendar extends Calendar { * in the default time zone with the default locale. * * @param date The date to which the new calendar is set. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public HebrewCalendar(Date date) { super(TimeZone.getDefault(), ULocale.getDefault()); @@ -408,8 +386,7 @@ public class HebrewCalendar extends Calendar { * @param minute The value used to set the calendar's {@link #MINUTE MINUTE} time field. * * @param second The value used to set the calendar's {@link #SECOND SECOND} time field. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public HebrewCalendar(int year, int month, int date, int hour, int minute, int second) @@ -455,8 +432,7 @@ public class HebrewCalendar extends Calendar { * * @exception IllegalArgumentException if the field is invalid or refers * to a field that cannot be handled by this method. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public void add(int field, int amount) { @@ -542,8 +518,7 @@ public class HebrewCalendar extends Calendar { * * @exception IllegalArgumentException if the field is invalid or refers * to a field that cannot be handled by this method. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public void roll(int field, int amount) { @@ -717,8 +692,7 @@ public class HebrewCalendar extends Calendar { //------------------------------------------------------------------------- /** - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ protected int handleGetLimit(int field, int limitType) { return LIMITS[field][limitType]; @@ -726,8 +700,7 @@ public class HebrewCalendar extends Calendar { /** * Returns the length of the given month in the given year - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ protected int handleGetMonthLength(int extendedYear, int month) { @@ -745,8 +718,7 @@ public class HebrewCalendar extends Calendar { /** * Returns the number of days in the given Hebrew year - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ protected int handleGetYearLength(int eyear) { return (int)(startOfYear(eyear+1) - startOfYear(eyear)); @@ -775,8 +747,7 @@ public class HebrewCalendar extends Calendar { *

In addition, subclasses should compute any subclass-specific * fields, that is, fields from BASE_FIELD_COUNT to * getFieldCount() - 1. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ protected void handleComputeFields(int julianDay) { long d = julianDay - 347997; @@ -816,8 +787,7 @@ public class HebrewCalendar extends Calendar { //------------------------------------------------------------------------- /** - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ protected int handleGetExtendedYear() { int year; @@ -831,8 +801,7 @@ public class HebrewCalendar extends Calendar { /** * Return JD of start of given month/year. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ protected int handleComputeMonthStart(int eyear, int month, boolean useMonth) { diff --git a/icu4j/src/com/ibm/icu/util/HebrewHoliday.java b/icu4j/src/com/ibm/icu/util/HebrewHoliday.java index 1eb5adde73a..20adea80474 100755 --- a/icu4j/src/com/ibm/icu/util/HebrewHoliday.java +++ b/icu4j/src/com/ibm/icu/util/HebrewHoliday.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 1996-2004, International Business Machines Corporation and * + * Copyright (C) 1996-2005, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -8,7 +8,7 @@ package com.ibm.icu.util; /** - * @draft ICU 2.8 + * @draft ICU 2.8 (retainAll) * @deprecated This is a draft API and might change in a future release of ICU. */ public class HebrewHoliday extends Holiday diff --git a/icu4j/src/com/ibm/icu/util/Holiday.java b/icu4j/src/com/ibm/icu/util/Holiday.java index ce218f13a01..4d31a954b7e 100755 --- a/icu4j/src/com/ibm/icu/util/Holiday.java +++ b/icu4j/src/com/ibm/icu/util/Holiday.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 1996-2004, International Business Machines Corporation and * + * Copyright (C) 1996-2005, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -14,7 +14,7 @@ import java.util.ResourceBundle; /** * An abstract class representing a holiday. - * @draft ICU 2.8 + * @draft ICU 2.8 (retainAll) * @deprecated This is a draft API and might change in a future release of ICU. */ public abstract class Holiday implements DateRule diff --git a/icu4j/src/com/ibm/icu/util/IslamicCalendar.java b/icu4j/src/com/ibm/icu/util/IslamicCalendar.java index 6c267092795..8c19c741da0 100755 --- a/icu4j/src/com/ibm/icu/util/IslamicCalendar.java +++ b/icu4j/src/com/ibm/icu/util/IslamicCalendar.java @@ -61,15 +61,12 @@ import java.util.Locale; * fixed-cycle civil calendar is used. However, if setCivil(false) * is called, an approximation of the true lunar calendar will be used. *

- * Note This API has not been promoted to @stable and instead has been left - * as @draft ICU 2.8. It may yet change or be removed in a future release. * * @see com.ibm.icu.util.GregorianCalendar * * @author Laura Werner * @author Alan Liu - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public class IslamicCalendar extends Calendar { // jdk1.4.2 serialver @@ -83,85 +80,73 @@ public class IslamicCalendar extends Calendar { /** * Constant for Muharram, the 1st month of the Islamic year. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int MUHARRAM = 0; /** * Constant for Safar, the 2nd month of the Islamic year. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int SAFAR = 1; /** * Constant for Rabi' al-awwal (or Rabi' I), the 3rd month of the Islamic year. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int RABI_1 = 2; /** * Constant for Rabi' al-thani or (Rabi' II), the 4th month of the Islamic year. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int RABI_2 = 3; /** * Constant for Jumada al-awwal or (Jumada I), the 5th month of the Islamic year. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int JUMADA_1 = 4; /** * Constant for Jumada al-thani or (Jumada II), the 6th month of the Islamic year. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int JUMADA_2 = 5; /** * Constant for Rajab, the 7th month of the Islamic year. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int RAJAB = 6; /** * Constant for Sha'ban, the 8th month of the Islamic year. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int SHABAN = 7; /** * Constant for Ramadan, the 9th month of the Islamic year. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int RAMADAN = 8; /** * Constant for Shawwal, the 10th month of the Islamic year. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int SHAWWAL = 9; /** * Constant for Dhu al-Qi'dah, the 11th month of the Islamic year. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int DHU_AL_QIDAH = 10; /** * Constant for Dhu al-Hijjah, the 12th month of the Islamic year. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final int DHU_AL_HIJJAH = 11; @@ -175,8 +160,7 @@ public class IslamicCalendar extends Calendar { /** * Constructs a default IslamicCalendar using the current time * in the default time zone with the default locale. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public IslamicCalendar() { @@ -187,8 +171,7 @@ public class IslamicCalendar extends Calendar { * Constructs an IslamicCalendar based on the current time * in the given time zone with the default locale. * @param zone the given time zone. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public IslamicCalendar(TimeZone zone) { @@ -200,8 +183,7 @@ public class IslamicCalendar extends Calendar { * in the default time zone with the given locale. * * @param aLocale the given locale. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public IslamicCalendar(Locale aLocale) { @@ -227,8 +209,7 @@ public class IslamicCalendar extends Calendar { * * @param zone the given time zone. * @param aLocale the given locale. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public IslamicCalendar(TimeZone zone, Locale aLocale) { @@ -256,8 +237,7 @@ public class IslamicCalendar extends Calendar { * in the default time zone with the default locale. * * @param date The date to which the new calendar is set. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public IslamicCalendar(Date date) { super(TimeZone.getDefault(), ULocale.getDefault()); @@ -272,8 +252,7 @@ public class IslamicCalendar extends Calendar { * @param month the value used to set the {@link #MONTH MONTH} time field in the calendar. * Note that the month value is 0-based. e.g., 0 for Muharram. * @param date the value used to set the {@link #DATE DATE} time field in the calendar. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public IslamicCalendar(int year, int month, int date) { @@ -297,8 +276,7 @@ public class IslamicCalendar extends Calendar { * in the calendar. * @param second the value used to set the {@link #SECOND SECOND} time field * in the calendar. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public IslamicCalendar(int year, int month, int date, int hour, int minute, int second) @@ -318,8 +296,7 @@ public class IslamicCalendar extends Calendar { * * @param beCivil true to use the civil calendar, * false to use the astronomical calendar. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public void setCivil(boolean beCivil) { @@ -337,8 +314,7 @@ public class IslamicCalendar extends Calendar { * Returns true if this object is using the fixed-cycle civil * calendar, or false if using the religious, astronomical * calendar. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public boolean isCivil() { return civil; @@ -376,8 +352,7 @@ public class IslamicCalendar extends Calendar { }; /** - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ protected int handleGetLimit(int field, int limitType) { return LIMITS[field][limitType]; @@ -539,8 +514,7 @@ public class IslamicCalendar extends Calendar { * * @param extendedYear The hijri year * @param month The hijri month, 0-based - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ protected int handleGetMonthLength(int extendedYear, int month) { @@ -560,8 +534,7 @@ public class IslamicCalendar extends Calendar { /** * Return the number of days in the given Islamic year - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ protected int handleGetYearLength(int extendedYear) { if (civil) { @@ -578,8 +551,7 @@ public class IslamicCalendar extends Calendar { // Return JD of start of given month/year /** - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ protected int handleComputeMonthStart(int eyear, int month, boolean useMonth) { return (int) monthStart(eyear, month) + 1948439; @@ -590,8 +562,7 @@ public class IslamicCalendar extends Calendar { //------------------------------------------------------------------------- /** - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ protected int handleGetExtendedYear() { int year; @@ -617,8 +588,7 @@ public class IslamicCalendar extends Calendar { * The DAY_OF_WEEK and DOW_LOCAL fields are already set when this * method is called. The getGregorianXxx() methods return Gregorian * calendar equivalents for the given Julian day. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ protected void handleComputeFields(int julianDay) { int year, month, dayOfMonth, dayOfYear; diff --git a/icu4j/src/com/ibm/icu/util/JapaneseCalendar.java b/icu4j/src/com/ibm/icu/util/JapaneseCalendar.java index 05943d8fd18..53cef7a9fe2 100755 --- a/icu4j/src/com/ibm/icu/util/JapaneseCalendar.java +++ b/icu4j/src/com/ibm/icu/util/JapaneseCalendar.java @@ -33,15 +33,11 @@ import java.util.Locale; * may change in the future as we add more historical data. Use the predefined * constants rather than using actual, absolute numbers. *

- * Note This API has not been promoted to @stable and instead has been left - * as @draft ICU 2.8. It may yet change or be removed in a future release. - * * @see com.ibm.icu.util.GregorianCalendar * * @author Laura Werner * @author Alan Liu - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public class JapaneseCalendar extends GregorianCalendar { // jdk1.4.2 serialver @@ -56,8 +52,7 @@ public class JapaneseCalendar extends GregorianCalendar { /** * Constructs a default JapaneseCalendar using the current time * in the default time zone with the default locale. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public JapaneseCalendar() { super(); @@ -67,8 +62,7 @@ public class JapaneseCalendar extends GregorianCalendar { * Constructs a JapaneseCalendar based on the current time * in the given time zone with the default locale. * @param zone the given time zone. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public JapaneseCalendar(TimeZone zone) { super(zone); @@ -78,8 +72,7 @@ public class JapaneseCalendar extends GregorianCalendar { * Constructs a JapaneseCalendar based on the current time * in the default time zone with the given locale. * @param aLocale the given locale. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public JapaneseCalendar(Locale aLocale) { super(aLocale); @@ -103,8 +96,7 @@ public class JapaneseCalendar extends GregorianCalendar { * @param zone the given time zone. * * @param aLocale the given locale. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public JapaneseCalendar(TimeZone zone, Locale aLocale) { super(zone, aLocale); @@ -129,8 +121,7 @@ public class JapaneseCalendar extends GregorianCalendar { * in the default time zone with the default locale. * * @param date The date to which the new calendar is set. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public JapaneseCalendar(Date date) { this(); @@ -157,8 +148,7 @@ public class JapaneseCalendar extends GregorianCalendar { * The value is 0-based. e.g., 0 for January. * * @param date The value used to set the calendar's DATE field. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public JapaneseCalendar(int era, int year, int month, int date) { super(year, month, date); @@ -177,8 +167,7 @@ public class JapaneseCalendar extends GregorianCalendar { * The value is 0-based. e.g., 0 for January. * * @param date The value used to set the calendar's {@link #DATE DATE} field. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public JapaneseCalendar(int year, int month, int date) { super(year, month, date); @@ -203,8 +192,7 @@ public class JapaneseCalendar extends GregorianCalendar { * @param minute The value used to set the calendar's {@link #MINUTE MINUTE} time field. * * @param second The value used to set the calendar's {@link #SECOND SECOND} time field. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public JapaneseCalendar(int year, int month, int date, int hour, int minute, int second) @@ -216,8 +204,7 @@ public class JapaneseCalendar extends GregorianCalendar { //------------------------------------------------------------------------- /** - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ protected int handleGetExtendedYear() { int year; @@ -233,8 +220,7 @@ public class JapaneseCalendar extends GregorianCalendar { } /** - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ protected void handleComputeFields(int julianDay) { super.handleComputeFields(julianDay); @@ -529,36 +515,31 @@ public class JapaneseCalendar extends GregorianCalendar { // Constant for the current era. This must be regularly updated. /** - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ static public final int CURRENT_ERA = (ERAS.length / 3) - 1; /** * Constant for the era starting on Sept. 8, 1868 AD. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ static public final int MEIJI = CURRENT_ERA - 3; /** * Constant for the era starting on July 30, 1912 AD. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ static public final int TAISHO = CURRENT_ERA - 2; /** * Constant for the era starting on Dec. 25, 1926 AD. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ static public final int SHOWA = CURRENT_ERA - 1; /** * Constant for the era starting on Jan. 7, 1989 AD. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ static public final int HEISEI = CURRENT_ERA; @@ -579,8 +560,7 @@ public class JapaneseCalendar extends GregorianCalendar { * Override GregorianCalendar. We should really handle YEAR_WOY and * EXTENDED_YEAR here too to implement the 1..5000000 range, but it's * not critical. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ protected int handleGetLimit(int field, int limitType) { switch (field) { diff --git a/icu4j/src/com/ibm/icu/util/LocaleData.java b/icu4j/src/com/ibm/icu/util/LocaleData.java index 60e0e993471..30dbfa0a77d 100644 --- a/icu4j/src/com/ibm/icu/util/LocaleData.java +++ b/icu4j/src/com/ibm/icu/util/LocaleData.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2004, International Business Machines Corporation and * + * Copyright (C) 2004-2005, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -12,8 +12,7 @@ import com.ibm.icu.text.UnicodeSet; /** * A class for accessing miscelleneous data in the locale bundles * @author ram - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public final class LocaleData { @@ -50,22 +49,19 @@ public final class LocaleData { /** * Enumeration for representing the measurement systems. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final class MeasurementSystem{ /** * Measurement system specified by Le Système International d'Unités (SI) * otherwise known as Metric system. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final MeasurementSystem SI = new MeasurementSystem(0); /** * Measurement system followed in the United States of America. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final MeasurementSystem US = new MeasurementSystem(1); @@ -73,6 +69,7 @@ public final class LocaleData { private MeasurementSystem(int id){ systemID = id; } + private boolean equals(int id){ return systemID == id; } @@ -105,8 +102,7 @@ public final class LocaleData { /** * A class that represents the size of letter head * used in the country - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final class PaperSize{ private int height; @@ -119,8 +115,7 @@ public final class LocaleData { /** * Retruns the height of the paper * @return the height - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public int getHeight(){ return height; @@ -128,8 +123,7 @@ public final class LocaleData { /** * Returns the width of hte paper * @return the width - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public int getWidth(){ return width; diff --git a/icu4j/src/com/ibm/icu/util/RangeDateRule.java b/icu4j/src/com/ibm/icu/util/RangeDateRule.java index 84439f96b4b..e586cc383f1 100755 --- a/icu4j/src/com/ibm/icu/util/RangeDateRule.java +++ b/icu4j/src/com/ibm/icu/util/RangeDateRule.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 1996-2004, International Business Machines Corporation and * + * Copyright (C) 1996-2005, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -12,7 +12,7 @@ import java.util.Vector; /** * Implementation of DateRule that takes a range. - * @draft ICU 2.8 + * @draft ICU 2.8 (retainAll) * @deprecated This is a draft API and might change in a future release of ICU. */ public class RangeDateRule implements DateRule { diff --git a/icu4j/src/com/ibm/icu/util/SimpleDateRule.java b/icu4j/src/com/ibm/icu/util/SimpleDateRule.java index 3d48bbf47cb..7b8b06af2d0 100755 --- a/icu4j/src/com/ibm/icu/util/SimpleDateRule.java +++ b/icu4j/src/com/ibm/icu/util/SimpleDateRule.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 1996-2004, International Business Machines Corporation and * + * Copyright (C) 1996-2005, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -11,7 +11,7 @@ import java.util.Date; /** * Simple implementation of DateRule. - * @draft ICU 2.8 + * @draft ICU 2.8 (retainAll) * @deprecated This is a draft API and might change in a future release of ICU. */ public class SimpleDateRule implements DateRule diff --git a/icu4j/src/com/ibm/icu/util/SimpleHoliday.java b/icu4j/src/com/ibm/icu/util/SimpleHoliday.java index f247a072342..6335f2ac3d3 100755 --- a/icu4j/src/com/ibm/icu/util/SimpleHoliday.java +++ b/icu4j/src/com/ibm/icu/util/SimpleHoliday.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 1996-2004, International Business Machines Corporation and * + * Copyright (C) 1996-2005, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -15,7 +15,7 @@ import com.ibm.icu.util.GregorianCalendar; * A holiday whose date can be represented by a month, day, and optionally day of week * in the Gregorian calendar. * - * @draft ICU 2.8 + * @draft ICU 2.8 (retainAll) * @deprecated This is a draft API and might change in a future release of ICU. */ public class SimpleHoliday extends Holiday { diff --git a/icu4j/src/com/ibm/icu/util/TimeZone.java b/icu4j/src/com/ibm/icu/util/TimeZone.java index ff85a657c72..9aa39ceb226 100755 --- a/icu4j/src/com/ibm/icu/util/TimeZone.java +++ b/icu4j/src/com/ibm/icu/util/TimeZone.java @@ -76,8 +76,7 @@ abstract public class TimeZone implements Serializable, Cloneable { /** * Default constructor. (For invocation by subclass constructors, * typically implicit.) - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public TimeZone() { } @@ -132,13 +131,12 @@ abstract public class TimeZone implements Serializable, Cloneable { * @see Calendar#ZONE_OFFSET * @see Calendar#DST_OFFSET * @see #getOffset(long, boolean, int[]) - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public int getOffset(long date) { - int[] result = new int[2]; - getOffset(date, false, result); - return result[0]+result[1]; + int[] result = new int[2]; + getOffset(date, false, result); + return result[0]+result[1]; } /** @@ -160,8 +158,7 @@ abstract public class TimeZone implements Serializable, Cloneable { * time, in offsets[1]. If DST is not in effect, the DST offset is * zero; otherwise it is a positive value, typically one hour. * - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public void getOffset(long date, boolean local, int[] offsets) { offsets[0] = getRawOffset(); @@ -514,14 +511,13 @@ abstract public class TimeZone implements Serializable, Cloneable { * the known latest daylight saving value. * * @return the amount of saving time in milliseconds - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public int getDSTSavings() { - if (useDaylightTime()) { - return 3600000; - } - return 0; + if (useDaylightTime()) { + return 3600000; + } + return 0; } /** diff --git a/icu4j/src/com/ibm/icu/util/ULocale.java b/icu4j/src/com/ibm/icu/util/ULocale.java index cbec0568722..a58e0a5919f 100644 --- a/icu4j/src/com/ibm/icu/util/ULocale.java +++ b/icu4j/src/com/ibm/icu/util/ULocale.java @@ -80,8 +80,7 @@ import com.ibm.icu.impl.ICUResourceBundle; * @author weiv * @author Alan Liu * @author Ram Viswanadha - * @deprecated This is a draft API and might change in a future release of ICU. - * @draft ICU 2.8 + * @stable ICU 2.8 */ public final class ULocale implements Serializable { // using serialver from jdk1.4.2_05 @@ -268,8 +267,7 @@ public final class ULocale implements Serializable { /** * The root ULocale. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final ULocale ROOT = new ULocale(EMPTY_STRING, (Locale)null); @@ -733,7 +731,7 @@ public final class ULocale implements Serializable { * Construct a ULocale object from a {@link java.util.Locale}. * @param loc a JDK locale * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @internal */ private ULocale(Locale loc) { this.localeID = getName(loc.toString()); @@ -774,8 +772,7 @@ public final class ULocale implements Serializable { * * @param localeID string representation of the locale, e.g: * "en_US", "sy_Cyrl_YU", "zh__pinyin", "es_ES@currency=EUR,collation=traditional" - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public ULocale(String localeID) { this.localeID = getName(localeID); @@ -856,8 +853,7 @@ public final class ULocale implements Serializable { * Convert this ULocale object to a {@link java.util.Locale}. * @return a JDK locale that either exactly represents this object * or is the closest approximation. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public Locale toLocale() { if (locale == null) { @@ -874,8 +870,7 @@ public final class ULocale implements Serializable { /** * Returns the current default ULocale. - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static ULocale getDefault() { synchronized (ULocale.class) { @@ -2612,7 +2607,7 @@ public final class ULocale implements Serializable { * above the valid locale. If the object was not constructed from * locale data, then the valid locale is null. * - * @draft ICU 2.8 + * @draft ICU 2.8 (retain) * @deprecated This is a draft API and might change in a future release of ICU. */ public static Type ACTUAL_LOCALE = new Type(0); @@ -2628,7 +2623,7 @@ public final class ULocale implements Serializable { * *

Note: The valid locale will be returned correctly in ICU * 3.0 or later. In ICU 2.8, it is not returned correctly. - * @draft ICU 2.8 + * @draft ICU 2.8 (retain) * @deprecated This is a draft API and might change in a future release of ICU. */ public static Type VALID_LOCALE = new Type(1); @@ -2638,7 +2633,7 @@ public final class ULocale implements Serializable { * @see com.ibm.icu.util.ULocale * @see com.ibm.icu.util.ULocale#ACTUAL_LOCALE * @see com.ibm.icu.util.ULocale#VALID_LOCALE - * @draft ICU 2.8 + * @draft ICU 2.8 (retainAll) * @deprecated This is a draft API and might change in a future release of ICU. */ public static final class Type { diff --git a/icu4j/src/com/ibm/icu/util/VersionInfo.java b/icu4j/src/com/ibm/icu/util/VersionInfo.java index 2a9176f05fe..d04bbe738f6 100644 --- a/icu4j/src/com/ibm/icu/util/VersionInfo.java +++ b/icu4j/src/com/ibm/icu/util/VersionInfo.java @@ -125,22 +125,19 @@ public final class VersionInfo /** * ICU4J collator runtime version - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final VersionInfo UCOL_RUNTIME_VERSION; /** * ICU4J collator builder version - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final VersionInfo UCOL_BUILDER_VERSION; /** * ICU4J collator tailorings version - * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.8 */ public static final VersionInfo UCOL_TAILORINGS_VERSION;