stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8020539: Clean up doclint problems in java.util package, part 2

Browse Source 
Clean up doclint errors and warnings in classes in java.util

Reviewed-by: darcy, chegar
This commit is contained in:
Brian Burkhalter 2013-07-30 10:35:06 -07:00 committed by Brian Burkhalter
parent ee1343b38a
commit 0aa76a2c72
10 changed files with 145 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jdk/src/share/classes/java/util/List.java
View File

@ -384,10 +384,12 @@ public interface List<E> extends Collection<E> {
* @implSpec * @implSpec
* The default implementation is equivalent to, for this {@code list}: * The default implementation is equivalent to, for this {@code list}:
* <pre> * <pre>
* {@code
* final ListIterator<E> li = list.listIterator(); * final ListIterator<E> li = list.listIterator();
* while (li.hasNext()) { * while (li.hasNext()) {
* li.set(operator.apply(li.next())); * li.set(operator.apply(li.next()));
* } * }
* }
* </pre> * </pre>
* If the list's list-iterator does not support the {@code set} operation * If the list's list-iterator does not support the {@code set} operation
* then an {@code UnsupportedOperationException} will be thrown when * then an {@code UnsupportedOperationException} will be thrown when

1
jdk/src/share/classes/java/util/Map.java
View File

@ -561,6 +561,7 @@ public interface Map<K,V> {
* concurrency properties. * concurrency properties.
* *
* @param key the key whose associated value is to be returned * @param key the key whose associated value is to be returned
* @param defaultValue the default mapping of the key
* @return the value to which the specified key is mapped, or * @return the value to which the specified key is mapped, or
* {@code defaultValue} if this map contains no mapping for the key * {@code defaultValue} if this map contains no mapping for the key
* @throws ClassCastException if the key is of an inappropriate type for * @throws ClassCastException if the key is of an inappropriate type for

2
jdk/src/share/classes/java/util/Optional.java
View File

@ -93,6 +93,7 @@ public final class Optional<T> {
/** /**
* Returns an {@code Optional} with the specified present non-null value. * Returns an {@code Optional} with the specified present non-null value.
* *
* @param <T> the class of the value
* @param value the value to be present, which must be non-null * @param value the value to be present, which must be non-null
* @return an {@code Optional} with the value present * @return an {@code Optional} with the value present
*/ */
@ -104,6 +105,7 @@ public final class Optional<T> {
* Returns an {@code Optional} describing the specified value, if non-null, * Returns an {@code Optional} describing the specified value, if non-null,
* otherwise returns an empty {@code Optional}. * otherwise returns an empty {@code Optional}.
* *
* @param <T> the class of the value
* @param value the possibly-null value to describe * @param value the possibly-null value to describe
* @return an {@code Optional} with a present value if the specified value * @return an {@code Optional} with a present value if the specified value
* is non-null, otherwise an empty {@code Optional} * is non-null, otherwise an empty {@code Optional}

13
jdk/src/share/classes/java/util/Random.java
View File

@ -225,9 +225,8 @@ class Random implements java.io.Serializable {
* Returns the next pseudorandom, uniformly distributed {@code int} * Returns the next pseudorandom, uniformly distributed {@code int}
* value from this random number generator's sequence. The general * value from this random number generator's sequence. The general
* contract of {@code nextInt} is that one {@code int} value is * contract of {@code nextInt} is that one {@code int} value is
* pseudorandomly generated and returned. All 2<font size="-1"><sup>32 * pseudorandomly generated and returned. All 2<sup>32</sup> possible
* </sup></font> possible {@code int} values are produced with * {@code int} values are produced with (approximately) equal probability.
* (approximately) equal probability.
* *
* <p>The method {@code nextInt} is implemented by class {@code Random} * <p>The method {@code nextInt} is implemented by class {@code Random}
* as if by: * as if by:
@ -370,11 +369,9 @@ class Random implements java.io.Serializable {
* <p>The general contract of {@code nextFloat} is that one * <p>The general contract of {@code nextFloat} is that one
* {@code float} value, chosen (approximately) uniformly from the * {@code float} value, chosen (approximately) uniformly from the
* range {@code 0.0f} (inclusive) to {@code 1.0f} (exclusive), is * range {@code 0.0f} (inclusive) to {@code 1.0f} (exclusive), is
* pseudorandomly generated and returned. All 2<font * pseudorandomly generated and returned. All 2<sup>24</sup> possible
* size="-1"><sup>24</sup></font> possible {@code float} values * {@code float} values of the form <i>m&nbsp;x&nbsp;</i>2<sup>-24</sup>,
* of the form <i>m&nbsp;x&nbsp;</i>2<font * where <i>m</i> is a positive integer less than 2<sup>24</sup>, are
* size="-1"><sup>-24</sup></font>, where <i>m</i> is a positive
* integer less than 2<font size="-1"><sup>24</sup> </font>, are
* produced with (approximately) equal probability. * produced with (approximately) equal probability.
* *
* <p>The method {@code nextFloat} is implemented by class {@code Random} * <p>The method {@code nextFloat} is implemented by class {@code Random}

276
jdk/src/share/classes/java/util/Scanner.java
View File

@ -76,7 +76,7 @@ import sun.misc.LRUCache;
* }</pre></blockquote> * }</pre></blockquote>
* <p> * <p>
* prints the following output: * prints the following output:
* <blockqjote><pre>{@code * <blockquote><pre>{@code
* 1 * 1
* 2 * 2
* red * red
@ -149,8 +149,7 @@ import sun.misc.LRUCache;
* {@link #reset} method will reset the value of the scanner's radix to * {@link #reset} method will reset the value of the scanner's radix to
* <code>10</code> regardless of whether it was previously changed. * <code>10</code> regardless of whether it was previously changed.
* *
* <a name="localized-numbers"> * <h3> <a name="localized-numbers">Localized numbers</a> </h3>
* <h4> Localized numbers </h4>
* *
* <p> An instance of this class is capable of scanning numbers in the standard * <p> An instance of this class is capable of scanning numbers in the standard
* formats as well as in the formats of the scanner's locale. A scanner's * formats as well as in the formats of the scanner's locale. A scanner's
@ -167,186 +166,139 @@ import sun.misc.LRUCache;
* {@link java.text.DecimalFormatSymbols DecimalFormatSymbols} object, * {@link java.text.DecimalFormatSymbols DecimalFormatSymbols} object,
* <tt>dfs</tt>. * <tt>dfs</tt>.
* *
* <blockquote><table> * <blockquote><dl>
* <tr><td valign="top"><i>LocalGroupSeparator&nbsp;&nbsp;</i></td> * <dt><i>LocalGroupSeparator&nbsp;&nbsp;</i>
* <td valign="top">The character used to separate thousands groups, * <dd>The character used to separate thousands groups,
* <i>i.e.,</i>&nbsp;<tt>dfs.</tt>{@link * <i>i.e.,</i>&nbsp;<tt>dfs.</tt>{@link
* java.text.DecimalFormatSymbols#getGroupingSeparator * java.text.DecimalFormatSymbols#getGroupingSeparator
* getGroupingSeparator()}</td></tr> * getGroupingSeparator()}
* <tr><td valign="top"><i>LocalDecimalSeparator&nbsp;&nbsp;</i></td> * <dt><i>LocalDecimalSeparator&nbsp;&nbsp;</i>
* <td valign="top">The character used for the decimal point, * <dd>The character used for the decimal point,
* <i>i.e.,</i>&nbsp;<tt>dfs.</tt>{@link * <i>i.e.,</i>&nbsp;<tt>dfs.</tt>{@link
* java.text.DecimalFormatSymbols#getDecimalSeparator * java.text.DecimalFormatSymbols#getDecimalSeparator
* getDecimalSeparator()}</td></tr> * getDecimalSeparator()}
* <tr><td valign="top"><i>LocalPositivePrefix&nbsp;&nbsp;</i></td> * <dt><i>LocalPositivePrefix&nbsp;&nbsp;</i>
* <td valign="top">The string that appears before a positive number (may * <dd>The string that appears before a positive number (may
* be empty), <i>i.e.,</i>&nbsp;<tt>df.</tt>{@link * be empty), <i>i.e.,</i>&nbsp;<tt>df.</tt>{@link
* java.text.DecimalFormat#getPositivePrefix * java.text.DecimalFormat#getPositivePrefix
* getPositivePrefix()}</td></tr> * getPositivePrefix()}
* <tr><td valign="top"><i>LocalPositiveSuffix&nbsp;&nbsp;</i></td> * <dt><i>LocalPositiveSuffix&nbsp;&nbsp;</i>
* <td valign="top">The string that appears after a positive number (may be * <dd>The string that appears after a positive number (may be
* empty), <i>i.e.,</i>&nbsp;<tt>df.</tt>{@link * empty), <i>i.e.,</i>&nbsp;<tt>df.</tt>{@link
* java.text.DecimalFormat#getPositiveSuffix * java.text.DecimalFormat#getPositiveSuffix
* getPositiveSuffix()}</td></tr> * getPositiveSuffix()}
* <tr><td valign="top"><i>LocalNegativePrefix&nbsp;&nbsp;</i></td> * <dt><i>LocalNegativePrefix&nbsp;&nbsp;</i>
* <td valign="top">The string that appears before a negative number (may * <dd>The string that appears before a negative number (may
* be empty), <i>i.e.,</i>&nbsp;<tt>df.</tt>{@link * be empty), <i>i.e.,</i>&nbsp;<tt>df.</tt>{@link
* java.text.DecimalFormat#getNegativePrefix * java.text.DecimalFormat#getNegativePrefix
* getNegativePrefix()}</td></tr> * getNegativePrefix()}
* <tr><td valign="top"><i>LocalNegativeSuffix&nbsp;&nbsp;</i></td> * <dt><i>LocalNegativeSuffix&nbsp;&nbsp;</i>
* <td valign="top">The string that appears after a negative number (may be * <dd>The string that appears after a negative number (may be
* empty), <i>i.e.,</i>&nbsp;<tt>df.</tt>{@link * empty), <i>i.e.,</i>&nbsp;<tt>df.</tt>{@link
* java.text.DecimalFormat#getNegativeSuffix * java.text.DecimalFormat#getNegativeSuffix
* getNegativeSuffix()}</td></tr> * getNegativeSuffix()}
* <tr><td valign="top"><i>LocalNaN&nbsp;&nbsp;</i></td> * <dt><i>LocalNaN&nbsp;&nbsp;</i>
* <td valign="top">The string that represents not-a-number for * <dd>The string that represents not-a-number for
* floating-point values, * floating-point values,
* <i>i.e.,</i>&nbsp;<tt>dfs.</tt>{@link * <i>i.e.,</i>&nbsp;<tt>dfs.</tt>{@link
* java.text.DecimalFormatSymbols#getNaN * java.text.DecimalFormatSymbols#getNaN
* getNaN()}</td></tr> * getNaN()}
* <tr><td valign="top"><i>LocalInfinity&nbsp;&nbsp;</i></td> * <dt><i>LocalInfinity&nbsp;&nbsp;</i>
* <td valign="top">The string that represents infinity for floating-point * <dd>The string that represents infinity for floating-point
* values, <i>i.e.,</i>&nbsp;<tt>dfs.</tt>{@link * values, <i>i.e.,</i>&nbsp;<tt>dfs.</tt>{@link
* java.text.DecimalFormatSymbols#getInfinity * java.text.DecimalFormatSymbols#getInfinity
* getInfinity()}</td></tr> * getInfinity()}
* </table></blockquote> * </dl></blockquote>
* *
* <a name="number-syntax"> * <h4> <a name="number-syntax">Number syntax</a> </h4>
* <h4> Number syntax </h4>
* *
* <p> The strings that can be parsed as numbers by an instance of this class * <p> The strings that can be parsed as numbers by an instance of this class
* are specified in terms of the following regular-expression grammar, where * are specified in terms of the following regular-expression grammar, where
* Rmax is the highest digit in the radix being used (for example, Rmax is 9 * Rmax is the highest digit in the radix being used (for example, Rmax is 9 in base 10).
* in base 10).
* *
* <p> * <p>
* <table cellspacing=0 cellpadding=0 align=center> * <dl>
* * <dt><i>NonAsciiDigit</i>:
* <tr><td valign=top align=right><i>NonASCIIDigit</i>&nbsp;&nbsp;::</td> * <dd>A non-ASCII character c for which
* <td valign=top>= A non-ASCII character c for which
* {@link java.lang.Character#isDigit Character.isDigit}<tt>(c)</tt> * {@link java.lang.Character#isDigit Character.isDigit}<tt>(c)</tt>
* returns&nbsp;true</td></tr> * returns&nbsp;true
* *
* <tr><td>&nbsp;</td></tr> * <dt><i>Non0Digit</i>:
* <dd><tt>[1-</tt><i>Rmax</i><tt>] | </tt><i>NonASCIIDigit</i>
* *
* <tr><td align=right><i>Non0Digit</i>&nbsp;&nbsp;::</td> * <dt><i>Digit</i>:
* <td><tt>= [1-</tt><i>Rmax</i><tt>] | </tt><i>NonASCIIDigit</i></td></tr> * <dd><tt>[0-</tt><i>Rmax</i><tt>] | </tt><i>NonASCIIDigit</i>
* *
* <tr><td>&nbsp;</td></tr> * <dt><i>GroupedNumeral</i>:
* <dd><tt>(&nbsp;</tt><i>Non0Digit</i>
* <i>Digit</i><tt>?
* </tt><i>Digit</i><tt>?</tt>
* <dd>&nbsp;&nbsp;&nbsp;&nbsp;<tt>(&nbsp;</tt><i>LocalGroupSeparator</i>
* <i>Digit</i>
* <i>Digit</i>
* <i>Digit</i><tt> )+ )</tt>
* *
* <tr><td align=right><i>Digit</i>&nbsp;&nbsp;::</td> * <dt><i>Numeral</i>:
* <td><tt>= [0-</tt><i>Rmax</i><tt>] | </tt><i>NonASCIIDigit</i></td></tr> * <dd><tt>( ( </tt><i>Digit</i><tt>+ )
* | </tt><i>GroupedNumeral</i><tt> )</tt>
* *
* <tr><td>&nbsp;</td></tr> * <dt><a name="Integer-regex"><i>Integer</i>:</a>
* <dd><tt>( [-+]? ( </tt><i>Numeral</i><tt>
* ) )</tt>
* <dd><tt>| </tt><i>LocalPositivePrefix</i> <i>Numeral</i>
* <i>LocalPositiveSuffix</i>
* <dd><tt>| </tt><i>LocalNegativePrefix</i> <i>Numeral</i>
* <i>LocalNegativeSuffix</i>
* *
* <tr><td valign=top align=right><i>GroupedNumeral</i>&nbsp;&nbsp;::</td> * <dt><i>DecimalNumeral</i>:
* <td valign=top> * <dd><i>Numeral</i>
* <table cellpadding=0 cellspacing=0> * <dd><tt>| </tt><i>Numeral</i>
* <tr><td><tt>= (&nbsp;</tt></td> * <i>LocalDecimalSeparator</i>
* <td><i>Non0Digit</i><tt> * <i>Digit</i><tt>*</tt>
* </tt><i>Digit</i><tt>? * <dd><tt>| </tt><i>LocalDecimalSeparator</i>
* </tt><i>Digit</i><tt>?</tt></td></tr> * <i>Digit</i><tt>+</tt>
* <tr><td></td>
* <td><tt>(&nbsp;</tt><i>LocalGroupSeparator</i><tt>
* </tt><i>Digit</i><tt>
* </tt><i>Digit</i><tt>
* </tt><i>Digit</i><tt> )+ )</tt></td></tr>
* </table></td></tr>
* *
* <tr><td>&nbsp;</td></tr> * <dt><i>Exponent</i>:
* <dd><tt>( [eE] [+-]? </tt><i>Digit</i><tt>+ )</tt>
* *
* <tr><td align=right><i>Numeral</i>&nbsp;&nbsp;::</td> * <dt><a name="Decimal-regex"><i>Decimal</i>:</a>
* <td><tt>= ( ( </tt><i>Digit</i><tt>+ ) * <dd><tt>( [-+]? </tt><i>DecimalNumeral</i>
* | </tt><i>GroupedNumeral</i><tt> )</tt></td></tr> * <i>Exponent</i><tt>? )</tt>
* <dd><tt>| </tt><i>LocalPositivePrefix</i>
* <i>DecimalNumeral</i>
* <i>LocalPositiveSuffix</i>
* <i>Exponent</i><tt>?</tt>
* <dd><tt>| </tt><i>LocalNegativePrefix</i>
* <i>DecimalNumeral</i>
* <i>LocalNegativeSuffix</i>
* <i>Exponent</i><tt>?</tt>
* *
* <tr><td>&nbsp;</td></tr> * <dt><i>HexFloat</i>:
* <dd><tt>[-+]? 0[xX][0-9a-fA-F]*\.[0-9a-fA-F]+
* ([pP][-+]?[0-9]+)?</tt>
* *
* <tr><td valign=top align=right> * <dt><i>NonNumber</i>:
* <a name="Integer-regex"><i>Integer</i>&nbsp;&nbsp;::</td> * <dd><tt>NaN
* <td valign=top><tt>= ( [-+]? ( </tt><i>Numeral</i><tt>
* ) )</tt></td></tr>
* <tr><td></td>
* <td><tt>| </tt><i>LocalPositivePrefix</i><tt> </tt><i>Numeral</i><tt>
* </tt><i>LocalPositiveSuffix</i></td></tr>
* <tr><td></td>
* <td><tt>| </tt><i>LocalNegativePrefix</i><tt> </tt><i>Numeral</i><tt>
* </tt><i>LocalNegativeSuffix</i></td></tr>
*
* <tr><td>&nbsp;</td></tr>
*
* <tr><td align=right><i>DecimalNumeral</i>&nbsp;&nbsp;::</td>
* <td><tt>= </tt><i>Numeral</i></td></tr>
* <tr><td></td>
* <td><tt>| </tt><i>Numeral</i><tt>
* </tt><i>LocalDecimalSeparator</i><tt>
* </tt><i>Digit</i><tt>*</tt></td></tr>
* <tr><td></td>
* <td><tt>| </tt><i>LocalDecimalSeparator</i><tt>
* </tt><i>Digit</i><tt>+</tt></td></tr>
*
* <tr><td>&nbsp;</td></tr>
*
* <tr><td align=right><i>Exponent</i>&nbsp;&nbsp;::</td>
* <td><tt>= ( [eE] [+-]? </tt><i>Digit</i><tt>+ )</tt></td></tr>
*
* <tr><td>&nbsp;</td></tr>
*
* <tr><td align=right>
* <a name="Decimal-regex"><i>Decimal</i>&nbsp;&nbsp;::</td>
* <td><tt>= ( [-+]? </tt><i>DecimalNumeral</i><tt>
* </tt><i>Exponent</i><tt>? )</tt></td></tr>
* <tr><td></td>
* <td><tt>| </tt><i>LocalPositivePrefix</i><tt>
* </tt><i>DecimalNumeral</i><tt>
* </tt><i>LocalPositiveSuffix</i>
* </tt><i>Exponent</i><tt>?</td></tr>
* <tr><td></td>
* <td><tt>| </tt><i>LocalNegativePrefix</i><tt>
* </tt><i>DecimalNumeral</i><tt>
* </tt><i>LocalNegativeSuffix</i>
* </tt><i>Exponent</i><tt>?</td></tr>
*
* <tr><td>&nbsp;</td></tr>
*
* <tr><td align=right><i>HexFloat</i>&nbsp;&nbsp;::</td>
* <td><tt>= [-+]? 0[xX][0-9a-fA-F]*\.[0-9a-fA-F]+
* ([pP][-+]?[0-9]+)?</tt></td></tr>
*
* <tr><td>&nbsp;</td></tr>
*
* <tr><td align=right><i>NonNumber</i>&nbsp;&nbsp;::</td>
* <td valign=top><tt>= NaN
* | </tt><i>LocalNan</i><tt> * | </tt><i>LocalNan</i><tt>
* | Infinity * | Infinity
* | </tt><i>LocalInfinity</i></td></tr> * | </tt><i>LocalInfinity</i>
* *
* <tr><td>&nbsp;</td></tr> * <dt><i>SignedNonNumber</i>:
* <dd><tt>( [-+]? </tt><i>NonNumber</i><tt> )</tt>
* <dd><tt>| </tt><i>LocalPositivePrefix</i>
* <i>NonNumber</i>
* <i>LocalPositiveSuffix</i>
* <dd><tt>| </tt><i>LocalNegativePrefix</i>
* <i>NonNumber</i>
* <i>LocalNegativeSuffix</i>
* *
* <tr><td align=right><i>SignedNonNumber</i>&nbsp;&nbsp;::</td> * <dt><a name="Float-regex"><i>Float</i></a>:
* <td><tt>= ( [-+]? </tt><i>NonNumber</i><tt> )</tt></td></tr> * <dd><i>Decimal</i>
* <tr><td></td> * <tt>| </tt><i>HexFloat</i>
* <td><tt>| </tt><i>LocalPositivePrefix</i><tt> * <tt>| </tt><i>SignedNonNumber</i>
* </tt><i>NonNumber</i><tt>
* </tt><i>LocalPositiveSuffix</i></td></tr>
* <tr><td></td>
* <td><tt>| </tt><i>LocalNegativePrefix</i><tt>
* </tt><i>NonNumber</i><tt>
* </tt><i>LocalNegativeSuffix</i></td></tr>
* *
* <tr><td>&nbsp;</td></tr> * </dl>
* * <p>Whitespace is not significant in the above regular expressions.
* <tr><td valign=top align=right>
* <a name="Float-regex"><i>Float</i>&nbsp;&nbsp;::</td>
* <td valign=top><tt>= </tt><i>Decimal</i><tt></td></tr>
* <tr><td></td>
* <td><tt>| </tt><i>HexFloat</i><tt></td></tr>
* <tr><td></td>
* <td><tt>| </tt><i>SignedNonNumber</i><tt></td></tr>
*
* </table>
* </center>
*
* <p> Whitespace is not significant in the above regular expressions.
* *
* @since 1.5 * @since 1.5
*/ */
@ -1675,6 +1627,7 @@ public final class Scanner implements Iterator<String>, Closeable {
* <tt>findWithinHorizon(Pattern.compile(pattern, horizon))</tt>. * <tt>findWithinHorizon(Pattern.compile(pattern, horizon))</tt>.
* *
* @param pattern a string specifying the pattern to search for * @param pattern a string specifying the pattern to search for
* @param horizon the search horizon
* @return the text that matched the specified pattern * @return the text that matched the specified pattern
* @throws IllegalStateException if this scanner is closed * @throws IllegalStateException if this scanner is closed
* @throws IllegalArgumentException if horizon is negative * @throws IllegalArgumentException if horizon is negative
@ -1709,6 +1662,7 @@ public final class Scanner implements Iterator<String>, Closeable {
* thrown. * thrown.
* *
* @param pattern the pattern to scan for * @param pattern the pattern to scan for
* @param horizon the search horizon
* @return the text that matched the specified pattern * @return the text that matched the specified pattern
* @throws IllegalStateException if this scanner is closed * @throws IllegalStateException if this scanner is closed
* @throws IllegalArgumentException if horizon is negative * @throws IllegalArgumentException if horizon is negative

11
jdk/src/share/classes/java/util/ServiceLoader.java
View File

@ -68,12 +68,13 @@ import java.util.NoSuchElementException;
* *
* <p><a name="format"> A service provider is identified by placing a * <p><a name="format"> A service provider is identified by placing a
* <i>provider-configuration file</i> in the resource directory * <i>provider-configuration file</i> in the resource directory
* <tt>META-INF/services</tt>. The file's name is the fully-qualified <a * <tt>META-INF/services</tt>.</a> The file's name is the fully-qualified <a
* href="../lang/ClassLoader.html#name">binary name</a> of the service's type. * href="../lang/ClassLoader.html#name">binary name</a> of the service's type.
* The file contains a list of fully-qualified binary names of concrete * The file contains a list of fully-qualified binary names of concrete
* provider classes, one per line. Space and tab characters surrounding each * provider classes, one per line. Space and tab characters surrounding each
* name, as well as blank lines, are ignored. The comment character is * name, as well as blank lines, are ignored. The comment character is
* <tt>'#'</tt> (<tt>'&#92;u0023'</tt>, <font size="-1">NUMBER SIGN</font>); on * <tt>'#'</tt> (<tt>'&#92;u0023'</tt>,
* <font style="font-size:smaller;">NUMBER SIGN</font>); on
* each line all characters following the first comment character are ignored. * each line all characters following the first comment character are ignored.
* The file must be encoded in UTF-8. * The file must be encoded in UTF-8.
* *
@ -484,6 +485,8 @@ public final class ServiceLoader<S>
* Creates a new service loader for the given service type and class * Creates a new service loader for the given service type and class
* loader. * loader.
* *
* @param <S> the class of the service type
*
* @param service * @param service
* The interface or abstract class representing the service * The interface or abstract class representing the service
* *
@ -517,6 +520,8 @@ public final class ServiceLoader<S>
* ServiceLoader.load(<i>service</i>, * ServiceLoader.load(<i>service</i>,
* Thread.currentThread().getContextClassLoader())</pre></blockquote> * Thread.currentThread().getContextClassLoader())</pre></blockquote>
* *
* @param <S> the class of the service type
*
* @param service * @param service
* The interface or abstract class representing the service * The interface or abstract class representing the service
* *
@ -546,6 +551,8 @@ public final class ServiceLoader<S>
* have been installed into the current Java virtual machine; providers on * have been installed into the current Java virtual machine; providers on
* the application's class path will be ignored. * the application's class path will be ignored.
* *
* @param <S> the class of the service type
*
* @param service * @param service
* The interface or abstract class representing the service * The interface or abstract class representing the service
* *

1
jdk/src/share/classes/java/util/StringJoiner.java
View File

@ -202,6 +202,7 @@ public final class StringJoiner {
* @param other The {@code StringJoiner} whose contents should be merged * @param other The {@code StringJoiner} whose contents should be merged
* into this one * into this one
* @throws NullPointerException if the other {@code StringJoiner} is null * @throws NullPointerException if the other {@code StringJoiner} is null
* @return This {@code StringJoiner}
*/ */
public StringJoiner merge(StringJoiner other) { public StringJoiner merge(StringJoiner other) {
Objects.requireNonNull(other); Objects.requireNonNull(other);

14
jdk/src/share/classes/java/util/TimeZone.java
View File

@ -118,7 +118,7 @@ import sun.util.locale.provider.TimeZoneNameUtility;
* </pre></blockquote> * </pre></blockquote>
* For example, TimeZone.getTimeZone("GMT-8").getID() returns "GMT-08:00". * For example, TimeZone.getTimeZone("GMT-8").getID() returns "GMT-08:00".
* *
* <h4>Three-letter time zone IDs</h4> * <h3>Three-letter time zone IDs</h3>
* *
* For compatibility with JDK 1.1.x, some other three-letter time zone IDs * For compatibility with JDK 1.1.x, some other three-letter time zone IDs
* (such as "PST", "CTT", "AST") are also supported. However, <strong>their * (such as "PST", "CTT", "AST") are also supported. However, <strong>their
@ -304,10 +304,10 @@ abstract public class TimeZone implements Serializable, Cloneable {
* presentation to the user in the default locale. * presentation to the user in the default locale.
* *
* <p>This method is equivalent to: * <p>This method is equivalent to:
* <pre><blockquote> * <blockquote><pre>
* getDisplayName(false, {@link #LONG}, * getDisplayName(false, {@link #LONG},
* Locale.getDefault({@link Locale.Category#DISPLAY})) * Locale.getDefault({@link Locale.Category#DISPLAY}))
* </blockquote></pre> * </pre></blockquote>
* *
* @return the human-readable name of this time zone in the default locale. * @return the human-readable name of this time zone in the default locale.
* @since 1.2 * @since 1.2
@ -325,9 +325,9 @@ abstract public class TimeZone implements Serializable, Cloneable {
* presentation to the user in the specified {@code locale}. * presentation to the user in the specified {@code locale}.
* *
* <p>This method is equivalent to: * <p>This method is equivalent to:
* <pre><blockquote> * <blockquote><pre>
* getDisplayName(false, {@link #LONG}, locale) * getDisplayName(false, {@link #LONG}, locale)
* </blockquote></pre> * </pre></blockquote>
* *
* @param locale the locale in which to supply the display name. * @param locale the locale in which to supply the display name.
* @return the human-readable name of this time zone in the given locale. * @return the human-readable name of this time zone in the given locale.
@ -347,10 +347,10 @@ abstract public class TimeZone implements Serializable, Cloneable {
* Time). Otherwise, a Standard Time name is returned. * Time). Otherwise, a Standard Time name is returned.
* *
* <p>This method is equivalent to: * <p>This method is equivalent to:
* <pre><blockquote> * <blockquote><pre>
* getDisplayName(daylight, style, * getDisplayName(daylight, style,
* Locale.getDefault({@link Locale.Category#DISPLAY})) * Locale.getDefault({@link Locale.Category#DISPLAY}))
* </blockquote></pre> * </pre></blockquote>
* *
* @param daylight {@code true} specifying a Daylight Saving Time name, or * @param daylight {@code true} specifying a Daylight Saving Time name, or
* {@code false} specifying a Standard Time name * {@code false} specifying a Standard Time name

1
jdk/src/share/classes/java/util/UUID.java
View File

@ -286,6 +286,7 @@ public final class UUID implements java.io.Serializable, Comparable<UUID> {
* *
* @throws UnsupportedOperationException * @throws UnsupportedOperationException
* If this UUID is not a version 1 UUID * If this UUID is not a version 1 UUID
* @return The timestamp of this {@code UUID}.
*/ */
public long timestamp() { public long timestamp() {
if (version() != 1) { if (version() != 1) {

4
jdk/src/share/classes/java/util/Vector.java
View File

@ -45,9 +45,9 @@ import java.util.function.UnaryOperator;
* capacity of a vector before inserting a large number of * capacity of a vector before inserting a large number of
* components; this reduces the amount of incremental reallocation. * components; this reduces the amount of incremental reallocation.
* *
* <p><a name="fail-fast"/> * <p><a name="fail-fast">
* The iterators returned by this class's {@link #iterator() iterator} and * The iterators returned by this class's {@link #iterator() iterator} and
* {@link #listIterator(int) listIterator} methods are <em>fail-fast</em>: * {@link #listIterator(int) listIterator} methods are <em>fail-fast</em></a>:
* if the vector is structurally modified at any time after the iterator is * if the vector is structurally modified at any time after the iterator is
* created, in any way except through the iterator's own * created, in any way except through the iterator's own
* {@link ListIterator#remove() remove} or * {@link ListIterator#remove() remove} or