Integrate changes cherry-picked for ticket #12005 into android_icu4j.

Fix numerous warnings / errors from Javadoc generation

Bug: 22023363
(cherry picked from bfab1e7fec36dff93fb980c546ad64a565faf9fc)
Change-Id: I7e97889b415a9e4c83c9b821b939a7ee8d2a96e4

1 files changed, 140 insertions, 142 deletions

diff --git a/android_icu4j/src/main/java/android/icu/lang/UProperty.java b/android_icu4j/src/main/java/android/icu/lang/UProperty.java
index d2dbbacf1..8e4cbb097 100644
--- a/android_icu4j/src/main/java/android/icu/lang/UProperty.java
+++ b/android_icu4j/src/main/java/android/icu/lang/UProperty.java
@@ -9,20 +9,20 @@
 package android.icu.lang;
 
 /**
- * <p>Selection constants for Unicode properties. </p>
- * <p>These constants are used in functions like 
- * UCharacter.hasBinaryProperty(int) to select one of the Unicode properties. 
- * </p>
- * <p>The properties APIs are intended to reflect Unicode properties as 
- * defined in the Unicode Character Database (UCD) and Unicode Technical 
- * Reports (UTR).</p>
+ * <p>Selection constants for Unicode properties.
+ * <p>These constants are used in functions like
+ * UCharacter.hasBinaryProperty(int) to select one of the Unicode properties.
+ *
+ * <p>The properties APIs are intended to reflect Unicode properties as
+ * defined in the Unicode Character Database (UCD) and Unicode Technical
+ * Reports (UTR).
  * <p>For details about the properties see <a href=http://www.unicode.org>
- * http://www.unicode.org</a>.</p> 
+ * http://www.unicode.org</a>.
  * <p>For names of Unicode properties see the UCD file PropertyAliases.txt.
- * </p> 
- * <p>Important: If ICU is built with UCD files from Unicode versions below 
- * 3.2, then properties marked with "new" are not or not fully 
- * available. Check UCharacter.getUnicodeVersion() to be sure.</p>
+ *
+ * <p>Important: If ICU is built with UCD files from Unicode versions below
+ * 3.2, then properties marked with "new" are not or not fully
+ * available. Check UCharacter.getUnicodeVersion() to be sure.
  * @author Syn Wee Quek
  * @see android.icu.lang.UCharacter
  */
@@ -39,250 +39,248 @@ public interface UProperty
     @Deprecated
     public static final int UNDEFINED = -1;
 
-    /** 
-     * <p>Binary property Alphabetic. </p>
-     * <p>Property for UCharacter.isUAlphabetic(), different from the property 
-     * in UCharacter.isalpha().</p>
-     * <p>Lu + Ll + Lt + Lm + Lo + Nl + Other_Alphabetic.</p>
-     */ 
-    public static final int ALPHABETIC = 0; 
+    /**
+     * <p>Binary property Alphabetic.
+     * <p>Property for UCharacter.isUAlphabetic(), different from the property
+     * in UCharacter.isalpha().
+     * <p>Lu + Ll + Lt + Lm + Lo + Nl + Other_Alphabetic.
+     */
+    public static final int ALPHABETIC = 0;
 
-    /** 
-     * First constant for binary Unicode properties. 
-     */ 
+    /**
+     * First constant for binary Unicode properties.
+     */
     public static final int BINARY_START = ALPHABETIC;
 
-    /** 
+    /**
      * Binary property ASCII_Hex_Digit (0-9 A-F a-f).
-     */ 
-    public static final int ASCII_HEX_DIGIT = 1; 
+     */
+    public static final int ASCII_HEX_DIGIT = 1;
 
-    /** 
-     * <p>Binary property Bidi_Control.</p>
+    /**
+     * <p>Binary property Bidi_Control.
      * <p>Format controls which have specific functions in the Bidi Algorithm.
-     * </p> 
-     */ 
-    public static final int BIDI_CONTROL = 2; 
+     */
+    public static final int BIDI_CONTROL = 2;
 
