Update some comments / docs about JDK 7.

RELNOTES=n/a
PiperOrigin-RevId: 654907100

android/guava-testlib/src/com/google/common/collect/testing/AbstractIteratorTester.java

@@ -400,19 +400,13 @@ private <T extends Iterator<E>> void internalExecuteAndCompare(
         @SuppressWarnings("unchecked")
         E targetReturnValueFromNext = (E) targetReturnValue;
         /*
-         * We have an Iterator<E> and want to cast it to
-         * MultiExceptionListIterator. Because we're inside an
-         * AbstractIteratorTester<E>, that's implicitly a cast to
-         * AbstractIteratorTester<E>.MultiExceptionListIterator. The runtime
-         * won't be able to verify the AbstractIteratorTester<E> part, so it's
-         * an unchecked cast. We know, however, that the only possible value for
-         * the type parameter is <E>, since otherwise the
-         * MultiExceptionListIterator wouldn't be an Iterator<E>. The cast is
-         * safe, even though javac can't tell.
-         *
-         * Sun bug 6665356 is an additional complication. Until OpenJDK 7, javac
-         * doesn't recognize this kind of cast as unchecked cast. Neither does
-         * Eclipse 3.4. Right now, this suppression is mostly unnecessary.
+         * We have an Iterator<E> and want to cast it to MultiExceptionListIterator. Because we're
+         * inside an AbstractIteratorTester<E>, that's implicitly a cast to
+         * AbstractIteratorTester<E>.MultiExceptionListIterator. The runtime won't be able to verify
+         * the AbstractIteratorTester<E> part, so it's an unchecked cast. We know, however, that the
+         * only possible value for the type parameter is <E>, since otherwise the
+         * MultiExceptionListIterator wouldn't be an Iterator<E>. The cast is safe, even though
+         * javac can't tell.
          */
         @SuppressWarnings("unchecked")
         MultiExceptionListIterator multiExceptionListIterator =

android/guava/src/com/google/common/net/HostAndPort.java

@@ -190,7 +190,7 @@ public static HostAndPort fromString(String hostPortString) {
     int port = NO_PORT;
     if (!Strings.isNullOrEmpty(portString)) {
       // Try to parse the whole port string as a number.
-      // JDK7 accepts leading plus signs. We don't want to.
+      // Java accepts leading plus signs. We don't want to.
       checkArgument(
           !portString.startsWith("+") && CharMatcher.ascii().matchesAllOf(portString),
           "Unparseable port number: %s",

android/guava/src/com/google/common/primitives/Ints.java

@@ -772,8 +772,8 @@ int[] toIntArray() {
    * throwing an exception if parsing fails. Additionally, this method only accepts ASCII digits,
    * and returns {@code null} if non-ASCII digits are present in the string.
    *
-   * <p>Note that strings prefixed with ASCII {@code '+'} are rejected, even under JDK 7, despite
-   * the change to {@link Integer#parseInt(String)} for that version.
+   * <p>Note that strings prefixed with ASCII {@code '+'} are rejected, even though {@link
+   * Integer#parseInt(String)} accepts them.
    *
    * @param string the string representation of an integer value
    * @return the integer value represented by {@code string}, or {@code null} if {@code string} has
@@ -794,8 +794,8 @@ public static Integer tryParse(String string) {
    * throwing an exception if parsing fails. Additionally, this method only accepts ASCII digits,
    * and returns {@code null} if non-ASCII digits are present in the string.
    *
-   * <p>Note that strings prefixed with ASCII {@code '+'} are rejected, even under JDK 7, despite
-   * the change to {@link Integer#parseInt(String, int)} for that version.
+   * <p>Note that strings prefixed with ASCII {@code '+'} are rejected, even though {@link
+   * Integer#parseInt(String)} accepts them.
    *
    * @param string the string representation of an integer value
    * @param radix the radix to use when parsing

android/guava/src/com/google/common/primitives/Longs.java

@@ -360,8 +360,8 @@ static int digit(char c) {
    * an exception if parsing fails. Additionally, this method only accepts ASCII digits, and returns
    * {@code null} if non-ASCII digits are present in the string.
    *
-   * <p>Note that strings prefixed with ASCII {@code '+'} are rejected, even under JDK 7, despite
-   * the change to {@link Long#parseLong(String)} for that version.
+   * <p>Note that strings prefixed with ASCII {@code '+'} are rejected, even though {@link
+   * Integer#parseInt(String)} accepts them.
    *
    * @param string the string representation of a long value
    * @return the long value represented by {@code string}, or {@code null} if {@code string} has a
@@ -382,8 +382,8 @@ public static Long tryParse(String string) {
    * throwing an exception if parsing fails. Additionally, this method only accepts ASCII digits,
    * and returns {@code null} if non-ASCII digits are present in the string.
    *
-   * <p>Note that strings prefixed with ASCII {@code '+'} are rejected, even under JDK 7, despite
-   * the change to {@link Long#parseLong(String, int)} for that version.
+   * <p>Note that strings prefixed with ASCII {@code '+'} are rejected, even though {@link
+   * Integer#parseInt(String)} accepts them.
    *
    * @param string the string representation of a long value
    * @param radix the radix to use when parsing

guava-testlib/src/com/google/common/collect/testing/AbstractIteratorTester.java

@@ -416,19 +416,13 @@ private <T extends Iterator<E>> void internalExecuteAndCompare(
         @SuppressWarnings("unchecked")
         E targetReturnValueFromNext = (E) targetReturnValue;
         /*
-         * We have an Iterator<E> and want to cast it to
-         * MultiExceptionListIterator. Because we're inside an
-         * AbstractIteratorTester<E>, that's implicitly a cast to
-         * AbstractIteratorTester<E>.MultiExceptionListIterator. The runtime
-         * won't be able to verify the AbstractIteratorTester<E> part, so it's
-         * an unchecked cast. We know, however, that the only possible value for
-         * the type parameter is <E>, since otherwise the
-         * MultiExceptionListIterator wouldn't be an Iterator<E>. The cast is
-         * safe, even though javac can't tell.
-         *
-         * Sun bug 6665356 is an additional complication. Until OpenJDK 7, javac
-         * doesn't recognize this kind of cast as unchecked cast. Neither does
-         * Eclipse 3.4. Right now, this suppression is mostly unnecessary.
+         * We have an Iterator<E> and want to cast it to MultiExceptionListIterator. Because we're
+         * inside an AbstractIteratorTester<E>, that's implicitly a cast to
+         * AbstractIteratorTester<E>.MultiExceptionListIterator. The runtime won't be able to verify
+         * the AbstractIteratorTester<E> part, so it's an unchecked cast. We know, however, that the
+         * only possible value for the type parameter is <E>, since otherwise the
+         * MultiExceptionListIterator wouldn't be an Iterator<E>. The cast is safe, even though
+         * javac can't tell.
          */
         @SuppressWarnings("unchecked")
         MultiExceptionListIterator multiExceptionListIterator =

guava/src/com/google/common/net/HostAndPort.java

@@ -190,7 +190,7 @@ public static HostAndPort fromString(String hostPortString) {
     int port = NO_PORT;
     if (!Strings.isNullOrEmpty(portString)) {
       // Try to parse the whole port string as a number.
-      // JDK7 accepts leading plus signs. We don't want to.
+      // Java accepts leading plus signs. We don't want to.
       checkArgument(
           !portString.startsWith("+") && CharMatcher.ascii().matchesAllOf(portString),
           "Unparseable port number: %s",

guava/src/com/google/common/primitives/Ints.java

@@ -779,8 +779,8 @@ int[] toIntArray() {
    * throwing an exception if parsing fails. Additionally, this method only accepts ASCII digits,
    * and returns {@code null} if non-ASCII digits are present in the string.
    *
-   * <p>Note that strings prefixed with ASCII {@code '+'} are rejected, even under JDK 7, despite
-   * the change to {@link Integer#parseInt(String)} for that version.
+   * <p>Note that strings prefixed with ASCII {@code '+'} are rejected, even though {@link
+   * Integer#parseInt(String)} accepts them.
    *
    * @param string the string representation of an integer value
    * @return the integer value represented by {@code string}, or {@code null} if {@code string} has
@@ -801,8 +801,8 @@ public static Integer tryParse(String string) {
    * throwing an exception if parsing fails. Additionally, this method only accepts ASCII digits,
    * and returns {@code null} if non-ASCII digits are present in the string.
    *
-   * <p>Note that strings prefixed with ASCII {@code '+'} are rejected, even under JDK 7, despite
-   * the change to {@link Integer#parseInt(String, int)} for that version.
+   * <p>Note that strings prefixed with ASCII {@code '+'} are rejected, even though {@link
+   * Integer#parseInt(String)} accepts them.
    *
    * @param string the string representation of an integer value
    * @param radix the radix to use when parsing

guava/src/com/google/common/primitives/Longs.java

@@ -362,8 +362,8 @@ static int digit(char c) {
    * an exception if parsing fails. Additionally, this method only accepts ASCII digits, and returns
    * {@code null} if non-ASCII digits are present in the string.
    *
-   * <p>Note that strings prefixed with ASCII {@code '+'} are rejected, even under JDK 7, despite
-   * the change to {@link Long#parseLong(String)} for that version.
+   * <p>Note that strings prefixed with ASCII {@code '+'} are rejected, even though {@link
+   * Integer#parseInt(String)} accepts them.
    *
    * @param string the string representation of a long value
    * @return the long value represented by {@code string}, or {@code null} if {@code string} has a
@@ -384,8 +384,8 @@ public static Long tryParse(String string) {
    * throwing an exception if parsing fails. Additionally, this method only accepts ASCII digits,
    * and returns {@code null} if non-ASCII digits are present in the string.
    *
-   * <p>Note that strings prefixed with ASCII {@code '+'} are rejected, even under JDK 7, despite
-   * the change to {@link Long#parseLong(String, int)} for that version.
+   * <p>Note that strings prefixed with ASCII {@code '+'} are rejected, even though {@link
+   * Integer#parseInt(String)} accepts them.
    *
    * @param string the string representation of a long value
    * @param radix the radix to use when parsing