OpenJDK / jdk / jdk12
changeset 21337:b39845ce15e2
Merge
| author | mfang |
|---|---|
| date | Tue, 22 Oct 2013 14:37:40 -0700 |
| parents | 305269108873 c60dfce46a77 |
| children | ed59bead7654 |
| files | |
| diffstat | 93 files changed, 236 insertions(+), 296 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/src/share/classes/java/io/ByteArrayInputStream.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/io/ByteArrayInputStream.java Tue Oct 22 14:37:40 2013 -0700 @@ -275,7 +275,6 @@ * Closing a <tt>ByteArrayInputStream</tt> has no effect. The methods in * this class can be called after the stream has been closed without * generating an <tt>IOException</tt>. - * <p> */ public void close() throws IOException { }
--- a/jdk/src/share/classes/java/io/ByteArrayOutputStream.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/io/ByteArrayOutputStream.java Tue Oct 22 14:37:40 2013 -0700 @@ -263,8 +263,6 @@ * Closing a <tt>ByteArrayOutputStream</tt> has no effect. The methods in * this class can be called after the stream has been closed without * generating an <tt>IOException</tt>. - * <p> - * */ public void close() throws IOException { }
--- a/jdk/src/share/classes/java/io/DataInput.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/io/DataInput.java Tue Oct 22 14:37:40 2013 -0700 @@ -155,7 +155,7 @@ * to the length of {@code b}. * <p> * This method blocks until one of the - * following conditions occurs:<p> + * following conditions occurs: * <ul> * <li>{@code b.length} * bytes of input data are available, in which @@ -197,7 +197,7 @@ * <p> * This method * blocks until one of the following conditions - * occurs:<p> + * occurs: * <ul> * <li>{@code len} bytes * of input data are available, in which case @@ -316,8 +316,8 @@ * be the second byte. The value * returned * is: - * <p><pre><code>(short)((a << 8) | (b & 0xff)) - * </code></pre> + * <pre>{@code (short)((a << 8) | (b & 0xff)) + * }</pre> * This method * is suitable for reading the bytes written * by the {@code writeShort} method of @@ -337,8 +337,8 @@ * be the first byte read and * {@code b} * be the second byte. The value returned is: - * <p><pre><code>(((a & 0xff) << 8) | (b & 0xff)) - * </code></pre> + * <pre>{@code (((a & 0xff) << 8) | (b & 0xff)) + * }</pre> * This method is suitable for reading the bytes * written by the {@code writeShort} method * of interface {@code DataOutput} if @@ -359,8 +359,8 @@ * be the first byte read and {@code b} * be the second byte. The value * returned is: - * <p><pre><code>(char)((a << 8) | (b & 0xff)) - * </code></pre> + * <pre>{@code (char)((a << 8) | (b & 0xff)) + * }</pre> * This method * is suitable for reading bytes written by * the {@code writeChar} method of interface @@ -377,10 +377,10 @@ * Reads four input bytes and returns an * {@code int} value. Let {@code a-d} * be the first through fourth bytes read. The value returned is: - * <p><pre><code> - * (((a & 0xff) << 24) | ((b & 0xff) << 16) | - *  ((c & 0xff) << 8) | (d & 0xff)) - * </code></pre> + * <pre>{@code + * (((a & 0xff) << 24) | ((b & 0xff) << 16) | + * ((c & 0xff) << 8) | (d & 0xff)) + * }</pre> * This method is suitable * for reading bytes written by the {@code writeInt} * method of interface {@code DataOutput}. @@ -397,16 +397,16 @@ * a {@code long} value. Let {@code a-h} * be the first through eighth bytes read. * The value returned is: - * <p><pre><code> - * (((long)(a & 0xff) << 56) | - * ((long)(b & 0xff) << 48) | - * ((long)(c & 0xff) << 40) | - * ((long)(d & 0xff) << 32) | - * ((long)(e & 0xff) << 24) | - * ((long)(f & 0xff) << 16) | - * ((long)(g & 0xff) << 8) | - * ((long)(h & 0xff))) - * </code></pre> + * <pre>{@code + * (((long)(a & 0xff) << 56) | + * ((long)(b & 0xff) << 48) | + * ((long)(c & 0xff) << 40) | + * ((long)(d & 0xff) << 32) | + * ((long)(e & 0xff) << 24) | + * ((long)(f & 0xff) << 16) | + * ((long)(g & 0xff) << 8) | + * ((long)(h & 0xff))) + * }</pre> * <p> * This method is suitable * for reading bytes written by the {@code writeLong} @@ -540,9 +540,9 @@ * not match the bit pattern {@code 10xxxxxx}, * then a {@code UTFDataFormatException} * is thrown. Otherwise, the group is converted - * to the character:<p> - * <pre><code>(char)(((a& 0x1F) << 6) | (b & 0x3F)) - * </code></pre> + * to the character: + * <pre>{@code (char)(((a & 0x1F) << 6) | (b & 0x3F)) + * }</pre> * If the first byte of a group * matches the bit pattern {@code 1110xxxx}, * then the group consists of that byte {@code a} @@ -554,10 +554,10 @@ * does not match the bit pattern {@code 10xxxxxx}, * then a {@code UTFDataFormatException} * is thrown. Otherwise, the group is converted - * to the character:<p> - * <pre><code> - * (char)(((a & 0x0F) << 12) | ((b & 0x3F) << 6) | (c & 0x3F)) - * </code></pre> + * to the character: + * <pre>{@code + * (char)(((a & 0x0F) << 12) | ((b & 0x3F) << 6) | (c & 0x3F)) + * }</pre> * If the first byte of a group matches the * pattern {@code 1111xxxx} or the pattern * {@code 10xxxxxx}, then a {@code UTFDataFormatException}
--- a/jdk/src/share/classes/java/io/DataOutput.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/io/DataOutput.java Tue Oct 22 14:37:40 2013 -0700 @@ -134,11 +134,11 @@ * Writes two bytes to the output * stream to represent the value of the argument. * The byte values to be written, in the order - * shown, are: <p> - * <pre><code> - * (byte)(0xff & (v >> 8)) - * (byte)(0xff & v) - * </code> </pre> <p> + * shown, are: + * <pre>{@code + * (byte)(0xff & (v >> 8)) + * (byte)(0xff & v) + * }</pre> <p> * The bytes written by this method may be * read by the <code>readShort</code> method * of interface <code>DataInput</code> , which @@ -156,10 +156,10 @@ * output stream. * The byte values to be written, in the order * shown, are: - * <p><pre><code> - * (byte)(0xff & (v >> 8)) - * (byte)(0xff & v) - * </code></pre><p> + * <pre>{@code + * (byte)(0xff & (v >> 8)) + * (byte)(0xff & v) + * }</pre><p> * The bytes written by this method may be * read by the <code>readChar</code> method * of interface <code>DataInput</code> , which @@ -176,12 +176,12 @@ * comprised of four bytes, to the output stream. * The byte values to be written, in the order * shown, are: - * <p><pre><code> - * (byte)(0xff & (v >> 24)) - * (byte)(0xff & (v >> 16)) - * (byte)(0xff & (v >>    8)) - * (byte)(0xff & v) - * </code></pre><p> + * <pre>{@code + * (byte)(0xff & (v >> 24)) + * (byte)(0xff & (v >> 16)) + * (byte)(0xff & (v >> 8)) + * (byte)(0xff & v) + * }</pre><p> * The bytes written by this method may be read * by the <code>readInt</code> method of interface * <code>DataInput</code> , which will then @@ -197,16 +197,16 @@ * comprised of eight bytes, to the output stream. * The byte values to be written, in the order * shown, are: - * <p><pre><code> - * (byte)(0xff & (v >> 56)) - * (byte)(0xff & (v >> 48)) - * (byte)(0xff & (v >> 40)) - * (byte)(0xff & (v >> 32)) - * (byte)(0xff & (v >> 24)) - * (byte)(0xff & (v >> 16)) - * (byte)(0xff & (v >> 8)) - * (byte)(0xff & v) - * </code></pre><p> + * <pre>{@code + * (byte)(0xff & (v >> 56)) + * (byte)(0xff & (v >> 48)) + * (byte)(0xff & (v >> 40)) + * (byte)(0xff & (v >> 32)) + * (byte)(0xff & (v >> 24)) + * (byte)(0xff & (v >> 16)) + * (byte)(0xff & (v >> 8)) + * (byte)(0xff & v) + * }</pre><p> * The bytes written by this method may be * read by the <code>readLong</code> method * of interface <code>DataInput</code> , which @@ -314,24 +314,24 @@ * If a character <code>c</code> * is in the range <code>\u0001</code> through * <code>\u007f</code>, it is represented - * by one byte:<p> + * by one byte: * <pre>(byte)c </pre> <p> * If a character <code>c</code> is <code>\u0000</code> * or is in the range <code>\u0080</code> * through <code>\u07ff</code>, then it is * represented by two bytes, to be written - * in the order shown:<p> <pre><code> - * (byte)(0xc0 | (0x1f & (c >> 6))) - * (byte)(0x80 | (0x3f & c)) - * </code></pre> <p> If a character + * in the order shown: <pre>{@code + * (byte)(0xc0 | (0x1f & (c >> 6))) + * (byte)(0x80 | (0x3f & c)) + * }</pre> <p> If a character * <code>c</code> is in the range <code>\u0800</code> * through <code>uffff</code>, then it is * represented by three bytes, to be written - * in the order shown:<p> <pre><code> - * (byte)(0xe0 | (0x0f & (c >> 12))) - * (byte)(0x80 | (0x3f & (c >> 6))) - * (byte)(0x80 | (0x3f & c)) - * </code></pre> <p> First, + * in the order shown: <pre>{@code + * (byte)(0xe0 | (0x0f & (c >> 12))) + * (byte)(0x80 | (0x3f & (c >> 6))) + * (byte)(0x80 | (0x3f & c)) + * }</pre> <p> First, * the total number of bytes needed to represent * all the characters of <code>s</code> is * calculated. If this number is larger than
--- a/jdk/src/share/classes/java/io/FilePermission.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/io/FilePermission.java Tue Oct 22 14:37:40 2013 -0700 @@ -55,7 +55,7 @@ * a list of one or more comma-separated keywords. The possible keywords are * "read", "write", "execute", "delete", and "readlink". Their meaning is * defined as follows: - * <P> + * * <DL> * <DT> read <DD> read permission * <DT> write <DD> write permission @@ -297,11 +297,11 @@ /** * Checks if this FilePermission object "implies" the specified permission. * <P> - * More specifically, this method returns true if:<p> + * More specifically, this method returns true if: * <ul> - * <li> <i>p</i> is an instanceof FilePermission,<p> + * <li> <i>p</i> is an instanceof FilePermission, * <li> <i>p</i>'s actions are a proper subset of this - * object's actions, and <p> + * object's actions, and * <li> <i>p</i>'s pathname is implied by this object's * pathname. For example, "/tmp/*" implies "/tmp/foo", since * "/tmp/*" encompasses all files in the "/tmp" directory,
--- a/jdk/src/share/classes/java/io/InputStream.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/io/InputStream.java Tue Oct 22 14:37:40 2013 -0700 @@ -306,8 +306,7 @@ * * <p> The general contract of <code>reset</code> is: * - * <p><ul> - * + * <ul> * <li> If the method <code>markSupported</code> returns * <code>true</code>, then: *
--- a/jdk/src/share/classes/java/io/ObjectInputStream.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/io/ObjectInputStream.java Tue Oct 22 14:37:40 2013 -0700 @@ -109,7 +109,7 @@ * * <p>Serializable classes that require special handling during the * serialization and deserialization process should implement the following - * methods:<p> + * methods: * * <pre> * private void writeObject(java.io.ObjectOutputStream stream)
--- a/jdk/src/share/classes/java/io/PipedInputStream.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/io/PipedInputStream.java Tue Oct 22 14:37:40 2013 -0700 @@ -172,15 +172,14 @@ * unconnected piped output stream and <code>snk</code> * is an unconnected piped input stream, they * may be connected by either the call: - * <p> + * * <pre><code>snk.connect(src)</code> </pre> * <p> * or the call: - * <p> + * * <pre><code>src.connect(snk)</code> </pre> * <p> - * The two - * calls have the same effect. + * The two calls have the same effect. * * @param src The piped output stream to connect to. * @exception IOException if an I/O error occurs.
--- a/jdk/src/share/classes/java/io/PipedReader.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/io/PipedReader.java Tue Oct 22 14:37:40 2013 -0700 @@ -145,15 +145,14 @@ * unconnected piped writer and <code>snk</code> * is an unconnected piped reader, they * may be connected by either the call: - * <p> + * * <pre><code>snk.connect(src)</code> </pre> * <p> * or the call: - * <p> + * * <pre><code>src.connect(snk)</code> </pre> * <p> - * The two - * calls have the same effect. + * The two calls have the same effect. * * @param src The piped writer to connect to. * @exception IOException if an I/O error occurs.
--- a/jdk/src/share/classes/java/io/RandomAccessFile.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/io/RandomAccessFile.java Tue Oct 22 14:37:40 2013 -0700 @@ -784,7 +784,7 @@ * </pre></blockquote> * <p> * then the result is equal to: - * <p><blockquote><pre> + * <blockquote><pre> * ((long)b1 << 56) + ((long)b2 << 48) * + ((long)b3 << 40) + ((long)b4 << 32) * + ((long)b5 << 24) + ((long)b6 << 16)
--- a/jdk/src/share/classes/java/io/Serializable.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/io/Serializable.java Tue Oct 22 14:37:40 2013 -0700 @@ -55,7 +55,7 @@ * * Classes that require special handling during the serialization and * deserialization process must implement special methods with these exact - * signatures: <p> + * signatures: * * <PRE> * private void writeObject(java.io.ObjectOutputStream out) @@ -101,7 +101,7 @@ * * <p>Serializable classes that need to designate an alternative object to be * used when writing an object to the stream should implement this - * special method with the exact signature: <p> + * special method with the exact signature: * * <PRE> * ANY-ACCESS-MODIFIER Object writeReplace() throws ObjectStreamException; @@ -115,7 +115,7 @@ * * Classes that need to designate a replacement when an instance of it * is read from the stream should implement this special method with the - * exact signature.<p> + * exact signature. * * <PRE> * ANY-ACCESS-MODIFIER Object readResolve() throws ObjectStreamException; @@ -133,7 +133,7 @@ * deserialization will result in an {@link InvalidClassException}. A * serializable class can declare its own serialVersionUID explicitly by * declaring a field named <code>"serialVersionUID"</code> that must be static, - * final, and of type <code>long</code>:<p> + * final, and of type <code>long</code>: * * <PRE> * ANY-ACCESS-MODIFIER static final long serialVersionUID = 42L;
--- a/jdk/src/share/classes/java/io/SerializablePermission.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/io/SerializablePermission.java Tue Oct 22 14:37:40 2013 -0700 @@ -43,7 +43,6 @@ * The following table lists all the possible SerializablePermission target names, * and for each provides a description of what the permission allows * and a discussion of the risks of granting code the permission. - * <P> * * <table border=1 cellpadding=5 summary="Permission target name, what the permission allows, and associated risks"> * <tr>
--- a/jdk/src/share/classes/java/lang/AbstractStringBuilder.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/lang/AbstractStringBuilder.java Tue Oct 22 14:37:40 2013 -0700 @@ -330,9 +330,9 @@ * characters to be copied is {@code srcEnd-srcBegin}. The * characters are copied into the subarray of {@code dst} starting * at index {@code dstBegin} and ending at index: - * <p><blockquote><pre> + * <pre>{@code * dstbegin + (srcEnd-srcBegin) - 1 - * </pre></blockquote> + * }</pre> * * @param srcBegin start copying at this offset. * @param srcEnd stop copying at this offset. @@ -859,16 +859,16 @@ * * <p> An invocation of this method of the form * - * <blockquote><pre> - * sb.subSequence(begin, end)</pre></blockquote> + * <pre>{@code + * sb.subSequence(begin, end)}</pre> * * behaves in exactly the same way as the invocation * - * <blockquote><pre> - * sb.substring(begin, end)</pre></blockquote> + * <pre>{@code + * sb.substring(begin, end)}</pre> * * This method is provided so that this class can - * implement the {@link CharSequence} interface. </p> + * implement the {@link CharSequence} interface. * * @param start the start index, inclusive. * @param end the end index, exclusive. @@ -1287,9 +1287,9 @@ * Returns the index within this string of the first occurrence of the * specified substring. The integer returned is the smallest value * <i>k</i> such that: - * <blockquote><pre> + * <pre>{@code * this.toString().startsWith(str, <i>k</i>) - * </pre></blockquote> + * }</pre> * is {@code true}. * * @param str any string. @@ -1306,10 +1306,10 @@ * Returns the index within this string of the first occurrence of the * specified substring, starting at the specified index. The integer * returned is the smallest value {@code k} for which: - * <blockquote><pre> + * <pre>{@code * k >= Math.min(fromIndex, this.length()) && * this.toString().startsWith(str, k) - * </pre></blockquote> + * }</pre> * If no such value of <i>k</i> exists, then -1 is returned. * * @param str the substring for which to search. @@ -1326,9 +1326,9 @@ * of the specified substring. The rightmost empty string "" is * considered to occur at the index value {@code this.length()}. * The returned index is the largest value <i>k</i> such that - * <blockquote><pre> + * <pre>{@code * this.toString().startsWith(str, k) - * </pre></blockquote> + * }</pre> * is true. * * @param str the substring to search for. @@ -1345,10 +1345,10 @@ * Returns the index within this string of the last occurrence of the * specified substring. The integer returned is the largest value <i>k</i> * such that: - * <blockquote><pre> + * <pre>{@code * k <= Math.min(fromIndex, this.length()) && * this.toString().startsWith(str, k) - * </pre></blockquote> + * }</pre> * If no such value of <i>k</i> exists, then -1 is returned. * * @param str the substring to search for.
--- a/jdk/src/share/classes/java/lang/ArrayStoreException.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/lang/ArrayStoreException.java Tue Oct 22 14:37:40 2013 -0700 @@ -29,7 +29,7 @@ * Thrown to indicate that an attempt has been made to store the * wrong type of object into an array of objects. For example, the * following code generates an <code>ArrayStoreException</code>: - * <p><blockquote><pre> + * <blockquote><pre> * Object x[] = new String[3]; * x[0] = new Integer(0); * </pre></blockquote>
--- a/jdk/src/share/classes/java/lang/Byte.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/lang/Byte.java Tue Oct 22 14:37:40 2013 -0700 @@ -244,7 +244,7 @@ * <dd><i>Sign<sub>opt</sub></i> {@code 0X} <i>HexDigits</i> * <dd><i>Sign<sub>opt</sub></i> {@code #} <i>HexDigits</i> * <dd><i>Sign<sub>opt</sub></i> {@code 0} <i>OctalDigits</i> - * <p> + * * <dt><i>Sign:</i> * <dd>{@code -} * <dd>{@code +}
--- a/jdk/src/share/classes/java/lang/Character.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/lang/Character.java Tue Oct 22 14:37:40 2013 -0700 @@ -5394,7 +5394,7 @@ * Other_Lowercase as defined by the Unicode Standard. * <p> * The following are examples of lowercase characters: - * <p><blockquote><pre> + * <blockquote><pre> * a b c d e f g h i j k l m n o p q r s t u v w x y z * '\u00DF' '\u00E0' '\u00E1' '\u00E2' '\u00E3' '\u00E4' '\u00E5' '\u00E6' * '\u00E7' '\u00E8' '\u00E9' '\u00EA' '\u00EB' '\u00EC' '\u00ED' '\u00EE' @@ -5430,7 +5430,7 @@ * Other_Lowercase as defined by the Unicode Standard. * <p> * The following are examples of lowercase characters: - * <p><blockquote><pre> + * <blockquote><pre> * a b c d e f g h i j k l m n o p q r s t u v w x y z * '\u00DF' '\u00E0' '\u00E1' '\u00E2' '\u00E3' '\u00E4' '\u00E5' '\u00E6' * '\u00E7' '\u00E8' '\u00E9' '\u00EA' '\u00EB' '\u00EC' '\u00ED' '\u00EE' @@ -5461,14 +5461,14 @@ * or it has contributory property Other_Uppercase as defined by the Unicode Standard. * <p> * The following are examples of uppercase characters: - * <p><blockquote><pre> + * <blockquote><pre> * A B C D E F G H I J K L M N O P Q R S T U V W X Y Z * '\u00C0' '\u00C1' '\u00C2' '\u00C3' '\u00C4' '\u00C5' '\u00C6' '\u00C7' * '\u00C8' '\u00C9' '\u00CA' '\u00CB' '\u00CC' '\u00CD' '\u00CE' '\u00CF' * '\u00D0' '\u00D1' '\u00D2' '\u00D3' '\u00D4' '\u00D5' '\u00D6' '\u00D8' * '\u00D9' '\u00DA' '\u00DB' '\u00DC' '\u00DD' '\u00DE' * </pre></blockquote> - * <p> Many other Unicode characters are uppercase too.<p> + * <p> Many other Unicode characters are uppercase too. * * <p><b>Note:</b> This method cannot handle <a * href="#supplementary"> supplementary characters</a>. To support @@ -5496,7 +5496,7 @@ * or it has contributory property Other_Uppercase as defined by the Unicode Standard. * <p> * The following are examples of uppercase characters: - * <p><blockquote><pre> + * <blockquote><pre> * A B C D E F G H I J K L M N O P Q R S T U V W X Y Z * '\u00C0' '\u00C1' '\u00C2' '\u00C3' '\u00C4' '\u00C5' '\u00C6' '\u00C7' * '\u00C8' '\u00C9' '\u00CA' '\u00CB' '\u00CC' '\u00CD' '\u00CE' '\u00CF' @@ -5540,7 +5540,7 @@ * <li>{@code LATIN CAPITAL LETTER N WITH SMALL LETTER J} * <li>{@code LATIN CAPITAL LETTER D WITH SMALL LETTER Z} * </ul> - * <p> Many other Unicode characters are titlecase too.<p> + * <p> Many other Unicode characters are titlecase too. * * <p><b>Note:</b> This method cannot handle <a * href="#supplementary"> supplementary characters</a>. To support
--- a/jdk/src/share/classes/java/lang/Class.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/lang/Class.java Tue Oct 22 14:37:40 2013 -0700 @@ -91,7 +91,7 @@ * <p> The following example uses a {@code Class} object to print the * class name of an object: * - * <p> <blockquote><pre> + * <blockquote><pre> * void printClassName(Object obj) { * System.out.println("The class of " + obj + * " is " + obj.getClass().getName()); @@ -103,7 +103,7 @@ * <cite>The Java™ Language Specification</cite>. * For example: * - * <p> <blockquote> + * <blockquote> * {@code System.out.println("The name of class Foo is: "+Foo.class.getName());} * </blockquote> *
--- a/jdk/src/share/classes/java/lang/ClassCastException.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/lang/ClassCastException.java Tue Oct 22 14:37:40 2013 -0700 @@ -29,7 +29,7 @@ * Thrown to indicate that the code has attempted to cast an object * to a subclass of which it is not an instance. For example, the * following code generates a <code>ClassCastException</code>: - * <p><blockquote><pre> + * <blockquote><pre> * Object x = new Integer(0); * System.out.println((String)x); * </pre></blockquote>
--- a/jdk/src/share/classes/java/lang/Double.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/lang/Double.java Tue Oct 22 14:37:40 2013 -0700 @@ -361,15 +361,11 @@ * <dd><i>SignedInteger</i> * </dl> * - * <p> - * * <dl> * <dt><i>HexFloatingPointLiteral</i>: * <dd> <i>HexSignificand BinaryExponent FloatTypeSuffix<sub>opt</sub></i> * </dl> * - * <p> - * * <dl> * <dt><i>HexSignificand:</i> * <dd><i>HexNumeral</i> @@ -380,15 +376,11 @@ * </i>{@code .} <i>HexDigits</i> * </dl> * - * <p> - * * <dl> * <dt><i>BinaryExponent:</i> * <dd><i>BinaryExponentIndicator SignedInteger</i> * </dl> * - * <p> - * * <dl> * <dt><i>BinaryExponentIndicator:</i> * <dd>{@code p}
--- a/jdk/src/share/classes/java/lang/Float.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/lang/Float.java Tue Oct 22 14:37:40 2013 -0700 @@ -321,15 +321,11 @@ * <dd><i>SignedInteger</i> * </dl> * - * <p> - * * <dl> * <dt><i>HexFloatingPointLiteral</i>: * <dd> <i>HexSignificand BinaryExponent FloatTypeSuffix<sub>opt</sub></i> * </dl> * - * <p> - * * <dl> * <dt><i>HexSignificand:</i> * <dd><i>HexNumeral</i> @@ -340,15 +336,11 @@ * </i>{@code .} <i>HexDigits</i> * </dl> * - * <p> - * * <dl> * <dt><i>BinaryExponent:</i> * <dd><i>BinaryExponentIndicator SignedInteger</i> * </dl> * - * <p> - * * <dl> * <dt><i>BinaryExponentIndicator:</i> * <dd>{@code p}
--- a/jdk/src/share/classes/java/lang/Integer.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/lang/Integer.java Tue Oct 22 14:37:40 2013 -0700 @@ -1123,7 +1123,7 @@ * <dd><i>Sign<sub>opt</sub></i> {@code 0X} <i>HexDigits</i> * <dd><i>Sign<sub>opt</sub></i> {@code #} <i>HexDigits</i> * <dd><i>Sign<sub>opt</sub></i> {@code 0} <i>OctalDigits</i> - * <p> + * * <dt><i>Sign:</i> * <dd>{@code -} * <dd>{@code +}
--- a/jdk/src/share/classes/java/lang/Iterable.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/lang/Iterable.java Tue Oct 22 14:37:40 2013 -0700 @@ -99,4 +99,3 @@ return Spliterators.spliteratorUnknownSize(iterator(), 0); } } -
--- a/jdk/src/share/classes/java/lang/Long.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/lang/Long.java Tue Oct 22 14:37:40 2013 -0700 @@ -853,7 +853,7 @@ * <dd><i>Sign<sub>opt</sub></i> {@code 0X} <i>HexDigits</i> * <dd><i>Sign<sub>opt</sub></i> {@code #} <i>HexDigits</i> * <dd><i>Sign<sub>opt</sub></i> {@code 0} <i>OctalDigits</i> - * <p> + * * <dt><i>Sign:</i> * <dd>{@code -} * <dd>{@code +}
--- a/jdk/src/share/classes/java/lang/RuntimePermission.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/lang/RuntimePermission.java Tue Oct 22 14:37:40 2013 -0700 @@ -47,7 +47,6 @@ * The following table lists all the possible RuntimePermission target names, * and for each provides a description of what the permission allows * and a discussion of the risks of granting code the permission. - * <P> * * <table border=1 cellpadding=5 summary="permission target name, * what the target allows,and associated risks">
--- a/jdk/src/share/classes/java/lang/Short.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/lang/Short.java Tue Oct 22 14:37:40 2013 -0700 @@ -249,7 +249,7 @@ * <dd><i>Sign<sub>opt</sub></i> {@code 0X} <i>HexDigits</i> * <dd><i>Sign<sub>opt</sub></i> {@code #} <i>HexDigits</i> * <dd><i>Sign<sub>opt</sub></i> {@code 0} <i>OctalDigits</i> - * <p> + * * <dt><i>Sign:</i> * <dd>{@code -} * <dd>{@code +}
--- a/jdk/src/share/classes/java/lang/String.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/lang/String.java Tue Oct 22 14:37:40 2013 -0700 @@ -47,16 +47,16 @@ * Strings are constant; their values cannot be changed after they * are created. String buffers support mutable strings. * Because String objects are immutable they can be shared. For example: - * <p><blockquote><pre> + * <blockquote><pre> * String str = "abc"; * </pre></blockquote><p> * is equivalent to: - * <p><blockquote><pre> + * <blockquote><pre> * char data[] = {'a', 'b', 'c'}; * String str = new String(data); * </pre></blockquote><p> * Here are some more examples of how strings can be used: - * <p><blockquote><pre> + * <blockquote><pre> * System.out.println("abc"); * String cde = "cde"; * System.out.println("abc" + cde); @@ -786,7 +786,7 @@ * {@code srcEnd-srcBegin}). The characters are copied into the * subarray of {@code dst} starting at index {@code dstBegin} * and ending at index: - * <p><blockquote><pre> + * <blockquote><pre> * dstbegin + (srcEnd-srcBegin) - 1 * </pre></blockquote> * @@ -2662,7 +2662,7 @@ * {@code String} may be a different length than the original {@code String}. * <p> * Examples of locale-sensitive and 1:M case mappings are in the following table. - * <p> + * * <table border="1" summary="Examples of locale-sensitive and 1:M case mappings. Shows Language code of locale, lower case, upper case, and description."> * <tr> * <th>Language Code of Locale</th>
--- a/jdk/src/share/classes/java/lang/Thread.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/lang/Thread.java Tue Oct 22 14:37:40 2013 -0700 @@ -76,7 +76,7 @@ * <code>Thread</code>. An instance of the subclass can then be * allocated and started. For example, a thread that computes primes * larger than a stated value could be written as follows: - * <p><hr><blockquote><pre> + * <hr><blockquote><pre> * class PrimeThread extends Thread { * long minPrime; * PrimeThread(long minPrime) { @@ -91,7 +91,7 @@ * </pre></blockquote><hr> * <p> * The following code would then create a thread and start it running: - * <p><blockquote><pre> + * <blockquote><pre> * PrimeThread p = new PrimeThread(143); * p.start(); * </pre></blockquote> @@ -102,7 +102,7 @@ * then be allocated, passed as an argument when creating * <code>Thread</code>, and started. The same example in this other * style looks like the following: - * <p><hr><blockquote><pre> + * <hr><blockquote><pre> * class PrimeRun implements Runnable { * long minPrime; * PrimeRun(long minPrime) { @@ -117,7 +117,7 @@ * </pre></blockquote><hr> * <p> * The following code would then create a thread and start it running: - * <p><blockquote><pre> + * <blockquote><pre> * PrimeRun p = new PrimeRun(143); * new Thread(p).start(); * </pre></blockquote>
--- a/jdk/src/share/classes/java/lang/management/ManagementFactory.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/lang/management/ManagementFactory.java Tue Oct 22 14:37:40 2013 -0700 @@ -60,7 +60,7 @@ * one or more <i>platform MXBeans</i> representing * the management interface of a component of the Java virtual * machine. - * <p> + * * <h3><a name="MXBean">Platform MXBeans</a></h3> * <p> * A platform MXBean is a <i>managed bean</i> that
--- a/jdk/src/share/classes/java/lang/management/ManagementPermission.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/lang/management/ManagementPermission.java Tue Oct 22 14:37:40 2013 -0700 @@ -33,10 +33,8 @@ * The following table * provides a summary description of what the permission allows, * and discusses the risks of granting code the permission. - * <P> * - * <table border=1 cellpadding=5 summary="Table shows permission target name, wh -at the permission allows, and associated risks"> + * <table border=1 cellpadding=5 summary="Table shows permission target name, what the permission allows, and associated risks"> * <tr> * <th>Permission Target Name</th> * <th>What the Permission Allows</th>
--- a/jdk/src/share/classes/java/lang/management/MemoryUsage.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/lang/management/MemoryUsage.java Tue Oct 22 14:37:40 2013 -0700 @@ -79,7 +79,7 @@ * </table> * * Below is a picture showing an example of a memory pool: - * <p> + * * <pre> * +----------------------------------------------+ * +//////////////// | + @@ -250,7 +250,7 @@ * Returns a <tt>MemoryUsage</tt> object represented by the * given <tt>CompositeData</tt>. The given <tt>CompositeData</tt> * must contain the following attributes: - * <p> + * * <blockquote> * <table border summary="The attributes and the types the given CompositeData contains"> * <tr>
--- a/jdk/src/share/classes/java/lang/management/package.html Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/lang/management/package.html Tue Oct 22 14:37:40 2013 -0700 @@ -82,7 +82,7 @@ <b>1. Direct access to an MXBean interface</b> <p> <ul> -<li>Get an MXBean instance locally in the running Java virtual machine:<p> +<li>Get an MXBean instance locally in the running Java virtual machine: <pre> RuntimeMXBean mxbean = ManagementFactory.getRuntimeMXBean(); @@ -103,7 +103,7 @@ <p> </li> <li>Construct an MXBean proxy instance that forwards the - method calls to a given MBeanServer:<p> + method calls to a given MBeanServer: <pre> MBeanServerConnection mbs;
--- a/jdk/src/share/classes/java/lang/reflect/ReflectPermission.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/lang/reflect/ReflectPermission.java Tue Oct 22 14:37:40 2013 -0700 @@ -31,7 +31,6 @@ * The following table * provides a summary description of what the permission allows, * and discusses the risks of granting code the permission. - * <P> * * <table border=1 cellpadding=5 summary="Table shows permission target name, what the permission allows, and associated risks"> * <tr>
--- a/jdk/src/share/classes/java/net/DatagramSocket.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/net/DatagramSocket.java Tue Oct 22 14:37:40 2013 -0700 @@ -196,7 +196,7 @@ * socket address. * <p> * If, if the address is {@code null}, creates an unbound socket. - * <p> + * * <p>If there is a security manager, * its {@code checkListen} method is first called * with the port from the socket address @@ -1109,7 +1109,7 @@ * represent the value of the TOS octet in IP packets sent by * the socket. * RFC 1349 defines the TOS values as follows: - * <p> + * * <UL> * <LI><CODE>IPTOS_LOWCOST (0x02)</CODE></LI> * <LI><CODE>IPTOS_RELIABILITY (0x04)</CODE></LI>
--- a/jdk/src/share/classes/java/net/Inet6Address.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/net/Inet6Address.java Tue Oct 22 14:37:40 2013 -0700 @@ -133,7 +133,7 @@ * representation. However, it will be converted into an IPv4 * address.</td></tr> * </table></blockquote> - * <p> + * * <h4><A NAME="scoped">Textual representation of IPv6 scoped addresses</a></h4> * * <p> The textual representation of IPv6 addresses as described above can be @@ -150,11 +150,11 @@ * * <p> The general format for specifying the <i>scope_id</i> is the following: * - * <p><blockquote><i>IPv6-address</i>%<i>scope_id</i></blockquote> + * <blockquote><i>IPv6-address</i>%<i>scope_id</i></blockquote> * <p> The IPv6-address is a literal IPv6 address as described above. * The <i>scope_id</i> refers to an interface on the local system, and it can be * specified in two ways. - * <p><ol><li><i>As a numeric identifier.</i> This must be a positive integer + * <ol><li><i>As a numeric identifier.</i> This must be a positive integer * that identifies the particular interface and scope as understood by the * system. Usually, the numeric values can be determined through administration * tools on the system. Each interface may have multiple values, one for each
--- a/jdk/src/share/classes/java/net/MulticastSocket.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/net/MulticastSocket.java Tue Oct 22 14:37:40 2013 -0700 @@ -140,7 +140,7 @@ * Create a MulticastSocket bound to the specified socket address. * <p> * Or, if the address is {@code null}, create an unbound socket. - * <p> + * * <p>If there is a security manager, * its {@code checkListen} method is first called * with the SocketAddress port as its argument to ensure the operation is allowed.
--- a/jdk/src/share/classes/java/net/NetPermission.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/net/NetPermission.java Tue Oct 22 14:37:40 2013 -0700 @@ -46,7 +46,6 @@ * The following table lists all the possible NetPermission target names, * and for each provides a description of what the permission allows * and a discussion of the risks of granting code the permission. - * <P> * * <table border=1 cellpadding=5 summary="Permission target name, what the permission allows, and associated risks"> * <tr>
--- a/jdk/src/share/classes/java/net/Proxy.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/net/Proxy.java Tue Oct 22 14:37:40 2013 -0700 @@ -66,8 +66,8 @@ * Used, for instance, to create sockets bypassing any other global * proxy settings (like SOCKS): * <P> - * {@code Socket s = new Socket(Proxy.NO_PROXY);}<br> - * <P> + * {@code Socket s = new Socket(Proxy.NO_PROXY);} + * */ public final static Proxy NO_PROXY = new Proxy();
--- a/jdk/src/share/classes/java/net/Socket.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/net/Socket.java Tue Oct 22 14:37:40 2013 -0700 @@ -1230,13 +1230,13 @@ * Generally, the window size can be modified at any time when a socket is * connected. However, if a receive window larger than 64K is required then * this must be requested <B>before</B> the socket is connected to the - * remote peer. There are two cases to be aware of:<p> + * remote peer. There are two cases to be aware of: * <ol> * <li>For sockets accepted from a ServerSocket, this must be done by calling * {@link ServerSocket#setReceiveBufferSize(int)} before the ServerSocket * is bound to a local address.<p></li> * <li>For client sockets, setReceiveBufferSize() must be called before - * connecting the socket to its remote peer.<p></li></ol> + * connecting the socket to its remote peer.</li></ol> * @param size the size to which to set the receive buffer * size. This value must be greater than 0. * @@ -1329,7 +1329,7 @@ * represent the value of the TOS octet in IP packets sent by * the socket. * RFC 1349 defines the TOS values as follows: - * <p> + * * <UL> * <LI><CODE>IPTOS_LOWCOST (0x02)</CODE></LI> * <LI><CODE>IPTOS_RELIABILITY (0x04)</CODE></LI>
--- a/jdk/src/share/classes/java/net/SocketOptions.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/net/SocketOptions.java Tue Oct 22 14:37:40 2013 -0700 @@ -134,7 +134,7 @@ * previously written data. *<P> * Valid for TCP only: SocketImpl. - * <P> + * * @see Socket#setTcpNoDelay * @see Socket#getTcpNoDelay */ @@ -155,7 +155,7 @@ * This option <B>must</B> be specified in the constructor. * <P> * Valid for: SocketImpl, DatagramSocketImpl - * <P> + * * @see Socket#getLocalAddress * @see DatagramSocket#getLocalAddress */ @@ -186,7 +186,7 @@ * want to use other than the system default. Takes/returns an InetAddress. * <P> * Valid for Multicast: DatagramSocketImpl - * <P> + * * @see MulticastSocket#setInterface(InetAddress) * @see MulticastSocket#getInterface() */
--- a/jdk/src/share/classes/java/net/SocketPermission.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/net/SocketPermission.java Tue Oct 22 14:37:40 2013 -0700 @@ -779,27 +779,27 @@ * specified permission. * <P> * More specifically, this method first ensures that all of the following - * are true (and returns false if any of them are not):<p> + * are true (and returns false if any of them are not): * <ul> - * <li> <i>p</i> is an instanceof SocketPermission,<p> + * <li> <i>p</i> is an instanceof SocketPermission, * <li> <i>p</i>'s actions are a proper subset of this - * object's actions, and<p> + * object's actions, and * <li> <i>p</i>'s port range is included in this port range. Note: - * port range is ignored when p only contains the action, 'resolve'.<p> + * port range is ignored when p only contains the action, 'resolve'. * </ul> * * Then {@code implies} checks each of the following, in order, - * and for each returns true if the stated condition is true:<p> + * and for each returns true if the stated condition is true: * <ul> * <li> If this object was initialized with a single IP address and one of <i>p</i>'s - * IP addresses is equal to this object's IP address.<p> + * IP addresses is equal to this object's IP address. * <li>If this object is a wildcard domain (such as *.sun.com), and * <i>p</i>'s canonical name (the name without any preceding *) * ends with this object's canonical host name. For example, *.sun.com - * implies *.eng.sun.com..<p> + * implies *.eng.sun.com. * <li>If this object was not initialized with a single IP address, and one of this - * object's IP addresses equals one of <i>p</i>'s IP addresses.<p> - * <li>If this canonical name equals <i>p</i>'s canonical name.<p> + * object's IP addresses equals one of <i>p</i>'s IP addresses. + * <li>If this canonical name equals <i>p</i>'s canonical name. * </ul> * * If none of the above are true, {@code implies} returns false.
--- a/jdk/src/share/classes/java/net/URI.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/net/URI.java Tue Oct 22 14:37:40 2013 -0700 @@ -389,20 +389,20 @@ * colon following a host name but no port (as in * {@code http://java.sun.com:} ), and that does not encode characters * except those that must be quoted, the following identities also hold: - * <p><pre> + * <pre> * new URI(<i>u</i>.getScheme(), * <i>u</i>.getSchemeSpecificPart(), * <i>u</i>.getFragment()) * .equals(<i>u</i>)</pre> * in all cases, - * <p><pre> + * <pre> * new URI(<i>u</i>.getScheme(), * <i>u</i>.getUserInfo(), <i>u</i>.getAuthority(), * <i>u</i>.getPath(), <i>u</i>.getQuery(), * <i>u</i>.getFragment()) * .equals(<i>u</i>)</pre> * if <i>u</i> is hierarchical, and - * <p><pre> + * <pre> * new URI(<i>u</i>.getScheme(), * <i>u</i>.getUserInfo(), <i>u</i>.getHost(), <i>u</i>.getPort(), * <i>u</i>.getPath(), <i>u</i>.getQuery(),
--- a/jdk/src/share/classes/java/net/URLConnection.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/net/URLConnection.java Tue Oct 22 14:37:40 2013 -0700 @@ -45,7 +45,7 @@ * application and a URL. Instances of this class can be used both to * read from and to write to the resource referenced by the URL. In * general, creating a connection to a URL is a multistep process: - * <p> + * * <center><table border=2 summary="Describes the process of creating a connection to a URL: openConnection() and connect() over time."> * <tr><th>{@code openConnection()}</th> * <th>{@code connect()}</th></tr>
--- a/jdk/src/share/classes/java/net/URLDecoder.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/net/URLDecoder.java Tue Oct 22 14:37:40 2013 -0700 @@ -43,7 +43,7 @@ * as the start of a special escaped sequence. * <p> * The following rules are applied in the conversion: - * <p> + * * <ul> * <li>The alphanumeric characters "{@code a}" through * "{@code z}", "{@code A}" through
--- a/jdk/src/share/classes/java/net/URLEncoder.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/net/URLEncoder.java Tue Oct 22 14:37:40 2013 -0700 @@ -49,7 +49,6 @@ * <p> * When encoding a String, the following rules apply: * - * <p> * <ul> * <li>The alphanumeric characters "{@code a}" through * "{@code z}", "{@code A}" through
--- a/jdk/src/share/classes/java/net/URLPermission.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/net/URLPermission.java Tue Oct 22 14:37:40 2013 -0700 @@ -45,7 +45,7 @@ * </pre> * <i>scheme</i> will typically be http or https, but is not restricted by this * class. - * <i>authority</i> is specified as:<p> + * <i>authority</i> is specified as: * <pre> * authority = hostrange [ : portrange ] * portrange = portnumber | -portnumber | portnumber-[portnumber] | * @@ -223,7 +223,7 @@ * Checks if this URLPermission implies the given permission. * Specifically, the following checks are done as if in the * following sequence: - * <p><ul> + * <ul> * <li>if 'p' is not an instance of URLPermission return false</li> * <li>if any of p's methods are not in this's method list, and if * this's method list is not equal to "*", then return false.</li> @@ -242,7 +242,7 @@ * <li>otherwise, return false</li> * </ul> * <p>Some examples of how paths are matched are shown below: - * <p><table border> + * <table border> * <caption>Examples of Path Matching</caption> * <tr><th>this's path</th><th>p's path</th><th>match</th></tr> * <tr><td>/a/b</td><td>/a/b</td><td>yes</td></tr>
--- a/jdk/src/share/classes/java/net/package-info.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/net/package-info.java Tue Oct 22 14:37:40 2013 -0700 @@ -127,9 +127,9 @@ * resources, then convert it into a {@link java.net.URL} when it is time to * access the resource. From that URL, you can either get the * {@link java.net.URLConnection} for fine control, or get directly the - * InputStream.<p> + * InputStream. * <p>Here is an example:</p> - * <p><pre> + * <pre> * URI uri = new URI("http://java.sun.com/"); * URL url = uri.toURL(); * InputStream in = url.openStream(); @@ -147,7 +147,7 @@ * the {@code java.protocol.handler.pkgs} system property. For instance if * it is set to {@code myapp.protocols}, then the URL code will try, in the * case of http, first to load {@code myapp.protocols.http.Handler}, then, - * if this fails, {@code http.Handler} from the default location.<p> + * if this fails, {@code http.Handler} from the default location. * <p>Note that the Handler class <b>has to</b> be a subclass of the abstract * class {@link java.net.URLStreamHandler}.</p> * <h2>Additional Specification</h2>
--- a/jdk/src/share/classes/java/nio/X-Buffer.java.template Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/nio/X-Buffer.java.template Tue Oct 22 14:37:40 2013 -0700 @@ -1129,7 +1129,7 @@ * * <p> Two $type$ buffers are equal if, and only if, * - * <p><ol> + * <ol> * * <li><p> They have the same element type, </p></li> *
--- a/jdk/src/share/classes/java/nio/file/FileSystem.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/nio/file/FileSystem.java Tue Oct 22 14:37:40 2013 -0700 @@ -355,7 +355,7 @@ * * <p> The following rules are used to interpret glob patterns: * - * <p> <ul> + * <ul> * <li><p> The {@code *} character matches zero or more {@link Character * characters} of a {@link Path#getName(int) name} component without * crossing directory boundaries. </p></li>
--- a/jdk/src/share/classes/java/rmi/activation/ActivationGroup.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/rmi/activation/ActivationGroup.java Tue Oct 22 14:37:40 2013 -0700 @@ -154,21 +154,21 @@ * active). If the object does not call * <code>Activatable.inactive</code> when it deactivates, the * object will never be garbage collected since the group keeps - * strong references to the objects it creates. <p> + * strong references to the objects it creates. * * <p>The group's <code>inactiveObject</code> method unexports the * remote object from the RMI runtime so that the object can no * longer receive incoming RMI calls. An object will only be unexported * if the object has no pending or executing calls. * The subclass of <code>ActivationGroup</code> must override this - * method and unexport the object. <p> + * method and unexport the object. * * <p>After removing the object from the RMI runtime, the group * must inform its <code>ActivationMonitor</code> (via the monitor's * <code>inactiveObject</code> method) that the remote object is * not currently active so that the remote object will be * re-activated by the activator upon a subsequent activation - * request.<p> + * request. * * <p>This method simply informs the group's monitor that the object * is inactive. It is up to the concrete subclass of ActivationGroup
--- a/jdk/src/share/classes/java/rmi/dgc/VMID.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/rmi/dgc/VMID.java Tue Oct 22 14:37:40 2013 -0700 @@ -67,7 +67,7 @@ * conditions: a) the conditions for uniqueness for objects of * the class <code>java.rmi.server.UID</code> are satisfied, and b) an * address can be obtained for this host that is unique and constant - * for the lifetime of this object. <p> + * for the lifetime of this object. */ public VMID() { addr = randomBytes;
--- a/jdk/src/share/classes/java/rmi/server/UnicastRemoteObject.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/rmi/server/UnicastRemoteObject.java Tue Oct 22 14:37:40 2013 -0700 @@ -36,7 +36,7 @@ * below, the stub for a remote object being exported is obtained as * follows: * - * <p><ul> + * <ul> * * <li>If the remote object is exported using the {@link * #exportObject(Remote) UnicastRemoteObject.exportObject(Remote)} method, @@ -66,9 +66,8 @@ * could not be loaded, or a problem occurs creating the stub instance, a * {@link StubNotFoundException} is thrown. * - * <p> * <li>For all other means of exporting: - * <p><ul> + * <ul> * * <li>If the remote object's stub class (as defined above) could not be * loaded or the system property @@ -93,7 +92,6 @@ * will be thrown. * </ul> * - * <p> * <li>Otherwise, an instance of the remote object's stub class (as * described above) is used as the stub. *
--- a/jdk/src/share/classes/java/security/AccessController.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/security/AccessController.java Tue Oct 22 14:37:40 2013 -0700 @@ -39,9 +39,9 @@ * <ul> * <li> to decide whether an access to a critical system * resource is to be allowed or denied, based on the security policy - * currently in effect,<p> + * currently in effect, * <li>to mark code as being "privileged", thus affecting subsequent - * access determinations, and<p> + * access determinations, and * <li>to obtain a "snapshot" of the current calling context so * access-control decisions from a different context can be made with * respect to the saved context. </ul>
--- a/jdk/src/share/classes/java/security/AlgorithmParameterGenerator.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/security/AlgorithmParameterGenerator.java Tue Oct 22 14:37:40 2013 -0700 @@ -48,7 +48,7 @@ * of the prime modulus (in bits). * When using this approach, algorithm-specific parameter generation * values - if any - default to some standard values, unless they can be - * derived from the specified size.<P> + * derived from the specified size. * * <li>The other approach initializes a parameter generator object * using algorithm-specific semantics, which are represented by a set of
--- a/jdk/src/share/classes/java/security/BasicPermission.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/security/BasicPermission.java Tue Oct 22 14:37:40 2013 -0700 @@ -57,7 +57,6 @@ * Subclasses may implement actions on top of BasicPermission, * if desired. * <p> - * <P> * @see java.security.Permission * @see java.security.Permissions * @see java.security.PermissionCollection @@ -153,9 +152,9 @@ * Checks if the specified permission is "implied" by * this object. * <P> - * More specifically, this method returns true if:<p> + * More specifically, this method returns true if: * <ul> - * <li> <i>p</i>'s class is the same as this object's class, and<p> + * <li> <i>p</i>'s class is the same as this object's class, and * <li> <i>p</i>'s name equals or (in the case of wildcards) * is implied by this object's * name. For example, "a.b.*" implies "a.b.c".
--- a/jdk/src/share/classes/java/security/CodeSource.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/security/CodeSource.java Tue Oct 22 14:37:40 2013 -0700 @@ -234,7 +234,7 @@ * Returns true if this CodeSource object "implies" the specified CodeSource. * <p> * More specifically, this method makes the following checks. - * If any fail, it returns false. If they all succeed, it returns true.<p> + * If any fail, it returns false. If they all succeed, it returns true. * <ul> * <li> <i>codesource</i> must not be null. * <li> If this object's certificates are not null, then all @@ -242,7 +242,7 @@ * certificates. * <li> If this object's location (getLocation()) is not null, then the * following checks are made against this object's location and - * <i>codesource</i>'s:<p> + * <i>codesource</i>'s: * <ul> * <li> <i>codesource</i>'s location must not be null. *
--- a/jdk/src/share/classes/java/security/Key.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/security/Key.java Tue Oct 22 14:37:40 2013 -0700 @@ -39,7 +39,7 @@ * RSA), which will work with those algorithms and with related * algorithms (such as MD5 with RSA, SHA-1 with RSA, Raw DSA, etc.) * The name of the algorithm of a key is obtained using the - * {@link #getAlgorithm() getAlgorithm} method.<P> + * {@link #getAlgorithm() getAlgorithm} method. * * <LI>An Encoded Form * @@ -65,12 +65,11 @@ * For more information, see * <a href="http://www.ietf.org/rfc/rfc3280.txt">RFC 3280: * Internet X.509 Public Key Infrastructure Certificate and CRL Profile</a>. - * <P> * * <LI>A Format * * <P>This is the name of the format of the encoded key. It is returned - * by the {@link #getFormat() getFormat} method.<P> + * by the {@link #getFormat() getFormat} method. * * </UL> *
--- a/jdk/src/share/classes/java/security/KeyPairGenerator.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/security/KeyPairGenerator.java Tue Oct 22 14:37:40 2013 -0700 @@ -77,7 +77,6 @@ * providers might have precomputed parameter sets for more than just the * three modulus sizes mentioned above. Still others might not have a list of * precomputed parameters at all and instead always create new parameter sets. - * <p> * * <li><b>Algorithm-Specific Initialization</b> * <p>For situations where a set of algorithm-specific parameters already
--- a/jdk/src/share/classes/java/security/KeyStore.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/security/KeyStore.java Tue Oct 22 14:37:40 2013 -0700 @@ -98,7 +98,6 @@ * KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType()); * </pre> * The system will return a keystore implementation for the default type. - * <p> * * <li>To provide a specific keystore type: * <pre>
--- a/jdk/src/share/classes/java/security/MessageDigest.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/security/MessageDigest.java Tue Oct 22 14:37:40 2013 -0700 @@ -54,21 +54,21 @@ * * <p>Implementations are free to implement the Cloneable interface. * Client applications can test cloneability by attempting cloning - * and catching the CloneNotSupportedException: <p> + * and catching the CloneNotSupportedException: + * + * <pre>{@code + * MessageDigest md = MessageDigest.getInstance("SHA"); * -* <pre> -* MessageDigest md = MessageDigest.getInstance("SHA"); -* -* try { -* md.update(toChapter1); -* MessageDigest tc1 = md.clone(); -* byte[] toChapter1Digest = tc1.digest(); -* md.update(toChapter2); -* ...etc. -* } catch (CloneNotSupportedException cnse) { -* throw new DigestException("couldn't make digest of partial content"); -* } -* </pre> + * try { + * md.update(toChapter1); + * MessageDigest tc1 = md.clone(); + * byte[] toChapter1Digest = tc1.digest(); + * md.update(toChapter2); + * ...etc. + * } catch (CloneNotSupportedException cnse) { + * throw new DigestException("couldn't make digest of partial content"); + * } + * }</pre> * * <p>Note that if a given implementation is not cloneable, it is * still possible to compute intermediate digests by instantiating
--- a/jdk/src/share/classes/java/security/Permission.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/security/Permission.java Tue Oct 22 14:37:40 2013 -0700 @@ -138,14 +138,14 @@ * Returns the hash code value for this Permission object. * <P> * The required {@code hashCode} behavior for Permission Objects is - * the following: <p> + * the following: * <ul> * <li>Whenever it is invoked on the same Permission object more than * once during an execution of a Java application, the * {@code hashCode} method * must consistently return the same integer. This integer need not * remain consistent from one execution of an application to another - * execution of the same application. <p> + * execution of the same application. * <li>If two Permission objects are equal according to the * {@code equals} * method, then calling the {@code hashCode} method on each of the
--- a/jdk/src/share/classes/java/security/PermissionCollection.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/security/PermissionCollection.java Tue Oct 22 14:37:40 2013 -0700 @@ -37,7 +37,6 @@ * collection, using the {@code implies} method. * <LI> enumerate all the permissions, using the {@code elements} method. * </UL> - * <P> * * <p>When it is desirable to group together a number of Permission objects * of the same type, the {@code newPermissionCollection} method on that
--- a/jdk/src/share/classes/java/security/SecurityPermission.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/security/SecurityPermission.java Tue Oct 22 14:37:40 2013 -0700 @@ -44,7 +44,6 @@ * The following table lists all the possible SecurityPermission target names, * and for each provides a description of what the permission allows * and a discussion of the risks of granting code the permission. - * <P> * * <table border=1 cellpadding=5 summary="target name,what the permission allows, and associated risks"> * <tr> @@ -193,7 +192,6 @@ * associated with classes that have been deprecated: {@link Identity}, * {@link IdentityScope}, {@link Signer}. Use of them is discouraged. See the * applicable classes for more information. - * <P> * * <table border=1 cellpadding=5 summary="target name,what the permission allows, and associated risks"> * <tr>
--- a/jdk/src/share/classes/java/security/Signature.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/security/Signature.java Tue Oct 22 14:37:40 2013 -0700 @@ -77,13 +77,13 @@ * (see {@link #initSign(PrivateKey)} * and {@link #initSign(PrivateKey, SecureRandom)}). * - * </ul><p> + * </ul> * - * <li>Updating<p> + * <li>Updating * * <p>Depending on the type of initialization, this will update the * bytes to be signed or verified. See the - * {@link #update(byte) update} methods.<p> + * {@link #update(byte) update} methods. * * <li>Signing or Verifying a signature on all updated bytes. See the * {@link #sign() sign} methods and the {@link #verify(byte[]) verify}
--- a/jdk/src/share/classes/java/security/SignedObject.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/security/SignedObject.java Tue Oct 22 14:37:40 2013 -0700 @@ -43,7 +43,7 @@ * object passed to the constructor and the {@code verify} method. * A typical usage for signing is the following: * - * <p> <pre>{@code + * <pre>{@code * Signature signingEngine = Signature.getInstance(algorithm, * provider); * SignedObject so = new SignedObject(myobject, signingKey, @@ -53,7 +53,7 @@ * <p> A typical usage for verification is the following (having * received SignedObject {@code so}): * - * <p> <pre>{@code + * <pre>{@code * Signature verificationEngine = * Signature.getInstance(algorithm, provider); * if (so.verify(publickey, verificationEngine))
--- a/jdk/src/share/classes/java/security/acl/Acl.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/security/acl/Acl.java Tue Oct 22 14:37:40 2013 -0700 @@ -42,27 +42,27 @@ * granted to the associated principal. If negative, the permissions * are to be denied.<p> * - * The ACL Entries in each ACL observe the following rules:<p> + * The ACL Entries in each ACL observe the following rules: * * <ul> <li>Each principal can have at most one positive ACL entry and * one negative entry; that is, multiple positive or negative ACL * entries are not allowed for any principal. Each entry specifies * the set of permissions that are to be granted (if positive) or - * denied (if negative). <p> + * denied (if negative). * * <li>If there is no entry for a particular principal, then the - * principal is considered to have a null (empty) permission set.<p> + * principal is considered to have a null (empty) permission set. * * <li>If there is a positive entry that grants a principal a * particular permission, and a negative entry that denies the * principal the same permission, the result is as though the - * permission was never granted or denied. <p> + * permission was never granted or denied. * * <li>Individual permissions always override permissions of the * group(s) to which the individual belongs. That is, individual * negative permissions (specific denial of permissions) override the * groups' positive permissions. And individual positive permissions - * override the groups' negative permissions.<p> + * override the groups' negative permissions. * * </ul> * @@ -159,12 +159,12 @@ * Returns an enumeration for the set of allowed permissions for the * specified principal (representing an entity such as an individual or * a group). This set of allowed permissions is calculated as - * follows:<p> + * follows: * * <ul> * * <li>If there is no entry in this Access Control List for the - * specified principal, an empty permission set is returned.<p> + * specified principal, an empty permission set is returned. * * <li>Otherwise, the principal's group permission sets are determined. * (A principal can belong to one or more groups, where a group is a
--- a/jdk/src/share/classes/java/security/cert/CertificateFactory.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/security/cert/CertificateFactory.java Tue Oct 22 14:37:40 2013 -0700 @@ -63,7 +63,7 @@ * supports those methods), so that each call to * {@code generateCertificate} consumes only one certificate, and the * read position of the input stream is positioned to the next certificate in - * the file:<p> + * the file: * * <pre>{@code * FileInputStream fis = new FileInputStream(filename); @@ -78,7 +78,7 @@ * }</pre> * * <p>The following example parses a PKCS#7-formatted certificate reply stored - * in a file and extracts all the certificates from it:<p> + * in a file and extracts all the certificates from it: * * <pre> * FileInputStream fis = new FileInputStream(filename);
--- a/jdk/src/share/classes/java/security/cert/PKIXRevocationChecker.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/security/cert/PKIXRevocationChecker.java Tue Oct 22 14:37:40 2013 -0700 @@ -299,7 +299,7 @@ /** * Allow revocation check to succeed if the revocation status cannot be * determined for one of the following reasons: - * <p><ul> + * <ul> * <li>The CRL or OCSP response cannot be obtained because of a * network error. * <li>The OCSP responder returns one of the following errors
--- a/jdk/src/share/classes/java/security/cert/PolicyQualifierInfo.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/security/cert/PolicyQualifierInfo.java Tue Oct 22 14:37:40 2013 -0700 @@ -35,7 +35,7 @@ * structure. * * <p>The ASN.1 definition is as follows: - * <p><pre> + * <pre> * PolicyQualifierInfo ::= SEQUENCE { * policyQualifierId PolicyQualifierId, * qualifier ANY DEFINED BY policyQualifierId }
--- a/jdk/src/share/classes/java/security/cert/TrustAnchor.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/security/cert/TrustAnchor.java Tue Oct 22 14:37:40 2013 -0700 @@ -44,7 +44,6 @@ * individual parameters. * <p> * <b>Concurrent Access</b> - * <p> * <p>All {@code TrustAnchor} objects must be immutable and * thread-safe. That is, multiple threads may concurrently invoke the * methods defined in this class on a single {@code TrustAnchor}
--- a/jdk/src/share/classes/java/security/cert/X509CertSelector.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/security/cert/X509CertSelector.java Tue Oct 22 14:37:40 2013 -0700 @@ -359,7 +359,7 @@ * criticality setting, and encapsulating OCTET STRING) * for a SubjectKeyIdentifier extension. * The ASN.1 notation for this structure follows. - * <p> + * * <pre>{@code * SubjectKeyIdentifier ::= KeyIdentifier * @@ -399,7 +399,7 @@ * criticality setting, and encapsulating OCTET STRING) * for an AuthorityKeyIdentifier extension. * The ASN.1 notation for this structure follows. - * <p> + * * <pre>{@code * AuthorityKeyIdentifier ::= SEQUENCE { * keyIdentifier [0] KeyIdentifier OPTIONAL,
--- a/jdk/src/share/classes/java/security/interfaces/DSAKeyPairGenerator.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/security/interfaces/DSAKeyPairGenerator.java Tue Oct 22 14:37:40 2013 -0700 @@ -43,11 +43,11 @@ * * <li>Get a key pair generator for the DSA algorithm by calling the * KeyPairGenerator {@code getInstance} method with "DSA" - * as its argument.<p> + * as its argument. * * <li>Initialize the generator by casting the result to a DSAKeyPairGenerator * and calling one of the - * {@code initialize} methods from this DSAKeyPairGenerator interface.<p> + * {@code initialize} methods from this DSAKeyPairGenerator interface. * * <li>Generate a key pair by calling the {@code generateKeyPair} * method from the KeyPairGenerator class.
--- a/jdk/src/share/classes/java/text/MessageFormat.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/text/MessageFormat.java Tue Oct 22 14:37:40 2013 -0700 @@ -125,7 +125,6 @@ * valid patterns, but <code>"ab {0'}' de"</code>, <code>"ab } de"</code> * and <code>"''{''"</code> are not. * - * <p> * <dl><dt><b>Warning:</b><dd>The rules for using quotes within message * format patterns unfortunately have shown to be somewhat confusing. * In particular, it isn't always obvious to localizers whether single @@ -146,7 +145,7 @@ * table shows how the values map to {@code Format} instances. Combinations not * shown in the table are illegal. A <i>SubformatPattern</i> must * be a valid pattern string for the {@code Format} subclass used. - * <p> + * * <table border=1 summary="Shows how FormatType and FormatStyle values map to Format instances"> * <tr> * <th id="ft" class="TableHeadingColor">FormatType @@ -215,7 +214,6 @@ * <td headers="fs"><i>SubformatPattern</i> * <td headers="sc">{@code new} {@link ChoiceFormat#ChoiceFormat(String) ChoiceFormat}{@code (subformatPattern)} * </table> - * <p> * * <h4>Usage Information</h4> * @@ -761,7 +759,7 @@ * as indicated by the first matching line of the following table. An * argument is <i>unavailable</i> if <code>arguments</code> is * <code>null</code> or has fewer than argumentIndex+1 elements. - * <p> + * * <table border=1 summary="Examples of subformat,argument,and formatted text"> * <tr> * <th>Subformat
--- a/jdk/src/share/classes/java/text/Normalizer.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/text/Normalizer.java Tue Oct 22 14:37:40 2013 -0700 @@ -53,12 +53,12 @@ * several different ways in Unicode. For example, take the character A-acute. * In Unicode, this can be encoded as a single character (the "composed" form): * - * <p><pre> + * <pre> * U+00C1 LATIN CAPITAL LETTER A WITH ACUTE</pre> * * or as two separate characters (the "decomposed" form): * - * <p><pre> + * <pre> * U+0041 LATIN CAPITAL LETTER A * U+0301 COMBINING ACUTE ACCENT</pre> * @@ -72,14 +72,14 @@ * <p> * Similarly, the string "ffi" can be encoded as three separate letters: * - * <p><pre> + * <pre> * U+0066 LATIN SMALL LETTER F * U+0066 LATIN SMALL LETTER F * U+0069 LATIN SMALL LETTER I</pre> * * or as the single character * - * <p><pre> + * <pre> * U+FB03 LATIN SMALL LIGATURE FFI</pre> * * The ffi ligature is not a distinct semantic character, and strictly speaking
--- a/jdk/src/share/classes/java/text/SimpleDateFormat.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/text/SimpleDateFormat.java Tue Oct 22 14:37:40 2013 -0700 @@ -356,7 +356,6 @@ * may be replaced with other, locale dependent, pattern letters. * <code>SimpleDateFormat</code> does not deal with the localization of text * other than the pattern letters; that's up to the client of the class. - * <p> * * <h4>Examples</h4> *
--- a/jdk/src/share/classes/java/util/Base64.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/util/Base64.java Tue Oct 22 14:37:40 2013 -0700 @@ -40,7 +40,6 @@ * <a href="http://www.ietf.org/rfc/rfc4648.txt">RFC 4648</a> and * <a href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045</a>. * - * <p> * <ul> * <li><a name="basic"><b>Basic</b></a> * <p> Uses "The Base64 Alphabet" as specified in Table 1 of
--- a/jdk/src/share/classes/java/util/BitSet.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/util/BitSet.java Tue Oct 22 14:37:40 2013 -0700 @@ -1164,10 +1164,10 @@ * <p>Example: * <pre> * BitSet drPepper = new BitSet();</pre> - * Now {@code drPepper.toString()} returns "{@code {}}".<p> + * Now {@code drPepper.toString()} returns "{@code {}}". * <pre> * drPepper.set(2);</pre> - * Now {@code drPepper.toString()} returns "{@code {2}}".<p> + * Now {@code drPepper.toString()} returns "{@code {2}}". * <pre> * drPepper.set(4); * drPepper.set(10);</pre>
--- a/jdk/src/share/classes/java/util/Deque.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/util/Deque.java Tue Oct 22 14:37:40 2013 -0700 @@ -56,7 +56,6 @@ * <p>The twelve methods described above are summarized in the * following table: * - * <p> * <table BORDER CELLPADDING=3 CELLSPACING=1> * <caption>Summary of Deque methods</caption> * <tr> @@ -100,7 +99,6 @@ * inherited from the {@code Queue} interface are precisely equivalent to * {@code Deque} methods as indicated in the following table: * - * <p> * <table BORDER CELLPADDING=3 CELLSPACING=1> * <caption>Comparison of Queue and Deque methods</caption> * <tr> @@ -139,7 +137,6 @@ * beginning of the deque. Stack methods are precisely equivalent to * {@code Deque} methods as indicated in the table below: * - * <p> * <table BORDER CELLPADDING=3 CELLSPACING=1> * <caption>Comparison of Stack and Deque methods</caption> * <tr>
--- a/jdk/src/share/classes/java/util/Locale.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/util/Locale.java Tue Oct 22 14:37:40 2013 -0700 @@ -1248,7 +1248,7 @@ * Returns a string representation of this <code>Locale</code> * object, consisting of language, country, variant, script, * and extensions as below: - * <p><blockquote> + * <blockquote> * language + "_" + country + "_" + (variant + "_#" | "#") + script + "-" + extensions * </blockquote> * @@ -2199,7 +2199,7 @@ * are exactly "ja", "JP", "JP" or "th", "TH", "TH" and script/extensions * fields are empty, this method supplies <code>UNICODE_LOCALE_EXTENSION</code> * "ca"/"japanese" (calendar type is "japanese") or "nu"/"thai" (number script - * type is "thai"). See <a href="Locale.html#special_cases_constructor"/>Special Cases</a> + * type is "thai"). See <a href="Locale.html#special_cases_constructor">Special Cases</a> * for more information. * * @return an instance of <code>Locale</code> equivalent to
--- a/jdk/src/share/classes/java/util/Properties.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/util/Properties.java Tue Oct 22 14:37:40 2013 -0700 @@ -244,7 +244,6 @@ * As an example, each of the following three lines specifies the key * {@code "Truth"} and the associated element value * {@code "Beauty"}: - * <p> * <pre> * Truth = Beauty * Truth:Beauty @@ -252,14 +251,12 @@ * </pre> * As another example, the following three lines specify a single * property: - * <p> * <pre> * fruits apple, banana, pear, \ * cantaloupe, watermelon, \ * kiwi, mango * </pre> * The key is {@code "fruits"} and the associated element is: - * <p> * <pre>"apple, banana, pear, cantaloupe, watermelon, kiwi, mango"</pre> * Note that a space appears before each {@code \} so that a space * will appear after each comma in the final result; the {@code \}, @@ -268,13 +265,11 @@ * characters. * <p> * As a third example, the line: - * <p> * <pre>cheeses * </pre> * specifies that the key is {@code "cheeses"} and the associated - * element is the empty string {@code ""}.<p> + * element is the empty string {@code ""}. * <p> - * * <a name="unicodeescapes"></a> * Characters in keys and elements can be represented in escape * sequences similar to those used for character and string literals
--- a/jdk/src/share/classes/java/util/PropertyPermission.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/util/PropertyPermission.java Tue Oct 22 14:37:40 2013 -0700 @@ -51,11 +51,10 @@ * signify a wildcard match. For example: "java.*" and "*" signify a wildcard * match, while "*java" and "a*b" do not. * <P> - * <P> * The actions to be granted are passed to the constructor in a string containing * a list of one or more comma-separated keywords. The possible keywords are * "read" and "write". Their meaning is defined as follows: - * <P> + * * <DL> * <DT> read * <DD> read permission. Allows <code>System.getProperty</code> to @@ -166,11 +165,11 @@ * Checks if this PropertyPermission object "implies" the specified * permission. * <P> - * More specifically, this method returns true if:<p> + * More specifically, this method returns true if: * <ul> - * <li> <i>p</i> is an instanceof PropertyPermission,<p> + * <li> <i>p</i> is an instanceof PropertyPermission, * <li> <i>p</i>'s actions are a subset of this - * object's actions, and <p> + * object's actions, and * <li> <i>p</i>'s name is implied by this object's * name. For example, "java.*" implies "java.home". * </ul>
--- a/jdk/src/share/classes/java/util/Queue.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/util/Queue.java Tue Oct 22 14:37:40 2013 -0700 @@ -47,7 +47,6 @@ * implementations; in most implementations, insert operations cannot * fail. * - * <p> * <table BORDER CELLPADDING=3 CELLSPACING=1> * <caption>Summary of Queue methods</caption> * <tr>
--- a/jdk/src/share/classes/java/util/ResourceBundle.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/util/ResourceBundle.java Tue Oct 22 14:37:40 2013 -0700 @@ -1084,7 +1084,6 @@ * bundles. Conceptually, the bundle loading process with the given * <code>control</code> is performed in the following steps. * - * <p> * <ol> * <li>This factory method looks up the resource bundle in the cache for * the specified <code>baseName</code>, <code>targetLocale</code> and
--- a/jdk/src/share/classes/java/util/Scanner.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/util/Scanner.java Tue Oct 22 14:37:40 2013 -0700 @@ -216,7 +216,6 @@ * 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 in base 10). * - * <p> * <dl> * <dt><i>NonAsciiDigit</i>: * <dd>A non-ASCII character c for which
--- a/jdk/src/share/classes/java/util/TimeZone.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/util/TimeZone.java Tue Oct 22 14:37:40 2013 -0700 @@ -606,7 +606,7 @@ * Otherwise, the method takes the following steps to determine the default * time zone. * - * <p><ul> + * <ul> * <li>Use the {@code user.timezone} property value as the default * time zone ID if it's available.</li> * <li>Detect the platform time zone ID. The source of the
--- a/jdk/src/share/classes/java/util/UUID.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/util/UUID.java Tue Oct 22 14:37:40 2013 -0700 @@ -233,7 +233,7 @@ * number describes how this {@code UUID} was generated. * * The version number has the following meaning: - * <p><ul> + * <ul> * <li>1 Time-based UUID * <li>2 DCE security UUID * <li>3 Name-based UUID @@ -252,7 +252,7 @@ * number describes the layout of the {@code UUID}. * * The variant number has the following meaning: - * <p><ul> + * <ul> * <li>0 Reserved for NCS backward compatibility * <li>2 <a href="http://www.ietf.org/rfc/rfc4122.txt">IETF RFC 4122</a> * (Leach-Salz), used by this class
--- a/jdk/src/share/classes/java/util/concurrent/BlockingDeque.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/util/concurrent/BlockingDeque.java Tue Oct 22 14:37:40 2013 -0700 @@ -50,7 +50,6 @@ * and the fourth blocks for only a given maximum time limit before giving * up. These methods are summarized in the following table: * - * <p> * <table BORDER CELLPADDING=3 CELLSPACING=1> * <caption>Summary of BlockingDeque methods</caption> * <tr> @@ -126,7 +125,6 @@ * {@code BlockingQueue} interface are precisely equivalent to * {@code BlockingDeque} methods as indicated in the following table: * - * <p> * <table BORDER CELLPADDING=3 CELLSPACING=1> * <caption>Comparison of BlockingQueue and BlockingDeque methods</caption> * <tr>
--- a/jdk/src/share/classes/java/util/concurrent/BlockingQueue.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/util/concurrent/BlockingQueue.java Tue Oct 22 14:37:40 2013 -0700 @@ -53,7 +53,6 @@ * and the fourth blocks for only a given maximum time limit before giving * up. These methods are summarized in the following table: * - * <p> * <table BORDER CELLPADDING=3 CELLSPACING=1> * <caption>Summary of BlockingQueue methods</caption> * <tr>
--- a/jdk/src/share/classes/java/util/concurrent/Future.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/util/concurrent/Future.java Tue Oct 22 14:37:40 2013 -0700 @@ -52,8 +52,8 @@ * * <p> * <b>Sample Usage</b> (Note that the following classes are all - * made-up.) <p> - * <pre> {@code + * made-up.) + * <pre> {@code * interface ArchiveSearcher { String search(String target); } * class App { * ExecutorService executor = ...
--- a/jdk/src/share/classes/java/util/concurrent/locks/ReentrantReadWriteLock.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/util/concurrent/locks/ReentrantReadWriteLock.java Tue Oct 22 14:37:40 2013 -0700 @@ -56,7 +56,6 @@ * constraints. A nonfair lock that is continuously contended may * indefinitely postpone one or more reader or writer threads, but * will normally have higher throughput than a fair lock. - * <p> * * <dt><b><i>Fair mode</i></b> * <dd>When constructed as fair, threads contend for entry using an
--- a/jdk/src/share/classes/java/util/jar/Pack200.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/util/jar/Pack200.java Tue Oct 22 14:37:40 2013 -0700 @@ -44,7 +44,7 @@ * The unpacker engine is used by deployment applications to * transform the byte-stream back to JAR format. * <p> - * Here is an example using packer and unpacker:<p> + * Here is an example using packer and unpacker: * <pre>{@code * import java.util.jar.Pack200; * import java.util.jar.Pack200.*;
--- a/jdk/src/share/classes/java/util/logging/Logger.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/util/logging/Logger.java Tue Oct 22 14:37:40 2013 -0700 @@ -150,7 +150,7 @@ * has or inherited a resource bundle name, then that resource bundle name * will be mapped to a {@code ResourceBundle} object, using the default Locale * at the time of logging. - * <br><a name="ResourceBundleMapping"/>When mapping resource bundle names to + * <br id="ResourceBundleMapping">When mapping resource bundle names to * {@code ResourceBundle} objects, the logger will first try to use the * Thread's {@linkplain java.lang.Thread#getContextClassLoader() context class * loader} to map the given resource bundle name to a {@code ResourceBundle}.
--- a/jdk/src/share/classes/java/util/regex/Pattern.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/util/regex/Pattern.java Tue Oct 22 14:37:40 2013 -0700 @@ -618,7 +618,7 @@ * are in conformance with the recommendation of <i>Annex C: Compatibility Properties</i> * of <a href="http://www.unicode.org/reports/tr18/"><i>Unicode Regular Expression * </i></a>, when {@link #UNICODE_CHARACTER_CLASS} flag is specified. - * <p> + * * <table border="0" cellpadding="1" cellspacing="0" * summary="predefined and posix character classes in Unicode mode"> * <tr align="left">
--- a/jdk/src/share/classes/java/util/spi/LocaleServiceProvider.java Tue Oct 22 14:36:43 2013 -0700 +++ b/jdk/src/share/classes/java/util/spi/LocaleServiceProvider.java Tue Oct 22 14:37:40 2013 -0700 @@ -41,7 +41,7 @@ * <code>java.util</code> packages use implementations of the provider * interfaces to offer support for locales beyond the set of locales * supported by the Java runtime environment itself. - * <p> + * * <h3>Packaging of Locale Sensitive Service Provider Implementations</h3> * Implementations of these locale sensitive services are packaged using the * <a href="../../../../technotes/guides/extensions/index.html">Java Extension Mechanism</a>