-    /** 
-     * <p>Binary property Bidi_Mirrored.</p> 
-     * <p>Characters that may change display in RTL text.</p> 
-     * <p>Property for UCharacter.isMirrored().</p> 
-     * <p>See Bidi Algorithm; UTR 9.</p> 
-     */ 
-    public static final int BIDI_MIRRORED = 3; 
+    /**
+     * <p>Binary property Bidi_Mirrored.
+     * <p>Characters that may change display in RTL text.
+     * <p>Property for UCharacter.isMirrored().
+     * <p>See Bidi Algorithm; UTR 9.
+     */
+    public static final int BIDI_MIRRORED = 3;
 
-    /** 
-     * <p>Binary property Dash.</p> 
-     * <p>Variations of dashes.</p> 
-     */ 
-    public static final int DASH = 4; 
+    /**
+     * <p>Binary property Dash.
+     * <p>Variations of dashes.
+     */
+    public static final int DASH = 4;
 
-    /** 
+    /**
      * <p>Binary property Default_Ignorable_Code_Point (new).
-     * </p> 
+     *
      * <p>Property that indicates codepoint is ignorable in most processing.
-     * </p>
-     * <p>Codepoints (2060..206F, FFF0..FFFB, E0000..E0FFF) + 
-     * Other_Default_Ignorable_Code_Point + (Cf + Cc + Cs - White_Space)</p> 
-     */ 
-    public static final int DEFAULT_IGNORABLE_CODE_POINT = 5; 
+     *
+     * <p>Codepoints (2060..206F, FFF0..FFFB, E0000..E0FFF) +
+     * Other_Default_Ignorable_Code_Point + (Cf + Cc + Cs - White_Space)
+     */
+    public static final int DEFAULT_IGNORABLE_CODE_POINT = 5;
 
-    /** 
-     * <p>Binary property Deprecated (new).</p> 
-     * <p>The usage of deprecated characters is strongly discouraged.</p> 
-     */ 
-    public static final int DEPRECATED = 6; 
+    /**
+     * <p>Binary property Deprecated (new).
+     * <p>The usage of deprecated characters is strongly discouraged.
+     */
+    public static final int DEPRECATED = 6;
 
-    /** 
-     * <p>Binary property Diacritic.</p> 
-     * <p>Characters that linguistically modify the meaning of another 
-     * character to which they apply.</p> 
-     */ 
-    public static final int DIACRITIC = 7; 
+    /**
+     * <p>Binary property Diacritic.
+     * <p>Characters that linguistically modify the meaning of another
+     * character to which they apply.
+     */
+    public static final int DIACRITIC = 7;
 
-    /** 
-     * <p>Binary property Extender.</p> 
+    /**
+     * <p>Binary property Extender.
      * <p>Extend the value or shape of a preceding alphabetic character, e.g.
-     * length and iteration marks.</p> 
-     */ 
-    public static final int EXTENDER = 8; 
+     * length and iteration marks.
+     */
+    public static final int EXTENDER = 8;
 
-    /** 
-     * <p>Binary property Full_Composition_Exclusion.</p> 
-     * <p>CompositionExclusions.txt + Singleton Decompositions + 
-     * Non-Starter Decompositions.</p> 
-     */ 
-    public static final int FULL_COMPOSITION_EXCLUSION = 9; 
+    /**
+     * <p>Binary property Full_Composition_Exclusion.
+     * <p>CompositionExclusions.txt + Singleton Decompositions +
+     * Non-Starter Decompositions.
+     */
+    public static final int FULL_COMPOSITION_EXCLUSION = 9;
 
-    /** 
-     * <p>Binary property Grapheme_Base (new).</p>
-     * <p>For programmatic determination of grapheme cluster boundaries. 
-     * [0..10FFFF]-Cc-Cf-Cs-Co-Cn-Zl-Zp-Grapheme_Link-Grapheme_Extend-CGJ</p> 
-     */ 
-    public static final int GRAPHEME_BASE = 10; 
+    /**
+     * <p>Binary property Grapheme_Base (new).
+     * <p>For programmatic determination of grapheme cluster boundaries.
+     * [0..10FFFF]-Cc-Cf-Cs-Co-Cn-Zl-Zp-Grapheme_Link-Grapheme_Extend-CGJ
+     */
+    public static final int GRAPHEME_BASE = 10;
 
