From 076242b2244b86bb8230a7198e20348e01920b43 Mon Sep 17 00:00:00 2001
From: Markus Scherer <markus.icu@gmail.com>
Date: Mon, 15 Sep 2014 20:18:49 +0000
Subject: [PATCH] ICU-9131 fix a few more annotation & API docs issues

X-SVN-Rev: 36512
---
 .../classes/core/src/com/ibm/icu/text/UTF16.java   |  2 --
 .../src/com/ibm/icu/text/UnicodeSetSpanner.java    | 14 +++++++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/UTF16.java b/icu4j/main/classes/core/src/com/ibm/icu/text/UTF16.java
index 2e1fcc0fb0d..b3dc2fbbaed 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/UTF16.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/UTF16.java
@@ -2620,7 +2620,6 @@ public final class UTF16 {
      * @draft ICU 54
      * @provisional This API might change or be removed in a future release.
      */
-    @Deprecated
     public static int getSingleCodePoint(CharSequence s) {
         if (s == null || s.length() == 0) {
             return -1;
@@ -2656,7 +2655,6 @@ public final class UTF16 {
      * @draft ICU 54
      * @provisional This API might change or be removed in a future release.
      */
-    @Deprecated
     public static int compareCodePoint(int codePoint, CharSequence s) {
         if (s == null) {
             return 1;
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/UnicodeSetSpanner.java b/icu4j/main/classes/core/src/com/ibm/icu/text/UnicodeSetSpanner.java
index e6019c50244..91a700b8839 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/UnicodeSetSpanner.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/UnicodeSetSpanner.java
@@ -104,8 +104,8 @@ public class UnicodeSetSpanner {
     public enum CountMethod {
         /**
          * Collapse spans. That is, modify/count the entire matching span as a single item, instead of separate
-         * code points.
-         * 
+         * set elements.
+         *
          * @draft ICU 54
          * @provisional This is a draft API and might change in a future release of ICU.
          */
@@ -120,7 +120,7 @@ public class UnicodeSetSpanner {
          * <li>spanning with [{ab}] will count two MIN_ELEMENTS.</li>
          * <li>spanning with [ab{ab}] will also count two MIN_ELEMENTS.</li>
          * </ul>
-         * 
+         *
          * @draft ICU 54
          * @provisional This is a draft API and might change in a future release of ICU.
          */
@@ -167,7 +167,7 @@ public class UnicodeSetSpanner {
      * @param countMethod
      *            whether to treat an entire span as a match, or individual elements as matches
      * @param spanCondition
-     *            the spanCondition to use. SIMPLE or CONTAINED means only count the code points in the span;
+     *            the spanCondition to use. SIMPLE or CONTAINED means only count the elements in the span;
      *            NOT_CONTAINED is the reverse.
      *            <br><b>WARNING: </b> when a UnicodeSet contains strings, there may be unexpected behavior in edge cases.
      * @return the count. Zero if there are none.
@@ -354,7 +354,7 @@ public class UnicodeSetSpanner {
     }
 
     /**
-     * Returns a trimmed sequence (using CharSequence.subsequence()), that omits matching code points at the start and
+     * Returns a trimmed sequence (using CharSequence.subsequence()), that omits matching elements at the start and
      * end of the string, using TrimOption.BOTH and SpanCondition.SIMPLE. For example:
      * 
      * <pre>
@@ -376,7 +376,7 @@ public class UnicodeSetSpanner {
     }
 
     /**
-     * Returns a trimmed sequence (using CharSequence.subsequence()), that omits matching code points at the start or
+     * Returns a trimmed sequence (using CharSequence.subsequence()), that omits matching elements at the start or
      * end of the string, using the trimOption and SpanCondition.SIMPLE. For example:
      * 
      * <pre>
@@ -401,7 +401,7 @@ public class UnicodeSetSpanner {
     }
 
     /**
-     * Returns a trimmed sequence (using CharSequence.subsequence()), that omits matching code points at the start or
+     * Returns a trimmed sequence (using CharSequence.subsequence()), that omits matching elements at the start or
      * end of the string, depending on the trimOption and spanCondition. For example:
      * 
      * <pre>