ICU-10905 Fixed missing @Deprecated annotation problem in several classes.

X-SVN-Rev: 35737

diff --git a/icu4j/main/classes/collate/src/com/ibm/icu/text/CollationElementIterator.java b/icu4j/main/classes/collate/src/com/ibm/icu/text/CollationElementIterator.java
index ded3baa06906f57f966bdc0271bd0d587a947049..c276829085ec1f10f267b060171f398284d2c849 100644 (file)
--- a/icu4j/main/classes/collate/src/com/ibm/icu/text/CollationElementIterator.java
+++ b/icu4j/main/classes/collate/src/com/ibm/icu/text/CollationElementIterator.java
@@ -717,6 +717,7 @@ public final class CollationElementIterator
      * @internal
      * @deprecated This API is ICU internal only.
      */
+    @Deprecated
     public int hashCode() {
         assert false : "hashCode not designed";
         return 42;
@@ -726,6 +727,7 @@ public final class CollationElementIterator
      * @internal
      * @deprecated This API is ICU internal only.
      */
+    @Deprecated
     public RuleBasedCollator getRuleBasedCollator() {
         return rbc_;
     }

diff --git a/icu4j/main/classes/collate/src/com/ibm/icu/text/Collator.java b/icu4j/main/classes/collate/src/com/ibm/icu/text/Collator.java
index 0dc10edb7cea5f34d38cca59ea285d02e0f73ff7..6e2e4bfb015e5df60de4c00278e7b9f68ff8bd21 100644 (file)
--- a/icu4j/main/classes/collate/src/com/ibm/icu/text/Collator.java
+++ b/icu4j/main/classes/collate/src/com/ibm/icu/text/Collator.java
@@ -1035,6 +1035,7 @@ public abstract class Collator implements Comparator<Object>, Freezable<Collator
      * @internal
      * @deprecated This API is ICU internal only.
      */
+    @Deprecated
     protected int doCompare(CharSequence left, CharSequence right) {
         return compare(left.toString(), right.toString());
     }
@@ -1131,6 +1132,7 @@ public abstract class Collator implements Comparator<Object>, Freezable<Collator
      * @see RuleBasedCollator#setAlternateHandlingShifted
      * @deprecated ICU 53 Call {@link #setMaxVariable(int)} instead.
      */
+    @Deprecated
     public abstract int setVariableTop(String varTop);
 
     /**
@@ -1155,6 +1157,7 @@ public abstract class Collator implements Comparator<Object>, Freezable<Collator
      * @see #setVariableTop(String)
      * @deprecated ICU 53 Call setMaxVariable() instead.
      */
+    @Deprecated
     public abstract void setVariableTop(int varTop);
 
     /**

diff --git a/icu4j/main/classes/collate/src/com/ibm/icu/text/RuleBasedCollator.java b/icu4j/main/classes/collate/src/com/ibm/icu/text/RuleBasedCollator.java
index c21cf450f6d5756bcadc33ea44ed6466d89823aa..ad94dea79b18074c924e3ee84132a51f6a10edaa 100644 (file)
--- a/icu4j/main/classes/collate/src/com/ibm/icu/text/RuleBasedCollator.java
+++ b/icu4j/main/classes/collate/src/com/ibm/icu/text/RuleBasedCollator.java
@@ -817,6 +817,7 @@ public final class RuleBasedCollator extends Collator {
      * @deprecated ICU 53 Call {@link #setMaxVariable(int)} instead.
      */
     @Override
+    @Deprecated
     public int setVariableTop(String varTop) {
         checkNotFrozen();
         if (varTop == null || varTop.length() == 0) {
@@ -854,6 +855,7 @@ public final class RuleBasedCollator extends Collator {
      * @deprecated ICU 53 Call setMaxVariable() instead.
      */
     @Override
+    @Deprecated
     public void setVariableTop(int varTop) {
         checkNotFrozen();
         internalSetVariableTop(varTop & 0xffffffffL);
@@ -1236,6 +1238,7 @@ public final class RuleBasedCollator extends Collator {
      * @internal for tests & tools
      * @deprecated This API is ICU internal only.
      */
+    @Deprecated
     public long[] internalGetCEs(CharSequence str) {
         CollationBuffer buffer = null;
         try {
@@ -1659,6 +1662,7 @@ public final class RuleBasedCollator extends Collator {
      * @deprecated This API is ICU internal only.
      */
     @Override
+    @Deprecated
     protected int doCompare(CharSequence left, CharSequence right) {
         if(left == right) {
             return Collation.EQUAL;

diff --git a/icu4j/main/classes/collate/src/com/ibm/icu/text/SearchIterator.java b/icu4j/main/classes/collate/src/com/ibm/icu/text/SearchIterator.java
index 3ec4fc7fdb26e98bdbaec872324b57217b288a20..349c0ad016d0e9f28df52cacbd5c29ccf2f8bbd7 100644 (file)
--- a/icu4j/main/classes/collate/src/com/ibm/icu/text/SearchIterator.java
+++ b/icu4j/main/classes/collate/src/com/ibm/icu/text/SearchIterator.java
@@ -712,6 +712,7 @@ public abstract class SearchIterator
      * @internal
      * @deprecated This API is ICU internal only.
      */
+    @Deprecated
     //TODO: This protected method is @stable 2.0 in ICU4C
     protected void setMatchNotFound() {
         search_.matchedIndex_ = DONE;

diff --git a/icu4j/main/classes/collate/src/com/ibm/icu/text/StringSearch.java b/icu4j/main/classes/collate/src/com/ibm/icu/text/StringSearch.java
index 43a68a0e7c4f3ecc8b8cc958aa5392bc068fbc0c..bb9ae0caa45d63b1c3bcc0854e07cbb3f12798bd 100644 (file)
--- a/icu4j/main/classes/collate/src/com/ibm/icu/text/StringSearch.java
+++ b/icu4j/main/classes/collate/src/com/ibm/icu/text/StringSearch.java
@@ -833,6 +833,7 @@ public final class StringSearch extends SearchIterator {
      * @internal
      * @deprecated This API is ICU internal only.
      */
+    @Deprecated
     protected void setMatchNotFound() {
         super.setMatchNotFound();
         // SearchIterator#setMatchNotFound() does following:

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/Normalizer.java b/icu4j/main/classes/core/src/com/ibm/icu/text/Normalizer.java
index 63d3840d904ebb8e7aff82e777e6e0eb4978f6c4..c1a83e243bf5b35d33a446af8d6642ee040928c1 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/Normalizer.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/Normalizer.java
@@ -227,6 +227,7 @@ public final class Normalizer implements Cloneable {
          * @internal
          * @deprecated This API is ICU internal only.
          */
+        @Deprecated
         protected Mode() {
         }
 

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/PluralRules.java b/icu4j/main/classes/core/src/com/ibm/icu/text/PluralRules.java
index fd97ecbd4b99798e95ae2919d8c0084850c9d4b1..2f6c4e2fea42939a4580bcf518bbb11d383e61b3 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/PluralRules.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/PluralRules.java
@@ -201,6 +201,7 @@ public class PluralRules implements Serializable {
          * @internal
          * @deprecated This API is ICU internal only.
          */
+        @Deprecated
         protected Factory() {
         }
 
@@ -2273,6 +2274,7 @@ public class PluralRules implements Serializable {
      * @internal
      * @deprecated This API is ICU internal only.
      */
+    @Deprecated
     public KeywordStatus getKeywordStatus(String keyword, int offset, Set<Double> explicits,
             Output<Double> uniqueValue, SampleType sampleType) {
         if (uniqueValue != null) {

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/StringCharacterIterator.java b/icu4j/main/classes/core/src/com/ibm/icu/text/StringCharacterIterator.java
index 08133a3f9598cf59e3037688eb7dc7987e42d38e..244260c63506df99e8970ae0759f2a07dbe2cab4 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/StringCharacterIterator.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/StringCharacterIterator.java
@@ -283,6 +283,7 @@ public final class StringCharacterIterator implements CharacterIterator
      * @return A copy of this 
      * @deprecated ICU 2.4. Use java.text.StringCharacterIterator instead.
      */
+    @Deprecated
     public Object clone()
     {
         try {

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/TimeZoneNames.java b/icu4j/main/classes/core/src/com/ibm/icu/text/TimeZoneNames.java
index 8832ae9c28e651252351f271c63bbd629bfcc3b9..e16448a135e65f5bbca94f619ee0baafffa925b4 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/TimeZoneNames.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/TimeZoneNames.java
@@ -424,6 +424,7 @@ public abstract class TimeZoneNames implements Serializable {
      * @internal
      * @deprecated This API is ICU internal only.
      */
+    @Deprecated
     public static abstract class Factory {
         /**
          * The factory method of <code>TimeZoneNames</code>.
@@ -434,6 +435,7 @@ public abstract class TimeZoneNames implements Serializable {
          * @internal
          * @deprecated This API is ICU internal only.
          */
+        @Deprecated
         public abstract TimeZoneNames getTimeZoneNames(ULocale locale);
 
         /**
@@ -441,6 +443,7 @@ public abstract class TimeZoneNames implements Serializable {
          * @internal
          * @deprecated This API is ICU internal only.
          */
+        @Deprecated
         protected Factory() {
         }
     }

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/UnicodeSet.java b/icu4j/main/classes/core/src/com/ibm/icu/text/UnicodeSet.java
index 6c1f0e050d432442c2bf936aad597666594b9fc5..e67d8f3ec666be50af0a39cb17dca85e198456ef 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/UnicodeSet.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/UnicodeSet.java
@@ -4573,6 +4573,7 @@ public class UnicodeSet extends UnicodeFilter implements Iterable<String>, Compa
      * @internal
      * @deprecated This API is ICU internal only.
      */
+    @Deprecated
     public static XSymbolTable getDefaultXSymbolTable() {
         return XSYMBOL_TABLE;
     }
@@ -4590,6 +4591,7 @@ public class UnicodeSet extends UnicodeFilter implements Iterable<String>, Compa
      * @internal
      * @deprecated This API is ICU internal only.
      */
+    @Deprecated
     public static void setDefaultXSymbolTable(XSymbolTable xSymbolTable) {
         XSYMBOL_TABLE = xSymbolTable;
     }

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/HebrewCalendar.java b/icu4j/main/classes/core/src/com/ibm/icu/util/HebrewCalendar.java
index 99e514c9604a1b679773c53f0c1b1e1e2dd417a2..d3b3e86ef33458523bb9be5ce4ba9e276a0fd318 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/util/HebrewCalendar.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/util/HebrewCalendar.java
@@ -755,6 +755,7 @@ public class HebrewCalendar extends Calendar {
      * @internal
      * @deprecated This API is ICU internal only.
      */
+    @Deprecated
     protected void validateField(int field) {
         if (field == MONTH && !isLeapYear(handleGetExtendedYear()) && internalGet(MONTH) == ADAR_1) {
             throw new IllegalArgumentException("MONTH cannot be ADAR_1(5) except leap years");

diff --git a/icu4j/main/classes/translit/src/com/ibm/icu/text/Transliterator.java b/icu4j/main/classes/translit/src/com/ibm/icu/text/Transliterator.java
index 581563ea8d75eb3bdbd3a4f7a7a5de478b423860..764bdc5cef08a5265d6eed09df69dfe55ed979c1 100644 (file)
--- a/icu4j/main/classes/translit/src/com/ibm/icu/text/Transliterator.java
+++ b/icu4j/main/classes/translit/src/com/ibm/icu/text/Transliterator.java
@@ -1631,6 +1631,7 @@ public abstract class Transliterator implements StringTransform  {
      * @internal
      * @deprecated  This API is ICU internal only.
      */
+    @Deprecated
     public void addSourceTargetSet(UnicodeSet inputFilter, UnicodeSet sourceSet, UnicodeSet targetSet) {
         UnicodeSet myFilter = getFilterAsUnicodeSet(inputFilter);
         UnicodeSet temp = new UnicodeSet(handleGetSourceSet()).retainAll(myFilter);
@@ -1652,6 +1653,7 @@ public abstract class Transliterator implements StringTransform  {
      * @internal
      * @deprecated  This API is ICU internal only.
      */
+    @Deprecated
    // TODO change to getMergedFilter
     public UnicodeSet getFilterAsUnicodeSet(UnicodeSet externalFilter) {
         if (filter == null) {