-    /** 
-     * <p>Binary property Grapheme_Extend (new).</p> 
-     * <p>For programmatic determination of grapheme cluster boundaries.</p> 
-     * <p>Me+Mn+Mc+Other_Grapheme_Extend-Grapheme_Link-CGJ</p> 
-     */ 
-    public static final int GRAPHEME_EXTEND = 11; 
+    /**
+     * <p>Binary property Grapheme_Extend (new).
+     * <p>For programmatic determination of grapheme cluster boundaries.
+     * <p>Me+Mn+Mc+Other_Grapheme_Extend-Grapheme_Link-CGJ
+     */
+    public static final int GRAPHEME_EXTEND = 11;
 
-    /** 
-     * <p>Binary property Grapheme_Link (new).</p> 
-     * <p>For programmatic determination of grapheme cluster boundaries.</p> 
-     */ 
-    public static final int GRAPHEME_LINK = 12; 
+    /**
+     * <p>Binary property Grapheme_Link (new).
+     * <p>For programmatic determination of grapheme cluster boundaries.
+     */
+    public static final int GRAPHEME_LINK = 12;
 
-    /** 
-     * <p>Binary property Hex_Digit.</p> 
-     * <p>Characters commonly used for hexadecimal numbers.</p> 
-     */ 
-    public static final int HEX_DIGIT = 13; 
+    /**
+     * <p>Binary property Hex_Digit.
+     * <p>Characters commonly used for hexadecimal numbers.
+     */
+    public static final int HEX_DIGIT = 13;
 
-    /** 
-     * <p>Binary property Hyphen.</p> 
+    /**
+     * <p>Binary property Hyphen.
      * <p>Dashes used to mark connections between pieces of words, plus the 
-     * Katakana middle dot.</p> 
+     * Katakana middle dot.
      */ 
     public static final int HYPHEN = 14; 
 
     /** 
-     * <p>Binary property ID_Continue.</p>
-     * <p>Characters that can continue an identifier.</p> 
-     * <p>ID_Start+Mn+Mc+Nd+Pc</p> 
+     * <p>Binary property ID_Continue.
+     * <p>Characters that can continue an identifier.
+     * <p>ID_Start+Mn+Mc+Nd+Pc
      */ 
     public static final int ID_CONTINUE = 15; 
 
     /** 
-     * <p>Binary property ID_Start.</p> 
-     * <p>Characters that can start an identifier.</p> 
-     * <p>Lu+Ll+Lt+Lm+Lo+Nl</p> 
+     * <p>Binary property ID_Start.
+     * <p>Characters that can start an identifier.
+     * <p>Lu+Ll+Lt+Lm+Lo+Nl
      */ 
     public static final int ID_START = 16; 
 
     /** 
-     * <p>Binary property Ideographic.</p> 
-     * <p>CJKV ideographs.</p> 
+     * <p>Binary property Ideographic.
+     * <p>CJKV ideographs.
      */ 
     public static final int IDEOGRAPHIC = 17; 
 
     /** 
-     * <p>Binary property IDS_Binary_Operator (new).</p> 
+     * <p>Binary property IDS_Binary_Operator (new).
      * <p>For programmatic determination of Ideographic Description Sequences.
-     * </p> 
      */ 
     public static final int IDS_BINARY_OPERATOR = 18; 
 
     /** 
-     * <p>Binary property IDS_Trinary_Operator (new).</p> 
-     * <p?For programmatic determination of Ideographic Description 
-     * Sequences.</p> 
+     * <p>Binary property IDS_Trinary_Operator (new).
+     * <p>For programmatic determination of Ideographic Description
+     * Sequences.
      */ 
     public static final int IDS_TRINARY_OPERATOR = 19; 
 
     /** 
-     * <p>Binary property Join_Control.</p> 
-     * <p>Format controls for cursive joining and ligation.</p> 
+     * <p>Binary property Join_Control.
+     * <p>Format controls for cursive joining and ligation.
      */ 
     public static final int JOIN_CONTROL = 20; 
 
     /** 
-     * <p>Binary property Logical_Order_Exception (new).</p> 
+     * <p>Binary property Logical_Order_Exception (new).
      * <p>Characters that do not use logical order and require special 
-     * handling in most processing.</p> 
+     * handling in most processing.
      */ 
     public static final int LOGICAL_ORDER_EXCEPTION = 21; 
 
     /** 
-     * <p>Binary property Lowercase.</p> 
+     * <p>Binary property Lowercase.
      * <p>Same as UCharacter.isULowercase(), different from 
-     * UCharacter.islower().</p> 
-     * <p>Ll+Other_Lowercase</p> 
+     * UCharacter.islower().
+     * <p>Ll+Other_Lowercase
      */ 
     public static final int LOWERCASE = 22; 
 
