ICU-13607 Fixed other ICU4J API doc problems affecting API change report.

X-SVN-Rev: 41019

diff --git a/icu4j/APIChangeReport.html b/icu4j/APIChangeReport.html
index 9c7d76ccd605e442dc839e25ab023c19378560b1..e9c3fc119f9f0c4d2c18c71a1aedc4b79c82b4db 100644 (file)
--- a/icu4j/APIChangeReport.html
+++ b/icu4j/APIChangeReport.html
@@ -95,25 +95,9 @@ DateTimePatternGenerator.DisplayWidth
 <li><span style='color:orange'>(draft)</span> public static final DateTimePatternGenerator.DisplayWidth NARROW</li>
 <li><span style='color:orange'>(draft)</span> public static final DateTimePatternGenerator.DisplayWidth WIDE</li>
 </ul>
-RBBIDataWrapper
-<ul>
-<li><span style='color:orange'>(draft)</span> public short[] fFTable</li>
-<li><span style='color:orange'>(draft)</span> public RBBIDataWrapper.RBBIDataHeader fHeader</li>
-<li><span style='color:orange'>(draft)</span> public short[] fRTable</li>
-<li><span style='color:orange'>(draft)</span> public short[] fSFTable</li>
-<li><span style='color:orange'>(draft)</span> public short[] fSRTable</li>
-<li><span style='color:orange'>(draft)</span> public void <i>dump</i>(java.io.PrintStream)</li>
-<li><span style='color:orange'>(draft)</span> public static java.lang.String <i>intToHexString</i>(int, int)</li>
-<li><span style='color:orange'>(draft)</span> public static java.lang.String <i>intToString</i>(int, int)</li>
-</ul>
-RBBIDataWrapper.RBBIDataHeader
-<ul>
-<li><span style='color:orange'>(draft)</span> public int fCatCount</li>
-<li><span style='color:orange'>(draft)</span> public <i>RBBIDataWrapper.RBBIDataHeader</i>()</li>
-</ul>
 TimeUnitFormat
 <ul>
-<li><span style='color:orange'>(draft)</span> public NumberFormat <i>getNumberFormat</i>()</li>
+<li><span style='color:gray'>(deprecated)</span> public NumberFormat <i>getNumberFormat</i>()</li>
 </ul>
 </ul>
 
@@ -126,6 +110,6 @@ Currency
 </ul>
 
 <hr/>
-<p><i><font size="-1">Contents generated by ReportAPI tool on Wed Feb 28 15:42:26 EST 2018<br/>© 2018 and later: Unicode, Inc. and others. License & terms of use: <a href="http://www.unicode.org/copyright.html#License">http://www.unicode.org/copyright.html#License</a></font></i></p>
+<p><i><font size="-1">Contents generated by ReportAPI tool on Wed Feb 28 17:22:31 EST 2018<br/>© 2018 and later: Unicode, Inc. and others. License & terms of use: <a href="http://www.unicode.org/copyright.html#License">http://www.unicode.org/copyright.html#License</a></font></i></p>
 </body>
 </html>

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/RBBIDataWrapper.java b/icu4j/main/classes/core/src/com/ibm/icu/text/RBBIDataWrapper.java
index 6ef666f0bc1973d3e0853ab29c526c4e9e5141dd..51d96e658706c7ad9524c537c191ad0dd6c109b4 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/RBBIDataWrapper.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/RBBIDataWrapper.java
@@ -23,16 +23,43 @@ import com.ibm.icu.impl.Trie2;
 * it is stored in a .brk file.
 * Not intended for public use; declared public for testing purposes only.
 * @internal
+* @deprecated This API is ICU internal only.
 */
