Merge "Remove broken @see tags from ICU javadoc."android-p-preview-4android-n-iot-release-smart-display

8 files changed, 50 insertions, 7 deletions

diff --git a/android_icu4j/src/main/java/android/icu/text/DateFormatSymbols.java b/android_icu4j/src/main/java/android/icu/text/DateFormatSymbols.java
index 431b90a28..f255ebfb9 100644
--- a/android_icu4j/src/main/java/android/icu/text/DateFormatSymbols.java
+++ b/android_icu4j/src/main/java/android/icu/text/DateFormatSymbols.java
@@ -81,7 +81,6 @@ import android.icu.util.UResourceBundleIterator;
  *
  * @see          DateFormat
  * @see          SimpleDateFormat
- * @see          android.icu.util.SimpleTimeZone
  * @author       Chen-Lieh Huang
  */
 public class DateFormatSymbols implements Serializable, Cloneable {
diff --git a/android_icu4j/src/main/java/android/icu/text/DateTimePatternGenerator.java b/android_icu4j/src/main/java/android/icu/text/DateTimePatternGenerator.java
index 231435252..9527cc7d6 100644
--- a/android_icu4j/src/main/java/android/icu/text/DateTimePatternGenerator.java
+++ b/android_icu4j/src/main/java/android/icu/text/DateTimePatternGenerator.java
@@ -1229,7 +1229,6 @@ public class DateTimePatternGenerator implements Freezable<DateTimePatternGenera
      *
      * @param field The index to get the append item name.
      * @return name for field
-     * @see #getFieldDisplayName(int, DisplayWidth)
      */
     public String getAppendItemName(int field) {
         return getFieldDisplayName(field, APPENDITEM_WIDTH);
diff --git a/android_icu4j/src/main/java/android/icu/util/Calendar.java b/android_icu4j/src/main/java/android/icu/util/Calendar.java
index 49b18a2e5..90f6584ec 100644
--- a/android_icu4j/src/main/java/android/icu/util/Calendar.java
+++ b/android_icu4j/src/main/java/android/icu/util/Calendar.java
@@ -4504,8 +4504,6 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
      * @param date the date and time
      * @return true if the given date and time is part of the
      * weekend
-     * @see #getDayOfWeekType
-     * @see #getWeekendTransition
      * @see #isWeekend()
      */
     public boolean isWeekend(Date date) {
@@ -4518,8 +4516,6 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
      * this calendar system.
      * @return true if the given date and time is part of the
      * weekend
-     * @see #getDayOfWeekType
-     * @see #getWeekendTransition
      * @see #isWeekend(Date)
      */
     public boolean isWeekend() {
diff --git a/android_icu4j/src/main/java/android/icu/util/TimeZone.java b/android_icu4j/src/main/java/android/icu/util/TimeZone.java
index 4d3315b5e..b40934063 100644
--- a/android_icu4j/src/main/java/android/icu/util/TimeZone.java
+++ b/android_icu4j/src/main/java/android/icu/util/TimeZone.java
@@ -85,7 +85,6 @@ import android.icu.util.ULocale.Category;
  *
  * @see          Calendar
  * @see          GregorianCalendar
- * @see          SimpleTimeZone
  * @author       Mark Davis, Deborah Goldsmith, Chen-Lieh Huang, Alan Liu
  */
 abstract public class TimeZone implements Serializable, Cloneable, Freezable<TimeZone> {
diff --git a/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/text/DateFormatSymbols.java.patch b/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/text/DateFormatSymbols.java.patch
new file mode 100644
index 000000000..b71a87d03
--- /dev/null
+++ b/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/text/DateFormatSymbols.java.patch
@@ -0,0 +1,10 @@
+--- android_icu4j/src/main/java/android/icu/text/DateFormatSymbols.java	2018-06-13 19:00:05.684113408 +0100
++++ android_icu4j/src/main/java/android/icu/text/DateFormatSymbols.java	2018-06-13 18:58:50.604424107 +0100
+@@ -81,7 +81,6 @@
+  *
+  * @see          DateFormat
+  * @see          SimpleDateFormat
+- * @see          android.icu.util.SimpleTimeZone
+  * @author       Chen-Lieh Huang
+  */
+ public class DateFormatSymbols implements Serializable, Cloneable {
diff --git a/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/text/DateTimePatternGenerator.java.patch b/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/text/DateTimePatternGenerator.java.patch
new file mode 100644
index 000000000..ad3c31f16
--- /dev/null
+++ b/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/text/DateTimePatternGenerator.java.patch
@@ -0,0 +1,10 @@
+--- android_icu4j/src/main/java/android/icu/text/DateTimePatternGenerator.java	2018-06-13 19:00:05.744113159 +0100
++++ android_icu4j/src/main/java/android/icu/text/DateTimePatternGenerator.java	2018-06-13 18:59:13.212330591 +0100
+@@ -1229,7 +1229,6 @@
+      *
+      * @param field The index to get the append item name.
+      * @return name for field
+-     * @see #getFieldDisplayName(int, DisplayWidth)
+      */
+     public String getAppendItemName(int field) {
+         return getFieldDisplayName(field, APPENDITEM_WIDTH);
diff --git a/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/util/Calendar.java.patch b/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/util/Calendar.java.patch
new file mode 100644
index 000000000..eb732bfb1
--- /dev/null
+++ b/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/util/Calendar.java.patch
@@ -0,0 +1,20 @@
+--- android_icu4j/src/main/java/android/icu/util/Calendar.java	2018-06-13 19:00:05.800112927 +0100
++++ android_icu4j/src/main/java/android/icu/util/Calendar.java	2018-06-13 18:59:13.224330541 +0100
+@@ -4504,8 +4504,6 @@
+      * @param date the date and time
+      * @return true if the given date and time is part of the
+      * weekend
+-     * @see #getDayOfWeekType
+-     * @see #getWeekendTransition
+      * @see #isWeekend()
+      */
+     public boolean isWeekend(Date date) {
+@@ -4518,8 +4516,6 @@
+      * this calendar system.
+      * @return true if the given date and time is part of the
+      * weekend
+-     * @see #getDayOfWeekType
+-     * @see #getWeekendTransition
+      * @see #isWeekend(Date)
+      */
+     public boolean isWeekend() {
diff --git a/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/util/TimeZone.java.patch b/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/util/TimeZone.java.patch
index 75d424277..e8bf3ff56 100644
--- a/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/util/TimeZone.java.patch
+++ b/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/util/TimeZone.java.patch
@@ -50,3 +50,13 @@
       */
      public static final int TIMEZONE_JDK = 1;
  
+--- android_icu4j/src/main/java/android/icu/util/TimeZone.java	2018-06-13 19:00:05.852112712 +0100
++++ android_icu4j/src/main/java/android/icu/util/TimeZone.java	2018-06-13 18:58:54.540407828 +0100
+@@ -85,7 +85,6 @@
+  *
+  * @see          Calendar
+  * @see          GregorianCalendar
+- * @see          SimpleTimeZone
+  * @author       Mark Davis, Deborah Goldsmith, Chen-Lieh Huang, Alan Liu
+  */
+ abstract public class TimeZone implements Serializable, Cloneable, Freezable<TimeZone> {