-    /** <p>Binary property Math.</p> 
-     * <p>Sm+Other_Math</p> 
+    /** <p>Binary property Math.
+     * <p>Sm+Other_Math
      */ 
     public static final int MATH = 23; 
 
     /** 
-     * <p>Binary property Noncharacter_Code_Point.</p> 
+     * <p>Binary property Noncharacter_Code_Point.
      * <p>Code points that are explicitly defined as illegal for the encoding 
-     * of characters.</p> 
+     * of characters.
      */ 
     public static final int NONCHARACTER_CODE_POINT = 24; 
 
     /** 
-     * <p>Binary property Quotation_Mark.</p> 
+     * <p>Binary property Quotation_Mark.
      */ 
     public static final int QUOTATION_MARK = 25; 
 
     /** 
-     * <p>Binary property Radical (new).</p> 
+     * <p>Binary property Radical (new).
      * <p>For programmatic determination of Ideographic Description 
-     * Sequences.</p> 
+     * Sequences.
      */ 
     public static final int RADICAL = 26; 
 
     /** 
-     * <p>Binary property Soft_Dotted (new).</p> 
-     * <p>Characters with a "soft dot", like i or j.</p>
-     * <p>An accent placed on these characters causes the dot to disappear.</p> 
+     * <p>Binary property Soft_Dotted (new).
+     * <p>Characters with a "soft dot", like i or j.
+     * <p>An accent placed on these characters causes the dot to disappear.
      */ 
     public static final int SOFT_DOTTED = 27; 
 
     /** 
-     * <p>Binary property Terminal_Punctuation.</p> 
+     * <p>Binary property Terminal_Punctuation.
      * <p>Punctuation characters that generally mark the end of textual 
-     * units.</p> 
+     * units.
      */ 
     public static final int TERMINAL_PUNCTUATION = 28; 
 
     /** 
-     * <p>Binary property Unified_Ideograph (new).</p> 
+     * <p>Binary property Unified_Ideograph (new).
      * <p>For programmatic determination of Ideographic Description 
-     * Sequences.</p> 
+     * Sequences.
      */ 
     public static final int UNIFIED_IDEOGRAPH = 29; 
 
     /** 
-     * <p>Binary property Uppercase.</p> 
+     * <p>Binary property Uppercase.
      * <p>Same as UCharacter.isUUppercase(), different from 
-     * UCharacter.isUpperCase().</p> 
-     * <p>Lu+Other_Uppercase</p> 
+     * UCharacter.isUpperCase().
+     * <p>Lu+Other_Uppercase
      */ 
     public static final int UPPERCASE = 30; 
 
     /** 
-     * <p>Binary property White_Space.</p> 
+     * <p>Binary property White_Space.
      * <p>Same as UCharacter.isUWhiteSpace(), different from 
-     * UCharacter.isSpace() and UCharacter.isWhitespace().</p> 
-     * Space characters+TAB+CR+LF-ZWSP-ZWNBSP</p> 
+     * UCharacter.isSpace() and UCharacter.isWhitespace().
+     * Space characters+TAB+CR+LF-ZWSP-ZWNBSP
      */ 
     public static final int WHITE_SPACE = 31; 
 
     /** 
-     * <p>Binary property XID_Continue.</p> 
+     * <p>Binary property XID_Continue.
      * <p>ID_Continue modified to allow closure under normalization forms 
-     * NFKC and NFKD.</p> 
+     * NFKC and NFKD.
      */ 
     public static final int XID_CONTINUE = 32; 
 
     /** 
-     * <p>Binary property XID_Start.</p> 
+     * <p>Binary property XID_Start.
      * <p>ID_Start modified to allow closure under normalization forms NFKC 
-     * and NFKD.</p> 
+     * and NFKD.
      */ 
     public static final int XID_START = 33; 
 
     /**
-     * <p>Binary property Case_Sensitive.</p>
+     * <p>Binary property Case_Sensitive.
      * <p>Either the source of a case
      * mapping or _in_ the target of a case mapping. Not the same as
-     * the general category Cased_Letter.</p>
+     * the general category Cased_Letter.
      */
     public static final int CASE_SENSITIVE = 34;