+@Deprecated
 public final class RBBIDataWrapper {
     //
     // These fields are the ready-to-use compiled rule data, as
     //   read from the file.
     //
+    /**
+     * @internal
+     * @deprecated This API is ICU internal only.
+     */
+    @Deprecated
     public RBBIDataHeader fHeader;
+    /**
+     * @internal
+     * @deprecated This API is ICU internal only.
+     */
+    @Deprecated
     public short   fFTable[];
+    /**
+     * @internal
+     * @deprecated This API is ICU internal only.
+     */
+    @Deprecated
     public short   fRTable[];
+    /**
+     * @internal
+     * @deprecated This API is ICU internal only.
+     */
+    @Deprecated
     public short   fSFTable[];
+    /**
+     * @internal
+     * @deprecated This API is ICU internal only.
+     */
+    @Deprecated
     public short   fSRTable[];
     Trie2          fTrie;
     String         fRuleSource;
@@ -80,15 +107,35 @@ public final class RBBIDataWrapper {
     // Index offsets to the fields in a state table row.
     //    Corresponds to struct RBBIStateTableRow in the C version.
     //
-    /** @internal */
+    /**
+     * @internal
+     * @deprecated This API is ICU internal only.
+     */
+    @Deprecated
     public final static int      ACCEPTING  = 0;
-    /** @internal */
+    /**
+     * @internal
+     * @deprecated This API is ICU internal only.
+     */
+    @Deprecated
     public final static int      LOOKAHEAD  = 1;
-    /** @internal */
+    /**
+     * @internal
+     * @deprecated This API is ICU internal only.
+     */
+    @Deprecated
     public final static int      TAGIDX     = 2;
-    /** @internal */
+    /**
+     * @internal
+     * @deprecated This API is ICU internal only.
+     */
+    @Deprecated
     public final static int      RESERVED   = 3;
-    /** @internal */
+    /**
+     * @internal
+     * @deprecated This API is ICU internal only.
+     */
+    @Deprecated
     public final static int      NEXTSTATES = 4;
 
     // Index offsets to header fields of a state table
@@ -110,12 +157,19 @@ public final class RBBIDataWrapper {
      * Data Header.  A struct-like class with the fields from the RBBI data file header.
      * Not intended for public use, declared public for testing purposes only.
      * @internal
+     * @deprecated This API is ICU internal only.
      */
+    @Deprecated
     public final static class RBBIDataHeader {
         int         fMagic;         //  == 0xbla0
         byte[]      fFormatVersion; //  For ICU 3.4 and later.
         int         fLength;        //  Total length in bytes of this RBBI Data,
                                        //      including all sections, not just the header.
+        /**
+         * @internal
+         * @deprecated This API is ICU internal only.
+         */
+        @Deprecated
         public int  fCatCount;      //  Number of character categories.
 
         //
@@ -138,6 +192,11 @@ public final class RBBIDataWrapper {
         int         fStatusTable;    // Offset to the table of rule status values
         int         fStatusTableLen;
 
+        /**
+         * @internal
+         * @deprecated This API is ICU internal only.
+         */
+        @Deprecated
         public RBBIDataHeader() {
             fMagic = 0;
             fFormatVersion = new byte[4];
@@ -149,7 +208,9 @@ public final class RBBIDataWrapper {
      * RBBI State Table Indexing Function.  Given a state number, return the
      * array index of the start of the state table row for that state.
      * @internal
+     * @deprecated This API is ICU internal only.
      */
+    @Deprecated
     public int getRowIndex(int state){
         return ROW_DATA + state * (fHeader.fCatCount + 4);
     }
@@ -322,8 +383,10 @@ public final class RBBIDataWrapper {
 
     /**
      *  Getters for fields from the state table header
-     *  @internal
+     * @internal
+     * @deprecated This API is ICU internal only.
      */
+    @Deprecated
     public int getStateTableNumStates(short table[]) {
         if (isBigEndian) {
             return (table[NUMSTATES] << 16) | (table[NUMSTATES+1] & 0xffff);
@@ -339,6 +402,11 @@ public final class RBBIDataWrapper {
 
     ///CLOVER:OFF
     /* Debug function to display the break iterator data. */
+    /**
+     * @internal
+     * @deprecated This API is ICU internal only.
+     */
+    @Deprecated
     public void dump(java.io.PrintStream out) {
         if (fFTable.length == 0) {
             // There is no table. Fail early for testing purposes.
@@ -363,6 +431,11 @@ public final class RBBIDataWrapper {
 
     ///CLOVER:OFF
     /* Fixed width int-to-string conversion. */
+    /**
+     * @internal
+     * @deprecated This API is ICU internal only.
+     */
+    @Deprecated
     static public String intToString(int n, int width) {
         StringBuilder  dest = new StringBuilder(width);
         dest.append(n);
@@ -375,6 +448,11 @@ public final class RBBIDataWrapper {
 
     ///CLOVER:OFF
     /* Fixed width int-to-string conversion. */
+    /**
+     * @internal
+     * @deprecated This API is ICU internal only.
+     */
+    @Deprecated
     static public String intToHexString(int n, int width) {
         StringBuilder  dest = new StringBuilder(width);
         dest.append(Integer.toHexString(n));

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/RuleBasedBreakIterator.java b/icu4j/main/classes/core/src/com/ibm/icu/text/RuleBasedBreakIterator.java
index 02b31c751fa4732faa0d506fe8ff39cf5c664177..8e0270a8c2ab0b098d5d4f0857a48c413bf51156 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/RuleBasedBreakIterator.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/RuleBasedBreakIterator.java
@@ -225,7 +225,9 @@ public class RuleBasedBreakIterator extends BreakIterator {
      * The rule data for this BreakIterator instance.
      * Not intended for public use. Declared public for testing purposes only.
      * @internal
+     * @deprecated This API is ICU internal only.
      */
+    @Deprecated
     public RBBIDataWrapper    fRData;
 
     /**

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/TimeUnitFormat.java b/icu4j/main/classes/core/src/com/ibm/icu/text/TimeUnitFormat.java
index cd0ef2dd6aaefece8c77ba2af8fab689edea679c..70a974ea85fd516410f49abd46daaf4f1de55d00 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/TimeUnitFormat.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/TimeUnitFormat.java
@@ -216,7 +216,12 @@ public class TimeUnitFormat extends MeasureFormat {
         return this;
     }
 
+    /**
+     * {@inheritDoc}
+     * @deprecated ICU 53 see {@link MeasureFormat}.
+     */
     @Override
+    @Deprecated
     public NumberFormat getNumberFormat() {
         return (NumberFormat) format.clone();
     }