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 e9d9d495527..dad04bcd743 100644 --- a/icu4j/src/com/ibm/icu/dev/tool/docs/CheckTags.java +++ b/icu4j/src/com/ibm/icu/dev/tool/docs/CheckTags.java @@ -350,10 +350,10 @@ public class CheckTags { break; case OBSOLETE: - foundObsoleteTag = true; if (tag.text().indexOf("ICU") != 0) { tagErr(tag); } + foundObsoleteTag = true; foundRequiredTag = true; break; diff --git a/icu4j/src/com/ibm/icu/lang/UCharacter.java b/icu4j/src/com/ibm/icu/lang/UCharacter.java index 78cf2bb8ba7..9e3cdb15c1a 100755 --- a/icu4j/src/com/ibm/icu/lang/UCharacter.java +++ b/icu4j/src/com/ibm/icu/lang/UCharacter.java @@ -102,392 +102,399 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection // blocks objects --------------------------------------------------- /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final UnicodeBlock NO_BLOCK - = new UnicodeBlock("NO_BLOCK", 0); + = new UnicodeBlock("NO_BLOCK", 0); /** * @stable ICU 2.4 */ public static final UnicodeBlock BASIC_LATIN - = new UnicodeBlock("BASIC_LATIN", 1); + = new UnicodeBlock("BASIC_LATIN", 1); /** * @stable ICU 2.4 */ public static final UnicodeBlock LATIN_1_SUPPLEMENT - = new UnicodeBlock("LATIN_1_SUPPLEMENT", 2); + = new UnicodeBlock("LATIN_1_SUPPLEMENT", 2); /** * @stable ICU 2.4 */ public static final UnicodeBlock LATIN_EXTENDED_A - = new UnicodeBlock("LATIN_EXTENDED_A", 3); + = new UnicodeBlock("LATIN_EXTENDED_A", 3); /** * @stable ICU 2.4 */ public static final UnicodeBlock LATIN_EXTENDED_B - = new UnicodeBlock("LATIN_EXTENDED_B", 4); + = new UnicodeBlock("LATIN_EXTENDED_B", 4); /** * @stable ICU 2.4 */ public static final UnicodeBlock IPA_EXTENSIONS - = new UnicodeBlock("IPA_EXTENSIONS", 5); + = new UnicodeBlock("IPA_EXTENSIONS", 5); /** * @stable ICU 2.4 */ public static final UnicodeBlock SPACING_MODIFIER_LETTERS - = new UnicodeBlock("SPACING_MODIFIER_LETTERS", 6); + = new UnicodeBlock("SPACING_MODIFIER_LETTERS", 6); /** * @stable ICU 2.4 */ public static final UnicodeBlock COMBINING_DIACRITICAL_MARKS - = new UnicodeBlock("COMBINING_DIACRITICAL_MARKS", 7); + = new UnicodeBlock("COMBINING_DIACRITICAL_MARKS", 7); /** * Unicode 3.2 renames this block to "Greek and Coptic". * @stable ICU 2.4 */ - public static final UnicodeBlock GREEK = new UnicodeBlock("GREEK", 8); + public static final UnicodeBlock GREEK + = new UnicodeBlock("GREEK", 8); /** * @stable ICU 2.4 */ public static final UnicodeBlock CYRILLIC - = new UnicodeBlock("CYRILLIC", 9); + = new UnicodeBlock("CYRILLIC", 9); /** * @stable ICU 2.4 */ public static final UnicodeBlock ARMENIAN - = new UnicodeBlock("ARMENIAN", 10); + = new UnicodeBlock("ARMENIAN", 10); /** * @stable ICU 2.4 */ public static final UnicodeBlock HEBREW - = new UnicodeBlock("HEBREW", 11); + = new UnicodeBlock("HEBREW", 11); /** * @stable ICU 2.4 */ public static final UnicodeBlock ARABIC - = new UnicodeBlock("ARABIC", 12); + = new UnicodeBlock("ARABIC", 12); /** * @stable ICU 2.4 */ public static final UnicodeBlock SYRIAC - = new UnicodeBlock("SYRIAC", 13); + = new UnicodeBlock("SYRIAC", 13); /** * @stable ICU 2.4 */ public static final UnicodeBlock THAANA - = new UnicodeBlock("THAANA", 14); + = new UnicodeBlock("THAANA", 14); /** * @stable ICU 2.4 */ public static final UnicodeBlock DEVANAGARI - = new UnicodeBlock("DEVANAGARI", 15); + = new UnicodeBlock("DEVANAGARI", 15); /** * @stable ICU 2.4 */ public static final UnicodeBlock BENGALI - = new UnicodeBlock("BENGALI", 16); + = new UnicodeBlock("BENGALI", 16); /** * @stable ICU 2.4 */ public static final UnicodeBlock GURMUKHI - = new UnicodeBlock("GURMUKHI", 17); + = new UnicodeBlock("GURMUKHI", 17); /** * @stable ICU 2.4 */ public static final UnicodeBlock GUJARATI - = new UnicodeBlock("GUJARATI", 18); + = new UnicodeBlock("GUJARATI", 18); /** * @stable ICU 2.4 */ - public static final UnicodeBlock ORIYA = new UnicodeBlock("ORIYA", 19); + public static final UnicodeBlock ORIYA + = new UnicodeBlock("ORIYA", 19); /** * @stable ICU 2.4 */ - public static final UnicodeBlock TAMIL = new UnicodeBlock("TAMIL", 20); + public static final UnicodeBlock TAMIL + = new UnicodeBlock("TAMIL", 20); /** * @stable ICU 2.4 */ public static final UnicodeBlock TELUGU - = new UnicodeBlock("TELUGU", 21); + = new UnicodeBlock("TELUGU", 21); /** * @stable ICU 2.4 */ public static final UnicodeBlock KANNADA - = new UnicodeBlock("KANNADA", 22); + = new UnicodeBlock("KANNADA", 22); /** * @stable ICU 2.4 */ public static final UnicodeBlock MALAYALAM - = new UnicodeBlock("MALAYALAM", 23); + = new UnicodeBlock("MALAYALAM", 23); /** * @stable ICU 2.4 */ public static final UnicodeBlock SINHALA - = new UnicodeBlock("SINHALA", 24); + = new UnicodeBlock("SINHALA", 24); /** * @stable ICU 2.4 */ - public static final UnicodeBlock THAI = new UnicodeBlock("THAI", 25); + public static final UnicodeBlock THAI + = new UnicodeBlock("THAI", 25); /** * @stable ICU 2.4 */ - public static final UnicodeBlock LAO = new UnicodeBlock("LAO", 26); + public static final UnicodeBlock LAO + = new UnicodeBlock("LAO", 26); /** * @stable ICU 2.4 */ public static final UnicodeBlock TIBETAN - = new UnicodeBlock("TIBETAN", 27); + = new UnicodeBlock("TIBETAN", 27); /** * @stable ICU 2.4 */ public static final UnicodeBlock MYANMAR - = new UnicodeBlock("MYANMAR", 28); + = new UnicodeBlock("MYANMAR", 28); /** * @stable ICU 2.4 */ public static final UnicodeBlock GEORGIAN - = new UnicodeBlock("GEORGIAN", 29); + = new UnicodeBlock("GEORGIAN", 29); /** * @stable ICU 2.4 */ public static final UnicodeBlock HANGUL_JAMO - = new UnicodeBlock("HANGUL_JAMO", 30); + = new UnicodeBlock("HANGUL_JAMO", 30); /** * @stable ICU 2.4 */ public static final UnicodeBlock ETHIOPIC - = new UnicodeBlock("ETHIOPIC", 31); + = new UnicodeBlock("ETHIOPIC", 31); /** * @stable ICU 2.4 */ public static final UnicodeBlock CHEROKEE - = new UnicodeBlock("CHEROKEE", 32); + = new UnicodeBlock("CHEROKEE", 32); /** * @stable ICU 2.4 */ public static final UnicodeBlock UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS - = new UnicodeBlock("UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS", 33); + = new UnicodeBlock("UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS", 33); /** * @stable ICU 2.4 */ - public static final UnicodeBlock OGHAM = new UnicodeBlock("OGHAM", 34); + public static final UnicodeBlock OGHAM + = new UnicodeBlock("OGHAM", 34); /** * @stable ICU 2.4 */ - public static final UnicodeBlock RUNIC = new UnicodeBlock("RUNIC", 35); + public static final UnicodeBlock RUNIC + = new UnicodeBlock("RUNIC", 35); /** * @stable ICU 2.4 */ - public static final UnicodeBlock KHMER = new UnicodeBlock("KHMER", 36); + public static final UnicodeBlock KHMER + = new UnicodeBlock("KHMER", 36); /** * @stable ICU 2.4 */ public static final UnicodeBlock MONGOLIAN - = new UnicodeBlock("MONGOLIAN", 37); + = new UnicodeBlock("MONGOLIAN", 37); /** * @stable ICU 2.4 */ public static final UnicodeBlock LATIN_EXTENDED_ADDITIONAL - = new UnicodeBlock("LATIN_EXTENDED_ADDITIONAL", 38); + = new UnicodeBlock("LATIN_EXTENDED_ADDITIONAL", 38); /** * @stable ICU 2.4 */ public static final UnicodeBlock GREEK_EXTENDED - = new UnicodeBlock("GREEK_EXTENDED", 39); + = new UnicodeBlock("GREEK_EXTENDED", 39); /** * @stable ICU 2.4 */ public static final UnicodeBlock GENERAL_PUNCTUATION - = new UnicodeBlock("GENERAL_PUNCTUATION", 40); + = new UnicodeBlock("GENERAL_PUNCTUATION", 40); /** * @stable ICU 2.4 */ public static final UnicodeBlock SUPERSCRIPTS_AND_SUBSCRIPTS - = new UnicodeBlock("SUPERSCRIPTS_AND_SUBSCRIPTS", 41); + = new UnicodeBlock("SUPERSCRIPTS_AND_SUBSCRIPTS", 41); /** * @stable ICU 2.4 */ public static final UnicodeBlock CURRENCY_SYMBOLS - = new UnicodeBlock("CURRENCY_SYMBOLS", 42); + = new UnicodeBlock("CURRENCY_SYMBOLS", 42); /** * Unicode 3.2 renames this block to "Combining Diacritical Marks for * Symbols". * @stable ICU 2.4 */ public static final UnicodeBlock COMBINING_MARKS_FOR_SYMBOLS - = new UnicodeBlock("COMBINING_MARKS_FOR_SYMBOLS", 43); + = new UnicodeBlock("COMBINING_MARKS_FOR_SYMBOLS", 43); /** * @stable ICU 2.4 */ public static final UnicodeBlock LETTERLIKE_SYMBOLS - = new UnicodeBlock("LETTERLIKE_SYMBOLS", 44); + = new UnicodeBlock("LETTERLIKE_SYMBOLS", 44); /** * @stable ICU 2.4 */ public static final UnicodeBlock NUMBER_FORMS - = new UnicodeBlock("NUMBER_FORMS", 45); + = new UnicodeBlock("NUMBER_FORMS", 45); /** * @stable ICU 2.4 */ public static final UnicodeBlock ARROWS - = new UnicodeBlock("ARROWS", 46); + = new UnicodeBlock("ARROWS", 46); /** * @stable ICU 2.4 */ public static final UnicodeBlock MATHEMATICAL_OPERATORS - = new UnicodeBlock("MATHEMATICAL_OPERATORS", 47); + = new UnicodeBlock("MATHEMATICAL_OPERATORS", 47); /** * @stable ICU 2.4 */ public static final UnicodeBlock MISCELLANEOUS_TECHNICAL - = new UnicodeBlock("MISCELLANEOUS_TECHNICAL", 48); + = new UnicodeBlock("MISCELLANEOUS_TECHNICAL", 48); /** * @stable ICU 2.4 */ public static final UnicodeBlock CONTROL_PICTURES - = new UnicodeBlock("CONTROL_PICTURES", 49); + = new UnicodeBlock("CONTROL_PICTURES", 49); /** * @stable ICU 2.4 */ public static final UnicodeBlock OPTICAL_CHARACTER_RECOGNITION - = new UnicodeBlock("OPTICAL_CHARACTER_RECOGNITION", 50); + = new UnicodeBlock("OPTICAL_CHARACTER_RECOGNITION", 50); /** * @stable ICU 2.4 */ public static final UnicodeBlock ENCLOSED_ALPHANUMERICS - = new UnicodeBlock("ENCLOSED_ALPHANUMERICS", 51); + = new UnicodeBlock("ENCLOSED_ALPHANUMERICS", 51); /** * @stable ICU 2.4 */ public static final UnicodeBlock BOX_DRAWING - = new UnicodeBlock("BOX_DRAWING", 52); + = new UnicodeBlock("BOX_DRAWING", 52); /** * @stable ICU 2.4 */ public static final UnicodeBlock BLOCK_ELEMENTS - = new UnicodeBlock("BLOCK_ELEMENTS", 53); + = new UnicodeBlock("BLOCK_ELEMENTS", 53); /** * @stable ICU 2.4 */ public static final UnicodeBlock GEOMETRIC_SHAPES - = new UnicodeBlock("GEOMETRIC_SHAPES", 54); + = new UnicodeBlock("GEOMETRIC_SHAPES", 54); /** * @stable ICU 2.4 */ public static final UnicodeBlock MISCELLANEOUS_SYMBOLS - = new UnicodeBlock("MISCELLANEOUS_SYMBOLS", 55); + = new UnicodeBlock("MISCELLANEOUS_SYMBOLS", 55); /** * @stable ICU 2.4 */ public static final UnicodeBlock DINGBATS - = new UnicodeBlock("DINGBATS", 56); + = new UnicodeBlock("DINGBATS", 56); /** * @stable ICU 2.4 */ public static final UnicodeBlock BRAILLE_PATTERNS - = new UnicodeBlock("BRAILLE_PATTERNS", 57); + = new UnicodeBlock("BRAILLE_PATTERNS", 57); /** * @stable ICU 2.4 */ public static final UnicodeBlock CJK_RADICALS_SUPPLEMENT - = new UnicodeBlock("CJK_RADICALS_SUPPLEMENT", 58); + = new UnicodeBlock("CJK_RADICALS_SUPPLEMENT", 58); /** * @stable ICU 2.4 */ public static final UnicodeBlock KANGXI_RADICALS - = new UnicodeBlock("KANGXI_RADICALS", 59); + = new UnicodeBlock("KANGXI_RADICALS", 59); /** * @stable ICU 2.4 */ public static final UnicodeBlock IDEOGRAPHIC_DESCRIPTION_CHARACTERS - = new UnicodeBlock("IDEOGRAPHIC_DESCRIPTION_CHARACTERS", 60); + = new UnicodeBlock("IDEOGRAPHIC_DESCRIPTION_CHARACTERS", 60); /** * @stable ICU 2.4 */ public static final UnicodeBlock CJK_SYMBOLS_AND_PUNCTUATION - = new UnicodeBlock("CJK_SYMBOLS_AND_PUNCTUATION", 61); + = new UnicodeBlock("CJK_SYMBOLS_AND_PUNCTUATION", 61); /** * @stable ICU 2.4 */ public static final UnicodeBlock HIRAGANA - = new UnicodeBlock("HIRAGANA", 62); + = new UnicodeBlock("HIRAGANA", 62); /** * @stable ICU 2.4 */ public static final UnicodeBlock KATAKANA - = new UnicodeBlock("KATAKANA", 63); + = new UnicodeBlock("KATAKANA", 63); /** * @stable ICU 2.4 */ public static final UnicodeBlock BOPOMOFO - = new UnicodeBlock("BOPOMOFO", 64); + = new UnicodeBlock("BOPOMOFO", 64); /** * @stable ICU 2.4 */ public static final UnicodeBlock HANGUL_COMPATIBILITY_JAMO - = new UnicodeBlock("HANGUL_COMPATIBILITY_JAMO", 65); + = new UnicodeBlock("HANGUL_COMPATIBILITY_JAMO", 65); /** * @stable ICU 2.4 */ public static final UnicodeBlock KANBUN - = new UnicodeBlock("KANBUN", 66); + = new UnicodeBlock("KANBUN", 66); /** * @stable ICU 2.4 */ public static final UnicodeBlock BOPOMOFO_EXTENDED - = new UnicodeBlock("BOPOMOFO_EXTENDED", 67); + = new UnicodeBlock("BOPOMOFO_EXTENDED", 67); /** * @stable ICU 2.4 */ public static final UnicodeBlock ENCLOSED_CJK_LETTERS_AND_MONTHS - = new UnicodeBlock("ENCLOSED_CJK_LETTERS_AND_MONTHS", 68); + = new UnicodeBlock("ENCLOSED_CJK_LETTERS_AND_MONTHS", 68); /** * @stable ICU 2.4 */ public static final UnicodeBlock CJK_COMPATIBILITY - = new UnicodeBlock("CJK_COMPATIBILITY", 69); + = new UnicodeBlock("CJK_COMPATIBILITY", 69); /** * @stable ICU 2.4 */ public static final UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A - = new UnicodeBlock("CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A", 70); + = new UnicodeBlock("CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A", 70); /** * @stable ICU 2.4 */ public static final UnicodeBlock CJK_UNIFIED_IDEOGRAPHS - = new UnicodeBlock("CJK_UNIFIED_IDEOGRAPHS", 71); + = new UnicodeBlock("CJK_UNIFIED_IDEOGRAPHS", 71); /** * @stable ICU 2.4 */ public static final UnicodeBlock YI_SYLLABLES - = new UnicodeBlock("YI_SYLLABLES", 72); + = new UnicodeBlock("YI_SYLLABLES", 72); /** * @stable ICU 2.4 */ public static final UnicodeBlock YI_RADICALS - = new UnicodeBlock("YI_RADICALS", 73); + = new UnicodeBlock("YI_RADICALS", 73); /** * @stable ICU 2.4 */ public static final UnicodeBlock HANGUL_SYLLABLES - = new UnicodeBlock("HANGUL_SYLLABLES", 74); + = new UnicodeBlock("HANGUL_SYLLABLES", 74); /** * @stable ICU 2.4 */ public static final UnicodeBlock HIGH_SURROGATES - = new UnicodeBlock("HIGH_SURROGATES", 75); + = new UnicodeBlock("HIGH_SURROGATES", 75); /** * @stable ICU 2.4 */ public static final UnicodeBlock HIGH_PRIVATE_USE_SURROGATES - = new UnicodeBlock("HIGH_PRIVATE_USE_SURROGATES", 76); + = new UnicodeBlock("HIGH_PRIVATE_USE_SURROGATES", 76); /** * @stable ICU 2.4 */ public static final UnicodeBlock LOW_SURROGATES - = new UnicodeBlock("LOW_SURROGATES", 77); + = new UnicodeBlock("LOW_SURROGATES", 77); /** * Same as public static final int PRIVATE_USE. * Until Unicode 3.1.1; the corresponding block name was "Private Use"; @@ -497,7 +504,7 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection * @stable ICU 2.4 */ public static final UnicodeBlock PRIVATE_USE_AREA - = new UnicodeBlock("PRIVATE_USE_AREA", 78); + = new UnicodeBlock("PRIVATE_USE_AREA", 78); /** * Same as public static final int PRIVATE_USE_AREA. * Until Unicode 3.1.1; the corresponding block name was "Private Use"; @@ -506,87 +513,88 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection * and adds separate blocks for the supplementary PUAs. * @stable ICU 2.4 */ - public static final UnicodeBlock PRIVATE_USE = PRIVATE_USE_AREA; + public static final UnicodeBlock PRIVATE_USE + = PRIVATE_USE_AREA; /** * @stable ICU 2.4 */ public static final UnicodeBlock CJK_COMPATIBILITY_IDEOGRAPHS - = new UnicodeBlock("CJK_COMPATIBILITY_IDEOGRAPHS", 79); + = new UnicodeBlock("CJK_COMPATIBILITY_IDEOGRAPHS", 79); /** * @stable ICU 2.4 */ public static final UnicodeBlock ALPHABETIC_PRESENTATION_FORMS - = new UnicodeBlock("ALPHABETIC_PRESENTATION_FORMS", 80); + = new UnicodeBlock("ALPHABETIC_PRESENTATION_FORMS", 80); /** * @stable ICU 2.4 */ public static final UnicodeBlock ARABIC_PRESENTATION_FORMS_A - = new UnicodeBlock("ARABIC_PRESENTATION_FORMS_A", 81); + = new UnicodeBlock("ARABIC_PRESENTATION_FORMS_A", 81); /** * @stable ICU 2.4 */ public static final UnicodeBlock COMBINING_HALF_MARKS - = new UnicodeBlock("COMBINING_HALF_MARKS", 82); + = new UnicodeBlock("COMBINING_HALF_MARKS", 82); /** * @stable ICU 2.4 */ public static final UnicodeBlock CJK_COMPATIBILITY_FORMS - = new UnicodeBlock("CJK_COMPATIBILITY_FORMS", 83); + = new UnicodeBlock("CJK_COMPATIBILITY_FORMS", 83); /** * @stable ICU 2.4 */ public static final UnicodeBlock SMALL_FORM_VARIANTS - = new UnicodeBlock("SMALL_FORM_VARIANTS", 84); + = new UnicodeBlock("SMALL_FORM_VARIANTS", 84); /** * @stable ICU 2.4 */ public static final UnicodeBlock ARABIC_PRESENTATION_FORMS_B - = new UnicodeBlock("ARABIC_PRESENTATION_FORMS_B", 85); + = new UnicodeBlock("ARABIC_PRESENTATION_FORMS_B", 85); /** * @stable ICU 2.4 */ public static final UnicodeBlock SPECIALS - = new UnicodeBlock("SPECIALS", 86); + = new UnicodeBlock("SPECIALS", 86); /** * @stable ICU 2.4 */ public static final UnicodeBlock HALFWIDTH_AND_FULLWIDTH_FORMS - = new UnicodeBlock("HALFWIDTH_AND_FULLWIDTH_FORMS", 87); + = new UnicodeBlock("HALFWIDTH_AND_FULLWIDTH_FORMS", 87); /** * @stable ICU 2.4 */ public static final UnicodeBlock OLD_ITALIC - = new UnicodeBlock("OLD_ITALIC", 88); + = new UnicodeBlock("OLD_ITALIC", 88); /** * @stable ICU 2.4 */ public static final UnicodeBlock GOTHIC - = new UnicodeBlock("GOTHIC", 89); + = new UnicodeBlock("GOTHIC", 89); /** * @stable ICU 2.4 */ public static final UnicodeBlock DESERET - = new UnicodeBlock("DESERET", 90); + = new UnicodeBlock("DESERET", 90); /** * @stable ICU 2.4 */ public static final UnicodeBlock BYZANTINE_MUSICAL_SYMBOLS - = new UnicodeBlock("BYZANTINE_MUSICAL_SYMBOLS", 91); + = new UnicodeBlock("BYZANTINE_MUSICAL_SYMBOLS", 91); /** * @stable ICU 2.4 */ public static final UnicodeBlock MUSICAL_SYMBOLS - = new UnicodeBlock("MUSICAL_SYMBOLS", 92); + = new UnicodeBlock("MUSICAL_SYMBOLS", 92); /** * @stable ICU 2.4 */ public static final UnicodeBlock MATHEMATICAL_ALPHANUMERIC_SYMBOLS - = new UnicodeBlock("MATHEMATICAL_ALPHANUMERIC_SYMBOLS", 93); + = new UnicodeBlock("MATHEMATICAL_ALPHANUMERIC_SYMBOLS", 93); /** * @stable ICU 2.4 */ public static final UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B - = new UnicodeBlock("CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B", 94); + = new UnicodeBlock("CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B", 94); /** * @stable ICU 2.4 */ @@ -596,7 +604,8 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection /** * @stable ICU 2.4 */ - public static final UnicodeBlock TAGS = new UnicodeBlock("TAGS", 96); + public static final UnicodeBlock TAGS + = new UnicodeBlock("TAGS", 96); // New blocks in Unicode 3.2 @@ -605,178 +614,164 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection * @stable ICU 2.4 */ public static final UnicodeBlock CYRILLIC_SUPPLEMENTARY - = new UnicodeBlock("CYRILLIC_SUPPLEMENTARY", 97); + = new UnicodeBlock("CYRILLIC_SUPPLEMENTARY", 97); /** * Unicode 4.0.1 renames the "Cyrillic Supplementary" block to "Cyrillic Supplement". * @draft ICU 3.0 - * @deprecated This is a draft API and might change in a future release of ICU. + * @deprecated This is a draft API and might change in a future release of ICU. */ public static final UnicodeBlock CYRILLIC_SUPPLEMENT - = new UnicodeBlock("CYRILLIC_SUPPLEMENT", 97); + = new UnicodeBlock("CYRILLIC_SUPPLEMENT", 97); /** * @stable ICU 2.4 */ public static final UnicodeBlock TAGALOG - = new UnicodeBlock("TAGALOG", 98); + = new UnicodeBlock("TAGALOG", 98); /** * @stable ICU 2.4 */ public static final UnicodeBlock HANUNOO - = new UnicodeBlock("HANUNOO", 99); + = new UnicodeBlock("HANUNOO", 99); /** * @stable ICU 2.4 */ - public static final UnicodeBlock BUHID = new UnicodeBlock("BUHID", 100); + public static final UnicodeBlock BUHID + = new UnicodeBlock("BUHID", 100); /** * @stable ICU 2.4 */ public static final UnicodeBlock TAGBANWA - = new UnicodeBlock("TAGBANWA", 101); + = new UnicodeBlock("TAGBANWA", 101); /** * @stable ICU 2.4 */ public static final UnicodeBlock MISCELLANEOUS_MATHEMATICAL_SYMBOLS_A - = new UnicodeBlock("MISCELLANEOUS_MATHEMATICAL_SYMBOLS_A", 102); + = new UnicodeBlock("MISCELLANEOUS_MATHEMATICAL_SYMBOLS_A", 102); /** * @stable ICU 2.4 */ public static final UnicodeBlock SUPPLEMENTAL_ARROWS_A - = new UnicodeBlock("SUPPLEMENTAL_ARROWS_A", 103); + = new UnicodeBlock("SUPPLEMENTAL_ARROWS_A", 103); /** * @stable ICU 2.4 */ public static final UnicodeBlock SUPPLEMENTAL_ARROWS_B - = new UnicodeBlock("SUPPLEMENTAL_ARROWS_B", 104); + = new UnicodeBlock("SUPPLEMENTAL_ARROWS_B", 104); /** * @stable ICU 2.4 */ public static final UnicodeBlock MISCELLANEOUS_MATHEMATICAL_SYMBOLS_B - = new UnicodeBlock("MISCELLANEOUS_MATHEMATICAL_SYMBOLS_B", 105); + = new UnicodeBlock("MISCELLANEOUS_MATHEMATICAL_SYMBOLS_B", 105); /** * @stable ICU 2.4 */ public static final UnicodeBlock SUPPLEMENTAL_MATHEMATICAL_OPERATORS - = new UnicodeBlock("SUPPLEMENTAL_MATHEMATICAL_OPERATORS", 106); + = new UnicodeBlock("SUPPLEMENTAL_MATHEMATICAL_OPERATORS", 106); /** * @stable ICU 2.4 */ public static final UnicodeBlock KATAKANA_PHONETIC_EXTENSIONS - = new UnicodeBlock("KATAKANA_PHONETIC_EXTENSIONS", 107); + = new UnicodeBlock("KATAKANA_PHONETIC_EXTENSIONS", 107); /** * @stable ICU 2.4 */ public static final UnicodeBlock VARIATION_SELECTORS - = new UnicodeBlock("VARIATION_SELECTORS", 108); + = new UnicodeBlock("VARIATION_SELECTORS", 108); /** * @stable ICU 2.4 */ public static final UnicodeBlock SUPPLEMENTARY_PRIVATE_USE_AREA_A - = new UnicodeBlock("SUPPLEMENTARY_PRIVATE_USE_AREA_A", 109); + = new UnicodeBlock("SUPPLEMENTARY_PRIVATE_USE_AREA_A", 109); /** * @stable ICU 2.4 */ public static final UnicodeBlock SUPPLEMENTARY_PRIVATE_USE_AREA_B - = new UnicodeBlock("SUPPLEMENTARY_PRIVATE_USE_AREA_B", 110); + = new UnicodeBlock("SUPPLEMENTARY_PRIVATE_USE_AREA_B", 110); /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final UnicodeBlock LIMBU - = new UnicodeBlock("LIMBU", 111); + = new UnicodeBlock("LIMBU", 111); /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final UnicodeBlock TAI_LE - = new UnicodeBlock("TAI LE", 112); + = new UnicodeBlock("TAI LE", 112); /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final UnicodeBlock KHMER_SYMBOLS - = new UnicodeBlock("KHMER SYMBOLS", 113); + = new UnicodeBlock("KHMER SYMBOLS", 113); /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final UnicodeBlock PHONETIC_EXTENSIONS - = new UnicodeBlock("PHONETIC EXTENSIONS", 114); + = new UnicodeBlock("PHONETIC EXTENSIONS", 114); /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final UnicodeBlock MISCELLANEOUS_SYMBOLS_AND_ARROWS - = new UnicodeBlock("MISCELLANEOUS_SYMBOLS_AND_ARROWS", 115); + = new UnicodeBlock("MISCELLANEOUS_SYMBOLS_AND_ARROWS", 115); /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final UnicodeBlock YIJING_HEXAGRAM_SYMBOLS - = new UnicodeBlock("YIJING_HEXAGRAM_SYMBOLS", 116); + = new UnicodeBlock("YIJING_HEXAGRAM_SYMBOLS", 116); /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final UnicodeBlock LINEAR_B_SYLLABARY - = new UnicodeBlock("LINEAR_B_SYLLABARY", 117); + = new UnicodeBlock("LINEAR_B_SYLLABARY", 117); /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final UnicodeBlock LINEAR_B_IDEOGRAMS - = new UnicodeBlock("LINEAR_B_IDEOGRAMS", 118); + = new UnicodeBlock("LINEAR_B_IDEOGRAMS", 118); /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final UnicodeBlock AEGEAN_NUMBERS - = new UnicodeBlock("AEGEAN_NUMBERS", 119); + = new UnicodeBlock("AEGEAN_NUMBERS", 119); /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final UnicodeBlock UGARITIC - = new UnicodeBlock("UGARITIC", 120); + = new UnicodeBlock("UGARITIC", 120); /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final UnicodeBlock SHAVIAN - = new UnicodeBlock("SHAVIAN", 121); + = new UnicodeBlock("SHAVIAN", 121); /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final UnicodeBlock OSMANYA - = new UnicodeBlock("OSMANYA", 122); + = new UnicodeBlock("OSMANYA", 122); /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final UnicodeBlock CYPRIOT_SYLLABARY - = new UnicodeBlock("CYPRIOT_SYLLABARY", 123); + = new UnicodeBlock("CYPRIOT_SYLLABARY", 123); /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final UnicodeBlock TAI_XUAN_JING_SYMBOLS - = new UnicodeBlock("TAI_XUAN_JING_SYMBOLS", 124); + = new UnicodeBlock("TAI_XUAN_JING_SYMBOLS", 124); /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final UnicodeBlock VARIATION_SELECTORS_SUPPLEMENT - = new UnicodeBlock("VARIATION_SELECTORS_SUPPLEMENT", 125); + = new UnicodeBlock("VARIATION_SELECTORS_SUPPLEMENT", 125); /** * @stable ICU 2.4 */ public static final UnicodeBlock INVALID_CODE - = new UnicodeBlock("INVALID_CODE", -1); + = new UnicodeBlock("INVALID_CODE", -1); // block id corresponding to icu4c ----------------------------------- @@ -1197,7 +1192,7 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection /** * Unicode 4.0.1 renames the "Cyrillic Supplementary" block to "Cyrillic Supplement". * @draft ICU 3.0 - * @deprecated This is a draft API and might change in a future release of ICU. + * @deprecated This is a draft API and might change in a future release of ICU. */ public static final int CYRILLIC_SUPPLEMENT_ID = 97; @@ -1254,81 +1249,66 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection */ public static final int SUPPLEMENTARY_PRIVATE_USE_AREA_B_ID = 110; - /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. - */ - public static final int LIMBU_ID = 111; /*[1900]*/ - /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. - */ - public static final int TAI_LE_ID = 112; /*[1950]*/ - /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. - */ - public static final int KHMER_SYMBOLS_ID = 113; /*[19E0]*/ - /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. - */ - public static final int PHONETIC_EXTENSIONS_ID = 114; /*[1D00]*/ - /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. - */ - public static final int MISCELLANEOUS_SYMBOLS_AND_ARROWS_ID = 115; /*[2B00]*/ - /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. - */ - public static final int YIJING_HEXAGRAM_SYMBOLS_ID = 116; /*[4DC0]*/ - /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. - */ - public static final int LINEAR_B_SYLLABARY_ID = 117; /*[10000]*/ - /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. - */ - public static final int LINEAR_B_IDEOGRAMS_ID = 118; /*[10080]*/ - /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. - */ - public static final int AEGEAN_NUMBERS_ID = 119; /*[10100]*/ - /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. - */ - public static final int UGARITIC_ID = 120; /*[10380]*/ - /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. - */ - public static final int SHAVIAN_ID = 121; /*[10450]*/ - /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. - */ - public static final int OSMANYA_ID = 122; /*[10480]*/ - /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. - */ - public static final int CYPRIOT_SYLLABARY_ID = 123; /*[10800]*/ - /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. - */ - public static final int TAI_XUAN_JING_SYMBOLS_ID = 124; /*[1D300]*/ - /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. - */ - public static final int VARIATION_SELECTORS_SUPPLEMENT_ID = 125; /*[E0100]*/ + /** + * @stable ICU 2.6 + */ + public static final int LIMBU_ID = 111; /*[1900]*/ + /** + * @stable ICU 2.6 + */ + public static final int TAI_LE_ID = 112; /*[1950]*/ + /** + * @stable ICU 2.6 + */ + public static final int KHMER_SYMBOLS_ID = 113; /*[19E0]*/ + /** + * @stable ICU 2.6 + */ + public static final int PHONETIC_EXTENSIONS_ID = 114; /*[1D00]*/ + /** + * @stable ICU 2.6 + */ + public static final int MISCELLANEOUS_SYMBOLS_AND_ARROWS_ID = 115; /*[2B00]*/ + /** + * @stable ICU 2.6 + */ + public static final int YIJING_HEXAGRAM_SYMBOLS_ID = 116; /*[4DC0]*/ + /** + * @stable ICU 2.6 + */ + public static final int LINEAR_B_SYLLABARY_ID = 117; /*[10000]*/ + /** + * @stable ICU 2.6 + */ + public static final int LINEAR_B_IDEOGRAMS_ID = 118; /*[10080]*/ + /** + * @stable ICU 2.6 + */ + public static final int AEGEAN_NUMBERS_ID = 119; /*[10100]*/ + /** + * @stable ICU 2.6 + */ + public static final int UGARITIC_ID = 120; /*[10380]*/ + /** + * @stable ICU 2.6 + */ + public static final int SHAVIAN_ID = 121; /*[10450]*/ + /** + * @stable ICU 2.6 + */ + public static final int OSMANYA_ID = 122; /*[10480]*/ + /** + * @stable ICU 2.6 + */ + public static final int CYPRIOT_SYLLABARY_ID = 123; /*[10800]*/ + /** + * @stable ICU 2.6 + */ + public static final int TAI_XUAN_JING_SYMBOLS_ID = 124; /*[1D300]*/ + /** + * @stable ICU 2.6 + */ + public static final int VARIATION_SELECTORS_SUPPLEMENT_ID = 125; /*[E0100]*/ /** * @stable ICU 2.4 */ @@ -1394,7 +1374,7 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection * @return the UnicodeBlock with that name * @throws IllegalArgumentException if the blockName could not be matched * @draft ICU 3.0 - * @deprecated This is a draft API and might change in a future release of ICU. + * @deprecated This is a draft API and might change in a future release of ICU. */ public static final UnicodeBlock forName(String blockName) { Map m = null; @@ -1420,7 +1400,6 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection } private static SoftReference mref; - /** * Returns the type ID of this Unicode block * @return integer type ID of this Unicode block @@ -1437,69 +1416,69 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection * Array of UnicodeBlocks, for easy access in getInstance(int) */ private final static UnicodeBlock BLOCKS_[] = { - NO_BLOCK, BASIC_LATIN, - LATIN_1_SUPPLEMENT, LATIN_EXTENDED_A, - LATIN_EXTENDED_B, IPA_EXTENSIONS, - SPACING_MODIFIER_LETTERS, COMBINING_DIACRITICAL_MARKS, - GREEK, CYRILLIC, - ARMENIAN, HEBREW, - ARABIC, SYRIAC, - THAANA, DEVANAGARI, - BENGALI, GURMUKHI, - GUJARATI, ORIYA, - TAMIL, TELUGU, - KANNADA, MALAYALAM, - SINHALA, THAI, - LAO, TIBETAN, - MYANMAR, GEORGIAN, - HANGUL_JAMO, ETHIOPIC, - CHEROKEE, UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS, - OGHAM, RUNIC, - KHMER, MONGOLIAN, - LATIN_EXTENDED_ADDITIONAL, GREEK_EXTENDED, - GENERAL_PUNCTUATION, SUPERSCRIPTS_AND_SUBSCRIPTS, - CURRENCY_SYMBOLS, COMBINING_MARKS_FOR_SYMBOLS, - LETTERLIKE_SYMBOLS, NUMBER_FORMS, - ARROWS, MATHEMATICAL_OPERATORS, - MISCELLANEOUS_TECHNICAL, CONTROL_PICTURES, - OPTICAL_CHARACTER_RECOGNITION, ENCLOSED_ALPHANUMERICS, - BOX_DRAWING, BLOCK_ELEMENTS, - GEOMETRIC_SHAPES, MISCELLANEOUS_SYMBOLS, - DINGBATS, BRAILLE_PATTERNS, - CJK_RADICALS_SUPPLEMENT, KANGXI_RADICALS, - IDEOGRAPHIC_DESCRIPTION_CHARACTERS, CJK_SYMBOLS_AND_PUNCTUATION, - HIRAGANA, KATAKANA, - BOPOMOFO, HANGUL_COMPATIBILITY_JAMO, - KANBUN, BOPOMOFO_EXTENDED, - ENCLOSED_CJK_LETTERS_AND_MONTHS, CJK_COMPATIBILITY, - CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A, CJK_UNIFIED_IDEOGRAPHS, - YI_SYLLABLES, YI_RADICALS, - HANGUL_SYLLABLES, HIGH_SURROGATES, - HIGH_PRIVATE_USE_SURROGATES, LOW_SURROGATES, - PRIVATE_USE_AREA, CJK_COMPATIBILITY_IDEOGRAPHS, - ALPHABETIC_PRESENTATION_FORMS, ARABIC_PRESENTATION_FORMS_A, - COMBINING_HALF_MARKS, CJK_COMPATIBILITY_FORMS, - SMALL_FORM_VARIANTS, ARABIC_PRESENTATION_FORMS_B, - SPECIALS, HALFWIDTH_AND_FULLWIDTH_FORMS, - OLD_ITALIC, GOTHIC, - DESERET, BYZANTINE_MUSICAL_SYMBOLS, - MUSICAL_SYMBOLS, MATHEMATICAL_ALPHANUMERIC_SYMBOLS, - CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B, - CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT, - TAGS, CYRILLIC_SUPPLEMENT, - TAGALOG, HANUNOO, - BUHID, TAGBANWA, - MISCELLANEOUS_MATHEMATICAL_SYMBOLS_A, SUPPLEMENTAL_ARROWS_A, - SUPPLEMENTAL_ARROWS_B, MISCELLANEOUS_MATHEMATICAL_SYMBOLS_B, - SUPPLEMENTAL_MATHEMATICAL_OPERATORS, - KATAKANA_PHONETIC_EXTENSIONS, - VARIATION_SELECTORS, SUPPLEMENTARY_PRIVATE_USE_AREA_A, - SUPPLEMENTARY_PRIVATE_USE_AREA_B, - LIMBU, TAI_LE, KHMER_SYMBOLS, PHONETIC_EXTENSIONS, - MISCELLANEOUS_SYMBOLS_AND_ARROWS, YIJING_HEXAGRAM_SYMBOLS, - LINEAR_B_SYLLABARY, LINEAR_B_IDEOGRAMS, AEGEAN_NUMBERS, - UGARITIC, SHAVIAN, OSMANYA, CYPRIOT_SYLLABARY, - TAI_XUAN_JING_SYMBOLS, VARIATION_SELECTORS_SUPPLEMENT + NO_BLOCK, BASIC_LATIN, + LATIN_1_SUPPLEMENT, LATIN_EXTENDED_A, + LATIN_EXTENDED_B, IPA_EXTENSIONS, + SPACING_MODIFIER_LETTERS, COMBINING_DIACRITICAL_MARKS, + GREEK, CYRILLIC, + ARMENIAN, HEBREW, + ARABIC, SYRIAC, + THAANA, DEVANAGARI, + BENGALI, GURMUKHI, + GUJARATI, ORIYA, + TAMIL, TELUGU, + KANNADA, MALAYALAM, + SINHALA, THAI, + LAO, TIBETAN, + MYANMAR, GEORGIAN, + HANGUL_JAMO, ETHIOPIC, + CHEROKEE, UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS, + OGHAM, RUNIC, + KHMER, MONGOLIAN, + LATIN_EXTENDED_ADDITIONAL, GREEK_EXTENDED, + GENERAL_PUNCTUATION, SUPERSCRIPTS_AND_SUBSCRIPTS, + CURRENCY_SYMBOLS, COMBINING_MARKS_FOR_SYMBOLS, + LETTERLIKE_SYMBOLS, NUMBER_FORMS, + ARROWS, MATHEMATICAL_OPERATORS, + MISCELLANEOUS_TECHNICAL, CONTROL_PICTURES, + OPTICAL_CHARACTER_RECOGNITION, ENCLOSED_ALPHANUMERICS, + BOX_DRAWING, BLOCK_ELEMENTS, + GEOMETRIC_SHAPES, MISCELLANEOUS_SYMBOLS, + DINGBATS, BRAILLE_PATTERNS, + CJK_RADICALS_SUPPLEMENT, KANGXI_RADICALS, + IDEOGRAPHIC_DESCRIPTION_CHARACTERS, CJK_SYMBOLS_AND_PUNCTUATION, + HIRAGANA, KATAKANA, + BOPOMOFO, HANGUL_COMPATIBILITY_JAMO, + KANBUN, BOPOMOFO_EXTENDED, + ENCLOSED_CJK_LETTERS_AND_MONTHS, CJK_COMPATIBILITY, + CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A, CJK_UNIFIED_IDEOGRAPHS, + YI_SYLLABLES, YI_RADICALS, + HANGUL_SYLLABLES, HIGH_SURROGATES, + HIGH_PRIVATE_USE_SURROGATES, LOW_SURROGATES, + PRIVATE_USE_AREA, CJK_COMPATIBILITY_IDEOGRAPHS, + ALPHABETIC_PRESENTATION_FORMS, ARABIC_PRESENTATION_FORMS_A, + COMBINING_HALF_MARKS, CJK_COMPATIBILITY_FORMS, + SMALL_FORM_VARIANTS, ARABIC_PRESENTATION_FORMS_B, + SPECIALS, HALFWIDTH_AND_FULLWIDTH_FORMS, + OLD_ITALIC, GOTHIC, + DESERET, BYZANTINE_MUSICAL_SYMBOLS, + MUSICAL_SYMBOLS, MATHEMATICAL_ALPHANUMERIC_SYMBOLS, + CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B, + CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT, + TAGS, CYRILLIC_SUPPLEMENT, + TAGALOG, HANUNOO, + BUHID, TAGBANWA, + MISCELLANEOUS_MATHEMATICAL_SYMBOLS_A, SUPPLEMENTAL_ARROWS_A, + SUPPLEMENTAL_ARROWS_B, MISCELLANEOUS_MATHEMATICAL_SYMBOLS_B, + SUPPLEMENTAL_MATHEMATICAL_OPERATORS, + KATAKANA_PHONETIC_EXTENSIONS, + VARIATION_SELECTORS, SUPPLEMENTARY_PRIVATE_USE_AREA_A, + SUPPLEMENTARY_PRIVATE_USE_AREA_B, + LIMBU, TAI_LE, KHMER_SYMBOLS, PHONETIC_EXTENSIONS, + MISCELLANEOUS_SYMBOLS_AND_ARROWS, YIJING_HEXAGRAM_SYMBOLS, + LINEAR_B_SYLLABARY, LINEAR_B_IDEOGRAMS, AEGEAN_NUMBERS, + UGARITIC, SHAVIAN, OSMANYA, CYPRIOT_SYLLABARY, + TAI_XUAN_JING_SYMBOLS, VARIATION_SELECTORS_SUPPLEMENT }; static { @@ -1525,7 +1504,7 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection super(name); m_id_ = id; } - }; + } /** * East Asian Width constants. @@ -1563,7 +1542,7 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection * @stable ICU 2.4 */ public static final int COUNT = 6; - }; + } /** * Decomposition Type constants. @@ -1648,7 +1627,7 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection * @stable ICU 2.4 */ public static final int COUNT = 18; - }; + } /** * Joining Type constants. @@ -1685,7 +1664,7 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection * @stable ICU 2.4 */ public static final int COUNT = 6; - }; + } /** * Joining Group constants. @@ -1899,25 +1878,22 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection */ public static final int ZAIN = 50; /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final int FE = 51; /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final int KHAPH = 52; /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final int ZHAIN =53; /** * @stable ICU 2.4 */ public static final int COUNT = 54; - }; + } /** * Line Break constants. @@ -1994,7 +1970,7 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection /** * Renamed from the misspelled "inseperable" in Unicode 4.0.1. * @draft ICU 3.0 - * @deprecated This is a draft API and might change in a future release of ICU. + * @deprecated This is a draft API and might change in a future release of ICU. */ public static final int INSEPARABLE = 15; /** @@ -2051,14 +2027,12 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection public static final int ZWSPACE = 28; /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final int NEXT_LINE = 29; /*[NL]*/ /* from here on: new in Unicode 4/ICU 2.6 */ /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final int WORD_JOINER = 30; /*[WJ]*/ @@ -2066,7 +2040,7 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection * @stable ICU 2.4 */ public static final int COUNT = 31; - }; + } /** * Numeric Type constants. @@ -2095,52 +2069,44 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection * @stable ICU 2.4 */ public static final int COUNT = 4; - }; + } /** * Hangul Syllable Type constants. * * @see UProperty#HANGUL_SYLLABLE_TYPE - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static interface HangulSyllableType { - /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + /** + * @stable ICU 2.6 */ - public static final int NOT_APPLICABLE = 0; /*[NA]*/ /*See note !!*/ - /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + public static final int NOT_APPLICABLE = 0; /*[NA]*/ /*See note !!*/ + /** + * @stable ICU 2.6 */ - public static final int LEADING_JAMO = 1; /*[L]*/ - /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + public static final int LEADING_JAMO = 1; /*[L]*/ + /** + * @stable ICU 2.6 */ - public static final int VOWEL_JAMO = 2; /*[V]*/ - /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + public static final int VOWEL_JAMO = 2; /*[V]*/ + /** + * @stable ICU 2.6 */ - public static final int TRAILING_JAMO = 3; /*[T]*/ - /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + public static final int TRAILING_JAMO = 3; /*[T]*/ + /** + * @stable ICU 2.6 */ - public static final int LV_SYLLABLE = 4; /*[LV]*/ - /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + public static final int LV_SYLLABLE = 4; /*[LV]*/ + /** + * @stable ICU 2.6 */ - public static final int LVT_SYLLABLE = 5; /*[LVT]*/ - /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + public static final int LVT_SYLLABLE = 5; /*[LVT]*/ + /** + * @stable ICU 2.6 */ - public static final int COUNT = 6; + public static final int COUNT = 6; } // public data members ----------------------------------------------- @@ -2165,7 +2131,7 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection * @stable ICU 2.1 */ public static final int SUPPLEMENTARY_MIN_VALUE = - UTF16.SUPPLEMENTARY_MIN_VALUE; + UTF16.SUPPLEMENTARY_MIN_VALUE; /** * Unicode value used when translating into Unicode encoding form and there @@ -3532,7 +3498,7 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection */ public static String toUpperCase(Locale locale, String str) { - return toUpperCase(ULocale.forLocale(locale), str); + return toUpperCase(ULocale.forLocale(locale), str); } /** @@ -3547,7 +3513,7 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection public static String toUpperCase(ULocale locale, String str) { if (locale == null) { - locale = ULocale.getDefault(); + locale = ULocale.getDefault(); } return PROPERTY_.toUpperCase(locale, str, 0, str.length()); } @@ -3562,7 +3528,7 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection */ public static String toLowerCase(Locale locale, String str) { - return toLowerCase(ULocale.forLocale(locale), str); + return toLowerCase(ULocale.forLocale(locale), str); } /** @@ -3579,7 +3545,7 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection int length = str.length(); StringBuffer result = new StringBuffer(length); if (locale == null) { - locale = ULocale.getDefault(); + locale = ULocale.getDefault(); } PROPERTY_.toLowerCase(locale, str, 0, length, result); return result.toString(); @@ -3607,7 +3573,7 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection public static String toTitleCase(Locale locale, String str, BreakIterator breakiter) { - return toTitleCase(ULocale.forLocale(locale), str, breakiter); + return toTitleCase(ULocale.forLocale(locale), str, breakiter); } /** @@ -3634,9 +3600,9 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection BreakIterator breakiter) { if (breakiter == null) { - if (locale == null) { - locale = ULocale.getDefault(); - } + if (locale == null) { + locale = ULocale.getDefault(); + } breakiter = BreakIterator.getWordInstance(locale); } return PROPERTY_.toTitleCase(locale, str, breakiter); @@ -3868,15 +3834,13 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection /** * Option value for case folding: use default mappings defined in CaseFolding.txt. - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final int FOLD_CASE_DEFAULT = 0x0000; /** * Option value for case folding: exclude the mappings for dotted I * and dotless i marked with 'I' in CaseFolding.txt. - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final int FOLD_CASE_EXCLUDE_SPECIAL_I = 0x0001; @@ -3892,10 +3856,10 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection * FOLD_CASE_EXCLUDE_SPECIAL_I and FOLD_CASE_DEFAULT * @return the case folding equivalent of the character, if * any; otherwise the character itself. - * @see #foldCase(String, boolean) - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @see #foldCase(String, boolean) + * @stable ICU 2.6 */ + /* * Issue for canonical caseless match (UAX #21): * Turkic casefolding (using "T" mappings in CaseFolding.txt) does not preserve @@ -3983,9 +3947,8 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection * FOLD_CASE_EXCLUDE_SPECIAL_I and FOLD_CASE_DEFAULT * @return the case folding equivalent of the character, if * any; otherwise the character itself. - * @see #foldCase(int, boolean) - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @see #foldCase(int, boolean) + * @stable ICU 2.6 */ public static final String foldCase(String str, int options){ int size = str.length(); @@ -4527,7 +4490,7 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection return getPropertyValueName(propertyEnum, getIntPropertyValue(codepoint, propertyEnum), nameChoice); } if (propertyEnum == UProperty.NUMERIC_VALUE) { - return String.valueOf(getUnicodeNumericValue(codepoint)); + return String.valueOf(getUnicodeNumericValue(codepoint)); } // otherwise must be string property switch (propertyEnum) { @@ -5559,8 +5522,7 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection * UCharacterProperty.getProperty. * @param ch code point whose property value is to be retrieved * @return property value of code point - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ private static int getProperty(int ch) { diff --git a/icu4j/src/com/ibm/icu/lang/UProperty.java b/icu4j/src/com/ibm/icu/lang/UProperty.java index ed0ecdb278e..0afa194130e 100644 --- a/icu4j/src/com/ibm/icu/lang/UProperty.java +++ b/icu4j/src/com/ibm/icu/lang/UProperty.java @@ -309,8 +309,7 @@ public interface UProperty *

Either the source of a case * mapping or _in_ the target of a case mapping. Not the same as * the general category Cased_Letter.

- * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final int CASE_SENSITIVE = 34; @@ -508,9 +507,8 @@ public interface UProperty /** * Enumerated property Hangul_Syllable_Type, new in Unicode 4. * Returns HangulSyllableType values. - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. - * */ + * @stable ICU 2.6 + */ public static final int HANGUL_SYLLABLE_TYPE = 0x100B; /** diff --git a/icu4j/src/com/ibm/icu/lang/UScript.java b/icu4j/src/com/ibm/icu/lang/UScript.java index b30ef8b55ff..2e93f0cf568 100755 --- a/icu4j/src/com/ibm/icu/lang/UScript.java +++ b/icu4j/src/com/ibm/icu/lang/UScript.java @@ -237,8 +237,7 @@ public final class UScript { public static final int TIBETAN = 39; /* Tibt */ /** * Unified Canadian Aboriginal Symbols - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final int CANADIAN_ABORIGINAL = 40; /* Cans */ /** @@ -274,58 +273,58 @@ public final class UScript { /** * Braille * New script in Unicode 4 - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. - * */ + * @stable ICU 2.6 + * + */ public static final int BRAILLE = 46; /* Brai */ /** * Cypriot * New script in Unicode 4 - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. - * */ + * @stable ICU 2.6 + * + */ public static final int CYPRIOT = 47; /* Cprt */ /** * Limbu * New script in Unicode 4 - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. - * */ + * @stable ICU 2.6 + * + */ public static final int LIMBU = 48; /* Limb */ /** * Linear B * New script in Unicode 4 - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. - * */ + * @stable ICU 2.6 + * + */ public static final int LINEAR_B = 49; /* Linb */ /** * Osmanya * New script in Unicode 4 - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. - * */ + * @stable ICU 2.6 + * + */ public static final int OSMANYA = 50; /* Osma */ /** * Shavian * New script in Unicode 4 - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. - * */ + * @stable ICU 2.6 + * + */ public static final int SHAVIAN = 51; /* Shaw */ /** * Tai Le * New script in Unicode 4 - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. - * */ + * @stable ICU 2.6 + * + */ public static final int TAI_LE = 52; /* Tale */ /** * Ugaritic * New script in Unicode 4 - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. - * */ + * @stable ICU 2.6 + * + */ public static final int UGARITIC = 53; /* Ugar */ /** * New script code in Unicode 4.0.1 diff --git a/icu4j/src/com/ibm/icu/text/BreakIterator.java b/icu4j/src/com/ibm/icu/text/BreakIterator.java index a868d34b1d0..594f4f50827 100755 --- a/icu4j/src/com/ibm/icu/text/BreakIterator.java +++ b/icu4j/src/com/ibm/icu/text/BreakIterator.java @@ -719,8 +719,7 @@ public abstract class BreakIterator implements Cloneable * Returns a list of locales for which BreakIterators can be used. * @return An array of Locales. All of the locales in the array can * be used when creating a BreakIterator. - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static synchronized Locale[] getAvailableLocales() { diff --git a/icu4j/src/com/ibm/icu/text/CollationKey.java b/icu4j/src/com/ibm/icu/text/CollationKey.java index cfc66f581d6..8e38d2a90df 100755 --- a/icu4j/src/com/ibm/icu/text/CollationKey.java +++ b/icu4j/src/com/ibm/icu/text/CollationKey.java @@ -87,8 +87,7 @@ public final class CollationKey implements Comparable /** * Options that used in the API CollationKey.getBound() for getting a * CollationKey based on the bound mode requested. - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final class BoundMode { @@ -99,30 +98,26 @@ public final class CollationKey implements Comparable /** * Lower bound - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final int LOWER = 0; /** * Upper bound that will match strings of exact size - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final int UPPER = 1; /** * Upper bound that will match all the strings that have the same * initial substring as the given string - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final int UPPER_LONG = 2; /** * Number of bound mode - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final int COUNT = 3; @@ -441,8 +436,7 @@ public final class CollationKey implements Comparable * @see Collator#TERTIARY * @see Collator#QUATERNARY * @see Collator#IDENTICAL - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public CollationKey getBound(int boundType, int noOfLevels) { @@ -538,8 +532,7 @@ public final class CollationKey implements Comparable * i.e. new CollationKey(null, merge_sort_order) * @exception IllegalArgumentException thrown if source CollationKey * argument is null or of 0 length. - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public CollationKey merge(CollationKey source) { diff --git a/icu4j/src/com/ibm/icu/text/Collator.java b/icu4j/src/com/ibm/icu/text/Collator.java index 5796b478ea1..d2354abe158 100755 --- a/icu4j/src/com/ibm/icu/text/Collator.java +++ b/icu4j/src/com/ibm/icu/text/Collator.java @@ -306,8 +306,7 @@ public abstract class Collator implements Comparator, Cloneable /** * Clone the collator. - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 * @return a clone of this collator. */ public Object clone() throws CloneNotSupportedException { @@ -320,8 +319,7 @@ public abstract class Collator implements Comparator, Cloneable * A factory used with registerFactory to register multiple collators and provide * display names for them. If standard locale display names are sufficient, * Collator instances may be registered instead. - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static abstract class CollatorFactory { /** @@ -330,8 +328,7 @@ public abstract class Collator implements Comparator, Cloneable * be listed by getAvailableLocales. * * @return true if this factory is visible - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public boolean visible() { return true; @@ -342,8 +339,7 @@ public abstract class Collator implements Comparator, Cloneable * is not supported, return null. * @param loc the locale for which this collator is to be created. * @return the newly created collator. - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public abstract Collator createCollator(ULocale loc); @@ -353,8 +349,7 @@ public abstract class Collator implements Comparator, Cloneable * @param objectLocale the locale identifying the collator * @param displayLocale the locale for which the display name of the collator should be localized * @return the display name - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public String getDisplayName(ULocale objectLocale, ULocale displayLocale) { if (visible()) { @@ -372,15 +367,13 @@ public abstract class Collator implements Comparator, Cloneable * supported by this factory. * * @return the set of supported locale IDs. - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public abstract Set getSupportedLocaleIDs(); /** * Empty default constructor. - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ protected CollatorFactory() { } @@ -474,8 +467,7 @@ public abstract class Collator implements Comparator, Cloneable * @param factory the factory to register * @return an object that can be used to unregister the registered factory. * - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final Object registerFactory(CollatorFactory factory) { return getShim().registerFactory(factory); @@ -485,8 +477,7 @@ public abstract class Collator implements Comparator, Cloneable * Unregister a collator previously registered using registerInstance. * @param registryKey the object previously returned by registerInstance. * @return true if the collator was successfully unregistered. - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final boolean unregister(Object registryKey) { if (shim == null) { @@ -631,8 +622,7 @@ public abstract class Collator implements Comparator, Cloneable * @param objectLocale the locale of the collator * @param displayLocale the locale for the collator's display name * @return the display name - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ static public String getDisplayName(Locale objectLocale, Locale displayLocale) { return getShim().getDisplayName(ULocale.forLocale(objectLocale), @@ -655,8 +645,7 @@ public abstract class Collator implements Comparator, Cloneable * Get the name of the collator for the objectLocale, localized for the current locale. * @param objectLocale the locale of the collator * @return the display name - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ static public String getDisplayName(Locale objectLocale) { return getShim().getDisplayName(ULocale.forLocale(objectLocale), ULocale.getDefault()); @@ -870,8 +859,7 @@ public abstract class Collator implements Comparator, Cloneable * element for the variable top has more than two bytes * @see #getVariableTop * @see RuleBasedCollator#setAlternateHandlingShifted - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public abstract int setVariableTop(String varTop); @@ -880,8 +868,7 @@ public abstract class Collator implements Comparator, Cloneable * Lower 16 bits are undefined and should be ignored. * @return the variable top value of a Collator. * @see #setVariableTop - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public abstract int getVariableTop(); @@ -893,13 +880,13 @@ public abstract class Collator implements Comparator, Cloneable * getVariableTop * @see #getVariableTop * @see #setVariableTop - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public abstract void setVariableTop(int varTop); - /** Get the version of this collator object. - * @return the version object associated with this collator + /** + * 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. */ diff --git a/icu4j/src/com/ibm/icu/text/Normalizer.java b/icu4j/src/com/ibm/icu/text/Normalizer.java index 3c250b0caab..026feaab5f7 100755 --- a/icu4j/src/com/ibm/icu/text/Normalizer.java +++ b/icu4j/src/com/ibm/icu/text/Normalizer.java @@ -141,8 +141,7 @@ public final class Normalizer implements Cloneable { * Options bit set value to select Unicode 3.2 normalization * (except NormalizationCorrections). * At most one Unicode version can be selected at a time. - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final int UNICODE_3_2=0x20; @@ -165,8 +164,7 @@ public final class Normalizer implements Cloneable { /** * This method is used for method dispatch - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ protected int normalize(char[] src, int srcStart, int srcLimit, char[] dest,int destStart,int destLimit, @@ -182,8 +180,7 @@ public final class Normalizer implements Cloneable { /** * This method is used for method dispatch - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ protected int normalize(char[] src, int srcStart, int srcLimit, char[] dest,int destStart,int destLimit, @@ -196,8 +193,7 @@ public final class Normalizer implements Cloneable { /** * This method is used for method dispatch - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ protected String normalize(String src, int options) { return src; @@ -237,8 +233,7 @@ public final class Normalizer implements Cloneable { /** * This method is used for method dispatch - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ protected QuickCheckResult quickCheck(char[] src,int start, int limit, boolean allowMaybe,UnicodeSet nx) { @@ -739,8 +734,7 @@ public final class Normalizer implements Cloneable { * internal normalization functions.) * * @see #compare - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final int COMPARE_NORM_OPTIONS_SHIFT = 20; @@ -764,8 +758,7 @@ public final class Normalizer implements Cloneable { * Currently the only available option is {@link #UNICODE_3_2}. * If you want the default behavior corresponding to one of the * standard Unicode Normalization Forms, use 0 for this argument. - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public Normalizer(String str, Mode mode, int opt) { this.text = UCharacterIterator.getInstance(str); @@ -786,8 +779,7 @@ public final class Normalizer implements Cloneable { * Currently the only available option is {@link #UNICODE_3_2}. * If you want the default behavior corresponding to one of the * standard Unicode Normalization Forms, use 0 for this argument. - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public Normalizer(CharacterIterator iter, Mode mode, int opt) { this.text = UCharacterIterator.getInstance( @@ -806,8 +798,7 @@ public final class Normalizer implements Cloneable { * * @param mode The normalization mode. * @param options The normalization options, ORed together (0 for no options). - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public Normalizer(UCharacterIterator iter, Mode mode, int options) { try { @@ -872,8 +863,7 @@ public final class Normalizer implements Cloneable { * NFC rules. * @param options The only recognized option is UNICODE_3_2 * @return String The composed string - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static String compose(String str, boolean compat, int options) { @@ -914,8 +904,7 @@ public final class Normalizer implements Cloneable { * result, the output was truncated. * @exception IndexOutOfBoundsException if target.length is less than the * required length - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static int compose(char[] source,char[] target, boolean compat, int options) { UnicodeSet nx = NormalizerImpl.getNX(options); @@ -954,8 +943,7 @@ public final class Normalizer implements Cloneable { * result, the output was truncated. * @exception IndexOutOfBoundsException if target.length is less than the * required length - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static int compose(char[] src,int srcStart, int srcLimit, char[] dest,int destStart, int destLimit, @@ -1005,8 +993,7 @@ public final class Normalizer implements Cloneable { * rules. * @param options The normalization options, ORed together (0 for no options). * @return String The decomposed string - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static String decompose(String str, boolean compat, int options) { @@ -1040,8 +1027,7 @@ public final class Normalizer implements Cloneable { * @param options The normalization options, ORed together (0 for no options). * @exception IndexOutOfBoundsException if the target capacity is less than * the required length - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static int decompose(char[] source,char[] target, boolean compat, int options) { int[] trailCC = new int[1]; @@ -1073,8 +1059,7 @@ public final class Normalizer implements Cloneable { * result,the output was truncated. * @exception IndexOutOfBoundsException if the target capacity is less than * the required length - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static int decompose(char[] src,int srcStart, int srcLimit, char[] dest,int destStart, int destLimit, @@ -1120,8 +1105,7 @@ public final class Normalizer implements Cloneable { * @param mode the normalization mode * @param options the optional features to be enabled. * @return String the normalized string - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static String normalize(String str, Mode mode, int options) { return mode.normalize(str,options); @@ -1156,8 +1140,7 @@ public final class Normalizer implements Cloneable { * result, the output was truncated. * @exception IndexOutOfBoundsException if the target capacity is less * than the required length - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static int normalize(char[] source,char[] target, Mode mode, int options) { int length = normalize(source,0,source.length,target,0,target.length,mode, options); @@ -1186,8 +1169,7 @@ public final class Normalizer implements Cloneable { * result, the output was truncated. * @exception IndexOutOfBoundsException if the target capacity is * less than the required length - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static int normalize(char[] src,int srcStart, int srcLimit, char[] dest,int destStart, int destLimit, @@ -1208,8 +1190,7 @@ public final class Normalizer implements Cloneable { * @param options Options for use with exclusion set an tailored Normalization * The only option that is currently recognized is UNICODE_3_2 * @return String The normalized string - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 * @see #UNICODE_3_2 */ // TODO: actually do the optimization when the guts of Normalizer are @@ -1224,8 +1205,7 @@ public final class Normalizer implements Cloneable { * @param mode The normalization mode * @return String The normalized string * @see #UNICODE_3_2 - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ // TODO: actually do the optimization when the guts of Normalizer are // upgraded --has just dumb implementation for now @@ -1257,8 +1237,7 @@ public final class Normalizer implements Cloneable { * The only option that is currently recognized is UNICODE_3_2 * @return Return code to specify if the text is normalized or not * (Normalizer.YES, Normalizer.NO or Normalizer.MAYBE) - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static QuickCheckResult quickCheck( String source, Mode mode, int options) { return mode.quickCheck(source.toCharArray(),0,source.length(),true,NormalizerImpl.getNX(options)); @@ -1275,8 +1254,7 @@ public final class Normalizer implements Cloneable { * The only option that is currently recognized is UNICODE_3_2 * @return Return code to specify if the text is normalized or not * (Normalizer.YES, Normalizer.NO or Normalizer.MAYBE) - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static QuickCheckResult quickCheck(char[] source, Mode mode, int options) { return mode.quickCheck(source,0,source.length,true, NormalizerImpl.getNX(options)); @@ -1303,8 +1281,7 @@ public final class Normalizer implements Cloneable { * @return Return code to specify if the text is normalized or not * (Normalizer.YES, Normalizer.NO or * Normalizer.MAYBE) - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static QuickCheckResult quickCheck(char[] source,int start, @@ -1334,8 +1311,7 @@ public final class Normalizer implements Cloneable { * The only option that is currently recognized is UNICODE_3_2 * @return Boolean value indicating whether the source string is in the * "mode" normalization form - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static boolean isNormalized(char[] src,int start, int limit, Mode mode, @@ -1351,8 +1327,7 @@ public final class Normalizer implements Cloneable { * @param options Options for use with exclusion set an tailored Normalization * The only option that is currently recognized is UNICODE_3_2 * @see #isNormalized - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static boolean isNormalized(String str, Mode mode, int options) { return (mode.quickCheck(str.toCharArray(),0,str.length(),false,NormalizerImpl.getNX(options))==YES); @@ -1367,8 +1342,7 @@ public final class Normalizer implements Cloneable { * The only option that is currently recognized is UNICODE_3_2 * * @see #isNormalized - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ // TODO: actually do the optimization when the guts of Normalizer are // upgraded --has just dumb implementation for now @@ -2065,8 +2039,7 @@ public final class Normalizer implements Cloneable { * turn the option on and false to turn it off. * * @see #getOption - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public void setOption(int option,boolean value) { if (value) { @@ -2080,8 +2053,7 @@ public final class Normalizer implements Cloneable { * Determine whether an option is turned on or off. *

* @see #setOption - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public int getOption(int option) { if((options & option)!=0) { diff --git a/icu4j/src/com/ibm/icu/text/NumberFormat.java b/icu4j/src/com/ibm/icu/text/NumberFormat.java index a73b800e7b5..1de2b66da13 100755 --- a/icu4j/src/com/ibm/icu/text/NumberFormat.java +++ b/icu4j/src/com/ibm/icu/text/NumberFormat.java @@ -634,42 +634,36 @@ public abstract class NumberFormat extends UFormat { * supports. When registered, the locales it supports extend or override the * locales already supported by ICU. * - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static abstract class NumberFormatFactory { /** * Value passed to format requesting a default number format. - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final int FORMAT_NUMBER = NUMBERSTYLE; /** * Value passed to format requesting a currency format. - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final int FORMAT_CURRENCY = CURRENCYSTYLE; /** * Value passed to format requesting a percent format. - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final int FORMAT_PERCENT = PERCENTSTYLE; /** * Value passed to format requesting a scientific format. - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final int FORMAT_SCIENTIFIC = SCIENTIFICSTYLE; /** * Value passed to format requesting an integer format. - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final int FORMAT_INTEGER = INTEGERSTYLE; @@ -678,8 +672,7 @@ public abstract class NumberFormat extends UFormat { * If not visible, the locales supported by this factory will not * be listed by getAvailableLocales. This value must not change. * @return true if the factory is visible. - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ ///CLOVER:OFF public boolean visible() { @@ -691,8 +684,7 @@ public abstract class NumberFormat extends UFormat { * Returns an immutable collection of the locale names directly * supported by this factory. * @return the supported locale names. - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public abstract Set getSupportedLocaleNames(); @@ -704,14 +696,12 @@ public abstract class NumberFormat extends UFormat { * @param loc the locale for which to create the format * @param formatType the type of format * @return the NumberFormat, or null. - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public abstract NumberFormat createFormat(ULocale loc, int formatType); /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ protected NumberFormatFactory() { } @@ -719,24 +709,21 @@ public abstract class NumberFormat extends UFormat { /** * A NumberFormatFactory that supports a single locale. It can be visible or invisible. - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static abstract class SimpleNumberFormatFactory extends NumberFormatFactory { final Set localeNames; final boolean visible; /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public SimpleNumberFormatFactory(ULocale locale) { this(locale, true); } /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public SimpleNumberFormatFactory(ULocale locale, boolean visible) { localeNames = Collections.singleton(locale.getBaseName()); @@ -744,16 +731,14 @@ public abstract class NumberFormat extends UFormat { } /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public final boolean visible() { return visible; } /** - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public final Set getSupportedLocaleNames() { return localeNames; @@ -821,8 +806,7 @@ public abstract class NumberFormat extends UFormat { * key that can be used to unregister this factory. * @param factory the factory to register * @return a key with which to unregister the factory - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static Object registerFactory(NumberFormatFactory factory) { if (factory == null) { @@ -836,8 +820,7 @@ public abstract class NumberFormat extends UFormat { * registerInstance or registerFactory). * @param registryKey a key obtained from registerFactory * @return true if the object was successfully unregistered - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static boolean unregister(Object registryKey) { if (registryKey == null) { @@ -1055,8 +1038,7 @@ public abstract class NumberFormat extends UFormat { * currency format. * @param theCurrency new currency object to use. May be null for * some subclasses. - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public void setCurrency(Currency theCurrency) { currency = theCurrency; @@ -1065,8 +1047,7 @@ public abstract class NumberFormat extends UFormat { /** * Gets the Currency object used to display currency * amounts. This may be null. - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public Currency getCurrency() { return currency; @@ -1450,8 +1431,7 @@ public abstract class NumberFormat extends UFormat { /** * Empty constructor. - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ protected NumberFormat() { } diff --git a/icu4j/src/com/ibm/icu/text/RuleBasedCollator.java b/icu4j/src/com/ibm/icu/text/RuleBasedCollator.java index 476cdb09504..eb877f8c6fd 100755 --- a/icu4j/src/com/ibm/icu/text/RuleBasedCollator.java +++ b/icu4j/src/com/ibm/icu/text/RuleBasedCollator.java @@ -602,8 +602,7 @@ public final class RuleBasedCollator extends Collator * * @see #getVariableTop * @see RuleBasedCollator#setAlternateHandlingShifted - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public int setVariableTop(String varTop) { @@ -648,8 +647,7 @@ public final class RuleBasedCollator extends Collator * getVariableTop * @see #getVariableTop * @see #setVariableTop - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public void setVariableTop(int varTop) { @@ -695,8 +693,7 @@ public final class RuleBasedCollator extends Collator * the tailored rules * @return the current rules that defines this Collator. * @see #getRules - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public String getRules(boolean fullrules) { @@ -936,8 +933,7 @@ public final class RuleBasedCollator extends Collator * Lower 16 bits are undefined and should be ignored. * @return the variable top value of a Collator. * @see #setVariableTop - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public int getVariableTop() { @@ -4449,8 +4445,9 @@ public final class RuleBasedCollator extends Collator // versionInfo[3] = coll->UCA->image->UCAVersion[0]; } - /** Get the UCA version of this collator object. - * @return the version object associated with this 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. */ diff --git a/icu4j/src/com/ibm/icu/text/Transliterator.java b/icu4j/src/com/ibm/icu/text/Transliterator.java index 9b72c9c4b4b..64df4233ddc 100755 --- a/icu4j/src/com/ibm/icu/text/Transliterator.java +++ b/icu4j/src/com/ibm/icu/text/Transliterator.java @@ -360,8 +360,7 @@ public abstract class Transliterator { /** * Constructs a Position object that is a copy of another. - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public Position(Position pos) { set(pos); @@ -369,8 +368,7 @@ public abstract class Transliterator { /** * Copies the indices of this position from another. - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public void set(Position pos) { contextStart = pos.contextStart; @@ -381,8 +379,7 @@ public abstract class Transliterator { /** * Returns true if this Position is equal to the given object. - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public boolean equals(Object obj) { if (obj instanceof Position) { @@ -397,8 +394,7 @@ public abstract class Transliterator { /** * Returns a string representation of this Position. - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public String toString() { return "[cs=" + contextStart diff --git a/icu4j/src/com/ibm/icu/text/UnicodeSet.java b/icu4j/src/com/ibm/icu/text/UnicodeSet.java index 020e8b07a67..26f1d12c6b0 100755 --- a/icu4j/src/com/ibm/icu/text/UnicodeSet.java +++ b/icu4j/src/com/ibm/icu/text/UnicodeSet.java @@ -2842,7 +2842,9 @@ public class UnicodeSet extends UnicodeFilter { * @param valueAlias * @param symbols if not null, then symbols are first called to see if a property * is available. If true, then everything else is skipped. - * @return + * @return this set + * @draft ICU 3.2 + * @deprecated This is a draft API and might change in a future release of ICU. */ public UnicodeSet applyPropertyAlias(String propertyAlias, String valueAlias, SymbolTable symbols) { @@ -3543,7 +3545,7 @@ public class UnicodeSet extends UnicodeFilter { * @deprecated * @author medavis */ - abstract public static class XSymbolTable implements SymbolTable { + abstract static class XSymbolTable implements SymbolTable { public UnicodeMatcher lookupMatcher(int i) { return null;} public boolean applyPropertyAlias(String propertyName, String propertyValue, UnicodeSet result) { diff --git a/icu4j/src/com/ibm/icu/util/Currency.java b/icu4j/src/com/ibm/icu/util/Currency.java index 484a4ad8142..d30346e1f84 100644 --- a/icu4j/src/com/ibm/icu/util/Currency.java +++ b/icu4j/src/com/ibm/icu/util/Currency.java @@ -45,16 +45,14 @@ public class Currency extends MeasureUnit implements Serializable { /** * Selector for getName() indicating a symbolic name for a * currency, such as "$" for USD. - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final int SYMBOL_NAME = 0; /** * Selector for ucurr_getName indicating the long name for a * currency, such as "US Dollar" for USD. - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final int LONG_NAME = 1; @@ -192,8 +190,7 @@ public class Currency extends MeasureUnit implements Serializable { * registerInstance). * @param registryKey the registry key returned from registerInstance * @see #registerInstance - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static boolean unregister(Object registryKey) { if (registryKey == null) { @@ -641,7 +638,7 @@ public class Currency extends MeasureUnit implements Serializable { // -------- BEGIN ULocale boilerplate -------- - /* + /** * Return the locale that was used to create this object, or null. * This may may differ from the locale requested at the time of * this object's creation. For example, if an object is created @@ -662,7 +659,8 @@ public class Currency extends MeasureUnit implements Serializable { * @see com.ibm.icu.util.ULocale * @see com.ibm.icu.util.ULocale#VALID_LOCALE * @see com.ibm.icu.util.ULocale#ACTUAL_LOCALE - * @obsolete ICU 3.2 + * @obsolete ICU 3.2 to be removed + * @deprecated This is a draft API and might change in a future release of ICU. */ public final ULocale getLocale(ULocale.Type type) { return ULocale.ROOT; diff --git a/icu4j/src/com/ibm/icu/util/ULocale.java b/icu4j/src/com/ibm/icu/util/ULocale.java index 69c55ce4b8e..92baea7cf9c 100644 --- a/icu4j/src/com/ibm/icu/util/ULocale.java +++ b/icu4j/src/com/ibm/icu/util/ULocale.java @@ -2146,8 +2146,7 @@ public final class ULocale implements Serializable { if (subtableName != null) { table = table.getWithFallback(subtableName); } - table = table.get(item); // no fallback? - return table.getString(); + return table.getStringWithFallback(item); } catch (MissingResourceException e) { String fallbackLocale = table.getWithFallback("Fallback").getString(); diff --git a/icu4j/src/com/ibm/icu/util/VersionInfo.java b/icu4j/src/com/ibm/icu/util/VersionInfo.java index 5dd84df85c1..ae7d609d072 100644 --- a/icu4j/src/com/ibm/icu/util/VersionInfo.java +++ b/icu4j/src/com/ibm/icu/util/VersionInfo.java @@ -91,8 +91,7 @@ public final class VersionInfo /** * Unicode 4.0 version - * @draft ICU 2.6 - * @deprecated This is a draft API and might change in a future release of ICU. + * @stable ICU 2.6 */ public static final VersionInfo UNICODE_4_0;