* * @author Xueming Shen * @since 1.6 diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/io/PipedInputStream.java --- a/jdk/src/share/classes/java/io/PipedInputStream.java Mon Jun 10 12:26:20 2013 +0200 +++ b/jdk/src/share/classes/java/io/PipedInputStream.java Mon Jun 10 12:58:32 2013 +0100 @@ -117,7 +117,7 @@ * @param src the stream to connect to. * @param pipeSize the size of the pipe's buffer. * @exception IOException if an I/O error occurs. - * @exception IllegalArgumentException if+ *+ * }{@code * Console cons; * char[] passwd; * if ((cons = System.console()) != null && @@ -83,7 +83,7 @@ * ... * java.util.Arrays.fill(passwd, ' '); * } - *
pipeSize <= 0.
+ * @exception IllegalArgumentException if {@code pipeSize <= 0}.
* @since 1.6
*/
public PipedInputStream(PipedOutputStream src, int pipeSize)
@@ -147,7 +147,7 @@
* connected} to a PipedOutputStream before being used.
*
* @param pipeSize the size of the pipe's buffer.
- * @exception IllegalArgumentException if pipeSize <= 0.
+ * @exception IllegalArgumentException if {@code pipeSize <= 0}.
* @since 1.6
*/
public PipedInputStream(int pipeSize) {
diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/io/PipedReader.java
--- a/jdk/src/share/classes/java/io/PipedReader.java Mon Jun 10 12:26:20 2013 +0200
+++ b/jdk/src/share/classes/java/io/PipedReader.java Mon Jun 10 12:58:32 2013 +0100
@@ -91,7 +91,7 @@
* @param src the stream to connect to.
* @param pipeSize the size of the pipe's buffer.
* @exception IOException if an I/O error occurs.
- * @exception IllegalArgumentException if pipeSize <= 0.
+ * @exception IllegalArgumentException if {@code pipeSize <= 0}.
* @since 1.6
*/
public PipedReader(PipedWriter src, int pipeSize) throws IOException {
@@ -120,7 +120,7 @@
* before being used.
*
* @param pipeSize the size of the pipe's buffer.
- * @exception IllegalArgumentException if pipeSize <= 0.
+ * @exception IllegalArgumentException if {@code pipeSize <= 0}.
* @since 1.6
*/
public PipedReader(int pipeSize) {
diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/io/PrintStream.java
--- a/jdk/src/share/classes/java/io/PrintStream.java Mon Jun 10 12:26:20 2013 +0200
+++ b/jdk/src/share/classes/java/io/PrintStream.java Mon Jun 10 12:58:32 2013 +0100
@@ -851,7 +851,7 @@
* null argument depends on the conversion.
*
- * @throws IllegalFormatException
+ * @throws java.util.IllegalFormatException
* If a format string contains an illegal syntax, a format
* specifier that is incompatible with the given arguments,
* insufficient arguments given the format string, or other
@@ -901,7 +901,7 @@
* null argument depends on the conversion.
*
- * @throws IllegalFormatException
+ * @throws java.util.IllegalFormatException
* If a format string contains an illegal syntax, a format
* specifier that is incompatible with the given arguments,
* insufficient arguments given the format string, or other
@@ -944,7 +944,7 @@
* null argument depends on the conversion.
*
- * @throws IllegalFormatException
+ * @throws java.util.IllegalFormatException
* If a format string contains an illegal syntax, a format
* specifier that is incompatible with the given arguments,
* insufficient arguments given the format string, or other
@@ -1001,7 +1001,7 @@
* null argument depends on the conversion.
*
- * @throws IllegalFormatException
+ * @throws java.util.IllegalFormatException
* If a format string contains an illegal syntax, a format
* specifier that is incompatible with the given arguments,
* insufficient arguments given the format string, or other
diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/io/PushbackInputStream.java
--- a/jdk/src/share/classes/java/io/PushbackInputStream.java Mon Jun 10 12:26:20 2013 +0200
+++ b/jdk/src/share/classes/java/io/PushbackInputStream.java Mon Jun 10 12:58:32 2013 +0100
@@ -85,7 +85,7 @@
*
* @param in the input stream from which bytes will be read.
* @param size the size of the pushback buffer.
- * @exception IllegalArgumentException if size is <= 0
+ * @exception IllegalArgumentException if {@code size <= 0}
* @since JDK1.1
*/
public PushbackInputStream(InputStream in, int size) {
diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/io/PushbackReader.java
--- a/jdk/src/share/classes/java/io/PushbackReader.java Mon Jun 10 12:26:20 2013 +0200
+++ b/jdk/src/share/classes/java/io/PushbackReader.java Mon Jun 10 12:58:32 2013 +0100
@@ -47,7 +47,7 @@
*
* @param in The reader from which characters will be read
* @param size The size of the pushback buffer
- * @exception IllegalArgumentException if size is <= 0
+ * @exception IllegalArgumentException if {@code size <= 0}
*/
public PushbackReader(Reader in, int size) {
super(in);
diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/io/StringReader.java
--- a/jdk/src/share/classes/java/io/StringReader.java Mon Jun 10 12:26:20 2013 +0200
+++ b/jdk/src/share/classes/java/io/StringReader.java Mon Jun 10 12:58:32 2013 +0100
@@ -163,7 +163,7 @@
* is no actual limit, so this argument must not
* be negative, but is otherwise ignored.
*
- * @exception IllegalArgumentException If readAheadLimit is < 0
+ * @exception IllegalArgumentException If {@code readAheadLimit < 0}
* @exception IOException If an I/O error occurs
*/
public void mark(int readAheadLimit) throws IOException {
diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/lang/Character.java
--- a/jdk/src/share/classes/java/lang/Character.java Mon Jun 10 12:26:20 2013 +0200
+++ b/jdk/src/share/classes/java/lang/Character.java Mon Jun 10 12:58:32 2013 +0100
@@ -4782,9 +4782,9 @@
* Unicode surrogate pair.
* This method is equivalent to the expression: - *
* * @param high the high-surrogate code value to be tested * @param low the low-surrogate code value to be tested diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/lang/ClassLoader.java --- a/jdk/src/share/classes/java/lang/ClassLoader.java Mon Jun 10 12:26:20 2013 +0200 +++ b/jdk/src/share/classes/java/lang/ClassLoader.java Mon Jun 10 12:58:32 2013 +0100 @@ -702,7 +702,7 @@ * bootstrap class loader. If name is not null, it * must be equal to the binary name of the class * specified by the byte array "b", otherwise a {@link - * NoClassDefFoundError} will be thrown. + * NoClassDefFoundError NoClassDefFoundError} will be thrown. * * @param name * The expected binary name of the class, or diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/lang/Comparable.java --- a/jdk/src/share/classes/java/lang/Comparable.java Mon Jun 10 12:26:20 2013 +0200 +++ b/jdk/src/share/classes/java/lang/Comparable.java Mon Jun 10 12:58:32 2013 +0100 @@ -56,7 +56,7 @@ * method.+ *+ * }{@code * isHighSurrogate(high) && isLowSurrogate(low) - *
* * For example, if one adds two keys a and b such that - * (!a.equals(b) && a.compareTo(b) == 0) to a sorted + * {@code (!a.equals(b) && a.compareTo(b) == 0)} to a sorted * set that does not use an explicit comparator, the second add * operation returns false (and the size of the sorted set does not increase) * because a and b are equivalent from the sorted set's diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/lang/Double.java --- a/jdk/src/share/classes/java/lang/Double.java Mon Jun 10 12:26:20 2013 +0200 +++ b/jdk/src/share/classes/java/lang/Double.java Mon Jun 10 12:58:32 2013 +0100 @@ -917,13 +917,13 @@ *
In all other cases, let s, e, and m be three * values that can be computed from the argument: * - *
* * Then the floating-point result equals the value of the mathematical * expression s·m·2e-1075. diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/lang/Float.java --- a/jdk/src/share/classes/java/lang/Float.java Mon Jun 10 12:26:20 2013 +0200 +++ b/jdk/src/share/classes/java/lang/Float.java Mon Jun 10 12:58:32 2013 +0100 @@ -821,13 +821,13 @@ *- * int s = ((bits >> 63) == 0) ? 1 : -1; - * int e = (int)((bits >> 52) & 0x7ffL); + *+ * }{@code + * int s = ((bits >> 63) == 0) ? 1 : -1; + * int e = (int)((bits >> 52) & 0x7ffL); * long m = (e == 0) ? - * (bits & 0xfffffffffffffL) << 1 : + * (bits & 0xfffffffffffffL) << 1 : * (bits & 0xfffffffffffffL) | 0x10000000000000L; - *
In all other cases, let s, e, and m be three * values that can be computed from the argument: * - *
* * Then the floating-point result equals the value of the mathematical * expression s·m·2e-150. diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/lang/StackTraceElement.java --- a/jdk/src/share/classes/java/lang/StackTraceElement.java Mon Jun 10 12:26:20 2013 +0200 +++ b/jdk/src/share/classes/java/lang/StackTraceElement.java Mon Jun 10 12:58:32 2013 +0100 @@ -181,12 +181,12 @@ * {@code StackTraceElement} instance representing the same execution * point as this instance. Two stack trace elements {@code a} and * {@code b} are equal if and only if: - *- * int s = ((bits >> 31) == 0) ? 1 : -1; - * int e = ((bits >> 23) & 0xff); + *+ * }{@code + * int s = ((bits >> 31) == 0) ? 1 : -1; + * int e = ((bits >> 23) & 0xff); * int m = (e == 0) ? - * (bits & 0x7fffff) << 1 : + * (bits & 0x7fffff) << 1 : * (bits & 0x7fffff) | 0x800000; - *
+ * {@code
* equals(a.getFileName(), b.getFileName()) &&
* a.getLineNumber() == b.getLineNumber()) &&
* equals(a.getClassName(), b.getClassName()) &&
* equals(a.getMethodName(), b.getMethodName())
- *
+ * }
* where {@code equals} has the semantics of {@link
* java.util.Objects#equals(Object, Object) Objects.equals}.
*
diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/lang/instrument/Instrumentation.java
--- a/jdk/src/share/classes/java/lang/instrument/Instrumentation.java Mon Jun 10 12:26:20 2013 +0200
+++ b/jdk/src/share/classes/java/lang/instrument/Instrumentation.java Mon Jun 10 12:58:32 2013 +0100
@@ -593,24 +593,28 @@
* and the normal automatic resolution. For
* RegisterNatives, the JVM will attempt this
* association:
- * - * method(foo) -> nativeImplementation(foo)+ *
{@code
+ * method(foo) -> nativeImplementation(foo)
+ * }
*
* When this fails, the resolution will be retried with
* the specified prefix prepended to the method name,
* yielding the correct resolution:
- * - * method(wrapped_foo) -> nativeImplementation(foo)+ *
{@code
+ * method(wrapped_foo) -> nativeImplementation(foo)
+ * }
*
* For automatic resolution, the JVM will attempt:
- * - * method(wrapped_foo) -> nativeImplementation(wrapped_foo)+ *
{@code
+ * method(wrapped_foo) -> nativeImplementation(wrapped_foo)
+ * }
*
* When this fails, the resolution will be retried with
* the specified prefix deleted from the implementation name,
* yielding the correct resolution:
- * - * method(wrapped_foo) -> nativeImplementation(foo)+ *
{@code
+ * method(wrapped_foo) -> nativeImplementation(foo)
+ * }
*
* Note that since the prefix is only used when standard
* resolution fails, native methods can be wrapped selectively.
diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/lang/invoke/MethodHandle.java
--- a/jdk/src/share/classes/java/lang/invoke/MethodHandle.java Mon Jun 10 12:26:20 2013 +0200
+++ b/jdk/src/share/classes/java/lang/invoke/MethodHandle.java Mon Jun 10 12:58:32 2013 +0100
@@ -251,7 +251,7 @@
*
* * Each of the above calls to {@code invokeExact} or plain {@code invoke} * generates a single invokevirtual instruction with * the symbolic type descriptor indicated in the following comment. @@ -754,7 +754,7 @@ * (The array may also be null when zero elements are required.) *+ *+ * }{@code Object x, y; String s; int i; MethodType mt; MethodHandle mh; MethodHandles.Lookup lookup = MethodHandles.lookup(); @@ -287,7 +287,7 @@ mh = lookup.findVirtual(java.io.PrintStream.class, "println", mt); mh.invokeExact(System.out, "Hello, world."); // invokeExact(Ljava/io/PrintStream;Ljava/lang/String;)V - *
* Here are some simple examples of array-spreading method handles: - *
* @param arrayType usually {@code Object[]}, the type of the array argument from which to extract the spread arguments * @param arrayLength the number of arguments to spread from an incoming array argument * @return a new method handle which spreads its final array argument, @@ -878,7 +878,7 @@ * number of collected arguments, use {@link #asVarargsCollector asVarargsCollector} instead. *+ *+ * }{@code MethodHandle equals = publicLookup() .findVirtual(String.class, "equals", methodType(boolean.class, Object.class)); assert( (boolean) equals.invokeExact("me", (Object)"me")); @@ -790,7 +790,7 @@ assertEquals("[A, B, C]", (String) caString3.invokeExact('A', 'B', 'C')); MethodHandle caToString2 = caString3.asSpreader(char[].class, 2); assertEquals("[A, B, C]", (String) caToString2.invokeExact('A', "BC".toCharArray())); - *
* Here are some examples of array-collecting method handles: - *
* @param arrayType often {@code Object[]}, the type of the array argument which will collect the arguments * @param arrayLength the number of arguments to collect into a new array argument * @return a new method handle which collects some trailing argument @@ -1041,7 +1041,7 @@ * It may (or may not) return the original variable arity method handle. *+ *+ * }{@code MethodHandle deepToString = publicLookup() .findStatic(Arrays.class, "deepToString", methodType(String.class, Object[].class)); assertEquals("[won]", (String) deepToString.invokeExact(new Object[]{"won"})); @@ -904,7 +904,7 @@ .findStatic(Arrays.class, "toString", methodType(String.class, long[].class)) .asCollector(long[].class, 1); assertEquals("[123]", (String) longsToString.invokeExact((long)123)); - *
* Here is an example, of a list-making variable arity method handle: - *
*+ *+ * }{@code MethodHandle deepToString = publicLookup() .findStatic(Arrays.class, "deepToString", methodType(String.class, Object[].class)); MethodHandle ts1 = deepToString.asVarargsCollector(Object[].class); @@ -1063,7 +1063,7 @@ List ls = (List) asList.invoke((Object)argv); assertEquals(1, ls.size()); assertEquals("[three, thee, tee]", Arrays.toString((Object[])ls.get(0))); - *
* Discussion: * These rules are designed as a dynamically-typed variation @@ -1134,7 +1134,7 @@ * a previous argument to {@code asVarargsCollector}. *
* Here is an example, of a list-making variable arity method handle: - *
* * @return a new method handle which accepts only a fixed number of arguments * @see #asVarargsCollector diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/lang/invoke/MethodHandles.java --- a/jdk/src/share/classes/java/lang/invoke/MethodHandles.java Mon Jun 10 12:26:20 2013 +0200 +++ b/jdk/src/share/classes/java/lang/invoke/MethodHandles.java Mon Jun 10 12:58:32 2013 +0100 @@ -1593,7 +1593,7 @@ * As in the case of {@link #dropArguments(MethodHandle,int,List) dropArguments}, * incoming arguments which are not mentioned in the reordering array * are may be any type, as determined only by {@code newType}. - *+ *+ * }{@code MethodHandle asListVar = publicLookup() .findStatic(Arrays.class, "asList", methodType(List.class, Object[].class)) .asVarargsCollector(Object[].class); @@ -1153,7 +1153,7 @@ assertEquals("[three, thee, tee]", asListFix.invoke(argv).toString()); assertEquals(1, ((List) asListVar.invoke((Object)argv)).size()); assertEquals("[three, thee, tee]", asListFix.invoke((Object)argv).toString()); - *
* @param target the method handle to invoke after arguments are reordered * @param newType the expected type of the new method handle * @param reorder an index array which controls the reordering diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/lang/management/MemoryUsage.java --- a/jdk/src/share/classes/java/lang/management/MemoryUsage.java Mon Jun 10 12:26:20 2013 +0200 +++ b/jdk/src/share/classes/java/lang/management/MemoryUsage.java Mon Jun 10 12:58:32 2013 +0100 @@ -72,8 +72,8 @@ * The amount of used and committed memory will always be less than * or equal to max if max is defined. * A memory allocation may fail if it attempts to increase the - * used memory such that used > committed even - * if used <= max would still be true (for example, + * used memory such that used > committed even + * if used <= max would still be true (for example, * when the system is low on virtual memory). * * diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/lang/management/RuntimeMXBean.java --- a/jdk/src/share/classes/java/lang/management/RuntimeMXBean.java Mon Jun 10 12:26:20 2013 +0200 +++ b/jdk/src/share/classes/java/lang/management/RuntimeMXBean.java Mon Jun 10 12:58:32 2013 +0100 @@ -308,7 +308,7 @@ * *+ *+ * }{@code import static java.lang.invoke.MethodHandles.*; import static java.lang.invoke.MethodType.*; ... @@ -1609,7 +1609,7 @@ MethodHandle twice = permuteArguments(add, intfn1, 0, 0); assert(twice.type().equals(intfn1)); assert((int)twice.invokeExact(21) == 42); - *
* MBeanServer access: The HTTP cookie management in java.net package looks like:
* See RFC 2965 sec. 3.3 & 7 for more detail.
+ * See RFC 2965 sec. 3.3 and 7 for more detail.
*
* @author Edward Wang
* @since 1.6
diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/net/DatagramSocket.java
--- a/jdk/src/share/classes/java/net/DatagramSocket.java Mon Jun 10 12:26:20 2013 +0200
+++ b/jdk/src/share/classes/java/net/DatagramSocket.java Mon Jun 10 12:58:32 2013 +0100
@@ -334,12 +334,12 @@
}
/**
- * Binds this DatagramSocket to a specific address & port.
+ * Binds this DatagramSocket to a specific address and port.
*
* If the address is
- * @param addr The address & port to bind to.
+ * @param addr The address and port to bind to.
* @throws SocketException if any error happens during the bind, or if the
* socket is already bound.
* @throws SecurityException if a security manager exists and its
@@ -844,7 +844,7 @@
* a java.net.SocketTimeoutException is raised, though the
* DatagramSocket is still valid. The option must be enabled
* prior to entering the blocking operation to have effect. The
- * timeout must be > 0.
+ * timeout must be {@code > 0}.
* A timeout of zero is interpreted as an infinite timeout.
*
* @param timeout the specified timeout in milliseconds.
@@ -1101,8 +1101,8 @@
* As the underlying network implementation may ignore this
* value applications should consider it a hint.
*
- * The tc must be in the range The tc must be in the range {@code 0 <= tc <=
+ * 255} or an IllegalArgumentException will be thrown.
* Notes:
* For Internet Protocol v4 the value consists of an
* The ttl is an unsigned 8-bit quantity, and so must be
- * in the range
- * @param endpoint The IP address & port number to bind to.
+ * @param endpoint The IP address and port number to bind to.
* @throws IOException if the bind operation fails, or if the socket
* is already bound.
* @throws SecurityException if a The tc must be in the range The tc must be in the range {@code 0 <= tc <=
+ * 255} or an IllegalArgumentException will be thrown.
* Notes:
* For Internet Protocol v4 the value consists of an
* The value of this socket option is an {@code Integer} in the range
- * 0 <= value <= 255. It is used to control
- * the scope of multicast datagrams sent by the datagram-oriented socket.
+ * {@code 0 <= value <= 255}. It is used to control the scope of multicast
+ * datagrams sent by the datagram-oriented socket.
* In the case of an {@link StandardProtocolFamily#INET IPv4} socket
* the option is the time-to-live (TTL) on multicast datagrams sent by the
* socket. Datagrams with a TTL of zero are not transmitted on the network
diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/net/URI.java
--- a/jdk/src/share/classes/java/net/URI.java Mon Jun 10 12:26:20 2013 +0200
+++ b/jdk/src/share/classes/java/net/URI.java Mon Jun 10 12:58:32 2013 +0100
@@ -258,7 +258,7 @@
*
- * The mapped type of Map
diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/lang/management/ThreadMXBean.java
--- a/jdk/src/share/classes/java/lang/management/ThreadMXBean.java Mon Jun 10 12:26:20 2013 +0200
+++ b/jdk/src/share/classes/java/lang/management/ThreadMXBean.java Mon Jun 10 12:58:32 2013 +0100
@@ -198,7 +198,7 @@
* null if the thread of the given ID is not alive or
* it does not exist.
*
- * @throws IllegalArgumentException if id <= 0.
+ * @throws IllegalArgumentException if {@code id <= 0}.
* @throws java.lang.SecurityException if a security manager
* exists and the caller does not have
* ManagementPermission("monitor").
@@ -236,7 +236,7 @@
* with no stack trace, no locked monitor and no synchronizer info.
*
* @throws IllegalArgumentException if any element in the input array
- * ids is <= 0.
+ * ids is {@code <= 0}.
* @throws java.lang.SecurityException if a security manager
* exists and the caller does not have
* ManagementPermission("monitor").
@@ -282,7 +282,7 @@
* null if the thread of the given ID is not alive or
* it does not exist.
*
- * @throws IllegalArgumentException if id <= 0.
+ * @throws IllegalArgumentException if {@code id <= 0}.
* @throws IllegalArgumentException if maxDepth is negative.
* @throws java.lang.SecurityException if a security manager
* exists and the caller does not have
@@ -336,7 +336,7 @@
*
* @throws IllegalArgumentException if maxDepth is negative.
* @throws IllegalArgumentException if any element in the input array
- * ids is <= 0.
+ * ids is {@code <= 0}.
* @throws java.lang.SecurityException if a security manager
* exists and the caller does not have
* ManagementPermission("monitor").
@@ -466,7 +466,7 @@
* and CPU time measurement is enabled;
* -1 otherwise.
*
- * @throws IllegalArgumentException if id <= 0 .
+ * @throws IllegalArgumentException if {@code id <= 0}.
* @throws java.lang.UnsupportedOperationException if the Java
* virtual machine does not support CPU time measurement for
* other threads.
@@ -501,7 +501,7 @@
* and CPU time measurement is enabled;
* -1 otherwise.
*
- * @throws IllegalArgumentException if id <= 0 .
+ * @throws IllegalArgumentException if {@code id <= 0}.
* @throws java.lang.UnsupportedOperationException if the Java
* virtual machine does not support CPU time measurement for
* other threads.
diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/net/CookieManager.java
--- a/jdk/src/share/classes/java/net/CookieManager.java Mon Jun 10 12:26:20 2013 +0200
+++ b/jdk/src/share/classes/java/net/CookieManager.java Mon Jun 10 12:58:32 2013 +0100
@@ -41,7 +41,7 @@
*
*
- *
+ *
* {@code
* use
* CookieHandler <------- HttpURLConnection
* ^
@@ -58,7 +58,7 @@
* | impl
* |
* Internal in-memory implementation
- *
+ * }
*
null, then the system will pick up
* an ephemeral port and a valid local address to bind the socket.
* 0 <= tc <=
- * 255 or an IllegalArgumentException will be thrown.
+ * integer, the least significant 8 bits of which
diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/net/HttpURLConnection.java
--- a/jdk/src/share/classes/java/net/HttpURLConnection.java Mon Jun 10 12:26:20 2013 +0200
+++ b/jdk/src/share/classes/java/net/HttpURLConnection.java Mon Jun 10 12:58:32 2013 +0100
@@ -109,7 +109,7 @@
* server. In this case, {@link #getHeaderField(int) getHeaderField(0)} returns the status
* line, but getHeaderFieldKey(0) returns null.
*
- * @param n an index, where n >=0.
+ * @param n an index, where {@code n >=0}.
* @return the key for the nth header field,
* or null if the key does not exist.
*/
@@ -260,7 +260,7 @@
* {@link #getHeaderFieldKey getHeaderFieldKey} method to iterate through all
* the headers in the message.
*
- * @param n an index, where n>=0.
+ * @param n an index, where {@code n>=0}.
* @return the value of the nth header field,
* or null if the value does not exist.
* @see java.net.HttpURLConnection#getHeaderFieldKey(int)
diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/net/InetSocketAddress.java
--- a/jdk/src/share/classes/java/net/InetSocketAddress.java Mon Jun 10 12:26:20 2013 +0200
+++ b/jdk/src/share/classes/java/net/InetSocketAddress.java Mon Jun 10 12:58:32 2013 +0100
@@ -389,7 +389,7 @@
* Two instances of InetSocketAddress represent the same
* address if both the InetAddresses (or hostnames if it is unresolved) and port
* numbers are equal.
- * If both addresses are unresolved, then the hostname & the port number
+ * If both addresses are unresolved, then the hostname and the port number
* are compared.
*
* Note: Hostnames are case insensitive. e.g. "FooBar" and "foobar" are
diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/net/MulticastSocket.java
--- a/jdk/src/share/classes/java/net/MulticastSocket.java Mon Jun 10 12:26:20 2013 +0200
+++ b/jdk/src/share/classes/java/net/MulticastSocket.java Mon Jun 10 12:58:32 2013 +0100
@@ -201,7 +201,7 @@
* scope of the multicasts.
*
* 0 <= ttl <= 0xFF .
+ * in the range {@code 0 <= ttl <= 0xFF }.
*
* @param ttl the time-to-live
* @exception IOException if an I/O exception occurs
diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/net/ServerSocket.java
--- a/jdk/src/share/classes/java/net/ServerSocket.java Mon Jun 10 12:26:20 2013 +0200
+++ b/jdk/src/share/classes/java/net/ServerSocket.java Mon Jun 10 12:58:32 2013 +0100
@@ -316,7 +316,7 @@
* If the address is null, then the system will pick up
* an ephemeral port and a valid local address to bind the socket.
* SecurityManager is present and
@@ -343,7 +343,7 @@
* or may choose to ignore the parameter altogther. The value provided
* should be greater than 0. If it is less than or equal to
* 0, then an implementation specific default will be used.
- * @param endpoint The IP address & port number to bind to.
+ * @param endpoint The IP address and port number to bind to.
* @param backlog requested maximum length of the queue of
* incoming connections.
* @throws IOException if the bind operation fails, or if the socket
@@ -614,7 +614,7 @@
* a java.net.SocketTimeoutException is raised, though the
* ServerSocket is still valid. The option must be enabled
* prior to entering the blocking operation to have effect. The
- * timeout must be > 0.
+ * timeout must be {@code > 0}.
* A timeout of zero is interpreted as an infinite timeout.
* @param timeout the specified timeout, in milliseconds
* @exception SocketException if there is an error in
diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/net/Socket.java
--- a/jdk/src/share/classes/java/net/Socket.java Mon Jun 10 12:26:20 2013 +0200
+++ b/jdk/src/share/classes/java/net/Socket.java Mon Jun 10 12:58:32 2013 +0100
@@ -1086,7 +1086,7 @@
* expires, a java.net.SocketTimeoutException is raised, though the
* Socket is still valid. The option must be enabled
* prior to entering the blocking operation to have effect. The
- * timeout must be > 0.
+ * timeout must be {@code > 0}.
* A timeout of zero is interpreted as an infinite timeout.
*
* @param timeout the specified timeout, in milliseconds.
@@ -1295,8 +1295,8 @@
* As the underlying network implementation may ignore this
* value applications should consider it a hint.
*
- * 0 <= tc <=
- * 255 or an IllegalArgumentException will be thrown.
+ * integer, the least significant 8 bits of which
diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/net/StandardSocketOptions.java
--- a/jdk/src/share/classes/java/net/StandardSocketOptions.java Mon Jun 10 12:26:20 2013 +0200
+++ b/jdk/src/share/classes/java/net/StandardSocketOptions.java Mon Jun 10 12:58:32 2013 +0100
@@ -277,8 +277,8 @@
* The time-to-live for Internet Protocol (IP) multicast datagrams.
*
* All alphanum characters together with those in the string
* "_-!.~'()*"
* punct
- * The characters in the string ",;:$&+=" The characters in the string ",;:$&+="
* reserved
* All punct characters together with those in the string
* "?/[]@" nth header field.
* It returns null if there are fewer than n+1 fields.
*
- * @param n an index, where n>=0
+ * @param n an index, where {@code n>=0}
* @return the key for the nth header field,
* or null if there are fewer than n+1
* fields.
@@ -680,7 +680,7 @@
* {@link #getHeaderFieldKey(int) getHeaderFieldKey} method to iterate through all
* the headers in the message.
*
- * @param n an index, where n>=0
+ * @param n an index, where {@code n>=0}
* @return the value of the nth header field
* or null if there are fewer than n+1 fields
* @see java.net.URLConnection#getHeaderFieldKey(int)
diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/nio/X-Buffer.java.template
--- a/jdk/src/share/classes/java/nio/X-Buffer.java.template Mon Jun 10 12:26:20 2013 +0200
+++ b/jdk/src/share/classes/java/nio/X-Buffer.java.template Mon Jun 10 12:58:32 2013 +0100
@@ -652,9 +652,10 @@
* src.get(dst, off, len) has exactly the same effect as
* the loop
*
- *
+ *
*
* except that it first checks that there are sufficient $type$s in
* this buffer and it is potentially much more efficient. {@code
* for (int i = off; i < off + len; i++)
- * dst[i] = src.get();
+ * dst[i] = src.get():
+ * }
+ * {@code
* for (int i = off; i < off + len; i++)
- * dst.put(a[i]);
+ * dst.put(a[i]);
+ * }
*
* except that it first checks that there is sufficient space in this
* buffer and it is potentially much more efficient.
@@ -874,9 +876,10 @@
* dst.put(src, start, end) has exactly the same effect
* as the loop
*
- *
+ * {@code
* for (int i = start; i < end; i++)
- * dst.put(src.charAt(i));
+ * dst.put(src.charAt(i));
+ * }
*
* except that it first checks that there is sufficient space in this
* buffer and it is potentially much more efficient.
@@ -1038,12 +1041,13 @@
* write was incomplete. The following loop, for example, copies bytes
* from one channel to another via the buffer buf:
*
- *
- * buf.clear(); // Prepare buffer for use
- * while (in.read(buf) >= 0 || buf.position != 0) {
- * buf.flip();
- * out.write(buf);
- * buf.compact(); // In case of partial write
+ * {@code
+ * buf.clear(); // Prepare buffer for use
+ * while (in.read(buf) >= 0 || buf.position != 0) {
+ * buf.flip();
+ * out.write(buf);
+ * buf.compact(); // In case of partial write
+ * }
* }
*
#end[byte]
diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/nio/channels/SelectableChannel.java
--- a/jdk/src/share/classes/java/nio/channels/SelectableChannel.java Mon Jun 10 12:26:20 2013 +0200
+++ b/jdk/src/share/classes/java/nio/channels/SelectableChannel.java Mon Jun 10 12:58:32 2013 +0100
@@ -208,7 +208,7 @@
* @throws IllegalArgumentException
* If a bit in the ops set does not correspond to an
* operation that is supported by this channel, that is, if
- * set & ~validOps() != 0
+ * {@code set & ~validOps() != 0}
*
* @return A key representing the registration of this channel with
* the given selector
@@ -265,8 +265,8 @@
*
* @throws IllegalArgumentException
* If a bit in ops does not correspond to an operation
- * that is supported by this channel, that is, if set &
- * ~validOps() != 0
+ * that is supported by this channel, that is, if {@code set &
+ * ~validOps() != 0}
*
* @return A key representing the registration of this channel with
* the given selector
diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/nio/channels/SelectionKey.java
--- a/jdk/src/share/classes/java/nio/channels/SelectionKey.java Mon Jun 10 12:26:20 2013 +0200
+++ b/jdk/src/share/classes/java/nio/channels/SelectionKey.java Mon Jun 10 12:58:32 2013 +0100
@@ -191,7 +191,7 @@
* @throws IllegalArgumentException
* If a bit in the set does not correspond to an operation that
* is supported by this key's channel, that is, if
- * (ops & ~channel().validOps()) != 0
+ * {@code (ops & ~channel().validOps()) != 0}
*
* @throws CancelledKeyException
* If this key has been cancelled
@@ -272,15 +272,15 @@
* An invocation of this method of the form k.isReadable()
* behaves in exactly the same way as the expression
*
- *
- * k.readyOps() & OP_READ != 0
+ * {@code
+ * k.readyOps() & OP_READ != 0
+ * }
*
* If this key's channel does not support read operations then this
* method always returns false.
*
* @return true if, and only if,
- * readyOps() & OP_READ is
- * nonzero
+ {@code readyOps() & OP_READ} is nonzero
*
* @throws CancelledKeyException
* If this key has been cancelled
@@ -295,15 +295,15 @@
* An invocation of this method of the form k.isWritable()
* behaves in exactly the same way as the expression
*
- *
- * k.readyOps() & OP_WRITE != 0
+ * {@code
+ * k.readyOps() & OP_WRITE != 0
+ * }
*
* If this key's channel does not support write operations then this
* method always returns false.
*
* @return true if, and only if,
- * readyOps() & OP_WRITE
- * is nonzero
+ * {@code readyOps() & OP_WRITE} is nonzero
*
* @throws CancelledKeyException
* If this key has been cancelled
@@ -319,15 +319,15 @@
* An invocation of this method of the form k.isConnectable()
* behaves in exactly the same way as the expression
*
- *
- * k.readyOps() & OP_CONNECT != 0
+ * {@code
+ * k.readyOps() & OP_CONNECT != 0
+ * }If this key's channel does not support socket-connect operations * then this method always returns false.
* * @return true if, and only if, - * readyOps() & OP_CONNECT - * is nonzero + * {@code readyOps() & OP_CONNECT} is nonzero * * @throws CancelledKeyException * If this key has been cancelled @@ -343,15 +343,15 @@ *An invocation of this method of the form k.isAcceptable() * behaves in exactly the same way as the expression * - *
+ *- * k.readyOps() & OP_ACCEPT != 0
{@code
+ * k.readyOps() & OP_ACCEPT != 0
+ * }If this key's channel does not support socket-accept operations then * this method always returns false.
* * @return true if, and only if, - * readyOps() & OP_ACCEPT - * is nonzero + * {@code readyOps() & OP_ACCEPT} is nonzero * * @throws CancelledKeyException * If this key has been cancelled diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/nio/charset/Charset-X-Coder.java.template --- a/jdk/src/share/classes/java/nio/charset/Charset-X-Coder.java.template Mon Jun 10 12:26:20 2013 +0200 +++ b/jdk/src/share/classes/java/nio/charset/Charset-X-Coder.java.template Mon Jun 10 12:58:32 2013 +0100 @@ -260,7 +260,7 @@ * method, passing the new replacement, after checking that the new * replacement is acceptable. * - * @param newReplacement + * @param newReplacement The replacement value * #if[decoder] * The new replacement; must not be null @@ -305,7 +305,7 @@ * should be overridden by $coder$s that require notification of changes to * the replacement. * - * @param newReplacement + * @param newReplacement The replacement value */ protected void implReplaceWith($replType$ newReplacement) { } diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/nio/file/Path.java --- a/jdk/src/share/classes/java/nio/file/Path.java Mon Jun 10 12:26:20 2013 +0200 +++ b/jdk/src/share/classes/java/nio/file/Path.java Mon Jun 10 12:58:32 2013 +0100 @@ -64,7 +64,7 @@ * those developing custom file system implementations. Methods may be added to * this interface in future releases. * - *Paths may be used with the {@link Files} class to operate on files, * directories, and other types of files. For example, suppose we want a {@link * java.io.BufferedReader} to read text from a file "{@code access.log}". The @@ -87,7 +87,7 @@ * addition, the {@link #toFile toFile} method is useful to construct a {@code * File} from the {@code String} representation of a {@code Path}. * - *
Implementations of this interface are immutable and safe for use by
* multiple concurrent threads.
*
diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/security/KeyStore.java
--- a/jdk/src/share/classes/java/security/KeyStore.java Mon Jun 10 12:26:20 2013 +0200
+++ b/jdk/src/share/classes/java/security/KeyStore.java Mon Jun 10 12:58:32 2013 +0100
@@ -317,7 +317,7 @@
* been specified by properties in the domain configuration data.
* It is cloned to prevent subsequent modification.
*
- * @exception NullPointerExcetion if {@code configuration} or
+ * @exception NullPointerException if {@code configuration} or
* {@code protectionParams} is {@code null}
*/
public DomainLoadStoreParameter(URI configuration,
diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/security/SecureRandom.java
--- a/jdk/src/share/classes/java/security/SecureRandom.java Mon Jun 10 12:26:20 2013 +0200
+++ b/jdk/src/share/classes/java/security/SecureRandom.java Mon Jun 10 12:58:32 2013 +0100
@@ -466,7 +466,7 @@
* nextLong, and nextFloat).
*
* @param numBits number of pseudo-random bits to be generated, where
- * 0 <= numBits <= 32.
+ * {@code 0 <= numBits <= 32}.
*
* @return an int containing the user-specified number
* of pseudo-random bits (right justified, with leading zeros).
diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/security/cert/CertPathValidatorException.java
--- a/jdk/src/share/classes/java/security/cert/CertPathValidatorException.java Mon Jun 10 12:26:20 2013 +0200
+++ b/jdk/src/share/classes/java/security/cert/CertPathValidatorException.java Mon Jun 10 12:58:32 2013 +0100
@@ -141,8 +141,8 @@
* that caused the error (or -1 if not applicable). Note that
* the list of certificates in a CertPath is zero based.
* @throws IndexOutOfBoundsException if the index is out of range
- * (index < -1 || (certPath != null && index >=
- * certPath.getCertificates().size())
+ * {@code (index < -1 || (certPath != null && index >=
+ * certPath.getCertificates().size()) }
* @throws IllegalArgumentException if certPath is
* null and index is not -1
*/
@@ -164,8 +164,8 @@
* the list of certificates in a CertPath is zero based.
* @param reason the reason the validation failed
* @throws IndexOutOfBoundsException if the index is out of range
- * (index < -1 || (certPath != null && index >=
- * certPath.getCertificates().size())
+ * {@code (index < -1 || (certPath != null && index >=
+ * certPath.getCertificates().size()) }
* @throws IllegalArgumentException if certPath is
* null and index is not -1
* @throws NullPointerException if reason is null
diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/security/cert/CertificateFactory.java
--- a/jdk/src/share/classes/java/security/cert/CertificateFactory.java Mon Jun 10 12:26:20 2013 +0200
+++ b/jdk/src/share/classes/java/security/cert/CertificateFactory.java Mon Jun 10 12:58:32 2013 +0100
@@ -65,7 +65,7 @@
* read position of the input stream is positioned to the next certificate in
* the file:
* - *
+ * {@code
* FileInputStream fis = new FileInputStream(filename);
* BufferedInputStream bis = new BufferedInputStream(fis);
*
@@ -75,7 +75,7 @@
* Certificate cert = cf.generateCertificate(bis);
* System.out.println(cert.toString());
* }
- *
+ * }
*
* The following example parses a PKCS#7-formatted certificate reply stored * in a file and extracts all the certificates from it:
diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/security/cert/X509Extension.java --- a/jdk/src/share/classes/java/security/cert/X509Extension.java Mon Jun 10 12:26:20 2013 +0200 +++ b/jdk/src/share/classes/java/security/cert/X509Extension.java Mon Jun 10 12:58:32 2013 +0100 @@ -84,12 +84,12 @@ * * Here is sample code to get a Set of critical extensions from an * X509Certificate and print the OIDs: - *
+ * {@code
* X509Certificate cert = null;
* try (InputStream inStrm = new FileInputStream("DER-encoded-Cert")) {
* CertificateFactory cf = CertificateFactory.getInstance("X.509");
* cert = (X509Certificate)cf.generateCertificate(inStrm);
- * }
+ * }
*
* Set critSet = cert.getCriticalExtensionOIDs();
* if (critSet != null && !critSet.isEmpty()) {
@@ -98,7 +98,7 @@
* System.out.println(oid);
* }
* }
- *
+ * {@code
* (field.hashCode() << 6) + (a.hashCode() << 4) + (b.hashCode() << 2)
- *
+ * }
*/
public int hashCode() {
return (field.hashCode() << 6 +
diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/sql/DatabaseMetaData.java
--- a/jdk/src/share/classes/java/sql/DatabaseMetaData.java Mon Jun 10 12:26:20 2013 +0200
+++ b/jdk/src/share/classes/java/sql/DatabaseMetaData.java Mon Jun 10 12:58:32 2013 +0100
@@ -1218,21 +1218,21 @@
*
* Each procedure description has the the following columns: *
null)
- * null)
- * null)
+ * null)
+ * @@ -1297,11 +1297,11 @@ *
Each row in the ResultSet is a parameter description or
* column description with the following fields:
*
null)
- * null)
- * null)
+ * null)
+ * ResultSet
* null)
+ * null)
* Note: Some databases may not return the column @@ -1481,19 +1481,19 @@ *
* Each table description has the following columns: *
null)
- * null)
- * null)
+ * null)
+ * null)
- * null)
- * null)
- * null)
+ * null)
+ * null)
+ * null)
- * null)
* The schema columns are: *
null)
+ * null)
* ResultSet object in which each row is a
@@ -1545,7 +1545,7 @@
*
* The catalog column is: *
ResultSet object in which each row has a
@@ -1560,7 +1560,7 @@
*
* The table type is: *
Each column description has the following columns: *
null)
- * null)
- * null)
+ * null)
+ * NULL values
* NULL values
* null)
- * null)
- * null)
+ * null)
+ * null if DATA_TYPE isn't REF)
- * null if the DATA_TYPE isn't REF)
- * null if the DATA_TYPE isn't REF)
- * null if DATA_TYPE
* isn't DISTINCT or user-generated REF)
- * Each privilige description has the following columns: *
null)
- * null)
- * null)
- * null)
+ * null)
+ * null)
+ * null if unknown
* Each privilige description has the following columns: *
null)
- * null)
- * null)
- * null)
+ * null)
+ * null)
+ * null if unknown
* Each column description has the following columns: *
Each column description has the following columns: *
java.sql.Types
- * java.sql.Types
+ * Each primary key column description has the following columns: *
null)
- * null)
- * null)
+ * null)
+ * null)
+ * null)
* Each primary key column description has the following columns: *
null)
- * null)
- * null)
- * null)
- * null)
+ * null)
+ * null)
- * null)
- * null)
+ * null)
+ * Each foreign key column description has the following columns: *
null)
- * null)
- * null)
+ * null)
+ * null)
+ * null)
* being exported (may be null)
- * null)
+ * null)
* being exported (may be null)
- * null)
- * null)
- * null)
+ * null)
+ * Each foreign key column description has the following columns: *
null)
- * null)
- * null)
+ * null)
+ * null)
+ * null)
* being exported (may be null)
- * null)
+ * null)
* being exported (may be null)
- * null)
- * null)
- * null)
+ * null)
+ * Each type description has the following columns: *
null)
- * null)
- * null)
- * null)
- * The PRECISION column represents the maximum column size that the server supports for the given datatype. @@ -2498,16 +2498,16 @@ * *
Each index column description has the following columns: *
null)
- * null)
- * null)
+ * null)
+ * null);
+ * null);
* null when TYPE is tableIndexStatistic
- * null when TYPE is
+ * null when TYPE is
* tableIndexStatistic
- * null when TYPE is
+ * null when TYPE is
* tableIndexStatistic
- * null if sort sequence is not supported;
+ * null if sort sequence is not supported;
* null when TYPE is tableIndexStatistic
- * null)
* Each type description has the following columns: *
null)
- * null)
- * null)
+ * null)
+ * null if DATA_TYPE is not
@@ -2894,14 +2894,14 @@
* describes the designated UDT and a direct supertype. A row has the following
* columns:
* null)
- * null)
- * null)
+ * null)
+ * null)
- * null)
- * Note: If the driver does not support type hierarchies, an @@ -2936,10 +2936,10 @@ * *
Each type description has the following columns: *
null)
- * null)
- * null)
+ * null)
+ * Note: If the driver does not support type hierarchies, an
@@ -3001,35 +3001,35 @@
* The ResultSet object that is returned has the following
* columns:
*
null)
- * null)
- * null)
+ * null)
+ * null)
- * null)
- * null)
+ * null)
+ * null if DATA_TYPE isn't REF)
- * null if DATA_TYPE isn't REF)
- * null if the DATA_TYPE isn't REF)
- * null if DATA_TYPE
* isn't DISTINCT or user-generated REF)
* RowId object remains valid.
* * The returned int values have the following relationship: - *
+ * {@code
* ROWID_UNSUPPORTED < ROWID_VALID_OTHER < ROWID_VALID_TRANSACTION
* < ROWID_VALID_SESSION < ROWID_VALID_FOREVER
- *
+ * }
* so conditional logic such as
- *
+ * {@code
* if (metadata.getRowIdLifetime() > DatabaseMetaData.ROWID_VALID_TRANSACTION)
- *
+ * }
* can be used. Valid Forever means valid across all Sessions, and valid for
* a Session means valid across all its contained Transactions.
*
@@ -3227,8 +3227,8 @@
*
* The schema columns are: *
null)
+ * null)
* *
Each function description has the the following columns: *
null)
- * null)
- * null)
+ * null)
+ * FUNCTION_NAME
* for example with overload functions
@@ -3359,12 +3359,12 @@
* is a parameter description, column description or
* return type description with the following fields:
* null)
- * null)
- * null)
+ * null)
+ * ResultSet
* FUNCTION_NAME
* for example with overload functions
@@ -3591,21 +3591,21 @@
*
* Each column description has the following columns: *
null)
- * null)
- * null)
+ * null)
+ * null)
- * null)
+ * The basic service for managing a set of JDBC drivers.
- * NOTE: The {@link DataSource} interface, new in the
+ * NOTE: The {@link javax.sql.DataSource} interface, new in the
* JDBC 2.0 API, provides another way to connect to a data source.
* The use of a DataSource object is the preferred means of
* connecting to a data source.
diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/sql/ResultSet.java
--- a/jdk/src/share/classes/java/sql/ResultSet.java Mon Jun 10 12:26:20 2013 +0200
+++ b/jdk/src/share/classes/java/sql/ResultSet.java Mon Jun 10 12:58:32 2013 +0100
@@ -1350,7 +1350,7 @@
* @param rows the number of rows to fetch
* @exception SQLException if a database access error occurs; this method
* is called on a closed result set or the
- * condition rows >= 0 is not satisfied
+ * condition {@code rows >= 0} is not satisfied
* @since 1.2
* @see #getFetchSize
*/
diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/sql/Statement.java
--- a/jdk/src/share/classes/java/sql/Statement.java Mon Jun 10 12:26:20 2013 +0200
+++ b/jdk/src/share/classes/java/sql/Statement.java Mon Jun 10 12:58:32 2013 +0100
@@ -144,7 +144,7 @@
* @param max the new column size limit in bytes; zero means there is no limit
* @exception SQLException if a database access error occurs,
* this method is called on a closed Statement
- * or the condition max >= 0 is not satisfied
+ * or the condition {@code max >= 0} is not satisfied
* @see #getMaxFieldSize
*/
void setMaxFieldSize(int max) throws SQLException;
@@ -174,7 +174,7 @@
* @param max the new max rows limit; zero means there is no limit
* @exception SQLException if a database access error occurs,
* this method is called on a closed Statement
- * or the condition max >= 0 is not satisfied
+ * or the condition {@code max >= 0} is not satisfied
* @see #getMaxRows
*/
void setMaxRows(int max) throws SQLException;
@@ -240,7 +240,7 @@
* there is no limit
* @exception SQLException if a database access error occurs,
* this method is called on a closed Statement
- * or the condition seconds >= 0 is not satisfied
+ * or the condition {@code seconds >= 0} is not satisfied
* @see #getQueryTimeout
*/
void setQueryTimeout(int seconds) throws SQLException;
@@ -385,10 +385,10 @@
* object(s) obtained with the method getResultSet.
*
*
There are no more results when the following is true: - *
+ * {@code
* // stmt is a Statement object
* ((stmt.getMoreResults() == false) && (stmt.getUpdateCount() == -1))
- *
+ * }
*
* @return true if the next result is a ResultSet
* object; false if it is an update count or there are
@@ -452,7 +452,7 @@
* @param rows the number of rows to fetch
* @exception SQLException if a database access error occurs,
* this method is called on a closed Statement or the
- * condition rows >= 0 is not satisfied.
+ * condition {@code rows >= 0} is not satisfied.
* @since 1.2
* @see #getFetchSize
*/
@@ -665,10 +665,10 @@
* true if the next result is a ResultSet object.
*
* There are no more results when the following is true: - *
+ * {@code
* // stmt is a Statement object
* ((stmt.getMoreResults(current) == false) && (stmt.getUpdateCount() == -1))
- *
+ * }
*
* @param current one of the following Statement
* constants indicating what should happen to current
@@ -1107,7 +1107,7 @@
* @param max the new max rows limit; zero means there is no limit
* @exception SQLException if a database access error occurs,
* this method is called on a closed Statement
- * or the condition max >= 0 is not satisfied
+ * or the condition {@code max >= 0} is not satisfied
* @see #getMaxRows
* @since 1.8
*/
diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/text/CharacterIterator.java
--- a/jdk/src/share/classes/java/text/CharacterIterator.java Mon Jun 10 12:26:20 2013 +0200
+++ b/jdk/src/share/classes/java/text/CharacterIterator.java Mon Jun 10 12:58:32 2013 +0100
@@ -62,27 +62,27 @@
* Examples:
* * Traverse the text from start to finish - *
+ * {@code
* public void traverseForward(CharacterIterator iter) {
* for(char c = iter.first(); c != CharacterIterator.DONE; c = iter.next()) {
* processChar(c);
* }
* }
- *
+ * }
*
* Traverse the text backwards, from end to start
- *
+ * {@code
* public void traverseBackward(CharacterIterator iter) {
* for(char c = iter.last(); c != CharacterIterator.DONE; c = iter.previous()) {
* processChar(c);
* }
* }
- *
+ * }
*
* Traverse both forward and backward from a given position in the text.
* Calls to notBoundary() in this example represents some
* additional stopping criteria.
- *
+ * {@code
* public void traverseOut(CharacterIterator iter, int pos) {
* for (char c = iter.setIndex(pos);
* c != CharacterIterator.DONE && notBoundary(c);
@@ -96,7 +96,7 @@
* int start = iter.getIndex();
* processSection(start, end);
* }
- *
+ * }
*
* @see StringCharacterIterator
* @see AttributedCharacterIterator
diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/text/ChoiceFormat.java
--- a/jdk/src/share/classes/java/text/ChoiceFormat.java Mon Jun 10 12:26:20 2013 +0200
+++ b/jdk/src/share/classes/java/text/ChoiceFormat.java Mon Jun 10 12:58:32 2013 +0100
@@ -376,7 +376,7 @@
/**
* Returns pattern with formatted double.
- * @param number number to be formatted & substituted.
+ * @param number number to be formatted and substituted.
* @param toAppendTo where text is appended.
* @param status ignore no useful status is returned.
*/
diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/text/Collator.java
--- a/jdk/src/share/classes/java/text/Collator.java Mon Jun 10 12:26:20 2013 +0200
+++ b/jdk/src/share/classes/java/text/Collator.java Mon Jun 10 12:58:32 2013 +0100
@@ -72,14 +72,14 @@
* The following example shows how to compare two strings using
* the Collator for the default locale.
* - ** *+ **{@code * // Compare two strings in the default locale * Collator myCollator = Collator.getInstance(); * if( myCollator.compare("abc", "ABC") < 0 ) * System.out.println("abc is less than ABC"); * else * System.out.println("abc is greater than or equal to ABC"); - *+ * }
diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/util/Calendar.java
--- a/jdk/src/share/classes/java/util/Calendar.java Mon Jun 10 12:26:20 2013 +0200
+++ b/jdk/src/share/classes/java/util/Calendar.java Mon Jun 10 12:58:32 2013 +0100
@@ -2681,9 +2681,9 @@
* Returns whether this Calendar represents a time
* before the time represented by the specified
* Object. This method is equivalent to:
- *
+ * } * if and only if+ *{@code * compareTo(when) < 0 - *
when is a Calendar
* instance. Otherwise, the method returns false.
*
@@ -2702,9 +2702,9 @@
* Returns whether this Calendar represents a time
* after the time represented by the specified
* Object. This method is equivalent to:
- * + * } * if and only if+ *{@code * compareTo(when) > 0 - *
when is a Calendar
* instance. Otherwise, the method returns false.
*
diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/util/Collections.java
--- a/jdk/src/share/classes/java/util/Collections.java Mon Jun 10 12:26:20 2013 +0200
+++ b/jdk/src/share/classes/java/util/Collections.java Mon Jun 10 12:58:32 2013 +0100
@@ -924,9 +924,9 @@
* Returns the starting position of the first occurrence of the specified
* target list within the specified source list, or -1 if there is no
* such occurrence. More formally, returns the lowest index i
- * such that source.subList(i, i+target.size()).equals(target),
+ * such that {@code source.subList(i, i+target.size()).equals(target)},
* or -1 if there is no such index. (Returns -1 if
- * target.size() > source.size().)
+ * {@code target.size() > source.size()})
*
* This implementation uses the "brute force" technique of scanning * over the source list, looking for a match with the target at each @@ -977,9 +977,9 @@ * Returns the starting position of the last occurrence of the specified * target list within the specified source list, or -1 if there is no such * occurrence. More formally, returns the highest index i - * such that source.subList(i, i+target.size()).equals(target), + * such that {@code source.subList(i, i+target.size()).equals(target)}, * or -1 if there is no such index. (Returns -1 if - * target.size() > source.size().) + * {@code target.size() > source.size()}) * *
This implementation uses the "brute force" technique of iterating * over the source list, looking for a match with the target at each diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/util/Date.java --- a/jdk/src/share/classes/java/util/Date.java Mon Jun 10 12:26:20 2013 +0200 +++ b/jdk/src/share/classes/java/util/Date.java Mon Jun 10 12:58:32 2013 +0100 @@ -984,8 +984,9 @@ * exclusive OR of the two halves of the primitive long * value returned by the {@link Date#getTime} * method. That is, the hash code is the value of the expression: - *
+ *- * (int)(this.getTime()^(this.getTime() >>> 32))
{@code
+ * (int)(this.getTime()^(this.getTime() >>> 32))
+ * }
* d mon yyyy hh:mm:ss GMTSample use: this override will allow the map to grow up to 100 * entries and then delete the eldest entry each time a new entry is * added, maintaining a steady state of 100 entries. - *
+ * {@code
* private static final int MAX_ENTRIES = 100;
*
* protected boolean removeEldestEntry(Map.Entry eldest) {
* return size() > MAX_ENTRIES;
* }
- *
+ * }
*
* This method typically does not modify the map in any way,
* instead allowing the map to modify itself as directed by its
diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/util/Random.java
--- a/jdk/src/share/classes/java/util/Random.java Mon Jun 10 12:26:20 2013 +0200
+++ b/jdk/src/share/classes/java/util/Random.java Mon Jun 10 12:58:32 2013 +0100
@@ -372,7 +372,7 @@
* range {@code 0.0f} (inclusive) to {@code 1.0f} (exclusive), is
* pseudorandomly generated and returned. All 224 possible {@code float} values
- * of the form m x 2m x 2-24, where m is a positive
* integer less than 224 , are
* produced with (approximately) equal probability.
diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/util/ResourceBundle.java
--- a/jdk/src/share/classes/java/util/ResourceBundle.java Mon Jun 10 12:26:20 2013 +0200
+++ b/jdk/src/share/classes/java/util/ResourceBundle.java Mon Jun 10 12:58:32 2013 +0100
@@ -2323,9 +2323,9 @@
* is returned. And if the resource bundles for the "ja" and
* "" For example, this code allows a user to read a number from
* System.in:
- * As another example, this code allows The scanner can also use delimiters other than whitespace. This
* example reads several items in from a string:
- *
* prints the following output:
- * The same output can be generated with this code, which uses a regular
* expression to parse all four tokens at once:
- * The default whitespace delimiter used
* by a scanner is as recognized by {@link java.lang.Character}.{@link
@@ -2640,11 +2644,11 @@
* scanner.reset() behaves in exactly the same way as the
* invocation
*
- * This method is typically invoked from within a task's run method, to
* determine whether the current execution of the task is sufficiently
* timely to warrant performing the scheduled activity:
- *
* Here is an example using packer and unpacker:
- *
* A Pack200 file compressed with gzip can be hosted on HTTP/1.1 web servers.
* The deployment applications can use "Accept-Encoding=pack200-gzip". This
diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/util/logging/ConsoleHandler.java
--- a/jdk/src/share/classes/java/util/logging/ConsoleHandler.java Mon Jun 10 12:26:20 2013 +0200
+++ b/jdk/src/share/classes/java/util/logging/ConsoleHandler.java Mon Jun 10 12:58:32 2013 +0100
@@ -35,7 +35,7 @@
*
* Configuration:
* By default each ConsoleHandler is initialized using the following
- * LogManager configuration properties where Locales are found, then the runtime resource
* lookup path (parent chain) is:
- *
+ *
*
* @param baseName
* the base name of the resource bundle, a fully
diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/util/Scanner.java
--- a/jdk/src/share/classes/java/util/Scanner.java Mon Jun 10 12:26:20 2013 +0200
+++ b/jdk/src/share/classes/java/util/Scanner.java Mon Jun 10 12:58:32 2013 +0100
@@ -49,47 +49,51 @@
*
* {@code
* Messages_ja -> Messages
- *
+ * }
*
*
+ *
+ * }{@code
* Scanner sc = new Scanner(System.in);
* int i = sc.nextInt();
- * long types to be
* assigned from entries in a file myNumbers:
- *
*
*
+ *
+ * }
+ * }{@code
* Scanner sc = new Scanner(new File("myNumbers"));
* while (sc.hasNextLong()) {
* long aLong = sc.nextLong();
- * }
*
+ *
+ * s.close();
+ * }{@code
* String input = "1 fish 2 fish red fish blue fish";
* Scanner s = new Scanner(input).useDelimiter("\\s*fish\\s*");
* System.out.println(s.nextInt());
* System.out.println(s.nextInt());
* System.out.println(s.next());
* System.out.println(s.next());
- * s.close();
+ * blue
+ * }
*
*
+ *
{@code
* 1
* 2
* red
- * blue
*
*
+ *
+ * s.close();
+ * }{@code
* String input = "1 fish 2 fish red fish blue fish";
* Scanner s = new Scanner(input);
* s.findInLine("(\\d+) fish (\\d+) fish (\\w+) fish (\\w+)");
* MatchResult result = s.match();
* for (int i=1; i<=result.groupCount(); i++)
* System.out.println(result.group(i));
- * s.close();
*
* @return this scanner
*
diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/util/TimerTask.java
--- a/jdk/src/share/classes/java/util/TimerTask.java Mon Jun 10 12:26:20 2013 +0200
+++ b/jdk/src/share/classes/java/util/TimerTask.java Mon Jun 10 12:58:32 2013 +0100
@@ -130,14 +130,14 @@
*
+ *
+ * }{@code
* scanner.useDelimiter("\\p{javaWhitespace}+")
* .useLocale(Locale.getDefault(Locale.Category.FORMAT))
* .useRadix(10);
- *
+ *
* This method is typically not used in conjunction with
* fixed-delay execution repeating tasks, as their scheduled
* execution times are allowed to drift over time, and so are not terribly
diff -r 889970e5b728 -r edb590d448c5 jdk/src/share/classes/java/util/jar/Pack200.java
--- a/jdk/src/share/classes/java/util/jar/Pack200.java Mon Jun 10 12:26:20 2013 +0200
+++ b/jdk/src/share/classes/java/util/jar/Pack200.java Mon Jun 10 12:58:32 2013 +0100
@@ -45,7 +45,7 @@
* transform the byte-stream back to JAR format.
* {@code
* public void run() {
* if (System.currentTimeMillis() - scheduledExecutionTime() >=
* MAX_TARDINESS)
* return; // Too late; skip this execution.
* // Perform the task
* }
- *
+ * }
+ * }
*
+ *
{@code
* import java.util.jar.Pack200;
* import java.util.jar.Pack200.*;
* ...
@@ -90,7 +90,7 @@
* } catch (IOException ioe) {
* ioe.printStackTrace();
* }
- *
The XML document has the following DOCTYPE declaration: - *
- * <!DOCTYPE preferences SYSTEM "http://java.sun.com/dtd/preferences.dtd"> - *+ *
{@code
+ *
+ * }
* Note that the system URI (http://java.sun.com/dtd/preferences.dtd) is
* not accessed when exporting or importing preferences; it merely
* serves as a string to uniquely identify the DTD, which is:
- *