diff --git a/src/share/classes/java/io/ByteArrayInputStream.java b/src/share/classes/java/io/ByteArrayInputStream.java index e58c6e64a64691c2a9b8b33318f48b8d33becc95..ce0b8d1f1830ae63047cb19915e9e5483c3e0351 100644 --- a/src/share/classes/java/io/ByteArrayInputStream.java +++ b/src/share/classes/java/io/ByteArrayInputStream.java @@ -275,7 +275,6 @@ class ByteArrayInputStream extends InputStream { * Closing a ByteArrayInputStream has no effect. The methods in * this class can be called after the stream has been closed without * generating an IOException. - *
*/ public void close() throws IOException { } diff --git a/src/share/classes/java/io/ByteArrayOutputStream.java b/src/share/classes/java/io/ByteArrayOutputStream.java index d28d397b31c9bf52e92a367a796e4cbd165d8637..cd3c139a27e3e856e8dfc93f7400b4e8ad8bcd77 100644 --- a/src/share/classes/java/io/ByteArrayOutputStream.java +++ b/src/share/classes/java/io/ByteArrayOutputStream.java @@ -263,8 +263,6 @@ public class ByteArrayOutputStream extends OutputStream { * Closing a ByteArrayOutputStream has no effect. The methods in * this class can be called after the stream has been closed without * generating an IOException. - *
- * */ public void close() throws IOException { } diff --git a/src/share/classes/java/io/DataInput.java b/src/share/classes/java/io/DataInput.java index 58a3a2bfd3f5075786fba046a84220a9d5e3756a..c61aeb58edafb99a52ef1d8785a0745a6517f711 100644 --- a/src/share/classes/java/io/DataInput.java +++ b/src/share/classes/java/io/DataInput.java @@ -155,7 +155,7 @@ interface DataInput { * to the length of {@code b}. *
* This method blocks until one of the - * following conditions occurs:
+ * following conditions occurs: *
* This method * blocks until one of the following conditions - * occurs:
+ * occurs: *
(short)((a << 8) | (b & 0xff))
- *
+ * {@code (short)((a << 8) | (b & 0xff))
+ * }
* This method
* is suitable for reading the bytes written
* by the {@code writeShort} method of
@@ -337,8 +337,8 @@ interface DataInput {
* be the first byte read and
* {@code b}
* be the second byte. The value returned is:
- * (((a & 0xff) << 8) | (b & 0xff))
- *
+ * {@code (((a & 0xff) << 8) | (b & 0xff))
+ * }
* This method is suitable for reading the bytes
* written by the {@code writeShort} method
* of interface {@code DataOutput} if
@@ -359,8 +359,8 @@ interface DataInput {
* be the first byte read and {@code b}
* be the second byte. The value
* returned is:
- * (char)((a << 8) | (b & 0xff))
- *
+ * {@code (char)((a << 8) | (b & 0xff))
+ * }
* This method
* is suitable for reading bytes written by
* the {@code writeChar} method of interface
@@ -377,10 +377,10 @@ interface DataInput {
* 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:
- *
- * (((a & 0xff) << 24) | ((b & 0xff) << 16) |
- * ((c & 0xff) << 8) | (d & 0xff))
- *
+ * {@code
+ * (((a & 0xff) << 24) | ((b & 0xff) << 16) |
+ * ((c & 0xff) << 8) | (d & 0xff))
+ * }
* This method is suitable
* for reading bytes written by the {@code writeInt}
* method of interface {@code DataOutput}.
@@ -397,16 +397,16 @@ interface DataInput {
* a {@code long} value. Let {@code a-h}
* be the first through eighth bytes read.
* The value returned is:
- *
- * (((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
+ * (((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)))
+ * }
* * This method is suitable * for reading bytes written by the {@code writeLong} @@ -540,9 +540,9 @@ interface DataInput { * not match the bit pattern {@code 10xxxxxx}, * then a {@code UTFDataFormatException} * is thrown. Otherwise, the group is converted - * to the character:
- *
(char)(((a& 0x1F) << 6) | (b & 0x3F))
- *
+ * to the character:
+ * {@code (char)(((a & 0x1F) << 6) | (b & 0x3F))
+ * }
* 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 @@ interface DataInput {
* does not match the bit pattern {@code 10xxxxxx},
* then a {@code UTFDataFormatException}
* is thrown. Otherwise, the group is converted
- * to the character:- *
- * (char)(((a & 0x0F) << 12) | ((b & 0x3F) << 6) | (c & 0x3F))
- *
+ * to the character:
+ * {@code
+ * (char)(((a & 0x0F) << 12) | ((b & 0x3F) << 6) | (c & 0x3F))
+ * }
* If the first byte of a group matches the
* pattern {@code 1111xxxx} or the pattern
* {@code 10xxxxxx}, then a {@code UTFDataFormatException}
diff --git a/src/share/classes/java/io/DataOutput.java b/src/share/classes/java/io/DataOutput.java
index 07fbc3a927d6d733d98a9cd7a090126fcb56d7e0..ce909d102385ba7560566886a15f8bdaca1fdd4b 100644
--- a/src/share/classes/java/io/DataOutput.java
+++ b/src/share/classes/java/io/DataOutput.java
@@ -134,11 +134,11 @@ interface DataOutput {
* 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: - *
- * (byte)(0xff & (v >> 8))
- * (byte)(0xff & v)
- * + * shown, are: + *
{@code
+ * (byte)(0xff & (v >> 8))
+ * (byte)(0xff & v)
+ * }
* The bytes written by this method may be
* read by the readShort method
* of interface DataInput , which
@@ -156,10 +156,10 @@ interface DataOutput {
* output stream.
* The byte values to be written, in the order
* shown, are:
- *
- * (byte)(0xff & (v >> 8))
- * (byte)(0xff & v)
- * + *
{@code
+ * (byte)(0xff & (v >> 8))
+ * (byte)(0xff & v)
+ * }
* The bytes written by this method may be
* read by the readChar method
* of interface DataInput , which
@@ -176,12 +176,12 @@ interface DataOutput {
* comprised of four bytes, to the output stream.
* The byte values to be written, in the order
* shown, are:
- *
- * (byte)(0xff & (v >> 24))
- * (byte)(0xff & (v >> 16))
- * (byte)(0xff & (v >> 8))
- * (byte)(0xff & v)
- * + *
{@code
+ * (byte)(0xff & (v >> 24))
+ * (byte)(0xff & (v >> 16))
+ * (byte)(0xff & (v >> 8))
+ * (byte)(0xff & v)
+ * }
* The bytes written by this method may be read
* by the readInt method of interface
* DataInput , which will then
@@ -197,16 +197,16 @@ interface DataOutput {
* comprised of eight bytes, to the output stream.
* The byte values to be written, in the order
* shown, are:
- *
- * (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
+ * (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)
+ * }
* The bytes written by this method may be
* read by the readLong method
* of interface DataInput , which
@@ -314,24 +314,24 @@ interface DataOutput {
* If a character c
* is in the range \u0001 through
* \u007f, it is represented
- * by one byte:
+ * by one byte: *
(byte)c
* If a character c is \u0000
* or is in the range \u0080
* through \u07ff, then it is
* represented by two bytes, to be written
- * in the order shown:
- * (byte)(0xc0 | (0x1f & (c >> 6)))
- * (byte)(0x80 | (0x3f & c))
- * If a character + * in the order shown:
{@code
+ * (byte)(0xc0 | (0x1f & (c >> 6)))
+ * (byte)(0x80 | (0x3f & c))
+ * } If a character
* c is in the range \u0800
* through uffff, then it is
* represented by three bytes, to be written
- * in the order shown:
- * (byte)(0xe0 | (0x0f & (c >> 12)))
- * (byte)(0x80 | (0x3f & (c >> 6)))
- * (byte)(0x80 | (0x3f & c))
- * First, + * in the order shown:
{@code
+ * (byte)(0xe0 | (0x0f & (c >> 12)))
+ * (byte)(0x80 | (0x3f & (c >> 6)))
+ * (byte)(0x80 | (0x3f & c))
+ * } First,
* the total number of bytes needed to represent
* all the characters of s is
* calculated. If this number is larger than
diff --git a/src/share/classes/java/io/FilePermission.java b/src/share/classes/java/io/FilePermission.java
index e70d292e0c8fef38cba0e0ad40c01a5d7ae524f4..89f2c33287a05736876f7eccae467ae1ba8cc04f 100644
--- a/src/share/classes/java/io/FilePermission.java
+++ b/src/share/classes/java/io/FilePermission.java
@@ -55,7 +55,7 @@ import sun.security.util.SecurityConstants;
* 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:
- *
+ * *
- * More specifically, this method returns true if:
+ * More specifically, this method returns true if: *
+ *
+ * object's actions, and *
The general contract of reset is:
*
- *
markSupported returns
* true, then:
*
diff --git a/src/share/classes/java/io/ObjectInputStream.java b/src/share/classes/java/io/ObjectInputStream.java
index c71681c255d5a332a0d893965d17574a15f4e0ae..15ecd9bee655de0799b9c55a4365fe5e60b51f8c 100644
--- a/src/share/classes/java/io/ObjectInputStream.java
+++ b/src/share/classes/java/io/ObjectInputStream.java
@@ -109,7 +109,7 @@ import sun.reflect.misc.ReflectUtil;
*
* Serializable classes that require special handling during the * serialization and deserialization process should implement the following - * methods:
+ * methods: * *
* private void writeObject(java.io.ObjectOutputStream stream)
diff --git a/src/share/classes/java/io/PipedInputStream.java b/src/share/classes/java/io/PipedInputStream.java
index af07de5b4e6ece3380429a40640878e8110148fe..83dde31ed4220244ba6a3371c881295fb733291f 100644
--- a/src/share/classes/java/io/PipedInputStream.java
+++ b/src/share/classes/java/io/PipedInputStream.java
@@ -172,15 +172,14 @@ public class PipedInputStream extends InputStream {
* unconnected piped output stream and snk
* is an unconnected piped input stream, they
* may be connected by either the call:
- *
+ *
*
snk.connect(src)
*
* or the call:
- *
+ *
*
src.connect(snk)
*
- * 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.
diff --git a/src/share/classes/java/io/PipedReader.java b/src/share/classes/java/io/PipedReader.java
index bb86022af6fce86f97c7da0930c702571660bf50..34716466a44260f1de11f7f5db04be869bd375b3 100644
--- a/src/share/classes/java/io/PipedReader.java
+++ b/src/share/classes/java/io/PipedReader.java
@@ -145,15 +145,14 @@ public class PipedReader extends Reader {
* unconnected piped writer and snk
* is an unconnected piped reader, they
* may be connected by either the call:
- *
+ *
*
snk.connect(src)
*
* or the call:
- *
+ *
*
src.connect(snk)
*
- * 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.
diff --git a/src/share/classes/java/io/RandomAccessFile.java b/src/share/classes/java/io/RandomAccessFile.java
index fd1c712d1e348d0d0bd751216e24146d25c22f34..c48aa99b32f7c1919a527c4ee3cd5a31f8c7db51 100644
--- a/src/share/classes/java/io/RandomAccessFile.java
+++ b/src/share/classes/java/io/RandomAccessFile.java
@@ -784,7 +784,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
*
* * then the result is equal to: - *
+ ** ((long)b1 << 56) + ((long)b2 << 48) * + ((long)b3 << 40) + ((long)b4 << 32) * + ((long)b5 << 24) + ((long)b6 << 16) diff --git a/src/share/classes/java/io/Serializable.java b/src/share/classes/java/io/Serializable.java index fc717f7570e9633f37a45b37ac92c591044e028a..2f7bea1833ed7d6935799610741588ec0a4d79b7 100644 --- a/src/share/classes/java/io/Serializable.java +++ b/src/share/classes/java/io/Serializable.java @@ -55,7 +55,7 @@ package java.io; * * Classes that require special handling during the serialization and * deserialization process must implement special methods with these exact - * signatures:+ * signatures: * *
* private void writeObject(java.io.ObjectOutputStream out) @@ -101,7 +101,7 @@ package java.io; * *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:
+ * special method with the exact signature: * *
* ANY-ACCESS-MODIFIER Object writeReplace() throws ObjectStreamException; @@ -115,7 +115,7 @@ package java.io; * * 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.+ * exact signature. * *
* ANY-ACCESS-MODIFIER Object readResolve() throws ObjectStreamException; @@ -133,7 +133,7 @@ package java.io; * deserialization will result in an {@link InvalidClassException}. A * serializable class can declare its own serialVersionUID explicitly by * declaring a field named"serialVersionUID"that must be static, - * final, and of typelong:+ * final, and of type
long: * ** ANY-ACCESS-MODIFIER static final long serialVersionUID = 42L; diff --git a/src/share/classes/java/io/SerializablePermission.java b/src/share/classes/java/io/SerializablePermission.java index eaa2913243d2ebe0804e0b8ede0c47354c232e0e..b208d24d2f57c25c344060c6c4a1f18408c961eb 100644 --- a/src/share/classes/java/io/SerializablePermission.java +++ b/src/share/classes/java/io/SerializablePermission.java @@ -43,7 +43,6 @@ import java.util.StringTokenizer; * 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. - ** *
*
diff --git a/src/share/classes/java/lang/AbstractStringBuilder.java b/src/share/classes/java/lang/AbstractStringBuilder.java index 3260da6ae998aa6142d0765fe6baf8a69f44dea1..3cde60d643792aabdc36ea8b46a9b794266bba72 100644 --- a/src/share/classes/java/lang/AbstractStringBuilder.java +++ b/src/share/classes/java/lang/AbstractStringBuilder.java @@ -330,9 +330,9 @@ abstract class AbstractStringBuilder implements Appendable, CharSequence { * 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: - * + * } * * @param srcBegin start copying at this offset. * @param srcEnd stop copying at this offset. @@ -859,16 +859,16 @@ abstract class AbstractStringBuilder implements Appendable, CharSequence { * *+ *{@code * dstbegin + (srcEnd-srcBegin) - 1 - *An invocation of this method of the form * - *
+ *- * sb.subSequence(begin, end){@code + * sb.subSequence(begin, end)}* * behaves in exactly the same way as the invocation * - *+ *- * sb.substring(begin, end){@code + * sb.substring(begin, end)}* * This method is provided so that this class can - * implement the {@link CharSequence} interface. + * implement the {@link CharSequence} interface. * * @param start the start index, inclusive. * @param end the end index, exclusive. @@ -1287,9 +1287,9 @@ abstract class AbstractStringBuilder implements Appendable, CharSequence { * Returns the index within this string of the first occurrence of the * specified substring. The integer returned is the smallest value * k such that: - *+ * } * is {@code true}. * * @param str any string. @@ -1306,10 +1306,10 @@ abstract class AbstractStringBuilder implements Appendable, CharSequence { * 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: - *+ *{@code * this.toString().startsWith(str, k) - *+ * } * If no such value of k exists, then -1 is returned. * * @param str the substring for which to search. @@ -1326,9 +1326,9 @@ abstract class AbstractStringBuilder implements Appendable, CharSequence { * 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 k such that - *+ *{@code * k >= Math.min(fromIndex, this.length()) && * this.toString().startsWith(str, k) - *+ * } * is true. * * @param str the substring to search for. @@ -1345,10 +1345,10 @@ abstract class AbstractStringBuilder implements Appendable, CharSequence { * Returns the index within this string of the last occurrence of the * specified substring. The integer returned is the largest value k * such that: - *+ *{@code * this.toString().startsWith(str, k) - *+ * } * If no such value of k exists, then -1 is returned. * * @param str the substring to search for. diff --git a/src/share/classes/java/lang/ArrayStoreException.java b/src/share/classes/java/lang/ArrayStoreException.java index aec35f2de3413cf45a6b1dc59a38679ce52b4a81..96fa7447a79ab1bd1e6e4b82370960e6432ef28b 100644 --- a/src/share/classes/java/lang/ArrayStoreException.java +++ b/src/share/classes/java/lang/ArrayStoreException.java @@ -29,7 +29,7 @@ package java.lang; * 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 * k <= Math.min(fromIndex, this.length()) && * this.toString().startsWith(str, k) - *ArrayStoreException: - *+ *diff --git a/src/share/classes/java/lang/Byte.java b/src/share/classes/java/lang/Byte.java index 275e33de5a79f3be3c92bab96e9e9621cba1359e..3a894a5f5e2cf310001145d36d41b74bb6b2207e 100644 --- a/src/share/classes/java/lang/Byte.java +++ b/src/share/classes/java/lang/Byte.java @@ -244,7 +244,7 @@ public final class Byte extends Number implements Comparable* Object x[] = new String[3]; * x[0] = new Integer(0); *{ * - Signopt {@code 0X} HexDigits *
- Signopt {@code #} HexDigits *
- Signopt {@code 0} OctalDigits - *
+ * *
- Sign: *
- {@code -} *
- {@code +} diff --git a/src/share/classes/java/lang/Character.java b/src/share/classes/java/lang/Character.java index 41576cca8d87915d85b92881323afa14cbc5c354..0926758b054fa6f0264aeb81773d1d1e9070c9d1 100644 --- a/src/share/classes/java/lang/Character.java +++ b/src/share/classes/java/lang/Character.java @@ -5394,7 +5394,7 @@ class Character implements java.io.Serializable, Comparable
{ * Other_Lowercase as defined by the Unicode Standard. * * The following are examples of lowercase characters: - *
+ ** 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 @@ class Character implements java.io.Serializable, Comparable{ * Other_Lowercase as defined by the Unicode Standard. * * The following are examples of lowercase characters: - *
+ ** 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 @@ class Character implements java.io.Serializable, Comparable{ * or it has contributory property Other_Uppercase as defined by the Unicode Standard. * * The following are examples of uppercase characters: - *
+ *- ** 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' *Many other Unicode characters are uppercase too.
+ *
Many other Unicode characters are uppercase too. * *
Note: This method cannot handle supplementary characters. To support @@ -5496,7 +5496,7 @@ class Character implements java.io.Serializable, Comparable
{ * or it has contributory property Other_Uppercase as defined by the Unicode Standard. * * The following are examples of uppercase characters: - *
+ ** 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 @@ class Character implements java.io.Serializable, Comparable{ * - {@code LATIN CAPITAL LETTER N WITH SMALL LETTER J} *
- {@code LATIN CAPITAL LETTER D WITH SMALL LETTER Z} * - *
Many other Unicode characters are titlecase too.
+ *
Many other Unicode characters are titlecase too. * *
Note: This method cannot handle supplementary characters. To support diff --git a/src/share/classes/java/lang/Class.java b/src/share/classes/java/lang/Class.java index 64376970a97a2bfd5f70ebe8dd5b9c6e8aac70ad..e11ee1e65e8bd1e240ac0b59cab954f26d143b23 100644 --- a/src/share/classes/java/lang/Class.java +++ b/src/share/classes/java/lang/Class.java @@ -91,7 +91,7 @@ import sun.reflect.misc.ReflectUtil; *
The following example uses a {@code Class} object to print the * class name of an object: * - *
+ ** void printClassName(Object obj) { * System.out.println("The class of " + obj + * " is " + obj.getClass().getName()); @@ -103,7 +103,7 @@ import sun.reflect.misc.ReflectUtil; * The Java™ Language Specification. * For example: * - *
+ ** {@code System.out.println("The name of class Foo is: "+Foo.class.getName());} ** diff --git a/src/share/classes/java/lang/ClassCastException.java b/src/share/classes/java/lang/ClassCastException.java index fc9b2616effc8e5913936033a7c23084627b3aa1..93b61630d21d38c798a60c47fcc541d4b1095c31 100644 --- a/src/share/classes/java/lang/ClassCastException.java +++ b/src/share/classes/java/lang/ClassCastException.java @@ -29,7 +29,7 @@ package java.lang; * 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 aClassCastException: - *+ *diff --git a/src/share/classes/java/lang/Double.java b/src/share/classes/java/lang/Double.java index 1b1aece8122321617cd8a0d1a0f794ef0517c1a6..690ca6a8dc3ffd5a544cafad015a34baaf63a88d 100644 --- a/src/share/classes/java/lang/Double.java +++ b/src/share/classes/java/lang/Double.java @@ -361,15 +361,11 @@ public final class Double extends Number implements Comparable* Object x = new Integer(0); * System.out.println((String)x); *{ * - SignedInteger * * - *
- * *
*
* - *- HexFloatingPointLiteral: *
- HexSignificand BinaryExponent FloatTypeSuffixopt *
- * *
*
* - *- HexSignificand: *
- HexNumeral @@ -380,15 +376,11 @@ public final class Double extends Number implements Comparable
{ * {@code .} HexDigits * - * *
*
* - *- BinaryExponent: *
- BinaryExponentIndicator SignedInteger *
- * *
*
* - *- BinaryExponentIndicator: *
- {@code p} diff --git a/src/share/classes/java/lang/Float.java b/src/share/classes/java/lang/Float.java index e130e92314e43f4d73d0a696df9b0132a7183b6c..5cc28f99bff4ae68d13f8aaf1fd3b5951173ef8f 100644 --- a/src/share/classes/java/lang/Float.java +++ b/src/share/classes/java/lang/Float.java @@ -321,15 +321,11 @@ public final class Float extends Number implements Comparable
{ * - SignedInteger *
- * *
*
* - *- HexFloatingPointLiteral: *
- HexSignificand BinaryExponent FloatTypeSuffixopt *
- * *
*
* - *- HexSignificand: *
- HexNumeral @@ -340,15 +336,11 @@ public final class Float extends Number implements Comparable
{ * {@code .} HexDigits * - * *
*
* - *- BinaryExponent: *
- BinaryExponentIndicator SignedInteger *
- * *
*
- BinaryExponentIndicator: *
- {@code p} diff --git a/src/share/classes/java/lang/Integer.java b/src/share/classes/java/lang/Integer.java index 7ee4b48855e0adf084c2e1e65ff563c616ef90f3..c5d971a54ae37a80619f82ba2f5f2296d583f652 100644 --- a/src/share/classes/java/lang/Integer.java +++ b/src/share/classes/java/lang/Integer.java @@ -1123,7 +1123,7 @@ public final class Integer extends Number implements Comparable
{ * - Signopt {@code 0X} HexDigits *
- Signopt {@code #} HexDigits *
- Signopt {@code 0} OctalDigits - *
+ * *
- Sign: *
- {@code -} *
- {@code +} diff --git a/src/share/classes/java/lang/Iterable.java b/src/share/classes/java/lang/Iterable.java index 0a3ca82f5b4368b849552b5ca1d1a2900c17186c..eed39388a8f8148e016eaf0bf3b3530a7278e5ae 100644 --- a/src/share/classes/java/lang/Iterable.java +++ b/src/share/classes/java/lang/Iterable.java @@ -51,10 +51,12 @@ public interface Iterable
{ Iterator iterator(); /** - * Performs the given action on the contents of the {@code Iterable}, in the - * order elements occur when iterating, until all elements have been - * processed or the action throws an exception. Errors or runtime - * exceptions thrown by the action are relayed to the caller. + * Performs the given action for each element of the {@code Iterable} + * until all elements have been processed or the action throws an + * exception. Unless otherwise specified by the implementing class, + * actions are performed in the order of iteration (if an iteration order + * is specified). Exceptions thrown by the action are relayed to the + * caller. * * @implSpec * The default implementation behaves as if: @@ -99,4 +101,3 @@ public interface Iterable
{ return Spliterators.spliteratorUnknownSize(iterator(), 0); } } - diff --git a/src/share/classes/java/lang/Long.java b/src/share/classes/java/lang/Long.java index bfaf0c4412fe0555b20d6f20c73cb35b78148d59..fa43fa4d0b5cf0a2bde91c8be3a2a0ddd82fc717 100644 --- a/src/share/classes/java/lang/Long.java +++ b/src/share/classes/java/lang/Long.java @@ -853,7 +853,7 @@ public final class Long extends Number implements Comparable { * - Signopt {@code 0X} HexDigits *
- Signopt {@code #} HexDigits *
- Signopt {@code 0} OctalDigits - *
+ * *
- Sign: *
- {@code -} *
- {@code +} diff --git a/src/share/classes/java/lang/RuntimePermission.java b/src/share/classes/java/lang/RuntimePermission.java index 6dcbc275e9e4f96631684499de52fa3138847247..9da131ba93833fc50ed350621db722de44d1663d 100644 --- a/src/share/classes/java/lang/RuntimePermission.java +++ b/src/share/classes/java/lang/RuntimePermission.java @@ -47,7 +47,6 @@ import java.util.StringTokenizer; * 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. - *
* *
diff --git a/src/share/classes/java/lang/Short.java b/src/share/classes/java/lang/Short.java index c7641807c568528709b599bd1198aadfba86a576..9fb3913beaeef6314c0b39f6bc76ea3e6346510e 100644 --- a/src/share/classes/java/lang/Short.java +++ b/src/share/classes/java/lang/Short.java @@ -249,7 +249,7 @@ public final class Short extends Number implements Comparable
{ * - Signopt {@code 0X} HexDigits *
- Signopt {@code #} HexDigits *
- Signopt {@code 0} OctalDigits - *
+ * *
- Sign: *
- {@code -} *
- {@code +} diff --git a/src/share/classes/java/lang/String.java b/src/share/classes/java/lang/String.java index 5c9a8017f140180253bcebb0a5f7862ab46ce3cc..9223c0ab54f93af8f2ffde71dc458f2155cd1c22 100644 --- a/src/share/classes/java/lang/String.java +++ b/src/share/classes/java/lang/String.java @@ -47,16 +47,16 @@ import java.util.regex.PatternSyntaxException; * 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: - *
+ ** String str = "abc"; ** is equivalent to: - *
+ ** char data[] = {'a', 'b', 'c'}; * String str = new String(data); ** Here are some more examples of how strings can be used: - *
+ ** System.out.println("abc"); * String cde = "cde"; * System.out.println("abc" + cde); @@ -786,7 +786,7 @@ public final class String * {@code srcEnd-srcBegin}). The characters are copied into the * subarray of {@code dst} starting at index {@code dstBegin} * and ending at index: - *+ ** @@ -2662,7 +2662,7 @@ public final class String * {@code String} may be a different length than the original {@code String}. ** dstbegin + (srcEnd-srcBegin) - 1 ** Examples of locale-sensitive and 1:M case mappings are in the following table. - *
+ * *
*
* Language Code of Locale diff --git a/src/share/classes/java/lang/Thread.java b/src/share/classes/java/lang/Thread.java index c2f5561bdf469527759be00ae5d3dd02c98bfdae..13d8ac26cad192ff98d8ca4d2f26830992e3de90 100644 --- a/src/share/classes/java/lang/Thread.java +++ b/src/share/classes/java/lang/Thread.java @@ -76,7 +76,7 @@ import sun.security.util.SecurityConstants; *Thread. 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: - *+ ** class PrimeThread extends Thread { * long minPrime; * PrimeThread(long minPrime) { @@ -91,7 +91,7 @@ import sun.security.util.SecurityConstants; *
** The following code would then create a thread and start it running: - *
+ *@@ -102,7 +102,7 @@ import sun.security.util.SecurityConstants; * then be allocated, passed as an argument when creating ** PrimeThread p = new PrimeThread(143); * p.start(); *Thread, and started. The same example in this other * style looks like the following: - *+ ** class PrimeRun implements Runnable { * long minPrime; * PrimeRun(long minPrime) { @@ -117,7 +117,7 @@ import sun.security.util.SecurityConstants; *
** The following code would then create a thread and start it running: - *
+ *diff --git a/src/share/classes/java/lang/invoke/LambdaMetafactory.java b/src/share/classes/java/lang/invoke/LambdaMetafactory.java index 87c7923d9babc508a459f310312b32809e1eab35..a5d2afab40ebe5c481f4f5dffa4b84cb8271c12d 100644 --- a/src/share/classes/java/lang/invoke/LambdaMetafactory.java +++ b/src/share/classes/java/lang/invoke/LambdaMetafactory.java @@ -183,15 +183,15 @@ public class LambdaMetafactory { * @param samMethodType MethodType of the method in the functional interface * to which the lambda or method reference is being * converted, represented as a MethodType. - * @param implMethod The implementation method which should be called - * (with suitable adaptation of argument types, return - * types, and adjustment for captured arguments) when - * methods of the resulting functional interface instance - * are invoked. + * @param implMethod A direct method handle describing the implementation + * method which should be called (with suitable adaptation + * of argument types, return types, and adjustment for + * captured arguments) when methods of the resulting + * functional interface instance are invoked. * @param instantiatedMethodType The signature of the primary functional * interface method after type variables * are substituted with their instantiation - * from the capture site + * from the capture site. * @return a CallSite, which, when invoked, will return an instance of the * functional interface * @throws ReflectiveOperationException if the caller is not able to @@ -220,15 +220,21 @@ public class LambdaMetafactory { * references to functional interfaces, which supports serialization and * other uncommon options. * - * The declared argument list for this method is: + ** PrimeRun p = new PrimeRun(143); * new Thread(p).start(); *The declared argument list for this method is: * + *
{@code * CallSite altMetafactory(MethodHandles.Lookup caller, * String invokedName, * MethodType invokedType, * Object... args) + * }* - * but it behaves as if the argument list is: + *but it behaves as if the argument list is as follows, where names that + * appear in the argument list for + * {@link #metafactory(MethodHandles.Lookup, String, MethodType, MethodType, MethodHandle, MethodType)} + * have the same specification as in that method: * + *
{@code * CallSite altMetafactory(MethodHandles.Lookup caller, * String invokedName, * MethodType invokedType, @@ -241,7 +247,15 @@ public class LambdaMetafactory { * int bridgeCount, // IF flags has BRIDGES set * MethodType... bridges // IF flags has BRIDGES set * ) + * }* + *If the flags contains {@code FLAG_SERIALIZABLE}, or one of the marker + * interfaces extends {@link Serializable}, the metafactory will link the + * call site to one that produces a serializable lambda. In addition to + * the lambda instance implementing {@code Serializable}, it will have a + * {@code writeReplace} method that returns an appropriate {@link + * SerializedLambda}, and an appropriate {@code $deserializeLambda$} + * method. * * @param caller Stacked automatically by VM; represents a lookup context * with the accessibility privileges of the caller. @@ -257,7 +271,7 @@ public class LambdaMetafactory { * In the event that the implementation method is an * instance method, the first argument in the invocation * signature will correspond to the receiver. - * @param args flags and optional arguments, as described above + * @param args flags and optional arguments, as described above. * @return a CallSite, which, when invoked, will return an instance of the * functional interface * @throws ReflectiveOperationException if the caller is not able to diff --git a/src/share/classes/java/lang/invoke/SerializedLambda.java b/src/share/classes/java/lang/invoke/SerializedLambda.java index 9be96ff685bdee8b2fcef7e914e540680f8f3ab4..e641201272155cf73f5ceecc8a2d0482baa3d8cc 100644 --- a/src/share/classes/java/lang/invoke/SerializedLambda.java +++ b/src/share/classes/java/lang/invoke/SerializedLambda.java @@ -32,9 +32,26 @@ import java.security.PrivilegedExceptionAction; import java.util.Objects; /** - * Serialized form of a lambda expression. The properties of this class represent the information that is present - * at the lambda factory site, including the identity of the primary functional interface method, the identity of the - * implementation method, and any variables captured from the local environment at the time of lambda capture. + * Serialized form of a lambda expression. The properties of this class + * represent the information that is present at the lambda factory site, including + * static metafactory arguments such as the identity of the primary functional + * interface method and the identity of the implementation method, as well as + * dynamic metafactory arguments such as values captured from the lexical scope + * at the time of lambda capture. + * + *
Implementors of serializable lambdas, such as compilers or language + * runtime libraries, are expected to ensure that instances deserialize properly. + * One means to do so is to ensure that the {@code writeReplace} method returns + * an instance of {@code SerializedLambda}, rather than allowing default + * serialization to proceed. + * + *
{@code SerializedLambda} has a {@code readResolve} method that looks for + * a (possibly private) static method called + * {@code $deserializeLambda$(SerializedLambda)} in the capturing class, invokes + * that with itself as the first argument, and returns the result. Lambda classes + * implementing {@code $deserializeLambda$} are responsible for validating + * that the properties of the {@code SerializedLambda} are consistent with a + * lambda actually captured by that class. * * @see LambdaMetafactory */ diff --git a/src/share/classes/java/lang/management/ManagementFactory.java b/src/share/classes/java/lang/management/ManagementFactory.java index 6e00706ccd04ed87a9cc440c439a0aa81540d07e..0c7297abe956d00027eab965baf466dc0bf09c27 100644 --- a/src/share/classes/java/lang/management/ManagementFactory.java +++ b/src/share/classes/java/lang/management/ManagementFactory.java @@ -60,7 +60,7 @@ import sun.management.ManagementFactoryHelper; * one or more platform MXBeans representing * the management interface of a component of the Java virtual * machine. - *
+ * *
Platform MXBeans
** A platform MXBean is a managed bean that diff --git a/src/share/classes/java/lang/management/ManagementPermission.java b/src/share/classes/java/lang/management/ManagementPermission.java index 7f62c5e396a6bd253fd1b3d182bed496d36e6c7a..ae3dc56451839a20e925d631e763e0ba77601bb6 100644 --- a/src/share/classes/java/lang/management/ManagementPermission.java +++ b/src/share/classes/java/lang/management/ManagementPermission.java @@ -33,10 +33,8 @@ package java.lang.management; * The following table * provides a summary description of what the permission allows, * and discusses the risks of granting code the permission. - *
* - *
+ *
*
* * Below is a picture showing an example of a memory pool: - ** Permission Target Name *What the Permission Allows diff --git a/src/share/classes/java/lang/management/MemoryUsage.java b/src/share/classes/java/lang/management/MemoryUsage.java index bbb75a2648451dc1e70e45bfd6a25b478c67165d..6d11e323f6dcecdce43b4b7b9933e15cad55e651 100644 --- a/src/share/classes/java/lang/management/MemoryUsage.java +++ b/src/share/classes/java/lang/management/MemoryUsage.java @@ -79,7 +79,7 @@ import sun.management.MemoryUsageCompositeData; *+ * *
* +----------------------------------------------+ * +//////////////// | + @@ -250,7 +250,7 @@ public class MemoryUsage { * Returns a MemoryUsage object represented by the * given CompositeData. The given CompositeData * must contain the following attributes: - *+ * *
**
diff --git a/src/share/classes/java/lang/management/package.html b/src/share/classes/java/lang/management/package.html index 7d2fa99b737932c151e0149a7b97fbebc36efb1a..c2c74d0ccdd686b02ada1ad5631aa629198d47d1 100644 --- a/src/share/classes/java/lang/management/package.html +++ b/src/share/classes/java/lang/management/package.html @@ -82,7 +82,7 @@ Java virtual machine and the runtime in the following ways: 1. Direct access to an MXBean interface
-
- Get an MXBean instance locally in the running Java virtual machine:
+
- Get an MXBean instance locally in the running Java virtual machine:
RuntimeMXBean mxbean = ManagementFactory.getRuntimeMXBean(); @@ -103,7 +103,7 @@ Java virtual machine and the runtime in the following ways:
- Construct an MXBean proxy instance that forwards the - method calls to a given MBeanServer:
+ method calls to a given MBeanServer:
MBeanServerConnection mbs; diff --git a/src/share/classes/java/lang/reflect/ReflectPermission.java b/src/share/classes/java/lang/reflect/ReflectPermission.java index 6570e79224245a0e7e7737416b77ca1ad32ba5cc..2674de47caa69c8ca1dfab70e395f7c5e5881c27 100644 --- a/src/share/classes/java/lang/reflect/ReflectPermission.java +++ b/src/share/classes/java/lang/reflect/ReflectPermission.java @@ -31,7 +31,6 @@ package java.lang.reflect; * The following table * provides a summary description of what the permission allows, * and discusses the risks of granting code the permission. - ** *
*
- *diff --git a/src/share/classes/java/net/DatagramSocket.java b/src/share/classes/java/net/DatagramSocket.java index ab60a263ac7479bdb4dad34fea89246d11cd8e5c..9f269ffd6600076d623f578c17086e05abbe0e1f 100644 --- a/src/share/classes/java/net/DatagramSocket.java +++ b/src/share/classes/java/net/DatagramSocket.java @@ -196,7 +196,7 @@ class DatagramSocket implements java.io.Closeable { * socket address. * ** If, if the address is {@code null}, creates an unbound socket. - *
+ * *
If there is a security manager, * its {@code checkListen} method is first called * with the port from the socket address @@ -1109,7 +1109,7 @@ class DatagramSocket implements java.io.Closeable { * represent the value of the TOS octet in IP packets sent by * the socket. * RFC 1349 defines the TOS values as follows: - *
+ * *
*
- *
IPTOS_LOWCOST (0x02)- diff --git a/src/share/classes/java/net/Inet6Address.java b/src/share/classes/java/net/Inet6Address.java index 068a4ce235df779eeee8ec13f78c50dc9a37dbb5..001c55ffc596ae4ea3aa0b86f275bf723b6c3ad9 100644 --- a/src/share/classes/java/net/Inet6Address.java +++ b/src/share/classes/java/net/Inet6Address.java @@ -133,7 +133,7 @@ import java.util.Arrays; * representation. However, it will be converted into an IPv4 * address.
IPTOS_RELIABILITY (0x04)+ * *
Textual representation of IPv6 scoped addresses
* *The textual representation of IPv6 addresses as described above can be @@ -150,11 +150,11 @@ import java.util.Arrays; * *
The general format for specifying the scope_id is the following: * - *
IPv6-address%scope_id+ *IPv6-address%scope_id*The IPv6-address is a literal IPv6 address as described above. * The scope_id refers to an interface on the local system, and it can be * specified in two ways. - *
- As a numeric identifier. This must be a positive integer + *
- As a numeric identifier. 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 diff --git a/src/share/classes/java/net/MulticastSocket.java b/src/share/classes/java/net/MulticastSocket.java index 9c5cb05acbb9427168bb927705c53140ff45e1bc..1d42dfe6e87ebb3c4e6f6e64675ada1dca5fa862 100644 --- a/src/share/classes/java/net/MulticastSocket.java +++ b/src/share/classes/java/net/MulticastSocket.java @@ -140,7 +140,7 @@ class MulticastSocket extends DatagramSocket { * Create a MulticastSocket bound to the specified socket address. *
* Or, if the address is {@code null}, create an unbound socket. - *
+ * *
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. diff --git a/src/share/classes/java/net/NetPermission.java b/src/share/classes/java/net/NetPermission.java index cf7cbd2af67db617a19fb11a6b768f9186ced3f8..9178f3487232751f579f7ee735ec710431d8f486 100644 --- a/src/share/classes/java/net/NetPermission.java +++ b/src/share/classes/java/net/NetPermission.java @@ -46,7 +46,6 @@ import java.util.StringTokenizer; * 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. - *
* *
*
diff --git a/src/share/classes/java/net/Proxy.java b/src/share/classes/java/net/Proxy.java index fe481fadfa2523ec9420eeba8a8ce32f0ef9121a..8ba020ef4846a8910ce661b1cdd02787c4d7ae49 100644 --- a/src/share/classes/java/net/Proxy.java +++ b/src/share/classes/java/net/Proxy.java @@ -66,8 +66,8 @@ public class Proxy { * Used, for instance, to create sockets bypassing any other global * proxy settings (like SOCKS): * - * {@code Socket s = new Socket(Proxy.NO_PROXY);}
- *+ * {@code Socket s = new Socket(Proxy.NO_PROXY);} + * */ public final static Proxy NO_PROXY = new Proxy(); diff --git a/src/share/classes/java/net/Socket.java b/src/share/classes/java/net/Socket.java index 361260351f581bb42a2d5b3c6d0629c34e2c4d60..21cf5aae1330e9f25fe0e2c70ffc6d07a4fc7f23 100644 --- a/src/share/classes/java/net/Socket.java +++ b/src/share/classes/java/net/Socket.java @@ -1230,13 +1230,13 @@ class Socket implements java.io.Closeable { * 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 before the socket is connected to the - * remote peer. There are two cases to be aware of:
+ * remote peer. There are two cases to be aware of: *
*
+ * connecting the socket to its remote peer. * @param size the size to which to set the receive buffer * size. This value must be greater than 0. * @@ -1329,7 +1329,7 @@ class Socket implements java.io.Closeable { * represent the value of the TOS octet in IP packets sent by * the socket. * RFC 1349 defines the TOS values as follows: - *- 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.
*- For client sockets, setReceiveBufferSize() must be called before - * connecting the socket to its remote peer.
+ * *
*
- *
IPTOS_LOWCOST (0x02)- diff --git a/src/share/classes/java/net/SocketOptions.java b/src/share/classes/java/net/SocketOptions.java index b9508dbb2664c96e5d31a5d27e8018af2ea0b80e..7e1b0fc85b6993dfad64444c188b33ed6af10f58 100644 --- a/src/share/classes/java/net/SocketOptions.java +++ b/src/share/classes/java/net/SocketOptions.java @@ -134,7 +134,7 @@ public interface SocketOptions { * previously written data. *
IPTOS_RELIABILITY (0x04)* Valid for TCP only: SocketImpl. - *
+ * * @see Socket#setTcpNoDelay * @see Socket#getTcpNoDelay */ @@ -155,7 +155,7 @@ public interface SocketOptions { * This option must be specified in the constructor. *
* Valid for: SocketImpl, DatagramSocketImpl - *
+ * * @see Socket#getLocalAddress * @see DatagramSocket#getLocalAddress */ @@ -186,7 +186,7 @@ public interface SocketOptions { * want to use other than the system default. Takes/returns an InetAddress. *
* Valid for Multicast: DatagramSocketImpl - *
+ * * @see MulticastSocket#setInterface(InetAddress) * @see MulticastSocket#getInterface() */ diff --git a/src/share/classes/java/net/SocketPermission.java b/src/share/classes/java/net/SocketPermission.java index e90856eac8ef93150e4e8698d268971b422b9774..1b11437b1aa0e6cacd72465f886639d85d2a77d3 100644 --- a/src/share/classes/java/net/SocketPermission.java +++ b/src/share/classes/java/net/SocketPermission.java @@ -779,27 +779,27 @@ public final class SocketPermission extends Permission * specified permission. *
* More specifically, this method first ensures that all of the following - * are true (and returns false if any of them are not):
+ * are true (and returns false if any of them are not): *
- *
* * Then {@code implies} checks each of the following, in order, - * and for each returns true if the stated condition is true:- p is an instanceof SocketPermission,
+ *
- p is an instanceof SocketPermission, *
- p's actions are a proper subset of this - * object's actions, and
+ * object's actions, and *
- p's port range is included in this port range. Note: - * port range is ignored when p only contains the action, 'resolve'.
+ * port range is ignored when p only contains the action, 'resolve'. *
+ * and for each returns true if the stated condition is true: *
*
* * If none of the above are true, {@code implies} returns false. diff --git a/src/share/classes/java/net/URI.java b/src/share/classes/java/net/URI.java index 71c4f6dc5ded9d4c480d026ac492350860260b83..813de5cf453c3ff6643760726315a4d06ce24355 100644 --- a/src/share/classes/java/net/URI.java +++ b/src/share/classes/java/net/URI.java @@ -389,20 +389,20 @@ import java.lang.NullPointerException; // for javadoc * 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: - *- If this object was initialized with a single IP address and one of p's - * IP addresses is equal to this object's IP address.
+ * IP addresses is equal to this object's IP address. *
- If this object is a wildcard domain (such as *.sun.com), and * p's canonical name (the name without any preceding *) * ends with this object's canonical host name. For example, *.sun.com - * implies *.eng.sun.com..
+ * implies *.eng.sun.com. *
- If this object was not initialized with a single IP address, and one of this - * object's IP addresses equals one of p's IP addresses.
- *
- If this canonical name equals p's canonical name.
+ * object's IP addresses equals one of p's IP addresses. + *
- If this canonical name equals p's canonical name. *
+ ** new URI(u.getScheme(), * u.getSchemeSpecificPart(), * u.getFragment()) * .equals(u)* in all cases, - *+ ** new URI(u.getScheme(), * u.getUserInfo(), u.getAuthority(), * u.getPath(), u.getQuery(), * u.getFragment()) * .equals(u)* if u is hierarchical, and - *+ ** new URI(u.getScheme(), * u.getUserInfo(), u.getHost(), u.getPort(), * u.getPath(), u.getQuery(), diff --git a/src/share/classes/java/net/URLConnection.java b/src/share/classes/java/net/URLConnection.java index b731ac70d90a1a351dc1889fb22723048e0b7f36..785cfc0c9e29c60aa2ec80ca7b67b15192ff88b9 100644 --- a/src/share/classes/java/net/URLConnection.java +++ b/src/share/classes/java/net/URLConnection.java @@ -45,7 +45,7 @@ import sun.net.www.MessageHeader; * 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: - *+ * *
*
diff --git a/src/share/classes/java/net/URLDecoder.java b/src/share/classes/java/net/URLDecoder.java index eb5e36e5d82f6ef57dbe04d82fcbd9b62e9d3220..acf10e98244520ac729b5a02e469c3360e76d1b5 100644 --- a/src/share/classes/java/net/URLDecoder.java +++ b/src/share/classes/java/net/URLDecoder.java @@ -43,7 +43,7 @@ import java.io.*; * as the start of a special escaped sequence. * {@code openConnection()} *{@code connect()} * The following rules are applied in the conversion: - *
+ * *
*
- The alphanumeric characters "{@code a}" through * "{@code z}", "{@code A}" through diff --git a/src/share/classes/java/net/URLEncoder.java b/src/share/classes/java/net/URLEncoder.java index b5c4a8c32f93634e7d67c769469ab396beb2dcb5..7b05e1cde792095829e929e19b0f9f6424d2da09 100644 --- a/src/share/classes/java/net/URLEncoder.java +++ b/src/share/classes/java/net/URLEncoder.java @@ -49,7 +49,6 @@ import sun.security.action.GetPropertyAction; *
* When encoding a String, the following rules apply: * - *
*
*
- The alphanumeric characters "{@code a}" through * "{@code z}", "{@code A}" through diff --git a/src/share/classes/java/net/URLPermission.java b/src/share/classes/java/net/URLPermission.java index f6572cd357598a09adf73e84a85113f8e60eeca9..2a6568f07a8a975e32ead902a1f6dc082a20c0e7 100644 --- a/src/share/classes/java/net/URLPermission.java +++ b/src/share/classes/java/net/URLPermission.java @@ -45,7 +45,7 @@ import java.security.Permission; * * scheme will typically be http or https, but is not restricted by this * class. - * authority is specified as:
+ * authority is specified as: *
* authority = hostrange [ : portrange ] * portrange = portnumber | -portnumber | portnumber-[portnumber] | * @@ -223,7 +223,7 @@ public final class URLPermission extends Permission { * Checks if this URLPermission implies the given permission. * Specifically, the following checks are done as if in the * following sequence: - *+ *
*
*- if 'p' is not an instance of URLPermission return false
*- 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.
@@ -242,7 +242,7 @@ public final class URLPermission extends Permission { *- otherwise, return false
*Some examples of how paths are matched are shown below: - *
+ *
*
Examples of Path Matching ** this's path p's path match diff --git a/src/share/classes/java/net/package-info.java b/src/share/classes/java/net/package-info.java index 6552b30b634db0a853bd57494005e6239b4d351c..fda2e4f28b8bea2515af3d1bc674ad85e045a692 100644 --- a/src/share/classes/java/net/package-info.java +++ b/src/share/classes/java/net/package-info.java @@ -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. /a/b /a/b yes + * InputStream. *
Here is an example:
- *+ ** 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.* The system will return a keystore implementation for the default type. - *+ * if this fails, {@code http.Handler} from the default location. *
Note that the Handler class has to be a subclass of the abstract * class {@link java.net.URLStreamHandler}.
*Additional Specification
diff --git a/src/share/classes/java/nio/X-Buffer.java.template b/src/share/classes/java/nio/X-Buffer.java.template index 60f0733c9ab19d1367e7cc0a6d8499fa2fc8c1a9..acc8fc899126713e347e18ff9c85f875e448ee0f 100644 --- a/src/share/classes/java/nio/X-Buffer.java.template +++ b/src/share/classes/java/nio/X-Buffer.java.template @@ -1129,7 +1129,7 @@ public abstract class $Type$Buffer * *Two $type$ buffers are equal if, and only if, * - *
+ *
* *
- * diff --git a/src/share/classes/java/nio/file/FileSystem.java b/src/share/classes/java/nio/file/FileSystem.java index 2296cada82959cdffecfc6a705a162b31707bbb1..2a961fb8ecfd8b97749999b0ad715bcbb0782d24 100644 --- a/src/share/classes/java/nio/file/FileSystem.java +++ b/src/share/classes/java/nio/file/FileSystem.java @@ -355,7 +355,7 @@ public abstract class FileSystem * *
They have the same element type,
The following rules are used to interpret glob patterns: * - *
+ *
*
- diff --git a/src/share/classes/java/rmi/RMISecurityManager.java b/src/share/classes/java/rmi/RMISecurityManager.java index 3759e7f48ea0a279c604254cf15f7b01a75d82fb..b260c49a1ce9a8e64d5f0aed0e7c1e82db3c4cdd 100644 --- a/src/share/classes/java/rmi/RMISecurityManager.java +++ b/src/share/classes/java/rmi/RMISecurityManager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,35 +28,38 @@ package java.rmi; import java.security.*; /** - * A subclass of {@link SecurityManager} used by RMI applications that use - * downloaded code. RMI's class loader will not download any classes from - * remote locations if no security manager has been set. - *
The {@code *} character matches zero or more {@link Character * characters} of a {@link Path#getName(int) name} component without * crossing directory boundaries.
RMISecurityManagerdoes not apply to applets, which run - * under the protection of their browser's security manager. + * {@code RMISecurityManager} implements a policy identical to the policy + * implemented by {@link SecurityManager}. RMI applications + * should use the {@code SecurityManager} class or another appropriate + * {@code SecurityManager} implementation instead of this class. RMI's class + * loader will download classes from remote locations only if a security + * manager has been set. * - *RMISecurityManagerimplements a policy that - * is no different than the policy implemented by {@link SecurityManager}. - * Therefore an RMI application should use theSecurityManager- * class or another application-specificSecurityManager- * implementation instead of this class. + * @implNote + *Applets typically run in a container that already has a security + * manager, so there is generally no need for applets to set a security + * manager. If you have a standalone application, you might need to set a + * {@code SecurityManager} in order to enable class downloading. This can be + * done by adding the following to your code. (It needs to be executed before + * RMI can download code from remote hosts, so it most likely needs to appear + * in the {@code main} method of your application.) * - *
To use a
SecurityManagerin your application, add - * the following statement to your code (it needs to be executed before RMI - * can download code from remote hosts, so it most likely needs to appear - * in themainmethod of your application): - * - *- * System.setSecurityManager(new SecurityManager()); - *+ *{@code + * if (System.getSecurityManager() == null) { + * System.setSecurityManager(new SecurityManager()); + * } + * }* * @author Roger Riggs * @author Peter Jones * @since JDK1.1 - **/ + * @deprecated Use {@link SecurityManager} instead. + */ +@Deprecated public class RMISecurityManager extends SecurityManager { /** - * Constructs a newRMISecurityManager. + * Constructs a new {@code RMISecurityManager}. * @since JDK1.1 */ public RMISecurityManager() { diff --git a/src/share/classes/java/rmi/activation/ActivationGroup.java b/src/share/classes/java/rmi/activation/ActivationGroup.java index 49dffd18e0eec536d1771cd75493f76f9996eb93..bfa64ba3c6f75696ad049a6d123d963058263c39 100644 --- a/src/share/classes/java/rmi/activation/ActivationGroup.java +++ b/src/share/classes/java/rmi/activation/ActivationGroup.java @@ -74,7 +74,7 @@ import sun.security.action.GetIntegerAction; *ActivationGroupwill override the system properties * with the properties requested when its *ActivationGroupDescwas created, and will set a - *java.rmi.RMISecurityManageras the default system + * {@link SecurityManager} as the default system * security manager. If your application requires specific properties * to be set when objects are activated in the group, the application * should create a specialPropertiesobject containing @@ -84,7 +84,7 @@ import sun.security.action.GetIntegerAction; *ActivationDescs (before the default *ActivationGroupDescis created). If your application * requires the use of a security manager other than - *java.rmi.RMISecurityManager, in the + * {@link SecurityManager}, in the * ActivativationGroupDescriptor properties list you can set *java.security.managerproperty to the name of the security * manager you would like to install. @@ -154,21 +154,21 @@ public abstract class ActivationGroup * active). If the object does not call *Activatable.inactivewhen it deactivates, the * object will never be garbage collected since the group keeps - * strong references to the objects it creates.+ * strong references to the objects it creates. * *
The group's
inactiveObjectmethod 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 ofActivationGroupmust override this - * method and unexport the object.+ * method and unexport the object. * *
After removing the object from the RMI runtime, the group * must inform its
ActivationMonitor(via the monitor's *inactiveObjectmethod) 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.+ * request. * *
This method simply informs the group's monitor that the object * is inactive. It is up to the concrete subclass of ActivationGroup @@ -235,7 +235,7 @@ public abstract class ActivationGroup *
Note that if your application creates its own custom * activation group, a security manager must be set for that * group. Otherwise objects cannot be activated in the group. - *
java.rmi.RMISecurityManageris set by default. + * {@link SecurityManager} is set by default. * *If a security manager is already set in the group VM, this * method first calls the security manager's diff --git a/src/share/classes/java/rmi/dgc/VMID.java b/src/share/classes/java/rmi/dgc/VMID.java index 45e58599d6630a1fce83b945c43c3922bf5c3ac2..913c598be2e33fc1a9031c23cbcd925ceabd6d33 100644 --- a/src/share/classes/java/rmi/dgc/VMID.java +++ b/src/share/classes/java/rmi/dgc/VMID.java @@ -67,7 +67,7 @@ public final class VMID implements java.io.Serializable { * conditions: a) the conditions for uniqueness for objects of * the class
java.rmi.server.UIDare satisfied, and b) an * address can be obtained for this host that is unique and constant - * for the lifetime of this object.+ * for the lifetime of this object. */ public VMID() { addr = randomBytes; diff --git a/src/share/classes/java/rmi/server/ServerRef.java b/src/share/classes/java/rmi/server/ServerRef.java index cf73b7c9ab277d6d98c1c3c017a7adce634dca26..f0b521eaad7fe784af1fd8c6462113881c8f0261 100644 --- a/src/share/classes/java/rmi/server/ServerRef.java +++ b/src/share/classes/java/rmi/server/ServerRef.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 1999, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -33,7 +33,9 @@ import java.rmi.*; * * @author Ann Wollrath * @since JDK1.1 + * @deprecated No replacement. This interface is unused and is obsolete. */ +@Deprecated public interface ServerRef extends RemoteRef { /** indicate compatibility with JDK 1.1.x version of class. */ diff --git a/src/share/classes/java/rmi/server/SocketSecurityException.java b/src/share/classes/java/rmi/server/SocketSecurityException.java index 61fc9154d901d307fb88c658e90fe5aafe386cb7..3fbec26e34158c1ec8f550c0735de2356eaffc54 100644 --- a/src/share/classes/java/rmi/server/SocketSecurityException.java +++ b/src/share/classes/java/rmi/server/SocketSecurityException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -30,7 +30,9 @@ package java.rmi.server; * * @author Ann Wollrath * @since JDK1.1 - **/ + * @deprecated This class is obsolete. Use {@link ExportException} instead. + */ +@Deprecated public class SocketSecurityException extends ExportException { /* indicate compatibility with JDK 1.1.x version of class */ diff --git a/src/share/classes/java/rmi/server/UnicastRemoteObject.java b/src/share/classes/java/rmi/server/UnicastRemoteObject.java index be86c275246a9ddc80745345e76fd3c49b0d6d04..80cab6f9ba1e28c9782963fa25994e2912c9a371 100644 --- a/src/share/classes/java/rmi/server/UnicastRemoteObject.java +++ b/src/share/classes/java/rmi/server/UnicastRemoteObject.java @@ -36,7 +36,7 @@ import sun.rmi.server.UnicastServerRef2; * below, the stub for a remote object being exported is obtained as * follows: * - *
+ *
* *
- If the remote object is exported using the {@link * #exportObject(Remote) UnicastRemoteObject.exportObject(Remote)} method, @@ -66,9 +66,8 @@ import sun.rmi.server.UnicastServerRef2; * could not be loaded, or a problem occurs creating the stub instance, a * {@link StubNotFoundException} is thrown. * - *
*
- For all other means of exporting: - *
+ *
* *
* - *- If the remote object's stub class (as defined above) could not be * loaded or the system property @@ -93,7 +92,6 @@ import sun.rmi.server.UnicastServerRef2; * will be thrown. *
*
- Otherwise, an instance of the remote object's stub class (as * described above) is used as the stub. * diff --git a/src/share/classes/java/security/AccessController.java b/src/share/classes/java/security/AccessController.java index 89392261fe1621df4c70f942f5c010721920ae54..36408a8d633d5a21afc495e921785dcfc261bbbe 100644 --- a/src/share/classes/java/security/AccessController.java +++ b/src/share/classes/java/security/AccessController.java @@ -39,9 +39,9 @@ import sun.reflect.Reflection; *
*
diff --git a/src/share/classes/java/security/AlgorithmParameterGenerator.java b/src/share/classes/java/security/AlgorithmParameterGenerator.java index 307aaaf17eb48b2a65f14cdf58168041b36c1913..7f9c7cbf4abfd86fca25ea9707d8bf522dfe16b4 100644 --- a/src/share/classes/java/security/AlgorithmParameterGenerator.java +++ b/src/share/classes/java/security/AlgorithmParameterGenerator.java @@ -48,7 +48,7 @@ import java.security.spec.AlgorithmParameterSpec; * 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.- to decide whether an access to a critical system * resource is to be allowed or denied, based on the security policy - * currently in effect,
+ * currently in effect, *
- to mark code as being "privileged", thus affecting subsequent - * access determinations, and
+ * access determinations, and *
- 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.
+ * derived from the specified size. * *
- The other approach initializes a parameter generator object * using algorithm-specific semantics, which are represented by a set of diff --git a/src/share/classes/java/security/BasicPermission.java b/src/share/classes/java/security/BasicPermission.java index 2d0c96665eefb1b1f7383994d10b1d9610e1634c..89cc2f921524934d96b40f05b96ef1bc1e7621f1 100644 --- a/src/share/classes/java/security/BasicPermission.java +++ b/src/share/classes/java/security/BasicPermission.java @@ -57,7 +57,6 @@ import java.io.IOException; * Subclasses may implement actions on top of BasicPermission, * if desired. *
- *
* @see java.security.Permission * @see java.security.Permissions * @see java.security.PermissionCollection @@ -153,9 +152,9 @@ public abstract class BasicPermission extends Permission * Checks if the specified permission is "implied" by * this object. *
- * More specifically, this method returns true if:
+ * More specifically, this method returns true if: *
- *
- p's class is the same as this object's class, and
+ *
- p's class is the same as this object's class, and *
- p's name equals or (in the case of wildcards) * is implied by this object's * name. For example, "a.b.*" implies "a.b.c". diff --git a/src/share/classes/java/security/CodeSource.java b/src/share/classes/java/security/CodeSource.java index b6167cb008b615f717a73d961fa140323adca874..62a5959ecd80bbd746360ecf3547deef4d19d362 100644 --- a/src/share/classes/java/security/CodeSource.java +++ b/src/share/classes/java/security/CodeSource.java @@ -234,7 +234,7 @@ public class CodeSource implements java.io.Serializable { * Returns true if this CodeSource object "implies" the specified CodeSource. *
* More specifically, this method makes the following checks. - * If any fail, it returns false. If they all succeed, it returns true.
+ * If any fail, it returns false. If they all succeed, it returns true. *
*
- codesource must not be null. *
- If this object's certificates are not null, then all @@ -242,7 +242,7 @@ public class CodeSource implements java.io.Serializable { * certificates. *
- If this object's location (getLocation()) is not null, then the * following checks are made against this object's location and - * codesource's:
+ * codesource's: *
*
* diff --git a/src/share/classes/java/security/KeyPairGenerator.java b/src/share/classes/java/security/KeyPairGenerator.java index 78b100c3afa4684526d0bfd52b9e4ba8ce214102..c09d2510294147a40c6b6ba0ae6bc07ad8c6ef87 100644 --- a/src/share/classes/java/security/KeyPairGenerator.java +++ b/src/share/classes/java/security/KeyPairGenerator.java @@ -77,7 +77,6 @@ import sun.security.jca.GetInstance.Instance; * 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. - *- codesource's location must not be null. * diff --git a/src/share/classes/java/security/Key.java b/src/share/classes/java/security/Key.java index 0ae4e3851b35f27f94541406249f1670db1f9746..c0c63d7c7c10630943d3d608d160382aabf1de12 100644 --- a/src/share/classes/java/security/Key.java +++ b/src/share/classes/java/security/Key.java @@ -39,7 +39,7 @@ package java.security; * 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.
+ * {@link #getAlgorithm() getAlgorithm} method. * *
- An Encoded Form * @@ -65,12 +65,11 @@ package java.security; * For more information, see * RFC 3280: * Internet X.509 Public Key Infrastructure Certificate and CRL Profile. - *
* *
- A Format * *
This is the name of the format of the encoded key. It is returned - * by the {@link #getFormat() getFormat} method.
+ * by the {@link #getFormat() getFormat} method. * *
* *
- Algorithm-Specific Initialization *
For situations where a set of algorithm-specific parameters already diff --git a/src/share/classes/java/security/KeyStore.java b/src/share/classes/java/security/KeyStore.java index e769bb158e13dbe143b58306f737bb7382f39574..19c05a87d4fb596d5df121788d151268bdd6d749 100644 --- a/src/share/classes/java/security/KeyStore.java +++ b/src/share/classes/java/security/KeyStore.java @@ -98,7 +98,6 @@ import javax.security.auth.callback.*; * KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType()); *
* *
- To provide a specific keystore type: *
diff --git a/src/share/classes/java/security/MessageDigest.java b/src/share/classes/java/security/MessageDigest.java index fa686785c45c36d3d9a1e481a4ea8e0d128b390a..60d41ffac721842eb5d2913388651a16e80c073b 100644 --- a/src/share/classes/java/security/MessageDigest.java +++ b/src/share/classes/java/security/MessageDigest.java @@ -54,21 +54,21 @@ import java.nio.ByteBuffer; * *Implementations are free to implement the Cloneable interface. * Client applications can test cloneability by attempting cloning - * and catching the CloneNotSupportedException:
+ * and catching the CloneNotSupportedException: * -*
-* 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"); -* } -*+ *{@code + * 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"); + * } + * }* *Note that if a given implementation is not cloneable, it is * still possible to compute intermediate digests by instantiating diff --git a/src/share/classes/java/security/Permission.java b/src/share/classes/java/security/Permission.java index dfa7163b43529d63830413c492726a8f56017f7d..088f97c35a608deb8b27d53563e9f2d83d03a0e6 100644 --- a/src/share/classes/java/security/Permission.java +++ b/src/share/classes/java/security/Permission.java @@ -138,14 +138,14 @@ public abstract class Permission implements Guard, java.io.Serializable { * Returns the hash code value for this Permission object. *
* The required {@code hashCode} behavior for Permission Objects is - * the following:
+ * the following: *
*
- *- 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.
+ * execution of the same application. *
- If two Permission objects are equal according to the * {@code equals} * method, then calling the {@code hashCode} method on each of the diff --git a/src/share/classes/java/security/PermissionCollection.java b/src/share/classes/java/security/PermissionCollection.java index 58b7bdfd99f1582d206684b6d32067145fd72dcd..3f13b9f93d52c5b97e312e4d1bef137f0d91cd7c 100644 --- a/src/share/classes/java/security/PermissionCollection.java +++ b/src/share/classes/java/security/PermissionCollection.java @@ -37,7 +37,6 @@ import java.util.*; * collection, using the {@code implies} method. *
- enumerate all the permissions, using the {@code elements} method. *
* *
When it is desirable to group together a number of Permission objects * of the same type, the {@code newPermissionCollection} method on that diff --git a/src/share/classes/java/security/SecurityPermission.java b/src/share/classes/java/security/SecurityPermission.java index bbdccaeffe3e40bddbb0aabbeb46aa669d0f8e87..5bb74569d3fe88b962ac5f1a7e0a112bc99726c9 100644 --- a/src/share/classes/java/security/SecurityPermission.java +++ b/src/share/classes/java/security/SecurityPermission.java @@ -44,7 +44,6 @@ import java.util.StringTokenizer; * 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. - *
* *
*
@@ -193,7 +192,6 @@ import java.util.StringTokenizer; * 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. - * * *
*
diff --git a/src/share/classes/java/security/Signature.java b/src/share/classes/java/security/Signature.java index a40290f8c99abd0339613ffa23609901a4718f59..7c5bd96eb28460d66d01acb66e42f82293894456 100644 --- a/src/share/classes/java/security/Signature.java +++ b/src/share/classes/java/security/Signature.java @@ -77,13 +77,13 @@ import sun.security.jca.GetInstance.Instance; * (see {@link #initSign(PrivateKey)} * and {@link #initSign(PrivateKey, SecureRandom)}). * - * + * * - *
- Updating
+ *
- Updating * *
Depending on the type of initialization, this will update the * bytes to be signed or verified. See the - * {@link #update(byte) update} methods.
+ * {@link #update(byte) update} methods. * *
- Signing or Verifying a signature on all updated bytes. See the * {@link #sign() sign} methods and the {@link #verify(byte[]) verify} diff --git a/src/share/classes/java/security/SignedObject.java b/src/share/classes/java/security/SignedObject.java index dba803d88e41f1c74d62a8cedd93c77b54ea2e2e..9ac864ee8a4167abe57d5b80972d003983ae6d79 100644 --- a/src/share/classes/java/security/SignedObject.java +++ b/src/share/classes/java/security/SignedObject.java @@ -43,7 +43,7 @@ import java.io.*; * object passed to the constructor and the {@code verify} method. * A typical usage for signing is the following: * - *
{@code + *{@code * Signature signingEngine = Signature.getInstance(algorithm, * provider); * SignedObject so = new SignedObject(myobject, signingKey, @@ -53,7 +53,7 @@ import java.io.*; *A typical usage for verification is the following (having * received SignedObject {@code so}): * - *
{@code + *{@code * Signature verificationEngine = * Signature.getInstance(algorithm, provider); * if (so.verify(publickey, verificationEngine)) diff --git a/src/share/classes/java/security/acl/Acl.java b/src/share/classes/java/security/acl/Acl.java index e7b6a21b28c720b623406f48c8a772e559a58f5b..b9cf0041d2f0870808c2838b716bff3044b6897c 100644 --- a/src/share/classes/java/security/acl/Acl.java +++ b/src/share/classes/java/security/acl/Acl.java @@ -42,27 +42,27 @@ import java.security.Principal; * granted to the associated principal. If negative, the permissions * are to be denied.* - * The ACL Entries in each ACL observe the following rules:
+ * The ACL Entries in each ACL observe the following rules: * *
* @@ -159,12 +159,12 @@ public interface Acl extends Owner { * 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:
- 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).
+ * denied (if negative). * *
- If there is no entry for a particular principal, then the - * principal is considered to have a null (empty) permission set.
+ * principal is considered to have a null (empty) permission set. * *
- 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.
+ * permission was never granted or denied. * *
- 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.
+ * override the groups' negative permissions. * *
+ * follows: * *
* *
- If there is no entry in this Access Control List for the - * specified principal, an empty permission set is returned.
+ * specified principal, an empty permission set is returned. * *
- Otherwise, the principal's group permission sets are determined. * (A principal can belong to one or more groups, where a group is a diff --git a/src/share/classes/java/security/cert/CertificateFactory.java b/src/share/classes/java/security/cert/CertificateFactory.java index 83ff9fbee927562674c5d00b2e9ca26a0d2d196b..f45866d1b74186004d4668d1db6218967b3e02b8 100644 --- a/src/share/classes/java/security/cert/CertificateFactory.java +++ b/src/share/classes/java/security/cert/CertificateFactory.java @@ -63,7 +63,7 @@ import sun.security.jca.GetInstance.Instance; * 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:
+ * the file: * *
{@code * FileInputStream fis = new FileInputStream(filename); @@ -78,7 +78,7 @@ import sun.security.jca.GetInstance.Instance; * }* *The following example parses a PKCS#7-formatted certificate reply stored - * in a file and extracts all the certificates from it:
+ * in a file and extracts all the certificates from it: * *
* FileInputStream fis = new FileInputStream(filename); diff --git a/src/share/classes/java/security/cert/PKIXRevocationChecker.java b/src/share/classes/java/security/cert/PKIXRevocationChecker.java index 3046a03ed2303145201b55abac109bb1fee302cf..a345c96cac830e601539cdcc2707ea4c378f3b92 100644 --- a/src/share/classes/java/security/cert/PKIXRevocationChecker.java +++ b/src/share/classes/java/security/cert/PKIXRevocationChecker.java @@ -299,7 +299,7 @@ public abstract class PKIXRevocationChecker extends PKIXCertPathChecker { /** * Allow revocation check to succeed if the revocation status cannot be * determined for one of the following reasons: - *+ *
*
- The CRL or OCSP response cannot be obtained because of a * network error. *
- The OCSP responder returns one of the following errors diff --git a/src/share/classes/java/security/cert/PolicyQualifierInfo.java b/src/share/classes/java/security/cert/PolicyQualifierInfo.java index bc083eb7a43c7377a1ee29faf2fb316c42190b5f..ec06a88ae5826acaa1874e809d5d295a61aa36b9 100644 --- a/src/share/classes/java/security/cert/PolicyQualifierInfo.java +++ b/src/share/classes/java/security/cert/PolicyQualifierInfo.java @@ -35,7 +35,7 @@ import sun.security.util.DerValue; * structure. * *
The ASN.1 definition is as follows: - *
+ ** PolicyQualifierInfo ::= SEQUENCE { * policyQualifierId PolicyQualifierId, * qualifier ANY DEFINED BY policyQualifierId } diff --git a/src/share/classes/java/security/cert/TrustAnchor.java b/src/share/classes/java/security/cert/TrustAnchor.java index fe267a52f669bf33d9a81cb53ec410ea657e31b1..c98bf814caf85a3a297ad79db1b2cde9d647a160 100644 --- a/src/share/classes/java/security/cert/TrustAnchor.java +++ b/src/share/classes/java/security/cert/TrustAnchor.java @@ -44,7 +44,6 @@ import sun.security.x509.X500Name; * individual parameters. ** Concurrent Access - *
*
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} diff --git a/src/share/classes/java/security/cert/X509CertSelector.java b/src/share/classes/java/security/cert/X509CertSelector.java index e44dba125e450fcdc6c1a6525b4bb01bdde1b81a..aae32c93f4445ce15dcac2de3e9afc2e608d662b 100644 --- a/src/share/classes/java/security/cert/X509CertSelector.java +++ b/src/share/classes/java/security/cert/X509CertSelector.java @@ -359,7 +359,7 @@ public class X509CertSelector implements CertSelector { * criticality setting, and encapsulating OCTET STRING) * for a SubjectKeyIdentifier extension. * The ASN.1 notation for this structure follows. - *
+ * *
{@code * SubjectKeyIdentifier ::= KeyIdentifier * @@ -399,7 +399,7 @@ public class X509CertSelector implements CertSelector { * criticality setting, and encapsulating OCTET STRING) * for an AuthorityKeyIdentifier extension. * The ASN.1 notation for this structure follows. - *+ * *
{@code * AuthorityKeyIdentifier ::= SEQUENCE { * keyIdentifier [0] KeyIdentifier OPTIONAL, diff --git a/src/share/classes/java/security/interfaces/DSAKeyPairGenerator.java b/src/share/classes/java/security/interfaces/DSAKeyPairGenerator.java index 390835725b90ece49c1c5c3346e16fd9a068218f..e50cfd24c4be0b3e871f8a115f866aae518ff41c 100644 --- a/src/share/classes/java/security/interfaces/DSAKeyPairGenerator.java +++ b/src/share/classes/java/security/interfaces/DSAKeyPairGenerator.java @@ -43,11 +43,11 @@ import java.security.*; * *- Get a key pair generator for the DSA algorithm by calling the * KeyPairGenerator {@code getInstance} method with "DSA" - * as its argument.
+ * as its argument. * *
- Initialize the generator by casting the result to a DSAKeyPairGenerator * and calling one of the - * {@code initialize} methods from this DSAKeyPairGenerator interface.
+ * {@code initialize} methods from this DSAKeyPairGenerator interface. * *
- Generate a key pair by calling the {@code generateKeyPair} * method from the KeyPairGenerator class. diff --git a/src/share/classes/java/text/MessageFormat.java b/src/share/classes/java/text/MessageFormat.java index 402a7fa52d96a7fb85574da6fb504d9431494821..2497a490eb02bdb02a9407e285978a3bf94cdc96 100644 --- a/src/share/classes/java/text/MessageFormat.java +++ b/src/share/classes/java/text/MessageFormat.java @@ -125,7 +125,6 @@ import java.util.Locale; * valid patterns, but
"ab {0'}' de","ab } de"* and"''{''"are not. * - **
- Warning:
- 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 @@ import java.util.Locale; * table shows how the values map to {@code Format} instances. Combinations not * shown in the table are illegal. A SubformatPattern must * be a valid pattern string for the {@code Format} subclass used. - *
+ * *
*
- ** FormatType @@ -215,7 +214,6 @@ import java.util.Locale; * SubformatPattern * {@code new} {@link ChoiceFormat#ChoiceFormat(String) ChoiceFormat}{@code (subformatPattern)} * * *
Usage Information
* @@ -761,7 +759,7 @@ public class MessageFormat extends Format { * as indicated by the first matching line of the following table. An * argument is unavailable ifargumentsis *nullor has fewer than argumentIndex+1 elements. - *+ * *
*
* Subformat diff --git a/src/share/classes/java/text/Normalizer.java b/src/share/classes/java/text/Normalizer.java index 88fdf2b29dac923deb407e7a1daac929d52ae9d3..a97b4c1d9d95ffa7c0412904f08a880d7487dc48 100644 --- a/src/share/classes/java/text/Normalizer.java +++ b/src/share/classes/java/text/Normalizer.java @@ -53,12 +53,12 @@ import sun.text.normalizer.NormalizerImpl; * 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): * - * + ** U+00C1 LATIN CAPITAL LETTER A WITH ACUTE* * or as two separate characters (the "decomposed" form): * - *+ ** U+0041 LATIN CAPITAL LETTER A * U+0301 COMBINING ACUTE ACCENT* @@ -72,14 +72,14 @@ import sun.text.normalizer.NormalizerImpl; ** Similarly, the string "ffi" can be encoded as three separate letters: * - *
+ ** U+0066 LATIN SMALL LETTER F * U+0066 LATIN SMALL LETTER F * U+0069 LATIN SMALL LETTER I* * or as the single character * - *+ ** @return the replacing object, not null diff --git a/src/share/classes/java/util/Base64.java b/src/share/classes/java/util/Base64.java index 39da03b7e3ce5132e31bed2362d569c4ce12fd7a..9418b7169e2ca41eac1846d10cdb613210804dcb 100644 --- a/src/share/classes/java/util/Base64.java +++ b/src/share/classes/java/util/Base64.java @@ -40,7 +40,6 @@ import java.nio.charset.StandardCharsets; * RFC 4648 and * RFC 2045. * - ** U+FB03 LATIN SMALL LIGATURE FFI* * The ffi ligature is not a distinct semantic character, and strictly speaking diff --git a/src/share/classes/java/text/SimpleDateFormat.java b/src/share/classes/java/text/SimpleDateFormat.java index fa9f673b8b864a0cd28a995cdbf9a39bde972ebf..c510d2d78a649a20b8adf4d5994a17008a6335ac 100644 --- a/src/share/classes/java/text/SimpleDateFormat.java +++ b/src/share/classes/java/text/SimpleDateFormat.java @@ -356,7 +356,6 @@ import sun.util.locale.provider.LocaleProviderAdapter; * may be replaced with other, locale dependent, pattern letters. *SimpleDateFormatdoes not deal with the localization of text * other than the pattern letters; that's up to the client of the class. - ** *
Examples
* diff --git a/src/share/classes/java/time/Duration.java b/src/share/classes/java/time/Duration.java index 896a2990eaafee44b84eb9eb4d8f36c8162d46fc..0b7fd177e910193ac6e939e8045f036b08fc05c4 100644 --- a/src/share/classes/java/time/Duration.java +++ b/src/share/classes/java/time/Duration.java @@ -141,7 +141,7 @@ public final class Duration /** * The pattern for parsing. */ - private final static Pattern PATTERN = + private static final Pattern PATTERN = Pattern.compile("([-+]?)P(?:([-+]?[0-9]+)D)?" + "(T(?:([-+]?[0-9]+)H)?(?:([-+]?[0-9]+)M)?(?:([-+]?[0-9]+)(?:[.,]([0-9]{0,9}))?S)?)?", Pattern.CASE_INSENSITIVE); @@ -554,7 +554,7 @@ public final class Duration * the simple initialization in Duration. */ private static class DurationUnits { - final static ListUNITS = + static final List UNITS = Collections.unmodifiableList(Arrays. asList(SECONDS, NANOS)); } diff --git a/src/share/classes/java/time/OffsetDateTime.java b/src/share/classes/java/time/OffsetDateTime.java index 755d6776c883860efe6ba4199bd1fe70059c6683..42698d5f7c065cb131d56d36cfe1b2aa41715e29 100644 --- a/src/share/classes/java/time/OffsetDateTime.java +++ b/src/share/classes/java/time/OffsetDateTime.java @@ -1903,9 +1903,9 @@ public final class OffsetDateTime * dedicated serialized form. * @serialData * - * out.writeByte(10); // identifies a OffsetDateTime - * out.writeObject(dateTime); - * out.writeObject(offset); + * out.writeByte(10); // identifies an OffsetDateTime + * // the datetime excluding the one byte header + * // the offset excluding the one byte header ** * @return the instance of {@code Ser}, not null @@ -1924,13 +1924,13 @@ public final class OffsetDateTime } void writeExternal(ObjectOutput out) throws IOException { - out.writeObject(dateTime); - out.writeObject(offset); + dateTime.writeExternal(out); + offset.writeExternal(out); } static OffsetDateTime readExternal(ObjectInput in) throws IOException, ClassNotFoundException { - LocalDateTime dateTime = (LocalDateTime) in.readObject(); - ZoneOffset offset = (ZoneOffset) in.readObject(); + LocalDateTime dateTime = LocalDateTime.readExternal(in); + ZoneOffset offset = ZoneOffset.readExternal(in); return OffsetDateTime.of(dateTime, offset); } diff --git a/src/share/classes/java/time/OffsetTime.java b/src/share/classes/java/time/OffsetTime.java index c9601a06d086a37c11cc7e50db0b8178274d5c1f..e82ccda2a4a6874ce2309839e9be207c1fbc9757 100644 --- a/src/share/classes/java/time/OffsetTime.java +++ b/src/share/classes/java/time/OffsetTime.java @@ -1374,9 +1374,9 @@ public final class OffsetTime * dedicated serialized form. * @serialData *- * out.writeByte(9); // identifies a OffsetTime - * out.writeObject(time); - * out.writeObject(offset); + * out.writeByte(9); // identifies an OffsetTime + * // the time excluding the one byte header + * // the offset excluding the one byte header ** * @return the instance of {@code Ser}, not null @@ -1395,13 +1395,13 @@ public final class OffsetTime } void writeExternal(ObjectOutput out) throws IOException { - out.writeObject(time); - out.writeObject(offset); + time.writeExternal(out); + offset.writeExternal(out); } static OffsetTime readExternal(ObjectInput in) throws IOException, ClassNotFoundException { - LocalTime time = (LocalTime) in.readObject(); - ZoneOffset offset = (ZoneOffset) in.readObject(); + LocalTime time = LocalTime.readExternal(in); + ZoneOffset offset = ZoneOffset.readExternal(in); return OffsetTime.of(time, offset); } diff --git a/src/share/classes/java/time/Period.java b/src/share/classes/java/time/Period.java index 998eb6075c1ef827b841ff7878afc98078810102..bbc1d56dede54aa327ad1ac244ba872907af8120 100644 --- a/src/share/classes/java/time/Period.java +++ b/src/share/classes/java/time/Period.java @@ -138,13 +138,13 @@ public final class Period /** * The pattern for parsing. */ - private final static Pattern PATTERN = + private static final Pattern PATTERN = Pattern.compile("([-+]?)P(?:([-+]?[0-9]+)Y)?(?:([-+]?[0-9]+)M)?(?:([-+]?[0-9]+)W)?(?:([-+]?[0-9]+)D)?", Pattern.CASE_INSENSITIVE); /** * The set of supported units. */ - private final static ListSUPPORTED_UNITS = + private static final List SUPPORTED_UNITS = Collections.unmodifiableList(Arrays. asList(YEARS, MONTHS, DAYS)); /** diff --git a/src/share/classes/java/time/chrono/ChronoPeriodImpl.java b/src/share/classes/java/time/chrono/ChronoPeriodImpl.java index 221ce7443f7ac01d10a631e10f5250e255881069..28cf0b47d77a6635aa696546ce47bf8f6ded22a7 100644 --- a/src/share/classes/java/time/chrono/ChronoPeriodImpl.java +++ b/src/share/classes/java/time/chrono/ChronoPeriodImpl.java @@ -104,7 +104,7 @@ final class ChronoPeriodImpl /** * The set of supported units. */ - private final static List SUPPORTED_UNITS = + private static final List SUPPORTED_UNITS = Collections.unmodifiableList(Arrays. asList(YEARS, MONTHS, DAYS)); /** diff --git a/src/share/classes/java/time/chrono/JapaneseDate.java b/src/share/classes/java/time/chrono/JapaneseDate.java index ae4708dbaff8fe31a3d341ece74b99f7a0eb221c..c1ed498563426b84f0ddc9e0eb7060151ddfc33e 100644 --- a/src/share/classes/java/time/chrono/JapaneseDate.java +++ b/src/share/classes/java/time/chrono/JapaneseDate.java @@ -140,7 +140,7 @@ public final class JapaneseDate /** * The first day supported by the JapaneseChronology is Meiji 6, January 1st. */ - final static LocalDate MEIJI_6_ISODATE = LocalDate.of(1873, 1, 1); + static final LocalDate MEIJI_6_ISODATE = LocalDate.of(1873, 1, 1); //----------------------------------------------------------------------- /** diff --git a/src/share/classes/java/time/temporal/WeekFields.java b/src/share/classes/java/time/temporal/WeekFields.java index dcc459af93df171c6542ea3ed57dcef86594e842..29dde9cf2f8a298a49e01703e24c54e25bec8894 100644 --- a/src/share/classes/java/time/temporal/WeekFields.java +++ b/src/share/classes/java/time/temporal/WeekFields.java @@ -245,15 +245,15 @@ public final class WeekFields implements Serializable { /** * The field used to access the computed DayOfWeek. */ - private transient final TemporalField dayOfWeek = ComputedDayOfField.ofDayOfWeekField(this); + private final transient TemporalField dayOfWeek = ComputedDayOfField.ofDayOfWeekField(this); /** * The field used to access the computed WeekOfMonth. */ - private transient final TemporalField weekOfMonth = ComputedDayOfField.ofWeekOfMonthField(this); + private final transient TemporalField weekOfMonth = ComputedDayOfField.ofWeekOfMonthField(this); /** * The field used to access the computed WeekOfYear. */ - private transient final TemporalField weekOfYear = ComputedDayOfField.ofWeekOfYearField(this); + private final transient TemporalField weekOfYear = ComputedDayOfField.ofWeekOfYearField(this); /** * The field that represents the week-of-week-based-year. * @@ -261,7 +261,7 @@ public final class WeekFields implements Serializable { *
* This unit is an immutable and thread-safe singleton. */ - private transient final TemporalField weekOfWeekBasedYear = ComputedDayOfField.ofWeekOfWeekBasedYearField(this); + private final transient TemporalField weekOfWeekBasedYear = ComputedDayOfField.ofWeekOfWeekBasedYearField(this); /** * The field that represents the week-based-year. *
@@ -269,7 +269,7 @@ public final class WeekFields implements Serializable { *
* This unit is an immutable and thread-safe singleton. */ - private transient final TemporalField weekBasedYear = ComputedDayOfField.ofWeekBasedYearField(this); + private final transient TemporalField weekBasedYear = ComputedDayOfField.ofWeekBasedYearField(this); //----------------------------------------------------------------------- /** diff --git a/src/share/classes/java/time/zone/Ser.java b/src/share/classes/java/time/zone/Ser.java index b2c3b259fb323f9d2ac7e703e33226e6fd484e03..31c2f2d2bc1349fa4e8ab2760a2645979f6cee32 100644 --- a/src/share/classes/java/time/zone/Ser.java +++ b/src/share/classes/java/time/zone/Ser.java @@ -171,9 +171,9 @@ final class Ser implements Externalizable { *
- ZoneRules * - {@code ZoneRules.of(standardTransitions, standardOffsets, savingsInstantTransitions, wallOffsets, lastRules);} *
- ZoneOffsetTransition - * - {@code ;} + * - {@code ZoneOffsetTransition of(LocalDateTime.ofEpochSecond(epochSecond), offsetBefore, offsetAfter);} *
- ZoneOffsetTransitionRule - * - {@code ;} + * - {@code ZoneOffsetTransitionRule.of(month, dom, dow, time, timeEndOfDay, timeDefinition, standardOffset, offsetBefore, offsetAfter);} * * @param in the data to read, not null */ diff --git a/src/share/classes/java/time/zone/ZoneOffsetTransition.java b/src/share/classes/java/time/zone/ZoneOffsetTransition.java index 04192dab8905c747802268314320e24489b92601..79cb5c8d594ad262cafa0a2671bb19a199e894b1 100644 --- a/src/share/classes/java/time/zone/ZoneOffsetTransition.java +++ b/src/share/classes/java/time/zone/ZoneOffsetTransition.java @@ -191,7 +191,7 @@ public final class ZoneOffsetTransition * out.writeByte(2); // identifies a ZoneOffsetTransition * out.writeEpochSec(toEpochSecond); * out.writeOffset(offsetBefore); - * out.writeOfset(offsetAfter); + * out.writeOffset(offsetAfter); * } *
*
*
- Basic *
Uses "The Base64 Alphabet" as specified in Table 1 of diff --git a/src/share/classes/java/util/BitSet.java b/src/share/classes/java/util/BitSet.java index c7c3143221fb4b73e87c6fa0fe1f61152573d3c3..721d160dc77d0b4833e3b6c7ed5b9dc5079db6b1 100644 --- a/src/share/classes/java/util/BitSet.java +++ b/src/share/classes/java/util/BitSet.java @@ -1164,10 +1164,10 @@ public class BitSet implements Cloneable, java.io.Serializable { *
Example: *
* BitSet drPepper = new BitSet();- * Now {@code drPepper.toString()} returns "{@code {}}".+ * Now {@code drPepper.toString()} returns "{@code {}}". *
* drPepper.set(2);- * Now {@code drPepper.toString()} returns "{@code {2}}".+ * Now {@code drPepper.toString()} returns "{@code {2}}". *
* drPepper.set(4); * drPepper.set(10);diff --git a/src/share/classes/java/util/Deque.java b/src/share/classes/java/util/Deque.java index f6511417f33e875ca732252958d64229bc8c2567..3ed3ab8f667119874fc505f442d3251cf0522524 100644 --- a/src/share/classes/java/util/Deque.java +++ b/src/share/classes/java/util/Deque.java @@ -56,7 +56,6 @@ package java.util; *The twelve methods described above are summarized in the * following table: * - *
*
*
Summary of Deque methods *@@ -100,7 +99,6 @@ package java.util; * inherited from the {@code Queue} interface are precisely equivalent to * {@code Deque} methods as indicated in the following table: * - * *
*
Comparison of Queue and Deque methods *@@ -139,7 +137,6 @@ package java.util; * beginning of the deque. Stack methods are precisely equivalent to * {@code Deque} methods as indicated in the table below: * - * *
*
Comparison of Stack and Deque methods *diff --git a/src/share/classes/java/util/DoubleSummaryStatistics.java b/src/share/classes/java/util/DoubleSummaryStatistics.java index 947f47c2744dd3a05bc86f92496d58688ea8e901..be9d4b5ae560cd76efbdb725256524ff197402b1 100644 --- a/src/share/classes/java/util/DoubleSummaryStatistics.java +++ b/src/share/classes/java/util/DoubleSummaryStatistics.java @@ -127,7 +127,7 @@ public class DoubleSummaryStatistics implements DoubleConsumer { * numerical sum compared to a simple summation of {@code double} * values. * - * @apiNote Sorting values by increasing absolute magnitude tends to yield + * @apiNote Values sorted by increasing absolute magnitude tend to yield * more accurate results. * * @return the sum of values, or zero if none diff --git a/src/share/classes/java/util/Iterator.java b/src/share/classes/java/util/Iterator.java index 4420d04995fd0c7e9e9cd9f3c4adf08ffd477e15..7d2daf8f96feb5bba18c21d20bd25f417a218414 100644 --- a/src/share/classes/java/util/Iterator.java +++ b/src/share/classes/java/util/Iterator.java @@ -94,10 +94,10 @@ public interface Iterator { } /** - * Performs the given action for each remaining element, in the order - * elements occur when iterating, until all elements have been processed or - * the action throws an exception. Errors or runtime exceptions thrown by - * the action are relayed to the caller. + * Performs the given action for each remaining element until all elements + * have been processed or the action throws an exception. Actions are + * performed in the order of iteration, if that order is specified. + * Exceptions thrown by the action are relayed to the caller. * * @implSpec * The default implementation behaves as if: diff --git a/src/share/classes/java/util/List.java b/src/share/classes/java/util/List.java index 42a1acf22c58aa11c4fa9a3e716c9bf097cb9fcb..5cbd044169ba9ac8ad30ca18a7e877584bff40e0 100644 --- a/src/share/classes/java/util/List.java +++ b/src/share/classes/java/util/List.java @@ -192,8 +192,9 @@ public interface List
extends Collection { * The following code can be used to dump the list into a newly * allocated array of String: * - * - * String[] y = x.toArray(new String[0]);+ *{@code + * String[] y = x.toArray(new String[0]); + * }* * Note that toArray(new Object[0]) is identical in function to * toArray(). @@ -383,14 +384,13 @@ public interface Listextends Collection { * * @implSpec * The default implementation is equivalent to, for this {@code list}: - * - * {@code - * final ListIterator+ *li = list.listIterator(); - * while (li.hasNext()) { - * li.set(operator.apply(li.next())); - * } - * } - * {@code + * final ListIterator+ * * If the list's list-iterator does not support the {@code set} operation * then an {@code UnsupportedOperationException} will be thrown when * replacing the first element. @@ -469,11 +469,11 @@ public interface Listli = list.listIterator(); + * while (li.hasNext()) { + * li.set(operator.apply(li.next())); + * } + * } extends Collection { /** * Returns the hash code value for this list. The hash code of a list * is defined to be the result of the following calculation: - * - * int hashCode = 1; - * for (E e : list) - * hashCode = 31*hashCode + (e==null ? 0 : e.hashCode()); - *+ *{@code + * int hashCode = 1; + * for (E e : list) + * hashCode = 31*hashCode + (e==null ? 0 : e.hashCode()); + * }* This ensures that list1.equals(list2) implies that * list1.hashCode()==list2.hashCode() for any two lists, * list1 and list2, as required by the general @@ -640,9 +640,9 @@ public interface Listextends Collection { * a list can be used as a range operation by passing a subList view * instead of a whole list. For example, the following idiom * removes a range of elements from a list: - * + ** Similar idioms may be constructed for indexOf and * lastIndexOf, and all of the algorithms in the * Collections class can be applied to a subList.{@code * list.subList(from, to).clear(); - *+ * }diff --git a/src/share/classes/java/util/Locale.java b/src/share/classes/java/util/Locale.java index 6ecd39393fd7d37a1d46df4793bc104eb26a4cc5..54050c65fa845b88b9d68b43f5697eee40011aea 100644 --- a/src/share/classes/java/util/Locale.java +++ b/src/share/classes/java/util/Locale.java @@ -1248,7 +1248,7 @@ public final class Locale implements Cloneable, Serializable { * Returns a string representation of this
Locale* object, consisting of language, country, variant, script, * and extensions as below: - *+ ** language + "_" + country + "_" + (variant + "_#" | "#") + script + "-" + extensions ** @@ -2199,7 +2199,7 @@ public final class Locale implements Cloneable, Serializable { * are exactly "ja", "JP", "JP" or "th", "TH", "TH" and script/extensions * fields are empty, this method suppliesUNICODE_LOCALE_EXTENSION* "ca"/"japanese" (calendar type is "japanese") or "nu"/"thai" (number script - * type is "thai"). See Special Cases + * type is "thai"). See Special Cases * for more information. * * @return an instance ofLocaleequivalent to diff --git a/src/share/classes/java/util/Map.java b/src/share/classes/java/util/Map.java index d67e58db2482a6b985f4fd82a11881260d8e7238..0adf9d45bc5f4806484763d353100aa3bb96f25e 100644 --- a/src/share/classes/java/util/Map.java +++ b/src/share/classes/java/util/Map.java @@ -562,9 +562,8 @@ public interface Map{ // Defaultable methods /** - * Returns the value to which the specified key is mapped, - * or {@code defaultValue} if this map contains no mapping - * for the key. + * Returns the value to which the specified key is mapped, or + * {@code defaultValue} if this map contains no mapping for the key. * * The default implementation makes no guarantees about synchronization * or atomicity properties of this method. Any implementation providing @@ -591,9 +590,10 @@ public interface Map
{ } /** - * Performs the given action on each entry in this map, in the order entries - * are returned by an entry set iterator (which may be unspecified), until - * all entries have been processed or the action throws an {@code Exception}. + * Performs the given action for each entry in this map until all entries + * have been processed or the action throws an exception. Unless + * otherwise specified by the implementing class, actions are performed in + * the order of entry set iteration (if an iteration order is specified.) * Exceptions thrown by the action are relayed to the caller. * * The default implementation should be overridden by implementations if @@ -636,9 +636,9 @@ public interface Map
{ /** * Replaces each entry's value with the result of invoking the given - * function on that entry, in the order entries are returned by an entry - * set iterator, until all entries have been processed or the function - * throws an exception. + * function on that entry until all entries have been processed or the + * function throws an exception. Exceptions thrown by the function are + * relayed to the caller. * * The default implementation makes no guarantees about synchronization * or atomicity properties of this method. Any implementation providing diff --git a/src/share/classes/java/util/PrimitiveIterator.java b/src/share/classes/java/util/PrimitiveIterator.java index 6689614b3377b8dfd47574e96ca20ec7fedcedb3..2bc864aa3febaa1c31e2f6ddf8025ccac11fb1bd 100644 --- a/src/share/classes/java/util/PrimitiveIterator.java +++ b/src/share/classes/java/util/PrimitiveIterator.java @@ -76,6 +76,7 @@ public interface PrimitiveIterator
extends Iterator { * @param action The action to be performed for each element * @throws NullPointerException if the specified action is null */ + @SuppressWarnings("overloads") void forEachRemaining(T_CONS action); /** @@ -93,10 +94,10 @@ public interface PrimitiveIterator extends Iterator { int nextInt(); /** - * Performs the given action for each remaining element, in the order - * elements occur when iterating, until all elements have been processed - * or the action throws an exception. Errors or runtime exceptions - * thrown by the action are relayed to the caller. + * Performs the given action for each remaining element until all elements + * have been processed or the action throws an exception. Actions are + * performed in the order of iteration, if that order is specified. + * Exceptions thrown by the action are relayed to the caller. * * @implSpec * The default implementation behaves as if: @@ -167,10 +168,10 @@ public interface PrimitiveIterator
extends Iterator { long nextLong(); /** - * Performs the given action for each remaining element, in the order - * elements occur when iterating, until all elements have been processed - * or the action throws an exception. Errors or runtime exceptions - * thrown by the action are relayed to the caller. + * Performs the given action for each remaining element until all elements + * have been processed or the action throws an exception. Actions are + * performed in the order of iteration, if that order is specified. + * Exceptions thrown by the action are relayed to the caller. * * @implSpec * The default implementation behaves as if: @@ -240,10 +241,10 @@ public interface PrimitiveIterator
extends Iterator { double nextDouble(); /** - * Performs the given action for each remaining element, in the order - * elements occur when iterating, until all elements have been processed - * or the action throws an exception. Errors or runtime exceptions - * thrown by the action are relayed to the caller. + * Performs the given action for each remaining element until all elements + * have been processed or the action throws an exception. Actions are + * performed in the order of iteration, if that order is specified. + * Exceptions thrown by the action are relayed to the caller. * * @implSpec * The default implementation behaves as if: diff --git a/src/share/classes/java/util/Properties.java b/src/share/classes/java/util/Properties.java index 073c77716304c75104eef1b8769f3183b5f3cff3..aba5fd1a339ff5a12f2698506e440283a7048194 100644 --- a/src/share/classes/java/util/Properties.java +++ b/src/share/classes/java/util/Properties.java @@ -244,7 +244,6 @@ class Properties extends Hashtable