diff --git a/jdk/src/share/classes/java/io/BufferedInputStream.java b/jdk/src/share/classes/java/io/BufferedInputStream.java
index fcc7e702db6..a161a988109 100644
--- a/jdk/src/share/classes/java/io/BufferedInputStream.java
+++ b/jdk/src/share/classes/java/io/BufferedInputStream.java
@@ -185,7 +185,7 @@ class BufferedInputStream extends FilterInputStream {
*
* @param in the underlying input stream.
* @param size the buffer size.
- * @exception IllegalArgumentException if size <= 0.
+ * @exception IllegalArgumentException if {@code size <= 0}.
*/
public BufferedInputStream(InputStream in, int size) {
super(in);
diff --git a/jdk/src/share/classes/java/io/BufferedReader.java b/jdk/src/share/classes/java/io/BufferedReader.java
index d742233a0fd..ebf398078bf 100644
--- a/jdk/src/share/classes/java/io/BufferedReader.java
+++ b/jdk/src/share/classes/java/io/BufferedReader.java
@@ -95,7 +95,7 @@ public class BufferedReader extends Reader {
* @param in A Reader
* @param sz Input-buffer size
*
- * @exception IllegalArgumentException If sz is <= 0
+ * @exception IllegalArgumentException If {@code sz <= 0}
*/
public BufferedReader(Reader in, int sz) {
super(in);
@@ -484,7 +484,7 @@ public class BufferedReader extends Reader {
* whose size is no smaller than limit.
* Therefore large values should be used with care.
*
- * @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 --git a/jdk/src/share/classes/java/io/BufferedWriter.java b/jdk/src/share/classes/java/io/BufferedWriter.java
index 83a467e7266..01dfb175e82 100644
--- a/jdk/src/share/classes/java/io/BufferedWriter.java
+++ b/jdk/src/share/classes/java/io/BufferedWriter.java
@@ -95,7 +95,7 @@ public class BufferedWriter extends Writer {
* @param out A Writer
* @param sz Output-buffer size, a positive integer
*
- * @exception IllegalArgumentException If sz is <= 0
+ * @exception IllegalArgumentException If {@code sz <= 0}
*/
public BufferedWriter(Writer out, int sz) {
super(out);
diff --git a/jdk/src/share/classes/java/io/Console.java b/jdk/src/share/classes/java/io/Console.java
index c4987dc0934..c100f8a0ccd 100644
--- a/jdk/src/share/classes/java/io/Console.java
+++ b/jdk/src/share/classes/java/io/Console.java
@@ -75,7 +75,7 @@ import sun.nio.cs.StreamEncoder;
* manually zero the returned character array after processing to minimize the
* lifetime of sensitive data in memory.
*
- * <blockquote><pre>
+ * <blockquote><pre>{@code
* Console cons;
* char[] passwd;
* if ((cons = System.console()) != null &&
@@ -83,7 +83,7 @@ import sun.nio.cs.StreamEncoder;
* ...
* java.util.Arrays.fill(passwd, ' ');
* }
- * </pre></blockquote>
+ * }</pre></blockquote>
*
* @author Xueming Shen
* @since 1.6
diff --git a/jdk/src/share/classes/java/io/PipedInputStream.java b/jdk/src/share/classes/java/io/PipedInputStream.java
index ca2115430d7..4ad8fbd81d8 100644
--- a/jdk/src/share/classes/java/io/PipedInputStream.java
+++ b/jdk/src/share/classes/java/io/PipedInputStream.java
@@ -117,7 +117,7 @@ public class PipedInputStream extends InputStream {
* @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>pipeSize <= 0</code>.
+ * @exception IllegalArgumentException if {@code pipeSize <= 0}.
* @since 1.6
*/
public PipedInputStream(PipedOutputStream src, int pipeSize)
@@ -147,7 +147,7 @@ public class PipedInputStream extends InputStream {
* connected} to a <code>PipedOutputStream</code> before being used.
*
* @param pipeSize the size of the pipe's buffer.
- * @exception IllegalArgumentException if <code>pipeSize <= 0</code>.
+ * @exception IllegalArgumentException if {@code pipeSize <= 0}.
* @since 1.6
*/
public PipedInputStream(int pipeSize) {
diff --git a/jdk/src/share/classes/java/io/PipedReader.java b/jdk/src/share/classes/java/io/PipedReader.java
index 95cfe1d7bd0..bb86022af6f 100644
--- a/jdk/src/share/classes/java/io/PipedReader.java
+++ b/jdk/src/share/classes/java/io/PipedReader.java
@@ -91,7 +91,7 @@ public class PipedReader extends Reader {
* @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>pipeSize <= 0</code>.
+ * @exception IllegalArgumentException if {@code pipeSize <= 0}.
* @since 1.6
*/
public PipedReader(PipedWriter src, int pipeSize) throws IOException {
@@ -120,7 +120,7 @@ public class PipedReader extends Reader {
* before being used.
*
* @param pipeSize the size of the pipe's buffer.
- * @exception IllegalArgumentException if <code>pipeSize <= 0</code>.
+ * @exception IllegalArgumentException if {@code pipeSize <= 0}.
* @since 1.6
*/
public PipedReader(int pipeSize) {
diff --git a/jdk/src/share/classes/java/io/PrintStream.java b/jdk/src/share/classes/java/io/PrintStream.java
index c4cd01f470f..b803c6a657f 100644
--- a/jdk/src/share/classes/java/io/PrintStream.java
+++ b/jdk/src/share/classes/java/io/PrintStream.java
@@ -851,7 +851,7 @@ public class PrintStream extends FilterOutputStream
* <tt>null</tt> argument depends on the <a
* href="../util/Formatter.html#syntax">conversion</a>.
*
- * @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 @@ public class PrintStream extends FilterOutputStream
* <tt>null</tt> argument depends on the <a
* href="../util/Formatter.html#syntax">conversion</a>.
*
- * @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 @@ public class PrintStream extends FilterOutputStream
* <tt>null</tt> argument depends on the <a
* href="../util/Formatter.html#syntax">conversion</a>.
*
- * @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 @@ public class PrintStream extends FilterOutputStream
* <tt>null</tt> argument depends on the <a
* href="../util/Formatter.html#syntax">conversion</a>.
*
- * @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 --git a/jdk/src/share/classes/java/io/PushbackInputStream.java b/jdk/src/share/classes/java/io/PushbackInputStream.java
index af0b525a6f2..b81bec424bc 100644
--- a/jdk/src/share/classes/java/io/PushbackInputStream.java
+++ b/jdk/src/share/classes/java/io/PushbackInputStream.java
@@ -85,7 +85,7 @@ class PushbackInputStream extends FilterInputStream {
*
* @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 --git a/jdk/src/share/classes/java/io/PushbackReader.java b/jdk/src/share/classes/java/io/PushbackReader.java
index 2f5b18cfefc..98ebd5dab9c 100644
--- a/jdk/src/share/classes/java/io/PushbackReader.java
+++ b/jdk/src/share/classes/java/io/PushbackReader.java
@@ -47,7 +47,7 @@ public class PushbackReader extends FilterReader {
*
* @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 --git a/jdk/src/share/classes/java/io/StringReader.java b/jdk/src/share/classes/java/io/StringReader.java
index 3778408e5f4..0cdf8fd2197 100644
--- a/jdk/src/share/classes/java/io/StringReader.java
+++ b/jdk/src/share/classes/java/io/StringReader.java
@@ -163,7 +163,7 @@ public class StringReader extends Reader {
* 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 --git a/jdk/src/share/classes/java/lang/Character.java b/jdk/src/share/classes/java/lang/Character.java
index 531263d3894..e512e582612 100644
--- a/jdk/src/share/classes/java/lang/Character.java
+++ b/jdk/src/share/classes/java/lang/Character.java
@@ -4782,9 +4782,9 @@ class Character implements java.io.Serializable, Comparable<Character> {
* Unicode surrogate pair</a>.
* <p>This method is equivalent to the expression:
- * <blockquote><pre>
+ * <blockquote><pre>{@code
* isHighSurrogate(high) && isLowSurrogate(low)
- * </pre></blockquote>
+ * }</pre></blockquote>
*
* @param high the high-surrogate code value to be tested
* @param low the low-surrogate code value to be tested
diff --git a/jdk/src/share/classes/java/lang/ClassLoader.java b/jdk/src/share/classes/java/lang/ClassLoader.java
index 8d0205f54f1..f26eafd980a 100644
--- a/jdk/src/share/classes/java/lang/ClassLoader.java
+++ b/jdk/src/share/classes/java/lang/ClassLoader.java
@@ -702,7 +702,7 @@ public abstract class ClassLoader {
* bootstrap class loader. If <tt>name</tt> is not <tt>null</tt>, it
* must be equal to the <a href="#name">binary name</a> of the class
* specified by the byte array "<tt>b</tt>", otherwise a {@link
- * <tt>NoClassDefFoundError</tt>} will be thrown. </p>
+ * NoClassDefFoundError <tt>NoClassDefFoundError</tt>} will be thrown. </p>
*
* @param name
* The expected <a href="#name">binary name</a> of the class, or
diff --git a/jdk/src/share/classes/java/lang/Comparable.java b/jdk/src/share/classes/java/lang/Comparable.java
index 123e10aa4da..9d607679a61 100644
--- a/jdk/src/share/classes/java/lang/Comparable.java
+++ b/jdk/src/share/classes/java/lang/Comparable.java
@@ -56,7 +56,7 @@ import java.util.*;
* method.<p>
*
* For example, if one adds two keys <tt>a</tt> and <tt>b</tt> such that
- * <tt>(!a.equals(b) && a.compareTo(b) == 0)</tt> to a sorted
+ * {@code (!a.equals(b) && a.compareTo(b) == 0)} to a sorted
* set that does not use an explicit comparator, the second <tt>add</tt>
* operation returns false (and the size of the sorted set does not increase)
* because <tt>a</tt> and <tt>b</tt> are equivalent from the sorted set's
diff --git a/jdk/src/share/classes/java/lang/Double.java b/jdk/src/share/classes/java/lang/Double.java
index a32d04cf75f..3f0e2cddd0f 100644
--- a/jdk/src/share/classes/java/lang/Double.java
+++ b/jdk/src/share/classes/java/lang/Double.java
@@ -917,13 +917,13 @@ public final class Double extends Number implements Comparable<Double> {
* <p>In all other cases, let <i>s</i>, <i>e</i>, and <i>m</i> be three
* values that can be computed from the argument:
*
- * <blockquote><pre>
- * int s = ((bits >> 63) == 0) ? 1 : -1;
- * int e = (int)((bits >> 52) & 0x7ffL);
+ * <blockquote><pre>{@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;
- * </pre></blockquote>
+ * }</pre></blockquote>
*
* Then the floating-point result equals the value of the mathematical
* expression <i>s</i>·<i>m</i>·2<sup><i>e</i>-1075</sup>.
diff --git a/jdk/src/share/classes/java/lang/Float.java b/jdk/src/share/classes/java/lang/Float.java
index 5b077111fe0..e46dff02a3b 100644
--- a/jdk/src/share/classes/java/lang/Float.java
+++ b/jdk/src/share/classes/java/lang/Float.java
@@ -821,13 +821,13 @@ public final class Float extends Number implements Comparable<Float> {
* <p>In all other cases, let <i>s</i>, <i>e</i>, and <i>m</i> be three
* values that can be computed from the argument:
*
- * <blockquote><pre>
- * int s = ((bits >> 31) == 0) ? 1 : -1;
- * int e = ((bits >> 23) & 0xff);
+ * <blockquote><pre>{@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;
- * </pre></blockquote>
+ * }</pre></blockquote>
*
* Then the floating-point result equals the value of the mathematical
* expression <i>s</i>·<i>m</i>·2<sup><i>e</i>-150</sup>.
diff --git a/jdk/src/share/classes/java/lang/StackTraceElement.java b/jdk/src/share/classes/java/lang/StackTraceElement.java
index b973d0f4293..4543749bb00 100644
--- a/jdk/src/share/classes/java/lang/StackTraceElement.java
+++ b/jdk/src/share/classes/java/lang/StackTraceElement.java
@@ -181,12 +181,12 @@ public final class StackTraceElement implements java.io.Serializable {
* {@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:
- * <pre>
+ * <pre>{@code
* equals(a.getFileName(), b.getFileName()) &&
* a.getLineNumber() == b.getLineNumber()) &&
* equals(a.getClassName(), b.getClassName()) &&
* equals(a.getMethodName(), b.getMethodName())
- * </pre>
+ * }</pre>
* where {@code equals} has the semantics of {@link
* java.util.Objects#equals(Object, Object) Objects.equals}.
*
diff --git a/jdk/src/share/classes/java/lang/instrument/Instrumentation.java b/jdk/src/share/classes/java/lang/instrument/Instrumentation.java
index 3d2083d6c61..1844837fd3b 100644
--- a/jdk/src/share/classes/java/lang/instrument/Instrumentation.java
+++ b/jdk/src/share/classes/java/lang/instrument/Instrumentation.java
@@ -593,24 +593,28 @@ public interface Instrumentation {
* and the normal automatic resolution. For
* <code>RegisterNatives</code>, the JVM will attempt this
* association:
- * <pre>
- * method(foo) -> nativeImplementation(foo)</pre>
+ * <pre>{@code
+ * method(foo) -> nativeImplementation(foo)
+ * }</pre>
* <p/>
* When this fails, the resolution will be retried with
* the specified prefix prepended to the method name,
* yielding the correct resolution:
- * <pre>
- * method(wrapped_foo) -> nativeImplementation(foo)</pre>
+ * <pre>{@code
+ * method(wrapped_foo) -> nativeImplementation(foo)
+ * }</pre>
* <p/>
* For automatic resolution, the JVM will attempt:
- * <pre>
- * method(wrapped_foo) -> nativeImplementation(wrapped_foo)</pre>
+ * <pre>{@code
+ * method(wrapped_foo) -> nativeImplementation(wrapped_foo)
+ * }</pre>
* <p/>
* When this fails, the resolution will be retried with
* the specified prefix deleted from the implementation name,
* yielding the correct resolution:
- * <pre>
- * method(wrapped_foo) -> nativeImplementation(foo)</pre>
+ * <pre>{@code
+ * method(wrapped_foo) -> nativeImplementation(foo)
+ * }</pre>
* <p/>
* Note that since the prefix is only used when standard
* resolution fails, native methods can be wrapped selectively.
diff --git a/jdk/src/share/classes/java/lang/invoke/MethodHandle.java b/jdk/src/share/classes/java/lang/invoke/MethodHandle.java
index 774faff5afb..06084056fb4 100644
--- a/jdk/src/share/classes/java/lang/invoke/MethodHandle.java
+++ b/jdk/src/share/classes/java/lang/invoke/MethodHandle.java
@@ -251,7 +251,7 @@ import java.util.logging.Logger;
*
* <h3>Usage examples</h3>
* Here are some examples of usage:
- * <p><blockquote><pre>
+ * <p><blockquote><pre>{@code
Object x, y; String s; int i;
MethodType mt; MethodHandle mh;
MethodHandles.Lookup lookup = MethodHandles.lookup();
@@ -287,7 +287,7 @@ mt = MethodType.methodType(void.class, String.class);
mh = lookup.findVirtual(java.io.PrintStream.class, "println", mt);
mh.invokeExact(System.out, "Hello, world.");
// invokeExact(Ljava/io/PrintStream;Ljava/lang/String;)V
- * </pre></blockquote>
+ * }</pre></blockquote>
* 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 @@ public abstract class MethodHandle {
* (The array may also be null when zero elements are required.)
* <p>
* Here are some simple examples of array-spreading method handles:
- * <blockquote><pre>
+ * <blockquote><pre>{@code
MethodHandle equals = publicLookup()
.findVirtual(String.class, "equals", methodType(boolean.class, Object.class));
assert( (boolean) equals.invokeExact("me", (Object)"me"));
@@ -790,7 +790,7 @@ MethodHandle caString3 = caToString.asCollector(char[].class, 3);
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()));
- * </pre></blockquote>
+ * }</pre></blockquote>
* @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 @@ assertEquals("[A, B, C]", (String) caToString2.invokeExact('A', "BC".toCharArray
* number of collected arguments, use {@link #asVarargsCollector asVarargsCollector} instead.
* <p>
* Here are some examples of array-collecting method handles:
- * <blockquote><pre>
+ * <blockquote><pre>{@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 @@ MethodHandle longsToString = publicLookup()
.findStatic(Arrays.class, "toString", methodType(String.class, long[].class))
.asCollector(long[].class, 1);
assertEquals("[123]", (String) longsToString.invokeExact((long)123));
- * </pre></blockquote>
+ * }</pre></blockquote>
* @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 @@ assertEquals("[123]", (String) longsToString.invokeExact((long)123));
* It may (or may not) return the original variable arity method handle.
* <p>
* Here is an example, of a list-making variable arity method handle:
- * <blockquote><pre>
+ * <blockquote><pre>{@code
MethodHandle deepToString = publicLookup()
.findStatic(Arrays.class, "deepToString", methodType(String.class, Object[].class));
MethodHandle ts1 = deepToString.asVarargsCollector(Object[].class);
@@ -1063,7 +1063,7 @@ assertEquals("[three, thee, tee]", asList.invoke((Object[])argv).toString());
List ls = (List) asList.invoke((Object)argv);
assertEquals(1, ls.size());
assertEquals("[three, thee, tee]", Arrays.toString((Object[])ls.get(0)));
- * </pre></blockquote>
+ * }</pre></blockquote>
* <p style="font-size:smaller;">
* <em>Discussion:</em>
* These rules are designed as a dynamically-typed variation
@@ -1134,7 +1134,7 @@ assertEquals("[three, thee, tee]", Arrays.toString((Object[])ls.get(0)));
* a previous argument to {@code asVarargsCollector}.
* <p>
* Here is an example, of a list-making variable arity method handle:
- * <blockquote><pre>
+ * <blockquote><pre>{@code
MethodHandle asListVar = publicLookup()
.findStatic(Arrays.class, "asList", methodType(List.class, Object[].class))
.asVarargsCollector(Object[].class);
@@ -1153,7 +1153,7 @@ assertEquals("[three, thee, tee]", asListVar.invoke(argv).toString());
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());
- * </pre></blockquote>
+ * }</pre></blockquote>
*
* @return a new method handle which accepts only a fixed number of arguments
* @see #asVarargsCollector
diff --git a/jdk/src/share/classes/java/lang/invoke/MethodHandles.java b/jdk/src/share/classes/java/lang/invoke/MethodHandles.java
index fa3cb607855..9c54f3cf7f1 100644
--- a/jdk/src/share/classes/java/lang/invoke/MethodHandles.java
+++ b/jdk/src/share/classes/java/lang/invoke/MethodHandles.java
@@ -1593,7 +1593,7 @@ publicLookup().findVirtual(MethodHandle.class, "invoke", type)
* 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}.
- * <blockquote><pre>
+ * <blockquote><pre>{@code
import static java.lang.invoke.MethodHandles.*;
import static java.lang.invoke.MethodType.*;
...
@@ -1609,7 +1609,7 @@ assert(add.type().equals(intfn2));
MethodHandle twice = permuteArguments(add, intfn1, 0, 0);
assert(twice.type().equals(intfn1));
assert((int)twice.invokeExact(21) == 42);
- * </pre></blockquote>
+ * }</pre></blockquote>
* @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 --git a/jdk/src/share/classes/java/lang/management/MemoryUsage.java b/jdk/src/share/classes/java/lang/management/MemoryUsage.java
index c223c710728..4dc23c0fe46 100644
--- a/jdk/src/share/classes/java/lang/management/MemoryUsage.java
+++ b/jdk/src/share/classes/java/lang/management/MemoryUsage.java
@@ -72,8 +72,8 @@ import sun.management.MemoryUsageCompositeData;
* The amount of used and committed memory will always be less than
* or equal to <tt>max</tt> if <tt>max</tt> is defined.
* A memory allocation may fail if it attempts to increase the
- * used memory such that <tt>used > committed</tt> even
- * if <tt>used <= max</tt> would still be true (for example,
+ * used memory such that <tt>used > committed</tt> even
+ * if <tt>used <= max</tt> would still be true (for example,
* when the system is low on virtual memory).
* </td>
* </tr>
diff --git a/jdk/src/share/classes/java/lang/management/RuntimeMXBean.java b/jdk/src/share/classes/java/lang/management/RuntimeMXBean.java
index 62463af44e4..e4142d3e439 100644
--- a/jdk/src/share/classes/java/lang/management/RuntimeMXBean.java
+++ b/jdk/src/share/classes/java/lang/management/RuntimeMXBean.java
@@ -308,7 +308,7 @@ public interface RuntimeMXBean extends PlatformManagedObject {
*
* <p>
* <b>MBeanServer access</b>:<br>
- * The mapped type of <tt>Map<String,String></tt> is
+ * The mapped type of {@code Map<String,String>} is
* {@link javax.management.openmbean.TabularData TabularData}
* with two items in each row as follows:
* <blockquote>
diff --git a/jdk/src/share/classes/java/lang/management/ThreadMXBean.java b/jdk/src/share/classes/java/lang/management/ThreadMXBean.java
index f804af1942f..30251d51f60 100644
--- a/jdk/src/share/classes/java/lang/management/ThreadMXBean.java
+++ b/jdk/src/share/classes/java/lang/management/ThreadMXBean.java
@@ -198,7 +198,7 @@ public interface ThreadMXBean extends PlatformManagedObject {
* <tt>null</tt> if the thread of the given ID is not alive or
* it does not exist.
*
- * @throws IllegalArgumentException if <tt>id <= 0</tt>.
+ * @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 @@ public interface ThreadMXBean extends PlatformManagedObject {
* with no stack trace, no locked monitor and no synchronizer info.
*
* @throws IllegalArgumentException if any element in the input array
- * <tt>ids</tt> is <tt><= 0</tt>.
+ * <tt>ids</tt> is {@code <= 0}.
* @throws java.lang.SecurityException if a security manager
* exists and the caller does not have
* ManagementPermission("monitor").
@@ -282,7 +282,7 @@ public interface ThreadMXBean extends PlatformManagedObject {
* <tt>null</tt> if the thread of the given ID is not alive or
* it does not exist.
*
- * @throws IllegalArgumentException if <tt>id <= 0</tt>.
+ * @throws IllegalArgumentException if {@code id <= 0}.
* @throws IllegalArgumentException if <tt>maxDepth is negative</tt>.
* @throws java.lang.SecurityException if a security manager
* exists and the caller does not have
@@ -336,7 +336,7 @@ public interface ThreadMXBean extends PlatformManagedObject {
*
* @throws IllegalArgumentException if <tt>maxDepth is negative</tt>.
* @throws IllegalArgumentException if any element in the input array
- * <tt>ids</tt> is <tt><= 0</tt>.
+ * <tt>ids</tt> is {@code <= 0}.
* @throws java.lang.SecurityException if a security manager
* exists and the caller does not have
* ManagementPermission("monitor").
@@ -466,7 +466,7 @@ public interface ThreadMXBean extends PlatformManagedObject {
* and CPU time measurement is enabled;
* <tt>-1</tt> otherwise.
*
- * @throws IllegalArgumentException if <tt>id <= 0 </tt>.
+ * @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 @@ public interface ThreadMXBean extends PlatformManagedObject {
* and CPU time measurement is enabled;
* <tt>-1</tt> otherwise.
*
- * @throws IllegalArgumentException if <tt>id <= 0 </tt>.
+ * @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 --git a/jdk/src/share/classes/java/net/CookieManager.java b/jdk/src/share/classes/java/net/CookieManager.java
index 90c7262b478..fde828f95ea 100644
--- a/jdk/src/share/classes/java/net/CookieManager.java
+++ b/jdk/src/share/classes/java/net/CookieManager.java
@@ -41,7 +41,7 @@ import sun.util.logging.PlatformLogger;
*
* <p> The HTTP cookie management in java.net package looks like:
* <blockquote>
- * <pre>
+ * <pre>{@code
* use
* CookieHandler <------- HttpURLConnection
* ^
@@ -58,7 +58,7 @@ import sun.util.logging.PlatformLogger;
* | impl
* |
* Internal in-memory implementation
- * </pre>
+ * }</pre>
* <ul>
* <li>
* CookieHandler is at the core of cookie management. User can call
diff --git a/jdk/src/share/classes/java/net/CookiePolicy.java b/jdk/src/share/classes/java/net/CookiePolicy.java
index aae5c1a8053..3de98f904da 100644
--- a/jdk/src/share/classes/java/net/CookiePolicy.java
+++ b/jdk/src/share/classes/java/net/CookiePolicy.java
@@ -30,7 +30,7 @@ package java.net;
* and which should be rejected. Three pre-defined policy implementations
* are provided, namely ACCEPT_ALL, ACCEPT_NONE and ACCEPT_ORIGINAL_SERVER.
*
- * <p>See RFC 2965 sec. 3.3 & 7 for more detail.
+ * <p>See RFC 2965 sec. 3.3 and 7 for more detail.
*
* @author Edward Wang
* @since 1.6
diff --git a/jdk/src/share/classes/java/net/DatagramSocket.java b/jdk/src/share/classes/java/net/DatagramSocket.java
index ad0af4850d5..d6ffca23755 100644
--- a/jdk/src/share/classes/java/net/DatagramSocket.java
+++ b/jdk/src/share/classes/java/net/DatagramSocket.java
@@ -334,12 +334,12 @@ class DatagramSocket implements java.io.Closeable {
}
/**
- * Binds this DatagramSocket to a specific address & port.
+ * Binds this DatagramSocket to a specific address and port.
* <p>
* If the address is <code>null</code>, then the system will pick up
* an ephemeral port and a valid local address to bind the socket.
*<p>
- * @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 @@ class DatagramSocket implements java.io.Closeable {
* a <B>java.net.SocketTimeoutException</B> is raised, though the
* DatagramSocket is still valid. The option <B>must</B> 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 @@ class DatagramSocket implements java.io.Closeable {
* As the underlying network implementation may ignore this
* value applications should consider it a hint.
*
- * <P> The tc <B>must</B> be in the range <code> 0 <= tc <=
- * 255</code> or an IllegalArgumentException will be thrown.
+ * <P> The tc <B>must</B> be in the range {@code 0 <= tc <=
+ * 255} or an IllegalArgumentException will be thrown.
* <p>Notes:
* <p>For Internet Protocol v4 the value consists of an
* <code>integer</code>, the least significant 8 bits of which
diff --git a/jdk/src/share/classes/java/net/HttpURLConnection.java b/jdk/src/share/classes/java/net/HttpURLConnection.java
index 193b9cef1c1..b93f1e731bd 100644
--- a/jdk/src/share/classes/java/net/HttpURLConnection.java
+++ b/jdk/src/share/classes/java/net/HttpURLConnection.java
@@ -109,7 +109,7 @@ abstract public class HttpURLConnection extends URLConnection {
* server. In this case, {@link #getHeaderField(int) getHeaderField(0)} returns the status
* line, but <code>getHeaderFieldKey(0)</code> returns null.
*
- * @param n an index, where n >=0.
+ * @param n an index, where {@code n >=0}.
* @return the key for the <code>n</code><sup>th</sup> header field,
* or <code>null</code> if the key does not exist.
*/
@@ -260,7 +260,7 @@ abstract public class HttpURLConnection extends URLConnection {
* {@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 <code>n</code><sup>th</sup> header field,
* or <code>null</code> if the value does not exist.
* @see java.net.HttpURLConnection#getHeaderFieldKey(int)
diff --git a/jdk/src/share/classes/java/net/InetSocketAddress.java b/jdk/src/share/classes/java/net/InetSocketAddress.java
index 4ad95043470..44604c664aa 100644
--- a/jdk/src/share/classes/java/net/InetSocketAddress.java
+++ b/jdk/src/share/classes/java/net/InetSocketAddress.java
@@ -389,7 +389,7 @@ public class InetSocketAddress
* Two instances of <code>InetSocketAddress</code> 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 --git a/jdk/src/share/classes/java/net/MulticastSocket.java b/jdk/src/share/classes/java/net/MulticastSocket.java
index ad4c7566aa1..0a4d7c1023d 100644
--- a/jdk/src/share/classes/java/net/MulticastSocket.java
+++ b/jdk/src/share/classes/java/net/MulticastSocket.java
@@ -201,7 +201,7 @@ class MulticastSocket extends DatagramSocket {
* scope of the multicasts.
*
* <p>The ttl is an <b>unsigned</b> 8-bit quantity, and so <B>must</B> be
- * in the range <code> 0 <= ttl <= 0xFF </code>.
+ * in the range {@code 0 <= ttl <= 0xFF }.
*
* @param ttl the time-to-live
* @exception IOException if an I/O exception occurs
diff --git a/jdk/src/share/classes/java/net/ServerSocket.java b/jdk/src/share/classes/java/net/ServerSocket.java
index b47e4420e44..52600bff6f9 100644
--- a/jdk/src/share/classes/java/net/ServerSocket.java
+++ b/jdk/src/share/classes/java/net/ServerSocket.java
@@ -316,7 +316,7 @@ class ServerSocket implements java.io.Closeable {
* If the address is <code>null</code>, then the system will pick up
* an ephemeral port and a valid local address to bind the socket.
* <p>
- * @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 <code>SecurityManager</code> is present and
@@ -343,7 +343,7 @@ class ServerSocket implements java.io.Closeable {
* or may choose to ignore the parameter altogther. The value provided
* should be greater than <code>0</code>. If it is less than or equal to
* <code>0</code>, 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 @@ class ServerSocket implements java.io.Closeable {
* a <B>java.net.SocketTimeoutException</B> is raised, though the
* ServerSocket is still valid. The option <B>must</B> 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 --git a/jdk/src/share/classes/java/net/Socket.java b/jdk/src/share/classes/java/net/Socket.java
index e0635c1bf9f..08b7ae616c5 100644
--- a/jdk/src/share/classes/java/net/Socket.java
+++ b/jdk/src/share/classes/java/net/Socket.java
@@ -1086,7 +1086,7 @@ class Socket implements java.io.Closeable {
* expires, a <B>java.net.SocketTimeoutException</B> is raised, though the
* Socket is still valid. The option <B>must</B> 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 @@ class Socket implements java.io.Closeable {
* As the underlying network implementation may ignore this
* value applications should consider it a hint.
*
- * <P> The tc <B>must</B> be in the range <code> 0 <= tc <=
- * 255</code> or an IllegalArgumentException will be thrown.
+ * <P> The tc <B>must</B> be in the range {@code 0 <= tc <=
+ * 255} or an IllegalArgumentException will be thrown.
* <p>Notes:
* <p>For Internet Protocol v4 the value consists of an
* <code>integer</code>, the least significant 8 bits of which
diff --git a/jdk/src/share/classes/java/net/StandardSocketOptions.java b/jdk/src/share/classes/java/net/StandardSocketOptions.java
index 9aeed2b5a28..84fedd804f1 100644
--- a/jdk/src/share/classes/java/net/StandardSocketOptions.java
+++ b/jdk/src/share/classes/java/net/StandardSocketOptions.java
@@ -277,8 +277,8 @@ public final class StandardSocketOptions {
* The <em>time-to-live</em> for Internet Protocol (IP) multicast datagrams.
*
* <p> The value of this socket option is an {@code Integer} in the range
- * <tt>0 <= value <= 255</tt>. 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 --git a/jdk/src/share/classes/java/net/URI.java b/jdk/src/share/classes/java/net/URI.java
index b4b22ded16b..ed90f090c29 100644
--- a/jdk/src/share/classes/java/net/URI.java
+++ b/jdk/src/share/classes/java/net/URI.java
@@ -258,7 +258,7 @@ import java.lang.NullPointerException; // for javadoc
* <td>All <i>alphanum</i> characters together with those in the string
* <tt>"_-!.~'()*"</tt></td></tr>
* <tr><th valign=top><i>punct</i></th>
- * <td>The characters in the string <tt>",;:$&+="</tt></td></tr>
+ * <td>The characters in the string <tt>",;:$&+="</tt></td></tr>
* <tr><th valign=top><i>reserved</i></th>
* <td>All <i>punct</i> characters together with those in the string
* <tt>"?/[]@"</tt></td></tr>
diff --git a/jdk/src/share/classes/java/net/URLConnection.java b/jdk/src/share/classes/java/net/URLConnection.java
index f1c51880734..b69c00f94a3 100644
--- a/jdk/src/share/classes/java/net/URLConnection.java
+++ b/jdk/src/share/classes/java/net/URLConnection.java
@@ -662,7 +662,7 @@ public abstract class URLConnection {
* Returns the key for the <code>n</code><sup>th</sup> header field.
* It returns <code>null</code> if there are fewer than <code>n+1</code> fields.
*
- * @param n an index, where n>=0
+ * @param n an index, where {@code n>=0}
* @return the key for the <code>n</code><sup>th</sup> header field,
* or <code>null</code> if there are fewer than <code>n+1</code>
* fields.
@@ -680,7 +680,7 @@ public abstract class URLConnection {
* {@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 <code>n</code><sup>th</sup> header field
* or <code>null</code> if there are fewer than <code>n+1</code> fields
* @see java.net.URLConnection#getHeaderFieldKey(int)
diff --git a/jdk/src/share/classes/java/nio/X-Buffer.java.template b/jdk/src/share/classes/java/nio/X-Buffer.java.template
index 475818d300d..738b18b51a1 100644
--- a/jdk/src/share/classes/java/nio/X-Buffer.java.template
+++ b/jdk/src/share/classes/java/nio/X-Buffer.java.template
@@ -652,9 +652,10 @@ public abstract class $Type$Buffer
* <tt>src.get(dst, off, len)</tt> has exactly the same effect as
* the loop
*
- * <pre>
+ * <pre>{@code
* for (int i = off; i < off + len; i++)
- * dst[i] = src.get(); </pre>
+ * dst[i] = src.get():
+ * }</pre>
*
* except that it first checks that there are sufficient $type$s in
* this buffer and it is potentially much more efficient. </p>
@@ -788,9 +789,10 @@ public abstract class $Type$Buffer
* <tt>dst.put(src, off, len)</tt> has exactly the same effect as
* the loop
*
- * <pre>
+ * <pre>{@code
* for (int i = off; i < off + len; i++)
- * dst.put(a[i]); </pre>
+ * dst.put(a[i]);
+ * }</pre>
*
* except that it first checks that there is sufficient space in this
* buffer and it is potentially much more efficient. </p>
@@ -874,9 +876,10 @@ public abstract class $Type$Buffer
* <tt>dst.put(src, start, end)</tt> has exactly the same effect
* as the loop
*
- * <pre>
+ * <pre>{@code
* for (int i = start; i < end; i++)
- * dst.put(src.charAt(i)); </pre>
+ * dst.put(src.charAt(i));
+ * }</pre>
*
* except that it first checks that there is sufficient space in this
* buffer and it is potentially much more efficient. </p>
@@ -1038,12 +1041,13 @@ public abstract class $Type$Buffer
* write was incomplete. The following loop, for example, copies bytes
* from one channel to another via the buffer <tt>buf</tt>:
*
- * <blockquote><pre>
- * 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
+ * <blockquote><pre>{@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
+ * }
* }</pre></blockquote>
*
#end[byte]
diff --git a/jdk/src/share/classes/java/nio/channels/SelectableChannel.java b/jdk/src/share/classes/java/nio/channels/SelectableChannel.java
index 8b7c7125786..35569e86ed7 100644
--- a/jdk/src/share/classes/java/nio/channels/SelectableChannel.java
+++ b/jdk/src/share/classes/java/nio/channels/SelectableChannel.java
@@ -208,7 +208,7 @@ public abstract class SelectableChannel
* @throws IllegalArgumentException
* If a bit in the <tt>ops</tt> set does not correspond to an
* operation that is supported by this channel, that is, if
- * <tt>set & ~validOps() != 0</tt>
+ * {@code set & ~validOps() != 0}
*
* @return A key representing the registration of this channel with
* the given selector
@@ -265,8 +265,8 @@ public abstract class SelectableChannel
*
* @throws IllegalArgumentException
* If a bit in <tt>ops</tt> does not correspond to an operation
- * that is supported by this channel, that is, if <tt>set &
- * ~validOps() != 0</tt>
+ * 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 --git a/jdk/src/share/classes/java/nio/channels/SelectionKey.java b/jdk/src/share/classes/java/nio/channels/SelectionKey.java
index ee339db09e9..2280cb9e216 100644
--- a/jdk/src/share/classes/java/nio/channels/SelectionKey.java
+++ b/jdk/src/share/classes/java/nio/channels/SelectionKey.java
@@ -191,7 +191,7 @@ public abstract class SelectionKey {
* @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
- * <tt>(ops & ~channel().validOps()) != 0</tt>
+ * {@code (ops & ~channel().validOps()) != 0}
*
* @throws CancelledKeyException
* If this key has been cancelled
@@ -272,15 +272,15 @@ public abstract class SelectionKey {
* <p> An invocation of this method of the form <tt>k.isReadable()</tt>
* behaves in exactly the same way as the expression
*
- * <blockquote><pre>
- * k.readyOps() & OP_READ != 0</pre></blockquote>
+ * <blockquote><pre>{@code
+ * k.readyOps() & OP_READ != 0
+ * }</pre></blockquote>
*
* <p> If this key's channel does not support read operations then this
* method always returns <tt>false</tt>. </p>
*
* @return <tt>true</tt> if, and only if,
- * <tt>readyOps()</tt> <tt>&</tt> <tt>OP_READ</tt> is
- * nonzero
+ {@code readyOps() & OP_READ} is nonzero
*
* @throws CancelledKeyException
* If this key has been cancelled
@@ -295,15 +295,15 @@ public abstract class SelectionKey {
* <p> An invocation of this method of the form <tt>k.isWritable()</tt>
* behaves in exactly the same way as the expression
*
- * <blockquote><pre>
- * k.readyOps() & OP_WRITE != 0</pre></blockquote>
+ * <blockquote><pre>{@code
+ * k.readyOps() & OP_WRITE != 0
+ * }</pre></blockquote>
*
* <p> If this key's channel does not support write operations then this
* method always returns <tt>false</tt>. </p>
*
* @return <tt>true</tt> if, and only if,
- * <tt>readyOps()</tt> <tt>&</tt> <tt>OP_WRITE</tt>
- * is nonzero
+ * {@code readyOps() & OP_WRITE} is nonzero
*
* @throws CancelledKeyException
* If this key has been cancelled
@@ -319,15 +319,15 @@ public abstract class SelectionKey {
* <p> An invocation of this method of the form <tt>k.isConnectable()</tt>
* behaves in exactly the same way as the expression
*
- * <blockquote><pre>
- * k.readyOps() & OP_CONNECT != 0</pre></blockquote>
+ * <blockqoute><pre>{@code
+ * k.readyOps() & OP_CONNECT != 0
+ * }</pre></blockquote>
*
* <p> If this key's channel does not support socket-connect operations
* then this method always returns <tt>false</tt>. </p>
*
* @return <tt>true</tt> if, and only if,
- * <tt>readyOps()</tt> <tt>&</tt> <tt>OP_CONNECT</tt>
- * is nonzero
+ * {@code readyOps() & OP_CONNECT} is nonzero
*
* @throws CancelledKeyException
* If this key has been cancelled
@@ -343,15 +343,15 @@ public abstract class SelectionKey {
* <p> An invocation of this method of the form <tt>k.isAcceptable()</tt>
* behaves in exactly the same way as the expression
*
- * <blockquote><pre>
- * k.readyOps() & OP_ACCEPT != 0</pre></blockquote>
+ * <blockquote><pre>{@code
+ * k.readyOps() & OP_ACCEPT != 0
+ * }</pre></blockquote>
*
* <p> If this key's channel does not support socket-accept operations then
* this method always returns <tt>false</tt>. </p>
*
* @return <tt>true</tt> if, and only if,
- * <tt>readyOps()</tt> <tt>&</tt> <tt>OP_ACCEPT</tt>
- * is nonzero
+ * {@code readyOps() & OP_ACCEPT} is nonzero
*
* @throws CancelledKeyException
* If this key has been cancelled
diff --git a/jdk/src/share/classes/java/nio/charset/Charset-X-Coder.java.template b/jdk/src/share/classes/java/nio/charset/Charset-X-Coder.java.template
index 2449d56cf44..8b115cc0fd2 100644
--- a/jdk/src/share/classes/java/nio/charset/Charset-X-Coder.java.template
+++ b/jdk/src/share/classes/java/nio/charset/Charset-X-Coder.java.template
@@ -260,7 +260,7 @@ public abstract class Charset$Coder$ {
* method, passing the new replacement, after checking that the new
* replacement is acceptable. </p>
*
- * @param newReplacement
+ * @param newReplacement The replacement value
*
#if[decoder]
* The new replacement; must not be <tt>null</tt>
@@ -305,7 +305,7 @@ public abstract class Charset$Coder$ {
* should be overridden by $coder$s that require notification of changes to
* the replacement. </p>
*
- * @param newReplacement
+ * @param newReplacement The replacement value
*/
protected void implReplaceWith($replType$ newReplacement) {
}
diff --git a/jdk/src/share/classes/java/nio/file/Path.java b/jdk/src/share/classes/java/nio/file/Path.java
index a7933a34815..57782765854 100644
--- a/jdk/src/share/classes/java/nio/file/Path.java
+++ b/jdk/src/share/classes/java/nio/file/Path.java
@@ -64,7 +64,7 @@ import java.util.Iterator;
* those developing custom file system implementations. Methods may be added to
* this interface in future releases. </p>
*
- * <a name="interop"><h4>Accessing Files</h4></a>
+ * <h4>Accessing Files</h4>
* <p> 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 @@ import java.util.Iterator;
* addition, the {@link #toFile toFile} method is useful to construct a {@code
* File} from the {@code String} representation of a {@code Path}.
*
- * <h4>Concurrency</h4></a>
+ * <h4>Concurrency</h4>
* <p> Implementations of this interface are immutable and safe for use by
* multiple concurrent threads.
*
diff --git a/jdk/src/share/classes/java/security/KeyStore.java b/jdk/src/share/classes/java/security/KeyStore.java
index 75d405771a7..5f1482c75ad 100644
--- a/jdk/src/share/classes/java/security/KeyStore.java
+++ b/jdk/src/share/classes/java/security/KeyStore.java
@@ -317,7 +317,7 @@ public class KeyStore {
* 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 --git a/jdk/src/share/classes/java/security/SecureRandom.java b/jdk/src/share/classes/java/security/SecureRandom.java
index 1b4872fa6eb..7d25b147ed3 100644
--- a/jdk/src/share/classes/java/security/SecureRandom.java
+++ b/jdk/src/share/classes/java/security/SecureRandom.java
@@ -466,7 +466,7 @@ public class SecureRandom extends java.util.Random {
* <code>nextLong</code>, and <code>nextFloat</code>).
*
* @param numBits number of pseudo-random bits to be generated, where
- * 0 <= <code>numBits</code> <= 32.
+ * {@code 0 <= numBits <= 32}.
*
* @return an <code>int</code> containing the user-specified number
* of pseudo-random bits (right justified, with leading zeros).
diff --git a/jdk/src/share/classes/java/security/cert/CertPathValidatorException.java b/jdk/src/share/classes/java/security/cert/CertPathValidatorException.java
index 9eedb620d9a..03cae751a0f 100644
--- a/jdk/src/share/classes/java/security/cert/CertPathValidatorException.java
+++ b/jdk/src/share/classes/java/security/cert/CertPathValidatorException.java
@@ -141,8 +141,8 @@ public class CertPathValidatorException extends GeneralSecurityException {
* that caused the error (or -1 if not applicable). Note that
* the list of certificates in a <code>CertPath</code> is zero based.
* @throws IndexOutOfBoundsException if the index is out of range
- * <code>(index < -1 || (certPath != null && index >=
- * certPath.getCertificates().size())</code>
+ * {@code (index < -1 || (certPath != null && index >=
+ * certPath.getCertificates().size()) }
* @throws IllegalArgumentException if <code>certPath</code> is
* <code>null</code> and <code>index</code> is not -1
*/
@@ -164,8 +164,8 @@ public class CertPathValidatorException extends GeneralSecurityException {
* the list of certificates in a <code>CertPath</code> is zero based.
* @param reason the reason the validation failed
* @throws IndexOutOfBoundsException if the index is out of range
- * <code>(index < -1 || (certPath != null && index >=
- * certPath.getCertificates().size())</code>
+ * {@code (index < -1 || (certPath != null && index >=
+ * certPath.getCertificates().size()) }
* @throws IllegalArgumentException if <code>certPath</code> is
* <code>null</code> and <code>index</code> is not -1
* @throws NullPointerException if <code>reason</code> is <code>null</code>
diff --git a/jdk/src/share/classes/java/security/cert/CertificateFactory.java b/jdk/src/share/classes/java/security/cert/CertificateFactory.java
index 57a3fe15f45..d0762df16be 100644
--- a/jdk/src/share/classes/java/security/cert/CertificateFactory.java
+++ b/jdk/src/share/classes/java/security/cert/CertificateFactory.java
@@ -65,7 +65,7 @@ import sun.security.jca.GetInstance.Instance;
* read position of the input stream is positioned to the next certificate in
* the file:<p>
*
- * <pre>
+ * <pre>{@code
* FileInputStream fis = new FileInputStream(filename);
* BufferedInputStream bis = new BufferedInputStream(fis);
*
@@ -75,7 +75,7 @@ import sun.security.jca.GetInstance.Instance;
* Certificate cert = cf.generateCertificate(bis);
* System.out.println(cert.toString());
* }
- * </pre>
+ * }</pre>
*
* <p>The following example parses a PKCS#7-formatted certificate reply stored
* in a file and extracts all the certificates from it:<p>
diff --git a/jdk/src/share/classes/java/security/cert/X509Extension.java b/jdk/src/share/classes/java/security/cert/X509Extension.java
index e2c362ee3ff..ee63e662347 100644
--- a/jdk/src/share/classes/java/security/cert/X509Extension.java
+++ b/jdk/src/share/classes/java/security/cert/X509Extension.java
@@ -84,12 +84,12 @@ public interface X509Extension {
*
* Here is sample code to get a Set of critical extensions from an
* X509Certificate and print the OIDs:
- * <pre><code>
+ * <pre>{@code
* X509Certificate cert = null;
* try (InputStream inStrm = new FileInputStream("DER-encoded-Cert")) {
* CertificateFactory cf = CertificateFactory.getInstance("X.509");
* cert = (X509Certificate)cf.generateCertificate(inStrm);
- * }<p>
+ * }
*
* Set<String> critSet = cert.getCriticalExtensionOIDs();
* if (critSet != null && !critSet.isEmpty()) {
@@ -98,7 +98,7 @@ public interface X509Extension {
* System.out.println(oid);
* }
* }
- * </code></pre>
+ * }</pre>
* @return a Set (or an empty Set if none are marked critical) of
* the extension OID strings for extensions that are marked critical.
* If there are no extensions present at all, then this method returns
diff --git a/jdk/src/share/classes/java/security/spec/EllipticCurve.java b/jdk/src/share/classes/java/security/spec/EllipticCurve.java
index a270ee72494..d9eef25caf8 100644
--- a/jdk/src/share/classes/java/security/spec/EllipticCurve.java
+++ b/jdk/src/share/classes/java/security/spec/EllipticCurve.java
@@ -184,9 +184,9 @@ public class EllipticCurve {
* Returns a hash code value for this elliptic curve.
* @return a hash code value computed from the hash codes of the field, A,
* and B, as follows:
- * <code>
+ * <pre>{@code
* (field.hashCode() << 6) + (a.hashCode() << 4) + (b.hashCode() << 2)
- * </code>
+ * }</pre>
*/
public int hashCode() {
return (field.hashCode() << 6 +
diff --git a/jdk/src/share/classes/java/sql/DatabaseMetaData.java b/jdk/src/share/classes/java/sql/DatabaseMetaData.java
index 7330b8eac02..035365512b7 100644
--- a/jdk/src/share/classes/java/sql/DatabaseMetaData.java
+++ b/jdk/src/share/classes/java/sql/DatabaseMetaData.java
@@ -1218,21 +1218,21 @@ public interface DatabaseMetaData extends Wrapper {
*
* <P>Each procedure description has the the following columns:
* <OL>
- * <LI><B>PROCEDURE_CAT</B> String => procedure catalog (may be <code>null</code>)
- * <LI><B>PROCEDURE_SCHEM</B> String => procedure schema (may be <code>null</code>)
- * <LI><B>PROCEDURE_NAME</B> String => procedure name
+ * <LI><B>PROCEDURE_CAT</B> String {@code =>} procedure catalog (may be <code>null</code>)
+ * <LI><B>PROCEDURE_SCHEM</B> String {@code =>} procedure schema (may be <code>null</code>)
+ * <LI><B>PROCEDURE_NAME</B> String {@code =>} procedure name
* <LI> reserved for future use
* <LI> reserved for future use
* <LI> reserved for future use
- * <LI><B>REMARKS</B> String => explanatory comment on the procedure
- * <LI><B>PROCEDURE_TYPE</B> short => kind of procedure:
+ * <LI><B>REMARKS</B> String {@code =>} explanatory comment on the procedure
+ * <LI><B>PROCEDURE_TYPE</B> short {@code =>} kind of procedure:
* <UL>
* <LI> procedureResultUnknown - Cannot determine if a return value
* will be returned
* <LI> procedureNoResult - Does not return a return value
* <LI> procedureReturnsResult - Returns a return value
* </UL>
- * <LI><B>SPECIFIC_NAME</B> String => The name which uniquely identifies this
+ * <LI><B>SPECIFIC_NAME</B> String {@code =>} The name which uniquely identifies this
* procedure within its schema.
* </OL>
* <p>
@@ -1297,11 +1297,11 @@ public interface DatabaseMetaData extends Wrapper {
* <P>Each row in the <code>ResultSet</code> is a parameter description or
* column description with the following fields:
* <OL>
- * <LI><B>PROCEDURE_CAT</B> String => procedure catalog (may be <code>null</code>)
- * <LI><B>PROCEDURE_SCHEM</B> String => procedure schema (may be <code>null</code>)
- * <LI><B>PROCEDURE_NAME</B> String => procedure name
- * <LI><B>COLUMN_NAME</B> String => column/parameter name
- * <LI><B>COLUMN_TYPE</B> Short => kind of column/parameter:
+ * <LI><B>PROCEDURE_CAT</B> String {@code =>} procedure catalog (may be <code>null</code>)
+ * <LI><B>PROCEDURE_SCHEM</B> String {@code =>} procedure schema (may be <code>null</code>)
+ * <LI><B>PROCEDURE_NAME</B> String {@code =>} procedure name
+ * <LI><B>COLUMN_NAME</B> String {@code =>} column/parameter name
+ * <LI><B>COLUMN_TYPE</B> Short {@code =>} kind of column/parameter:
* <UL>
* <LI> procedureColumnUnknown - nobody knows
* <LI> procedureColumnIn - IN parameter
@@ -1310,44 +1310,44 @@ public interface DatabaseMetaData extends Wrapper {
* <LI> procedureColumnReturn - procedure return value
* <LI> procedureColumnResult - result column in <code>ResultSet</code>
* </UL>
- * <LI><B>DATA_TYPE</B> int => SQL type from java.sql.Types
- * <LI><B>TYPE_NAME</B> String => SQL type name, for a UDT type the
+ * <LI><B>DATA_TYPE</B> int {@code =>} SQL type from java.sql.Types
+ * <LI><B>TYPE_NAME</B> String {@code =>} SQL type name, for a UDT type the
* type name is fully qualified
- * <LI><B>PRECISION</B> int => precision
- * <LI><B>LENGTH</B> int => length in bytes of data
- * <LI><B>SCALE</B> short => scale - null is returned for data types where
+ * <LI><B>PRECISION</B> int {@code =>} precision
+ * <LI><B>LENGTH</B> int {@code =>} length in bytes of data
+ * <LI><B>SCALE</B> short {@code =>} scale - null is returned for data types where
* SCALE is not applicable.
- * <LI><B>RADIX</B> short => radix
- * <LI><B>NULLABLE</B> short => can it contain NULL.
+ * <LI><B>RADIX</B> short {@code =>} radix
+ * <LI><B>NULLABLE</B> short {@code =>} can it contain NULL.
* <UL>
* <LI> procedureNoNulls - does not allow NULL values
* <LI> procedureNullable - allows NULL values
* <LI> procedureNullableUnknown - nullability unknown
* </UL>
- * <LI><B>REMARKS</B> String => comment describing parameter/column
- * <LI><B>COLUMN_DEF</B> String => default value for the column, which should be interpreted as a string when the value is enclosed in single quotes (may be <code>null</code>)
+ * <LI><B>REMARKS</B> String {@code =>} comment describing parameter/column
+ * <LI><B>COLUMN_DEF</B> String {@code =>} default value for the column, which should be interpreted as a string when the value is enclosed in single quotes (may be <code>null</code>)
* <UL>
* <LI> The string NULL (not enclosed in quotes) - if NULL was specified as the default value
* <LI> TRUNCATE (not enclosed in quotes) - if the specified default value cannot be represented without truncation
* <LI> NULL - if a default value was not specified
* </UL>
- * <LI><B>SQL_DATA_TYPE</B> int => reserved for future use
- * <LI><B>SQL_DATETIME_SUB</B> int => reserved for future use
- * <LI><B>CHAR_OCTET_LENGTH</B> int => the maximum length of binary and character based columns. For any other datatype the returned value is a
+ * <LI><B>SQL_DATA_TYPE</B> int {@code =>} reserved for future use
+ * <LI><B>SQL_DATETIME_SUB</B> int {@code =>} reserved for future use
+ * <LI><B>CHAR_OCTET_LENGTH</B> int {@code =>} the maximum length of binary and character based columns. For any other datatype the returned value is a
* NULL
- * <LI><B>ORDINAL_POSITION</B> int => the ordinal position, starting from 1, for the input and output parameters for a procedure. A value of 0
+ * <LI><B>ORDINAL_POSITION</B> int {@code =>} the ordinal position, starting from 1, for the input and output parameters for a procedure. A value of 0
*is returned if this row describes the procedure's return value. For result set columns, it is the
*ordinal position of the column in the result set starting from 1. If there are
*multiple result sets, the column ordinal positions are implementation
* defined.
- * <LI><B>IS_NULLABLE</B> String => ISO rules are used to determine the nullability for a column.
+ * <LI><B>IS_NULLABLE</B> String {@code =>} ISO rules are used to determine the nullability for a column.
* <UL>
* <LI> YES --- if the column can include NULLs
* <LI> NO --- if the column cannot include NULLs
* <LI> empty string --- if the nullability for the
* column is unknown
* </UL>
- * <LI><B>SPECIFIC_NAME</B> String => the name which uniquely identifies this procedure within its schema.
+ * <LI><B>SPECIFIC_NAME</B> String {@code =>} the name which uniquely identifies this procedure within its schema.
* </OL>
*
* <P><B>Note:</B> Some databases may not return the column
@@ -1481,19 +1481,19 @@ public interface DatabaseMetaData extends Wrapper {
* <P>
* Each table description has the following columns:
* <OL>
- * <LI><B>TABLE_CAT</B> String => table catalog (may be <code>null</code>)
- * <LI><B>TABLE_SCHEM</B> String => table schema (may be <code>null</code>)
- * <LI><B>TABLE_NAME</B> String => table name
- * <LI><B>TABLE_TYPE</B> String => table type. Typical types are "TABLE",
+ * <LI><B>TABLE_CAT</B> String {@code =>} table catalog (may be <code>null</code>)
+ * <LI><B>TABLE_SCHEM</B> String {@code =>} table schema (may be <code>null</code>)
+ * <LI><B>TABLE_NAME</B> String {@code =>} table name
+ * <LI><B>TABLE_TYPE</B> String {@code =>} table type. Typical types are "TABLE",
* "VIEW", "SYSTEM TABLE", "GLOBAL TEMPORARY",
* "LOCAL TEMPORARY", "ALIAS", "SYNONYM".
- * <LI><B>REMARKS</B> String => explanatory comment on the table
- * <LI><B>TYPE_CAT</B> String => the types catalog (may be <code>null</code>)
- * <LI><B>TYPE_SCHEM</B> String => the types schema (may be <code>null</code>)
- * <LI><B>TYPE_NAME</B> String => type name (may be <code>null</code>)
- * <LI><B>SELF_REFERENCING_COL_NAME</B> String => name of the designated
+ * <LI><B>REMARKS</B> String {@code =>} explanatory comment on the table
+ * <LI><B>TYPE_CAT</B> String {@code =>} the types catalog (may be <code>null</code>)
+ * <LI><B>TYPE_SCHEM</B> String {@code =>} the types schema (may be <code>null</code>)
+ * <LI><B>TYPE_NAME</B> String {@code =>} type name (may be <code>null</code>)
+ * <LI><B>SELF_REFERENCING_COL_NAME</B> String {@code =>} name of the designated
* "identifier" column of a typed table (may be <code>null</code>)
- * <LI><B>REF_GENERATION</B> String => specifies how values in
+ * <LI><B>REF_GENERATION</B> String {@code =>} specifies how values in
* SELF_REFERENCING_COL_NAME are created. Values are
* "SYSTEM", "USER", "DERIVED". (may be <code>null</code>)
* </OL>
@@ -1528,8 +1528,8 @@ public interface DatabaseMetaData extends Wrapper {
*
* <P>The schema columns are:
* <OL>
- * <LI><B>TABLE_SCHEM</B> String => schema name
- * <LI><B>TABLE_CATALOG</B> String => catalog name (may be <code>null</code>)
+ * <LI><B>TABLE_SCHEM</B> String {@code =>} schema name
+ * <LI><B>TABLE_CATALOG</B> String {@code =>} catalog name (may be <code>null</code>)
* </OL>
*
* @return a <code>ResultSet</code> object in which each row is a
@@ -1545,7 +1545,7 @@ public interface DatabaseMetaData extends Wrapper {
*
* <P>The catalog column is:
* <OL>
- * <LI><B>TABLE_CAT</B> String => catalog name
+ * <LI><B>TABLE_CAT</B> String {@code =>} catalog name
* </OL>
*
* @return a <code>ResultSet</code> object in which each row has a
@@ -1560,7 +1560,7 @@ public interface DatabaseMetaData extends Wrapper {
*
* <P>The table type is:
* <OL>
- * <LI><B>TABLE_TYPE</B> String => table type. Typical types are "TABLE",
+ * <LI><B>TABLE_TYPE</B> String {@code =>} table type. Typical types are "TABLE",
* "VIEW", "SYSTEM TABLE", "GLOBAL TEMPORARY",
* "LOCAL TEMPORARY", "ALIAS", "SYNONYM".
* </OL>
@@ -1582,55 +1582,55 @@ public interface DatabaseMetaData extends Wrapper {
*
* <P>Each column description has the following columns:
* <OL>
- * <LI><B>TABLE_CAT</B> String => table catalog (may be <code>null</code>)
- * <LI><B>TABLE_SCHEM</B> String => table schema (may be <code>null</code>)
- * <LI><B>TABLE_NAME</B> String => table name
- * <LI><B>COLUMN_NAME</B> String => column name
- * <LI><B>DATA_TYPE</B> int => SQL type from java.sql.Types
- * <LI><B>TYPE_NAME</B> String => Data source dependent type name,
+ * <LI><B>TABLE_CAT</B> String {@code =>} table catalog (may be <code>null</code>)
+ * <LI><B>TABLE_SCHEM</B> String {@code =>} table schema (may be <code>null</code>)
+ * <LI><B>TABLE_NAME</B> String {@code =>} table name
+ * <LI><B>COLUMN_NAME</B> String {@code =>} column name
+ * <LI><B>DATA_TYPE</B> int {@code =>} SQL type from java.sql.Types
+ * <LI><B>TYPE_NAME</B> String {@code =>} Data source dependent type name,
* for a UDT the type name is fully qualified
- * <LI><B>COLUMN_SIZE</B> int => column size.
+ * <LI><B>COLUMN_SIZE</B> int {@code =>} column size.
* <LI><B>BUFFER_LENGTH</B> is not used.
- * <LI><B>DECIMAL_DIGITS</B> int => the number of fractional digits. Null is returned for data types where
+ * <LI><B>DECIMAL_DIGITS</B> int {@code =>} the number of fractional digits. Null is returned for data types where
* DECIMAL_DIGITS is not applicable.
- * <LI><B>NUM_PREC_RADIX</B> int => Radix (typically either 10 or 2)
- * <LI><B>NULLABLE</B> int => is NULL allowed.
+ * <LI><B>NUM_PREC_RADIX</B> int {@code =>} Radix (typically either 10 or 2)
+ * <LI><B>NULLABLE</B> int {@code =>} is NULL allowed.
* <UL>
* <LI> columnNoNulls - might not allow <code>NULL</code> values
* <LI> columnNullable - definitely allows <code>NULL</code> values
* <LI> columnNullableUnknown - nullability unknown
* </UL>
- * <LI><B>REMARKS</B> String => comment describing column (may be <code>null</code>)
- * <LI><B>COLUMN_DEF</B> String => default value for the column, which should be interpreted as a string when the value is enclosed in single quotes (may be <code>null</code>)
- * <LI><B>SQL_DATA_TYPE</B> int => unused
- * <LI><B>SQL_DATETIME_SUB</B> int => unused
- * <LI><B>CHAR_OCTET_LENGTH</B> int => for char types the
+ * <LI><B>REMARKS</B> String {@code =>} comment describing column (may be <code>null</code>)
+ * <LI><B>COLUMN_DEF</B> String {@code =>} default value for the column, which should be interpreted as a string when the value is enclosed in single quotes (may be <code>null</code>)
+ * <LI><B>SQL_DATA_TYPE</B> int {@code =>} unused
+ * <LI><B>SQL_DATETIME_SUB</B> int {@code =>} unused
+ * <LI><B>CHAR_OCTET_LENGTH</B> int {@code =>} for char types the
* maximum number of bytes in the column
- * <LI><B>ORDINAL_POSITION</B> int => index of column in table
+ * <LI><B>ORDINAL_POSITION</B> int {@code =>} index of column in table
* (starting at 1)
- * <LI><B>IS_NULLABLE</B> String => ISO rules are used to determine the nullability for a column.
+ * <LI><B>IS_NULLABLE</B> String {@code =>} ISO rules are used to determine the nullability for a column.
* <UL>
* <LI> YES --- if the column can include NULLs
* <LI> NO --- if the column cannot include NULLs
* <LI> empty string --- if the nullability for the
* column is unknown
* </UL>
- * <LI><B>SCOPE_CATALOG</B> String => catalog of table that is the scope
+ * <LI><B>SCOPE_CATALOG</B> String {@code =>} catalog of table that is the scope
* of a reference attribute (<code>null</code> if DATA_TYPE isn't REF)
- * <LI><B>SCOPE_SCHEMA</B> String => schema of table that is the scope
+ * <LI><B>SCOPE_SCHEMA</B> String {@code =>} schema of table that is the scope
* of a reference attribute (<code>null</code> if the DATA_TYPE isn't REF)
- * <LI><B>SCOPE_TABLE</B> String => table name that this the scope
+ * <LI><B>SCOPE_TABLE</B> String {@code =>} table name that this the scope
* of a reference attribute (<code>null</code> if the DATA_TYPE isn't REF)
- * <LI><B>SOURCE_DATA_TYPE</B> short => source type of a distinct type or user-generated
+ * <LI><B>SOURCE_DATA_TYPE</B> short {@code =>} source type of a distinct type or user-generated
* Ref type, SQL type from java.sql.Types (<code>null</code> if DATA_TYPE
* isn't DISTINCT or user-generated REF)
- * <LI><B>IS_AUTOINCREMENT</B> String => Indicates whether this column is auto incremented
+ * <LI><B>IS_AUTOINCREMENT</B> String {@code =>} Indicates whether this column is auto incremented
* <UL>
* <LI> YES --- if the column is auto incremented
* <LI> NO --- if the column is not auto incremented
* <LI> empty string --- if it cannot be determined whether the column is auto incremented
* </UL>
- * <LI><B>IS_GENERATEDCOLUMN</B> String => Indicates whether this is a generated column
+ * <LI><B>IS_GENERATEDCOLUMN</B> String {@code =>} Indicates whether this is a generated column
* <UL>
* <LI> YES --- if this a generated column
* <LI> NO --- if this not a generated column
@@ -1703,15 +1703,15 @@ public interface DatabaseMetaData extends Wrapper {
*
* <P>Each privilige description has the following columns:
* <OL>
- * <LI><B>TABLE_CAT</B> String => table catalog (may be <code>null</code>)
- * <LI><B>TABLE_SCHEM</B> String => table schema (may be <code>null</code>)
- * <LI><B>TABLE_NAME</B> String => table name
- * <LI><B>COLUMN_NAME</B> String => column name
- * <LI><B>GRANTOR</B> String => grantor of access (may be <code>null</code>)
- * <LI><B>GRANTEE</B> String => grantee of access
- * <LI><B>PRIVILEGE</B> String => name of access (SELECT,
+ * <LI><B>TABLE_CAT</B> String {@code =>} table catalog (may be <code>null</code>)
+ * <LI><B>TABLE_SCHEM</B> String {@code =>} table schema (may be <code>null</code>)
+ * <LI><B>TABLE_NAME</B> String {@code =>} table name
+ * <LI><B>COLUMN_NAME</B> String {@code =>} column name
+ * <LI><B>GRANTOR</B> String {@code =>} grantor of access (may be <code>null</code>)
+ * <LI><B>GRANTEE</B> String {@code =>} grantee of access
+ * <LI><B>PRIVILEGE</B> String {@code =>} name of access (SELECT,
* INSERT, UPDATE, REFRENCES, ...)
- * <LI><B>IS_GRANTABLE</B> String => "YES" if grantee is permitted
+ * <LI><B>IS_GRANTABLE</B> String {@code =>} "YES" if grantee is permitted
* to grant to others; "NO" if not; <code>null</code> if unknown
* </OL>
*
@@ -1749,14 +1749,14 @@ public interface DatabaseMetaData extends Wrapper {
*
* <P>Each privilige description has the following columns:
* <OL>
- * <LI><B>TABLE_CAT</B> String => table catalog (may be <code>null</code>)
- * <LI><B>TABLE_SCHEM</B> String => table schema (may be <code>null</code>)
- * <LI><B>TABLE_NAME</B> String => table name
- * <LI><B>GRANTOR</B> String => grantor of access (may be <code>null</code>)
- * <LI><B>GRANTEE</B> String => grantee of access
- * <LI><B>PRIVILEGE</B> String => name of access (SELECT,
+ * <LI><B>TABLE_CAT</B> String {@code =>} table catalog (may be <code>null</code>)
+ * <LI><B>TABLE_SCHEM</B> String {@code =>} table schema (may be <code>null</code>)
+ * <LI><B>TABLE_NAME</B> String {@code =>} table name
+ * <LI><B>GRANTOR</B> String {@code =>} grantor of access (may be <code>null</code>)
+ * <LI><B>GRANTEE</B> String {@code =>} grantee of access
+ * <LI><B>PRIVILEGE</B> String {@code =>} name of access (SELECT,
* INSERT, UPDATE, REFRENCES, ...)
- * <LI><B>IS_GRANTABLE</B> String => "YES" if grantee is permitted
+ * <LI><B>IS_GRANTABLE</B> String {@code =>} "YES" if grantee is permitted
* to grant to others; "NO" if not; <code>null</code> if unknown
* </OL>
*
@@ -1783,21 +1783,21 @@ public interface DatabaseMetaData extends Wrapper {
*
* <P>Each column description has the following columns:
* <OL>
- * <LI><B>SCOPE</B> short => actual scope of result
+ * <LI><B>SCOPE</B> short {@code =>} actual scope of result
* <UL>
* <LI> bestRowTemporary - very temporary, while using row
* <LI> bestRowTransaction - valid for remainder of current transaction
* <LI> bestRowSession - valid for remainder of current session
* </UL>
- * <LI><B>COLUMN_NAME</B> String => column name
- * <LI><B>DATA_TYPE</B> int => SQL data type from java.sql.Types
- * <LI><B>TYPE_NAME</B> String => Data source dependent type name,
+ * <LI><B>COLUMN_NAME</B> String {@code =>} column name
+ * <LI><B>DATA_TYPE</B> int {@code =>} SQL data type from java.sql.Types
+ * <LI><B>TYPE_NAME</B> String {@code =>} Data source dependent type name,
* for a UDT the type name is fully qualified
- * <LI><B>COLUMN_SIZE</B> int => precision
- * <LI><B>BUFFER_LENGTH</B> int => not used
- * <LI><B>DECIMAL_DIGITS</B> short => scale - Null is returned for data types where
+ * <LI><B>COLUMN_SIZE</B> int {@code =>} precision
+ * <LI><B>BUFFER_LENGTH</B> int {@code =>} not used
+ * <LI><B>DECIMAL_DIGITS</B> short {@code =>} scale - Null is returned for data types where
* DECIMAL_DIGITS is not applicable.
- * <LI><B>PSEUDO_COLUMN</B> short => is this a pseudo column
+ * <LI><B>PSEUDO_COLUMN</B> short {@code =>} is this a pseudo column
* like an Oracle ROWID
* <UL>
* <LI> bestRowUnknown - may or may not be pseudo column
@@ -1902,15 +1902,15 @@ public interface DatabaseMetaData extends Wrapper {
*
* <P>Each column description has the following columns:
* <OL>
- * <LI><B>SCOPE</B> short => is not used
- * <LI><B>COLUMN_NAME</B> String => column name
- * <LI><B>DATA_TYPE</B> int => SQL data type from <code>java.sql.Types</code>
- * <LI><B>TYPE_NAME</B> String => Data source-dependent type name
- * <LI><B>COLUMN_SIZE</B> int => precision
- * <LI><B>BUFFER_LENGTH</B> int => length of column value in bytes
- * <LI><B>DECIMAL_DIGITS</B> short => scale - Null is returned for data types where
+ * <LI><B>SCOPE</B> short {@code =>} is not used
+ * <LI><B>COLUMN_NAME</B> String {@code =>} column name
+ * <LI><B>DATA_TYPE</B> int {@code =>} SQL data type from <code>java.sql.Types</code>
+ * <LI><B>TYPE_NAME</B> String {@code =>} Data source-dependent type name
+ * <LI><B>COLUMN_SIZE</B> int {@code =>} precision
+ * <LI><B>BUFFER_LENGTH</B> int {@code =>} length of column value in bytes
+ * <LI><B>DECIMAL_DIGITS</B> short {@code =>} scale - Null is returned for data types where
* DECIMAL_DIGITS is not applicable.
- * <LI><B>PSEUDO_COLUMN</B> short => whether this is pseudo column
+ * <LI><B>PSEUDO_COLUMN</B> short {@code =>} whether this is pseudo column
* like an Oracle ROWID
* <UL>
* <LI> versionColumnUnknown - may or may not be pseudo column
@@ -1978,14 +1978,14 @@ public interface DatabaseMetaData extends Wrapper {
*
* <P>Each primary key column description has the following columns:
* <OL>
- * <LI><B>TABLE_CAT</B> String => table catalog (may be <code>null</code>)
- * <LI><B>TABLE_SCHEM</B> String => table schema (may be <code>null</code>)
- * <LI><B>TABLE_NAME</B> String => table name
- * <LI><B>COLUMN_NAME</B> String => column name
- * <LI><B>KEY_SEQ</B> short => sequence number within primary key( a value
+ * <LI><B>TABLE_CAT</B> String {@code =>} table catalog (may be <code>null</code>)
+ * <LI><B>TABLE_SCHEM</B> String {@code =>} table schema (may be <code>null</code>)
+ * <LI><B>TABLE_NAME</B> String {@code =>} table name
+ * <LI><B>COLUMN_NAME</B> String {@code =>} column name
+ * <LI><B>KEY_SEQ</B> short {@code =>} sequence number within primary key( a value
* of 1 represents the first column of the primary key, a value of 2 would
* represent the second column within the primary key).
- * <LI><B>PK_NAME</B> String => primary key name (may be <code>null</code>)
+ * <LI><B>PK_NAME</B> String {@code =>} primary key name (may be <code>null</code>)
* </OL>
*
* @param catalog a catalog name; must match the catalog name as it
@@ -2012,22 +2012,22 @@ public interface DatabaseMetaData extends Wrapper {
*
* <P>Each primary key column description has the following columns:
* <OL>
- * <LI><B>PKTABLE_CAT</B> String => primary key table catalog
+ * <LI><B>PKTABLE_CAT</B> String {@code =>} primary key table catalog
* being imported (may be <code>null</code>)
- * <LI><B>PKTABLE_SCHEM</B> String => primary key table schema
+ * <LI><B>PKTABLE_SCHEM</B> String {@code =>} primary key table schema
* being imported (may be <code>null</code>)
- * <LI><B>PKTABLE_NAME</B> String => primary key table name
+ * <LI><B>PKTABLE_NAME</B> String {@code =>} primary key table name
* being imported
- * <LI><B>PKCOLUMN_NAME</B> String => primary key column name
+ * <LI><B>PKCOLUMN_NAME</B> String {@code =>} primary key column name
* being imported
- * <LI><B>FKTABLE_CAT</B> String => foreign key table catalog (may be <code>null</code>)
- * <LI><B>FKTABLE_SCHEM</B> String => foreign key table schema (may be <code>null</code>)
- * <LI><B>FKTABLE_NAME</B> String => foreign key table name
- * <LI><B>FKCOLUMN_NAME</B> String => foreign key column name
- * <LI><B>KEY_SEQ</B> short => sequence number within a foreign key( a value
+ * <LI><B>FKTABLE_CAT</B> String {@code =>} foreign key table catalog (may be <code>null</code>)
+ * <LI><B>FKTABLE_SCHEM</B> String {@code =>} foreign key table schema (may be <code>null</code>)
+ * <LI><B>FKTABLE_NAME</B> String {@code =>} foreign key table name
+ * <LI><B>FKCOLUMN_NAME</B> String {@code =>} foreign key column name
+ * <LI><B>KEY_SEQ</B> short {@code =>} sequence number within a foreign key( a value
* of 1 represents the first column of the foreign key, a value of 2 would
* represent the second column within the foreign key).
- * <LI><B>UPDATE_RULE</B> short => What happens to a
+ * <LI><B>UPDATE_RULE</B> short {@code =>} What happens to a
* foreign key when the primary key is updated:
* <UL>
* <LI> importedNoAction - do not allow update of primary
@@ -2041,7 +2041,7 @@ public interface DatabaseMetaData extends Wrapper {
* <LI> importedKeyRestrict - same as importedKeyNoAction
* (for ODBC 2.x compatibility)
* </UL>
- * <LI><B>DELETE_RULE</B> short => What happens to
+ * <LI><B>DELETE_RULE</B> short {@code =>} What happens to
* the foreign key when primary is deleted.
* <UL>
* <LI> importedKeyNoAction - do not allow delete of primary
@@ -2054,9 +2054,9 @@ public interface DatabaseMetaData extends Wrapper {
* <LI> importedKeySetDefault - change imported key to default if
* its primary key has been deleted
* </UL>
- * <LI><B>FK_NAME</B> String => foreign key name (may be <code>null</code>)
- * <LI><B>PK_NAME</B> String => primary key name (may be <code>null</code>)
- * <LI><B>DEFERRABILITY</B> short => can the evaluation of foreign key
+ * <LI><B>FK_NAME</B> String {@code =>} foreign key name (may be <code>null</code>)
+ * <LI><B>PK_NAME</B> String {@code =>} primary key name (may be <code>null</code>)
+ * <LI><B>DEFERRABILITY</B> short {@code =>} can the evaluation of foreign key
* constraints be deferred until commit
* <UL>
* <LI> importedKeyInitiallyDeferred - see SQL92 for definition
@@ -2195,22 +2195,22 @@ public interface DatabaseMetaData extends Wrapper {
*
* <P>Each foreign key column description has the following columns:
* <OL>
- * <LI><B>PKTABLE_CAT</B> String => primary key table catalog (may be <code>null</code>)
- * <LI><B>PKTABLE_SCHEM</B> String => primary key table schema (may be <code>null</code>)
- * <LI><B>PKTABLE_NAME</B> String => primary key table name
- * <LI><B>PKCOLUMN_NAME</B> String => primary key column name
- * <LI><B>FKTABLE_CAT</B> String => foreign key table catalog (may be <code>null</code>)
+ * <LI><B>PKTABLE_CAT</B> String {@code =>} primary key table catalog (may be <code>null</code>)
+ * <LI><B>PKTABLE_SCHEM</B> String {@code =>} primary key table schema (may be <code>null</code>)
+ * <LI><B>PKTABLE_NAME</B> String {@code =>} primary key table name
+ * <LI><B>PKCOLUMN_NAME</B> String {@code =>} primary key column name
+ * <LI><B>FKTABLE_CAT</B> String {@code =>} foreign key table catalog (may be <code>null</code>)
* being exported (may be <code>null</code>)
- * <LI><B>FKTABLE_SCHEM</B> String => foreign key table schema (may be <code>null</code>)
+ * <LI><B>FKTABLE_SCHEM</B> String {@code =>} foreign key table schema (may be <code>null</code>)
* being exported (may be <code>null</code>)
- * <LI><B>FKTABLE_NAME</B> String => foreign key table name
+ * <LI><B>FKTABLE_NAME</B> String {@code =>} foreign key table name
* being exported
- * <LI><B>FKCOLUMN_NAME</B> String => foreign key column name
+ * <LI><B>FKCOLUMN_NAME</B> String {@code =>} foreign key column name
* being exported
- * <LI><B>KEY_SEQ</B> short => sequence number within foreign key( a value
+ * <LI><B>KEY_SEQ</B> short {@code =>} sequence number within foreign key( a value
* of 1 represents the first column of the foreign key, a value of 2 would
* represent the second column within the foreign key).
- * <LI><B>UPDATE_RULE</B> short => What happens to
+ * <LI><B>UPDATE_RULE</B> short {@code =>} What happens to
* foreign key when primary is updated:
* <UL>
* <LI> importedNoAction - do not allow update of primary
@@ -2224,7 +2224,7 @@ public interface DatabaseMetaData extends Wrapper {
* <LI> importedKeyRestrict - same as importedKeyNoAction
* (for ODBC 2.x compatibility)
* </UL>
- * <LI><B>DELETE_RULE</B> short => What happens to
+ * <LI><B>DELETE_RULE</B> short {@code =>} What happens to
* the foreign key when primary is deleted.
* <UL>
* <LI> importedKeyNoAction - do not allow delete of primary
@@ -2237,9 +2237,9 @@ public interface DatabaseMetaData extends Wrapper {
* <LI> importedKeySetDefault - change imported key to default if
* its primary key has been deleted
* </UL>
- * <LI><B>FK_NAME</B> String => foreign key name (may be <code>null</code>)
- * <LI><B>PK_NAME</B> String => primary key name (may be <code>null</code>)
- * <LI><B>DEFERRABILITY</B> short => can the evaluation of foreign key
+ * <LI><B>FK_NAME</B> String {@code =>} foreign key name (may be <code>null</code>)
+ * <LI><B>PK_NAME</B> String {@code =>} primary key name (may be <code>null</code>)
+ * <LI><B>DEFERRABILITY</B> short {@code =>} can the evaluation of foreign key
* constraints be deferred until commit
* <UL>
* <LI> importedKeyInitiallyDeferred - see SQL92 for definition
@@ -2276,22 +2276,22 @@ public interface DatabaseMetaData extends Wrapper {
*
* <P>Each foreign key column description has the following columns:
* <OL>
- * <LI><B>PKTABLE_CAT</B> String => parent key table catalog (may be <code>null</code>)
- * <LI><B>PKTABLE_SCHEM</B> String => parent key table schema (may be <code>null</code>)
- * <LI><B>PKTABLE_NAME</B> String => parent key table name
- * <LI><B>PKCOLUMN_NAME</B> String => parent key column name
- * <LI><B>FKTABLE_CAT</B> String => foreign key table catalog (may be <code>null</code>)
+ * <LI><B>PKTABLE_CAT</B> String {@code =>} parent key table catalog (may be <code>null</code>)
+ * <LI><B>PKTABLE_SCHEM</B> String {@code =>} parent key table schema (may be <code>null</code>)
+ * <LI><B>PKTABLE_NAME</B> String {@code =>} parent key table name
+ * <LI><B>PKCOLUMN_NAME</B> String {@code =>} parent key column name
+ * <LI><B>FKTABLE_CAT</B> String {@code =>} foreign key table catalog (may be <code>null</code>)
* being exported (may be <code>null</code>)
- * <LI><B>FKTABLE_SCHEM</B> String => foreign key table schema (may be <code>null</code>)
+ * <LI><B>FKTABLE_SCHEM</B> String {@code =>} foreign key table schema (may be <code>null</code>)
* being exported (may be <code>null</code>)
- * <LI><B>FKTABLE_NAME</B> String => foreign key table name
+ * <LI><B>FKTABLE_NAME</B> String {@code =>} foreign key table name
* being exported
- * <LI><B>FKCOLUMN_NAME</B> String => foreign key column name
+ * <LI><B>FKCOLUMN_NAME</B> String {@code =>} foreign key column name
* being exported
- * <LI><B>KEY_SEQ</B> short => sequence number within foreign key( a value
+ * <LI><B>KEY_SEQ</B> short {@code =>} sequence number within foreign key( a value
* of 1 represents the first column of the foreign key, a value of 2 would
* represent the second column within the foreign key).
- * <LI><B>UPDATE_RULE</B> short => What happens to
+ * <LI><B>UPDATE_RULE</B> short {@code =>} What happens to
* foreign key when parent key is updated:
* <UL>
* <LI> importedNoAction - do not allow update of parent
@@ -2305,7 +2305,7 @@ public interface DatabaseMetaData extends Wrapper {
* <LI> importedKeyRestrict - same as importedKeyNoAction
* (for ODBC 2.x compatibility)
* </UL>
- * <LI><B>DELETE_RULE</B> short => What happens to
+ * <LI><B>DELETE_RULE</B> short {@code =>} What happens to
* the foreign key when parent key is deleted.
* <UL>
* <LI> importedKeyNoAction - do not allow delete of parent
@@ -2318,9 +2318,9 @@ public interface DatabaseMetaData extends Wrapper {
* <LI> importedKeySetDefault - change imported key to default if
* its parent key has been deleted
* </UL>
- * <LI><B>FK_NAME</B> String => foreign key name (may be <code>null</code>)
- * <LI><B>PK_NAME</B> String => parent key name (may be <code>null</code>)
- * <LI><B>DEFERRABILITY</B> short => can the evaluation of foreign key
+ * <LI><B>FK_NAME</B> String {@code =>} foreign key name (may be <code>null</code>)
+ * <LI><B>PK_NAME</B> String {@code =>} parent key name (may be <code>null</code>)
+ * <LI><B>DEFERRABILITY</B> short {@code =>} can the evaluation of foreign key
* constraints be deferred until commit
* <UL>
* <LI> importedKeyInitiallyDeferred - see SQL92 for definition
@@ -2371,40 +2371,40 @@ public interface DatabaseMetaData extends Wrapper {
*
* <P>Each type description has the following columns:
* <OL>
- * <LI><B>TYPE_NAME</B> String => Type name
- * <LI><B>DATA_TYPE</B> int => SQL data type from java.sql.Types
- * <LI><B>PRECISION</B> int => maximum precision
- * <LI><B>LITERAL_PREFIX</B> String => prefix used to quote a literal
+ * <LI><B>TYPE_NAME</B> String {@code =>} Type name
+ * <LI><B>DATA_TYPE</B> int {@code =>} SQL data type from java.sql.Types
+ * <LI><B>PRECISION</B> int {@code =>} maximum precision
+ * <LI><B>LITERAL_PREFIX</B> String {@code =>} prefix used to quote a literal
* (may be <code>null</code>)
- * <LI><B>LITERAL_SUFFIX</B> String => suffix used to quote a literal
+ * <LI><B>LITERAL_SUFFIX</B> String {@code =>} suffix used to quote a literal
(may be <code>null</code>)
- * <LI><B>CREATE_PARAMS</B> String => parameters used in creating
+ * <LI><B>CREATE_PARAMS</B> String {@code =>} parameters used in creating
* the type (may be <code>null</code>)
- * <LI><B>NULLABLE</B> short => can you use NULL for this type.
+ * <LI><B>NULLABLE</B> short {@code =>} can you use NULL for this type.
* <UL>
* <LI> typeNoNulls - does not allow NULL values
* <LI> typeNullable - allows NULL values
* <LI> typeNullableUnknown - nullability unknown
* </UL>
- * <LI><B>CASE_SENSITIVE</B> boolean=> is it case sensitive.
- * <LI><B>SEARCHABLE</B> short => can you use "WHERE" based on this type:
+ * <LI><B>CASE_SENSITIVE</B> boolean{@code =>} is it case sensitive.
+ * <LI><B>SEARCHABLE</B> short {@code =>} can you use "WHERE" based on this type:
* <UL>
* <LI> typePredNone - No support
* <LI> typePredChar - Only supported with WHERE .. LIKE
* <LI> typePredBasic - Supported except for WHERE .. LIKE
* <LI> typeSearchable - Supported for all WHERE ..
* </UL>
- * <LI><B>UNSIGNED_ATTRIBUTE</B> boolean => is it unsigned.
- * <LI><B>FIXED_PREC_SCALE</B> boolean => can it be a money value.
- * <LI><B>AUTO_INCREMENT</B> boolean => can it be used for an
+ * <LI><B>UNSIGNED_ATTRIBUTE</B> boolean {@code =>} is it unsigned.
+ * <LI><B>FIXED_PREC_SCALE</B> boolean {@code =>} can it be a money value.
+ * <LI><B>AUTO_INCREMENT</B> boolean {@code =>} can it be used for an
* auto-increment value.
- * <LI><B>LOCAL_TYPE_NAME</B> String => localized version of type name
+ * <LI><B>LOCAL_TYPE_NAME</B> String {@code =>} localized version of type name
* (may be <code>null</code>)
- * <LI><B>MINIMUM_SCALE</B> short => minimum scale supported
- * <LI><B>MAXIMUM_SCALE</B> short => maximum scale supported
- * <LI><B>SQL_DATA_TYPE</B> int => unused
- * <LI><B>SQL_DATETIME_SUB</B> int => unused
- * <LI><B>NUM_PREC_RADIX</B> int => usually 2 or 10
+ * <LI><B>MINIMUM_SCALE</B> short {@code =>} minimum scale supported
+ * <LI><B>MAXIMUM_SCALE</B> short {@code =>} maximum scale supported
+ * <LI><B>SQL_DATA_TYPE</B> int {@code =>} unused
+ * <LI><B>SQL_DATETIME_SUB</B> int {@code =>} unused
+ * <LI><B>NUM_PREC_RADIX</B> int {@code =>} usually 2 or 10
* </OL>
*
* <p>The PRECISION column represents the maximum column size that the server supports for the given datatype.
@@ -2498,16 +2498,16 @@ public interface DatabaseMetaData extends Wrapper {
*
* <P>Each index column description has the following columns:
* <OL>
- * <LI><B>TABLE_CAT</B> String => table catalog (may be <code>null</code>)
- * <LI><B>TABLE_SCHEM</B> String => table schema (may be <code>null</code>)
- * <LI><B>TABLE_NAME</B> String => table name
- * <LI><B>NON_UNIQUE</B> boolean => Can index values be non-unique.
+ * <LI><B>TABLE_CAT</B> String {@code =>} table catalog (may be <code>null</code>)
+ * <LI><B>TABLE_SCHEM</B> String {@code =>} table schema (may be <code>null</code>)
+ * <LI><B>TABLE_NAME</B> String {@code =>} table name
+ * <LI><B>NON_UNIQUE</B> boolean {@code =>} Can index values be non-unique.
* false when TYPE is tableIndexStatistic
- * <LI><B>INDEX_QUALIFIER</B> String => index catalog (may be <code>null</code>);
+ * <LI><B>INDEX_QUALIFIER</B> String {@code =>} index catalog (may be <code>null</code>);
* <code>null</code> when TYPE is tableIndexStatistic
- * <LI><B>INDEX_NAME</B> String => index name; <code>null</code> when TYPE is
+ * <LI><B>INDEX_NAME</B> String {@code =>} index name; <code>null</code> when TYPE is
* tableIndexStatistic
- * <LI><B>TYPE</B> short => index type:
+ * <LI><B>TYPE</B> short {@code =>} index type:
* <UL>
* <LI> tableIndexStatistic - this identifies table statistics that are
* returned in conjuction with a table's index descriptions
@@ -2515,20 +2515,20 @@ public interface DatabaseMetaData extends Wrapper {
* <LI> tableIndexHashed - this is a hashed index
* <LI> tableIndexOther - this is some other style of index
* </UL>
- * <LI><B>ORDINAL_POSITION</B> short => column sequence number
+ * <LI><B>ORDINAL_POSITION</B> short {@code =>} column sequence number
* within index; zero when TYPE is tableIndexStatistic
- * <LI><B>COLUMN_NAME</B> String => column name; <code>null</code> when TYPE is
+ * <LI><B>COLUMN_NAME</B> String {@code =>} column name; <code>null</code> when TYPE is
* tableIndexStatistic
- * <LI><B>ASC_OR_DESC</B> String => column sort sequence, "A" => ascending,
- * "D" => descending, may be <code>null</code> if sort sequence is not supported;
+ * <LI><B>ASC_OR_DESC</B> String {@code =>} column sort sequence, "A" {@code =>} ascending,
+ * "D" {@code =>} descending, may be <code>null</code> if sort sequence is not supported;
* <code>null</code> when TYPE is tableIndexStatistic
- * <LI><B>CARDINALITY</B> long => When TYPE is tableIndexStatistic, then
+ * <LI><B>CARDINALITY</B> long {@code =>} When TYPE is tableIndexStatistic, then
* this is the number of rows in the table; otherwise, it is the
* number of unique values in the index.
- * <LI><B>PAGES</B> long => When TYPE is tableIndexStatisic then
+ * <LI><B>PAGES</B> long {@code =>} When TYPE is tableIndexStatisic then
* this is the number of pages used for the table, otherwise it
* is the number of pages used for the current index.
- * <LI><B>FILTER_CONDITION</B> String => Filter condition, if any.
+ * <LI><B>FILTER_CONDITION</B> String {@code =>} Filter condition, if any.
* (may be <code>null</code>)
* </OL>
*
@@ -2781,14 +2781,14 @@ public interface DatabaseMetaData extends Wrapper {
*
* <P>Each type description has the following columns:
* <OL>
- * <LI><B>TYPE_CAT</B> String => the type's catalog (may be <code>null</code>)
- * <LI><B>TYPE_SCHEM</B> String => type's schema (may be <code>null</code>)
- * <LI><B>TYPE_NAME</B> String => type name
- * <LI><B>CLASS_NAME</B> String => Java class name
- * <LI><B>DATA_TYPE</B> int => type value defined in java.sql.Types.
+ * <LI><B>TYPE_CAT</B> String {@code =>} the type's catalog (may be <code>null</code>)
+ * <LI><B>TYPE_SCHEM</B> String {@code =>} type's schema (may be <code>null</code>)
+ * <LI><B>TYPE_NAME</B> String {@code =>} type name
+ * <LI><B>CLASS_NAME</B> String {@code =>} Java class name
+ * <LI><B>DATA_TYPE</B> int {@code =>} type value defined in java.sql.Types.
* One of JAVA_OBJECT, STRUCT, or DISTINCT
- * <LI><B>REMARKS</B> String => explanatory comment on the type
- * <LI><B>BASE_TYPE</B> short => type code of the source type of a
+ * <LI><B>REMARKS</B> String {@code =>} explanatory comment on the type
+ * <LI><B>BASE_TYPE</B> short {@code =>} type code of the source type of a
* DISTINCT type or the type that implements the user-generated
* reference type of the SELF_REFERENCING_COLUMN of a structured
* type as defined in java.sql.Types (<code>null</code> if DATA_TYPE is not
@@ -2894,14 +2894,14 @@ public interface DatabaseMetaData extends Wrapper {
* describes the designated UDT and a direct supertype. A row has the following
* columns:
* <OL>
- * <LI><B>TYPE_CAT</B> String => the UDT's catalog (may be <code>null</code>)
- * <LI><B>TYPE_SCHEM</B> String => UDT's schema (may be <code>null</code>)
- * <LI><B>TYPE_NAME</B> String => type name of the UDT
- * <LI><B>SUPERTYPE_CAT</B> String => the direct super type's catalog
+ * <LI><B>TYPE_CAT</B> String {@code =>} the UDT's catalog (may be <code>null</code>)
+ * <LI><B>TYPE_SCHEM</B> String {@code =>} UDT's schema (may be <code>null</code>)
+ * <LI><B>TYPE_NAME</B> String {@code =>} type name of the UDT
+ * <LI><B>SUPERTYPE_CAT</B> String {@code =>} the direct super type's catalog
* (may be <code>null</code>)
- * <LI><B>SUPERTYPE_SCHEM</B> String => the direct super type's schema
+ * <LI><B>SUPERTYPE_SCHEM</B> String {@code =>} the direct super type's schema
* (may be <code>null</code>)
- * <LI><B>SUPERTYPE_NAME</B> String => the direct super type's name
+ * <LI><B>SUPERTYPE_NAME</B> String {@code =>} the direct super type's name
* </OL>
*
* <P><B>Note:</B> If the driver does not support type hierarchies, an
@@ -2936,10 +2936,10 @@ public interface DatabaseMetaData extends Wrapper {
*
* <P>Each type description has the following columns:
* <OL>
- * <LI><B>TABLE_CAT</B> String => the type's catalog (may be <code>null</code>)
- * <LI><B>TABLE_SCHEM</B> String => type's schema (may be <code>null</code>)
- * <LI><B>TABLE_NAME</B> String => type name
- * <LI><B>SUPERTABLE_NAME</B> String => the direct super type's name
+ * <LI><B>TABLE_CAT</B> String {@code =>} the type's catalog (may be <code>null</code>)
+ * <LI><B>TABLE_SCHEM</B> String {@code =>} type's schema (may be <code>null</code>)
+ * <LI><B>TABLE_NAME</B> String {@code =>} type name
+ * <LI><B>SUPERTABLE_NAME</B> String {@code =>} the direct super type's name
* </OL>
*
* <P><B>Note:</B> If the driver does not support type hierarchies, an
@@ -3001,35 +3001,35 @@ public interface DatabaseMetaData extends Wrapper {
* The <code>ResultSet</code> object that is returned has the following
* columns:
* <OL>
- * <LI><B>TYPE_CAT</B> String => type catalog (may be <code>null</code>)
- * <LI><B>TYPE_SCHEM</B> String => type schema (may be <code>null</code>)
- * <LI><B>TYPE_NAME</B> String => type name
- * <LI><B>ATTR_NAME</B> String => attribute name
- * <LI><B>DATA_TYPE</B> int => attribute type SQL type from java.sql.Types
- * <LI><B>ATTR_TYPE_NAME</B> String => Data source dependent type name.
+ * <LI><B>TYPE_CAT</B> String {@code =>} type catalog (may be <code>null</code>)
+ * <LI><B>TYPE_SCHEM</B> String {@code =>} type schema (may be <code>null</code>)
+ * <LI><B>TYPE_NAME</B> String {@code =>} type name
+ * <LI><B>ATTR_NAME</B> String {@code =>} attribute name
+ * <LI><B>DATA_TYPE</B> int {@code =>} attribute type SQL type from java.sql.Types
+ * <LI><B>ATTR_TYPE_NAME</B> String {@code =>} Data source dependent type name.
* For a UDT, the type name is fully qualified. For a REF, the type name is
* fully qualified and represents the target type of the reference type.
- * <LI><B>ATTR_SIZE</B> int => column size. For char or date
+ * <LI><B>ATTR_SIZE</B> int {@code =>} column size. For char or date
* types this is the maximum number of characters; for numeric or
* decimal types this is precision.
- * <LI><B>DECIMAL_DIGITS</B> int => the number of fractional digits. Null is returned for data types where
+ * <LI><B>DECIMAL_DIGITS</B> int {@code =>} the number of fractional digits. Null is returned for data types where
* DECIMAL_DIGITS is not applicable.
- * <LI><B>NUM_PREC_RADIX</B> int => Radix (typically either 10 or 2)
- * <LI><B>NULLABLE</B> int => whether NULL is allowed
+ * <LI><B>NUM_PREC_RADIX</B> int {@code =>} Radix (typically either 10 or 2)
+ * <LI><B>NULLABLE</B> int {@code =>} whether NULL is allowed
* <UL>
* <LI> attributeNoNulls - might not allow NULL values
* <LI> attributeNullable - definitely allows NULL values
* <LI> attributeNullableUnknown - nullability unknown
* </UL>
- * <LI><B>REMARKS</B> String => comment describing column (may be <code>null</code>)
- * <LI><B>ATTR_DEF</B> String => default value (may be <code>null</code>)
- * <LI><B>SQL_DATA_TYPE</B> int => unused
- * <LI><B>SQL_DATETIME_SUB</B> int => unused
- * <LI><B>CHAR_OCTET_LENGTH</B> int => for char types the
+ * <LI><B>REMARKS</B> String {@code =>} comment describing column (may be <code>null</code>)
+ * <LI><B>ATTR_DEF</B> String {@code =>} default value (may be <code>null</code>)
+ * <LI><B>SQL_DATA_TYPE</B> int {@code =>} unused
+ * <LI><B>SQL_DATETIME_SUB</B> int {@code =>} unused
+ * <LI><B>CHAR_OCTET_LENGTH</B> int {@code =>} for char types the
* maximum number of bytes in the column
- * <LI><B>ORDINAL_POSITION</B> int => index of the attribute in the UDT
+ * <LI><B>ORDINAL_POSITION</B> int {@code =>} index of the attribute in the UDT
* (starting at 1)
- * <LI><B>IS_NULLABLE</B> String => ISO rules are used to determine
+ * <LI><B>IS_NULLABLE</B> String {@code =>} ISO rules are used to determine
* the nullability for a attribute.
* <UL>
* <LI> YES --- if the attribute can include NULLs
@@ -3037,13 +3037,13 @@ public interface DatabaseMetaData extends Wrapper {
* <LI> empty string --- if the nullability for the
* attribute is unknown
* </UL>
- * <LI><B>SCOPE_CATALOG</B> String => catalog of table that is the
+ * <LI><B>SCOPE_CATALOG</B> String {@code =>} catalog of table that is the
* scope of a reference attribute (<code>null</code> if DATA_TYPE isn't REF)
- * <LI><B>SCOPE_SCHEMA</B> String => schema of table that is the
+ * <LI><B>SCOPE_SCHEMA</B> String {@code =>} schema of table that is the
* scope of a reference attribute (<code>null</code> if DATA_TYPE isn't REF)
- * <LI><B>SCOPE_TABLE</B> String => table name that is the scope of a
+ * <LI><B>SCOPE_TABLE</B> String {@code =>} table name that is the scope of a
* reference attribute (<code>null</code> if the DATA_TYPE isn't REF)
- * <LI><B>SOURCE_DATA_TYPE</B> short => source type of a distinct type or user-generated
+ * <LI><B>SOURCE_DATA_TYPE</B> short {@code =>} source type of a distinct type or user-generated
* Ref type,SQL type from java.sql.Types (<code>null</code> if DATA_TYPE
* isn't DISTINCT or user-generated REF)
* </OL>
@@ -3203,14 +3203,14 @@ public interface DatabaseMetaData extends Wrapper {
* and if so the lifetime for which a <code>RowId</code> object remains valid.
* <p>
* The returned int values have the following relationship:
- * <pre>
+ * <pre>{@code
* ROWID_UNSUPPORTED < ROWID_VALID_OTHER < ROWID_VALID_TRANSACTION
* < ROWID_VALID_SESSION < ROWID_VALID_FOREVER
- * </pre>
+ * }</pre>
* so conditional logic such as
- * <pre>
+ * <pre>{@code
* if (metadata.getRowIdLifetime() > DatabaseMetaData.ROWID_VALID_TRANSACTION)
- * </pre>
+ * }</pre>
* 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 @@ public interface DatabaseMetaData extends Wrapper {
*
* <P>The schema columns are:
* <OL>
- * <LI><B>TABLE_SCHEM</B> String => schema name
- * <LI><B>TABLE_CATALOG</B> String => catalog name (may be <code>null</code>)
+ * <LI><B>TABLE_SCHEM</B> String {@code =>} schema name
+ * <LI><B>TABLE_CATALOG</B> String {@code =>} catalog name (may be <code>null</code>)
* </OL>
*
*
@@ -3273,10 +3273,10 @@ public interface DatabaseMetaData extends Wrapper {
* that the driver supports. The result set contains the following columns
* <p>
* <ol>
- * <li><b>NAME</b> String=> The name of the client info property<br>
- * <li><b>MAX_LEN</b> int=> The maximum length of the value for the property<br>
- * <li><b>DEFAULT_VALUE</b> String=> The default value of the property<br>
- * <li><b>DESCRIPTION</b> String=> A description of the property. This will typically
+ * <li><b>NAME</b> String{@code =>} The name of the client info property<br>
+ * <li><b>MAX_LEN</b> int{@code =>} The maximum length of the value for the property<br>
+ * <li><b>DEFAULT_VALUE</b> String{@code =>} The default value of the property<br>
+ * <li><b>DESCRIPTION</b> String{@code =>} A description of the property. This will typically
* contain information as to where this property is
* stored in the database.
* </ol>
@@ -3305,19 +3305,19 @@ public interface DatabaseMetaData extends Wrapper {
*
* <P>Each function description has the the following columns:
* <OL>
- * <LI><B>FUNCTION_CAT</B> String => function catalog (may be <code>null</code>)
- * <LI><B>FUNCTION_SCHEM</B> String => function schema (may be <code>null</code>)
- * <LI><B>FUNCTION_NAME</B> String => function name. This is the name
+ * <LI><B>FUNCTION_CAT</B> String {@code =>} function catalog (may be <code>null</code>)
+ * <LI><B>FUNCTION_SCHEM</B> String {@code =>} function schema (may be <code>null</code>)
+ * <LI><B>FUNCTION_NAME</B> String {@code =>} function name. This is the name
* used to invoke the function
- * <LI><B>REMARKS</B> String => explanatory comment on the function
- * <LI><B>FUNCTION_TYPE</B> short => kind of function:
+ * <LI><B>REMARKS</B> String {@code =>} explanatory comment on the function
+ * <LI><B>FUNCTION_TYPE</B> short {@code =>} kind of function:
* <UL>
* <LI>functionResultUnknown - Cannot determine if a return value
* or table will be returned
* <LI> functionNoTable- Does not return a table
* <LI> functionReturnsTable - Returns a table
* </UL>
- * <LI><B>SPECIFIC_NAME</B> String => the name which uniquely identifies
+ * <LI><B>SPECIFIC_NAME</B> String {@code =>} the name which uniquely identifies
* this function within its schema. This is a user specified, or DBMS
* generated, name that may be different then the <code>FUNCTION_NAME</code>
* for example with overload functions
@@ -3359,12 +3359,12 @@ public interface DatabaseMetaData extends Wrapper {
* is a parameter description, column description or
* return type description with the following fields:
* <OL>
- * <LI><B>FUNCTION_CAT</B> String => function catalog (may be <code>null</code>)
- * <LI><B>FUNCTION_SCHEM</B> String => function schema (may be <code>null</code>)
- * <LI><B>FUNCTION_NAME</B> String => function name. This is the name
+ * <LI><B>FUNCTION_CAT</B> String {@code =>} function catalog (may be <code>null</code>)
+ * <LI><B>FUNCTION_SCHEM</B> String {@code =>} function schema (may be <code>null</code>)
+ * <LI><B>FUNCTION_NAME</B> String {@code =>} function name. This is the name
* used to invoke the function
- * <LI><B>COLUMN_NAME</B> String => column/parameter name
- * <LI><B>COLUMN_TYPE</B> Short => kind of column/parameter:
+ * <LI><B>COLUMN_NAME</B> String {@code =>} column/parameter name
+ * <LI><B>COLUMN_TYPE</B> Short {@code =>} kind of column/parameter:
* <UL>
* <LI> functionColumnUnknown - nobody knows
* <LI> functionColumnIn - IN parameter
@@ -3374,30 +3374,30 @@ public interface DatabaseMetaData extends Wrapper {
* <LI> functionColumnResult - Indicates that the parameter or column
* is a column in the <code>ResultSet</code>
* </UL>
- * <LI><B>DATA_TYPE</B> int => SQL type from java.sql.Types
- * <LI><B>TYPE_NAME</B> String => SQL type name, for a UDT type the
+ * <LI><B>DATA_TYPE</B> int {@code =>} SQL type from java.sql.Types
+ * <LI><B>TYPE_NAME</B> String {@code =>} SQL type name, for a UDT type the
* type name is fully qualified
- * <LI><B>PRECISION</B> int => precision
- * <LI><B>LENGTH</B> int => length in bytes of data
- * <LI><B>SCALE</B> short => scale - null is returned for data types where
+ * <LI><B>PRECISION</B> int {@code =>} precision
+ * <LI><B>LENGTH</B> int {@code =>} length in bytes of data
+ * <LI><B>SCALE</B> short {@code =>} scale - null is returned for data types where
* SCALE is not applicable.
- * <LI><B>RADIX</B> short => radix
- * <LI><B>NULLABLE</B> short => can it contain NULL.
+ * <LI><B>RADIX</B> short {@code =>} radix
+ * <LI><B>NULLABLE</B> short {@code =>} can it contain NULL.
* <UL>
* <LI> functionNoNulls - does not allow NULL values
* <LI> functionNullable - allows NULL values
* <LI> functionNullableUnknown - nullability unknown
* </UL>
- * <LI><B>REMARKS</B> String => comment describing column/parameter
- * <LI><B>CHAR_OCTET_LENGTH</B> int => the maximum length of binary
+ * <LI><B>REMARKS</B> String {@code =>} comment describing column/parameter
+ * <LI><B>CHAR_OCTET_LENGTH</B> int {@code =>} the maximum length of binary
* and character based parameters or columns. For any other datatype the returned value
* is a NULL
- * <LI><B>ORDINAL_POSITION</B> int => the ordinal position, starting
+ * <LI><B>ORDINAL_POSITION</B> int {@code =>} the ordinal position, starting
* from 1, for the input and output parameters. A value of 0
* is returned if this row describes the function's return value.
* For result set columns, it is the
* ordinal position of the column in the result set starting from 1.
- * <LI><B>IS_NULLABLE</B> String => ISO rules are used to determine
+ * <LI><B>IS_NULLABLE</B> String {@code =>} ISO rules are used to determine
* the nullability for a parameter or column.
* <UL>
* <LI> YES --- if the parameter or column can include NULLs
@@ -3405,7 +3405,7 @@ public interface DatabaseMetaData extends Wrapper {
* <LI> empty string --- if the nullability for the
* parameter or column is unknown
* </UL>
- * <LI><B>SPECIFIC_NAME</B> String => the name which uniquely identifies
+ * <LI><B>SPECIFIC_NAME</B> String {@code =>} the name which uniquely identifies
* this function within its schema. This is a user specified, or DBMS
* generated, name that may be different then the <code>FUNCTION_NAME</code>
* for example with overload functions
@@ -3591,21 +3591,21 @@ public interface DatabaseMetaData extends Wrapper {
*
* <P>Each column description has the following columns:
* <OL>
- * <LI><B>TABLE_CAT</B> String => table catalog (may be <code>null</code>)
- * <LI><B>TABLE_SCHEM</B> String => table schema (may be <code>null</code>)
- * <LI><B>TABLE_NAME</B> String => table name
- * <LI><B>COLUMN_NAME</B> String => column name
- * <LI><B>DATA_TYPE</B> int => SQL type from java.sql.Types
- * <LI><B>COLUMN_SIZE</B> int => column size.
- * <LI><B>DECIMAL_DIGITS</B> int => the number of fractional digits. Null is returned for data types where
+ * <LI><B>TABLE_CAT</B> String {@code =>} table catalog (may be <code>null</code>)
+ * <LI><B>TABLE_SCHEM</B> String {@code =>} table schema (may be <code>null</code>)
+ * <LI><B>TABLE_NAME</B> String {@code =>} table name
+ * <LI><B>COLUMN_NAME</B> String {@code =>} column name
+ * <LI><B>DATA_TYPE</B> int {@code =>} SQL type from java.sql.Types
+ * <LI><B>COLUMN_SIZE</B> int {@code =>} column size.
+ * <LI><B>DECIMAL_DIGITS</B> int {@code =>} the number of fractional digits. Null is returned for data types where
* DECIMAL_DIGITS is not applicable.
- * <LI><B>NUM_PREC_RADIX</B> int => Radix (typically either 10 or 2)
- * <LI><B>COLUMN_USAGE</B> String => The allowed usage for the column. The
+ * <LI><B>NUM_PREC_RADIX</B> int {@code =>} Radix (typically either 10 or 2)
+ * <LI><B>COLUMN_USAGE</B> String {@code =>} The allowed usage for the column. The
* value returned will correspond to the enum name returned by {@link PseudoColumnUsage#name PseudoColumnUsage.name()}
- * <LI><B>REMARKS</B> String => comment describing column (may be <code>null</code>)
- * <LI><B>CHAR_OCTET_LENGTH</B> int => for char types the
+ * <LI><B>REMARKS</B> String {@code =>} comment describing column (may be <code>null</code>)
+ * <LI><B>CHAR_OCTET_LENGTH</B> int {@code =>} for char types the
* maximum number of bytes in the column
- * <LI><B>IS_NULLABLE</B> String => ISO rules are used to determine the nullability for a column.
+ * <LI><B>IS_NULLABLE</B> String {@code =>} ISO rules are used to determine the nullability for a column.
* <UL>
* <LI> YES --- if the column can include NULLs
* <LI> NO --- if the column cannot include NULLs
diff --git a/jdk/src/share/classes/java/sql/DriverManager.java b/jdk/src/share/classes/java/sql/DriverManager.java
index fbe16363529..797a920d230 100644
--- a/jdk/src/share/classes/java/sql/DriverManager.java
+++ b/jdk/src/share/classes/java/sql/DriverManager.java
@@ -36,7 +36,7 @@ import sun.reflect.Reflection;
/**
* <P>The basic service for managing a set of JDBC drivers.<br>
- * <B>NOTE:</B> The {@link <code>DataSource</code>} interface, new in the
+ * <B>NOTE:</B> 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 <code>DataSource</code> object is the preferred means of
* connecting to a data source.
diff --git a/jdk/src/share/classes/java/sql/ResultSet.java b/jdk/src/share/classes/java/sql/ResultSet.java
index ab547733128..7029c935906 100644
--- a/jdk/src/share/classes/java/sql/ResultSet.java
+++ b/jdk/src/share/classes/java/sql/ResultSet.java
@@ -1350,7 +1350,7 @@ public interface ResultSet extends Wrapper, AutoCloseable {
* @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 <code>rows >= 0 </code> is not satisfied
+ * condition {@code rows >= 0} is not satisfied
* @since 1.2
* @see #getFetchSize
*/
diff --git a/jdk/src/share/classes/java/sql/Statement.java b/jdk/src/share/classes/java/sql/Statement.java
index 34859c52c44..29b372f522e 100644
--- a/jdk/src/share/classes/java/sql/Statement.java
+++ b/jdk/src/share/classes/java/sql/Statement.java
@@ -144,7 +144,7 @@ public interface Statement extends Wrapper, AutoCloseable {
* @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 <code>Statement</code>
- * 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 @@ public interface Statement extends Wrapper, AutoCloseable {
* @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 <code>Statement</code>
- * 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 @@ public interface Statement extends Wrapper, AutoCloseable {
* there is no limit
* @exception SQLException if a database access error occurs,
* this method is called on a closed <code>Statement</code>
- * 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 @@ public interface Statement extends Wrapper, AutoCloseable {
* object(s) obtained with the method <code>getResultSet</code>.
*
* <P>There are no more results when the following is true:
- * <PRE>
+ * <PRE>{@code
* // stmt is a Statement object
* ((stmt.getMoreResults() == false) && (stmt.getUpdateCount() == -1))
- * </PRE>
+ * }</PRE>
*
* @return <code>true</code> if the next result is a <code>ResultSet</code>
* object; <code>false</code> if it is an update count or there are
@@ -452,7 +452,7 @@ public interface Statement extends Wrapper, AutoCloseable {
* @param rows the number of rows to fetch
* @exception SQLException if a database access error occurs,
* this method is called on a closed <code>Statement</code> or the
- * condition <code>rows >= 0</code> is not satisfied.
+ * condition {@code rows >= 0} is not satisfied.
* @since 1.2
* @see #getFetchSize
*/
@@ -665,10 +665,10 @@ public interface Statement extends Wrapper, AutoCloseable {
* <code>true</code> if the next result is a <code>ResultSet</code> object.
*
* <P>There are no more results when the following is true:
- * <PRE>
+ * <PRE>{@code
* // stmt is a Statement object
* ((stmt.getMoreResults(current) == false) && (stmt.getUpdateCount() == -1))
- * </PRE>
+ * }</PRE>
*
* @param current one of the following <code>Statement</code>
* constants indicating what should happen to current
@@ -1107,7 +1107,7 @@ public interface Statement extends Wrapper, AutoCloseable {
* @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 <code>Statement</code>
- * or the condition max >= 0 is not satisfied
+ * or the condition {@code max >= 0} is not satisfied
* @see #getMaxRows
* @since 1.8
*/
diff --git a/jdk/src/share/classes/java/text/CharacterIterator.java b/jdk/src/share/classes/java/text/CharacterIterator.java
index 2b21e14e5ed..7674268db16 100644
--- a/jdk/src/share/classes/java/text/CharacterIterator.java
+++ b/jdk/src/share/classes/java/text/CharacterIterator.java
@@ -62,27 +62,27 @@ package java.text;
* <P>Examples:<P>
*
* Traverse the text from start to finish
- * <pre>
+ * <pre>{@code
* public void traverseForward(CharacterIterator iter) {
* for(char c = iter.first(); c != CharacterIterator.DONE; c = iter.next()) {
* processChar(c);
* }
* }
- * </pre>
+ * }</pre>
*
* Traverse the text backwards, from end to start
- * <pre>
+ * <pre>{@code
* public void traverseBackward(CharacterIterator iter) {
* for(char c = iter.last(); c != CharacterIterator.DONE; c = iter.previous()) {
* processChar(c);
* }
* }
- * </pre>
+ * }</pre>
*
* Traverse both forward and backward from a given position in the text.
* Calls to notBoundary() in this example represents some
* additional stopping criteria.
- * <pre>
+ * <pre>{@code
* public void traverseOut(CharacterIterator iter, int pos) {
* for (char c = iter.setIndex(pos);
* c != CharacterIterator.DONE && notBoundary(c);
@@ -96,7 +96,7 @@ package java.text;
* int start = iter.getIndex();
* processSection(start, end);
* }
- * </pre>
+ * }</pre>
*
* @see StringCharacterIterator
* @see AttributedCharacterIterator
diff --git a/jdk/src/share/classes/java/text/ChoiceFormat.java b/jdk/src/share/classes/java/text/ChoiceFormat.java
index 1e318848300..7814f0ef2c5 100644
--- a/jdk/src/share/classes/java/text/ChoiceFormat.java
+++ b/jdk/src/share/classes/java/text/ChoiceFormat.java
@@ -376,7 +376,7 @@ public class ChoiceFormat extends NumberFormat {
/**
* 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 --git a/jdk/src/share/classes/java/text/Collator.java b/jdk/src/share/classes/java/text/Collator.java
index aaa5276d6f7..d105a810439 100644
--- a/jdk/src/share/classes/java/text/Collator.java
+++ b/jdk/src/share/classes/java/text/Collator.java
@@ -72,14 +72,14 @@ import sun.util.locale.provider.LocaleServiceProviderPool;
* The following example shows how to compare two strings using
* the <code>Collator</code> for the default locale.
* <blockquote>
- * <pre>
+ * <pre>{@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");
- * </pre>
+ * }</pre>
* </blockquote>
*
* <p>
diff --git a/jdk/src/share/classes/java/util/Calendar.java b/jdk/src/share/classes/java/util/Calendar.java
index 19c3c8540a7..566b8b090be 100644
--- a/jdk/src/share/classes/java/util/Calendar.java
+++ b/jdk/src/share/classes/java/util/Calendar.java
@@ -2681,9 +2681,9 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
* Returns whether this <code>Calendar</code> represents a time
* before the time represented by the specified
* <code>Object</code>. This method is equivalent to:
- * <pre><blockquote>
+ * <pre>{@code
* compareTo(when) < 0
- * </blockquote></pre>
+ * }</pre>
* if and only if <code>when</code> is a <code>Calendar</code>
* instance. Otherwise, the method returns <code>false</code>.
*
@@ -2702,9 +2702,9 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
* Returns whether this <code>Calendar</code> represents a time
* after the time represented by the specified
* <code>Object</code>. This method is equivalent to:
- * <pre><blockquote>
+ * <pre>{@code
* compareTo(when) > 0
- * </blockquote></pre>
+ * }</pre>
* if and only if <code>when</code> is a <code>Calendar</code>
* instance. Otherwise, the method returns <code>false</code>.
*
diff --git a/jdk/src/share/classes/java/util/Collections.java b/jdk/src/share/classes/java/util/Collections.java
index 30d589cdc7d..da258793ba6 100644
--- a/jdk/src/share/classes/java/util/Collections.java
+++ b/jdk/src/share/classes/java/util/Collections.java
@@ -924,9 +924,9 @@ public class Collections {
* 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 <tt>i</tt>
- * such that <tt>source.subList(i, i+target.size()).equals(target)</tt>,
+ * such that {@code source.subList(i, i+target.size()).equals(target)},
* or -1 if there is no such index. (Returns -1 if
- * <tt>target.size() > source.size()</tt>.)
+ * {@code target.size() > source.size()})
*
* <p>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 @@ public class Collections {
* 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 <tt>i</tt>
- * such that <tt>source.subList(i, i+target.size()).equals(target)</tt>,
+ * such that {@code source.subList(i, i+target.size()).equals(target)},
* or -1 if there is no such index. (Returns -1 if
- * <tt>target.size() > source.size()</tt>.)
+ * {@code target.size() > source.size()})
*
* <p>This implementation uses the "brute force" technique of iterating
* over the source list, looking for a match with the target at each
diff --git a/jdk/src/share/classes/java/util/Date.java b/jdk/src/share/classes/java/util/Date.java
index 61dac350389..502daaefdbb 100644
--- a/jdk/src/share/classes/java/util/Date.java
+++ b/jdk/src/share/classes/java/util/Date.java
@@ -984,8 +984,9 @@ public class Date
* exclusive OR of the two halves of the primitive <tt>long</tt>
* value returned by the {@link Date#getTime}
* method. That is, the hash code is the value of the expression:
- * <blockquote><pre>
- * (int)(this.getTime()^(this.getTime() >>> 32))</pre></blockquote>
+ * <blockquote><pre>{@code
+ * (int)(this.getTime()^(this.getTime() >>> 32))
+ * }</pre></blockquote>
*
* @return a hash code value for this object.
*/
@@ -1085,7 +1086,7 @@ public class Date
/**
* Creates a string representation of this <tt>Date</tt> object of
* the form:
- * <blockquote<pre>
+ * <blockquote><pre>
* d mon yyyy hh:mm:ss GMT</pre></blockquote>
* where:<ul>
* <li><i>d</i> is the day of the month (<tt>1</tt> through <tt>31</tt>),
diff --git a/jdk/src/share/classes/java/util/LinkedHashMap.java b/jdk/src/share/classes/java/util/LinkedHashMap.java
index 100710b1bdd..59a8d8f1a5d 100644
--- a/jdk/src/share/classes/java/util/LinkedHashMap.java
+++ b/jdk/src/share/classes/java/util/LinkedHashMap.java
@@ -437,13 +437,13 @@ public class LinkedHashMap<K,V>
* <p>Sample 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.
- * <pre>
+ * <pre>{@code
* private static final int MAX_ENTRIES = 100;
*
* protected boolean removeEldestEntry(Map.Entry eldest) {
* return size() > MAX_ENTRIES;
* }
- * </pre>
+ * }</pre>
*
* <p>This method typically does not modify the map in any way,
* instead allowing the map to modify itself as directed by its
diff --git a/jdk/src/share/classes/java/util/Random.java b/jdk/src/share/classes/java/util/Random.java
index c169e053dfd..ca430bae26f 100644
--- a/jdk/src/share/classes/java/util/Random.java
+++ b/jdk/src/share/classes/java/util/Random.java
@@ -372,7 +372,7 @@ class Random implements java.io.Serializable {
* range {@code 0.0f} (inclusive) to {@code 1.0f} (exclusive), is
* pseudorandomly generated and returned. All 2<font
* size="-1"><sup>24</sup></font> possible {@code float} values
- * of the form <i>m x </i>2<font
+ * of the form <i>m x </i>2<font
* size="-1"><sup>-24</sup></font>, where <i>m</i> is a positive
* integer less than 2<font size="-1"><sup>24</sup> </font>, are
* produced with (approximately) equal probability.
diff --git a/jdk/src/share/classes/java/util/ResourceBundle.java b/jdk/src/share/classes/java/util/ResourceBundle.java
index 0d52daa9c48..1d9d80b90a4 100644
--- a/jdk/src/share/classes/java/util/ResourceBundle.java
+++ b/jdk/src/share/classes/java/util/ResourceBundle.java
@@ -2323,9 +2323,9 @@ public abstract class ResourceBundle {
* is returned. And if the resource bundles for the "ja" and
* "" <code>Locale</code>s are found, then the runtime resource
* lookup path (parent chain) is:
- * <pre>
+ * <pre>{@code
* Messages_ja -> Messages
- * </pre>
+ * }</pre>
*
* @param baseName
* the base name of the resource bundle, a fully
diff --git a/jdk/src/share/classes/java/util/Scanner.java b/jdk/src/share/classes/java/util/Scanner.java
index cc19b0d1257..f6967f3a75c 100644
--- a/jdk/src/share/classes/java/util/Scanner.java
+++ b/jdk/src/share/classes/java/util/Scanner.java
@@ -49,47 +49,51 @@ import sun.misc.LRUCache;
*
* <p>For example, this code allows a user to read a number from
* <tt>System.in</tt>:
- * <blockquote><pre>
+ * <blockquote><pre>{@code
* Scanner sc = new Scanner(System.in);
* int i = sc.nextInt();
- * </pre></blockquote>
+ * }</pre></blockquote>
*
* <p>As another example, this code allows <code>long</code> types to be
* assigned from entries in a file <code>myNumbers</code>:
- * <blockquote><pre>
+ * <blockquote><pre>{@code
* Scanner sc = new Scanner(new File("myNumbers"));
* while (sc.hasNextLong()) {
* long aLong = sc.nextLong();
- * }</pre></blockquote>
+ * }
+ * }</pre></blockquote>
*
* <p>The scanner can also use delimiters other than whitespace. This
* example reads several items in from a string:
- *<blockquote><pre>
+ * <blockquote><pre>{@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(); </pre></blockquote>
+ * s.close();
+ * }</pre></blockquote>
* <p>
* prints the following output:
- * <blockquote><pre>
+ * <blockqjote><pre>{@code
* 1
* 2
* red
- * blue </pre></blockquote>
+ * blue
+ * }</pre></blockquote>
*
* <p>The same output can be generated with this code, which uses a regular
* expression to parse all four tokens at once:
- *<blockquote><pre>
+ * <blockquote><pre>{@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(); </pre></blockquote>
+ * s.close();
+ * }</pre></blockquote>
*
* <p>The <a name="default-delimiter">default whitespace delimiter</a> used
* by a scanner is as recognized by {@link java.lang.Character}.{@link
@@ -2640,11 +2644,11 @@ public final class Scanner implements Iterator<String>, Closeable {
* <tt>scanner.reset()</tt> behaves in exactly the same way as the
* invocation
*
- * <blockquote><pre>
+ * <blockquote><pre>{@code
* scanner.useDelimiter("\\p{javaWhitespace}+")
* .useLocale(Locale.getDefault(Locale.Category.FORMAT))
* .useRadix(10);
- * </pre></blockquote>
+ * }</pre></blockquote>
*
* @return this scanner
*
diff --git a/jdk/src/share/classes/java/util/TimerTask.java b/jdk/src/share/classes/java/util/TimerTask.java
index b8c83408680..691c9a03dae 100644
--- a/jdk/src/share/classes/java/util/TimerTask.java
+++ b/jdk/src/share/classes/java/util/TimerTask.java
@@ -130,14 +130,14 @@ public abstract class TimerTask implements Runnable {
* <p>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:
- * <pre>
+ * <pre>{@code
* public void run() {
* if (System.currentTimeMillis() - scheduledExecutionTime() >=
* MAX_TARDINESS)
* return; // Too late; skip this execution.
* // Perform the task
* }
- * </pre>
+ * }</pre>
* This method is typically <i>not</i> used in conjunction with
* <i>fixed-delay execution</i> repeating tasks, as their scheduled
* execution times are allowed to drift over time, and so are not terribly
diff --git a/jdk/src/share/classes/java/util/jar/Pack200.java b/jdk/src/share/classes/java/util/jar/Pack200.java
index c3ea39587a4..dbefe59305d 100644
--- a/jdk/src/share/classes/java/util/jar/Pack200.java
+++ b/jdk/src/share/classes/java/util/jar/Pack200.java
@@ -45,7 +45,7 @@ import java.beans.PropertyChangeListener;
* transform the byte-stream back to JAR format.
* <p>
* Here is an example using packer and unpacker:<p>
- * <blockquote><pre>
+ * <pre>{@code
* import java.util.jar.Pack200;
* import java.util.jar.Pack200.*;
* ...
@@ -90,7 +90,7 @@ import java.beans.PropertyChangeListener;
* } catch (IOException ioe) {
* ioe.printStackTrace();
* }
- * </pre></blockquote>
+ * }</pre>
* <p>
* 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 --git a/jdk/src/share/classes/java/util/logging/ConsoleHandler.java b/jdk/src/share/classes/java/util/logging/ConsoleHandler.java
index e0e70a5e689..a8b4bc4f0cd 100644
--- a/jdk/src/share/classes/java/util/logging/ConsoleHandler.java
+++ b/jdk/src/share/classes/java/util/logging/ConsoleHandler.java
@@ -35,7 +35,7 @@ import java.net.*;
* <p>
* <b>Configuration:</b>
* By default each <tt>ConsoleHandler</tt> is initialized using the following
- * <tt>LogManager</tt> configuration properties where <tt><handler-name></tt>
+ * <tt>LogManager</tt> configuration properties where {@code <handler-name>}
* refers to the fully-qualified class name of the handler.
* If properties are not defined
* (or have invalid values) then the specified default values are used.
diff --git a/jdk/src/share/classes/java/util/logging/FileHandler.java b/jdk/src/share/classes/java/util/logging/FileHandler.java
index 8d3b28d8d52..52360c206ee 100644
--- a/jdk/src/share/classes/java/util/logging/FileHandler.java
+++ b/jdk/src/share/classes/java/util/logging/FileHandler.java
@@ -333,7 +333,7 @@ public class FileHandler extends StreamHandler {
* @exception IOException if there are IO problems opening the files.
* @exception SecurityException if a security manager exists and if
* the caller does not have <tt>LoggingPermission("control")</tt>.
- * @exception IllegalArgumentException if limit < 0, or count < 1.
+ * @exception IllegalArgumentException if {@code limit < 0}, or {@code count < 1}.
* @exception IllegalArgumentException if pattern is an empty string
*/
public FileHandler(String pattern, int limit, int count)
@@ -371,7 +371,7 @@ public class FileHandler extends StreamHandler {
* @exception IOException if there are IO problems opening the files.
* @exception SecurityException if a security manager exists and if
* the caller does not have <tt>LoggingPermission("control")</tt>.
- * @exception IllegalArgumentException if limit < 0, or count < 1.
+ * @exception IllegalArgumentException if {@code limit < 0}, or {@code count < 1}.
* @exception IllegalArgumentException if pattern is an empty string
*
*/
diff --git a/jdk/src/share/classes/java/util/logging/MemoryHandler.java b/jdk/src/share/classes/java/util/logging/MemoryHandler.java
index 5c545cc2912..ddf72c2a1e1 100644
--- a/jdk/src/share/classes/java/util/logging/MemoryHandler.java
+++ b/jdk/src/share/classes/java/util/logging/MemoryHandler.java
@@ -64,7 +64,7 @@ package java.util.logging;
* (defaults to no <tt>Filter</tt>). </li>
* <li> <handler-name>.size
* defines the buffer size (defaults to 1000). </li>
- * <li> <handler-name>.push
+ * <li> <handler-name>.push
* defines the <tt>pushLevel</tt> (defaults to <tt>level.SEVERE</tt>). </li>
* <li> <handler-name>.target
* specifies the name of the target <tt>Handler </tt> class.
@@ -155,7 +155,7 @@ public class MemoryHandler extends Handler {
* @param size the number of log records to buffer (must be greater than zero)
* @param pushLevel message level to push on
*
- * @throws IllegalArgumentException if size is <= 0
+ * @throws IllegalArgumentException if {@code size is <= 0}
*/
public MemoryHandler(Handler target, int size, Level pushLevel) {
if (target == null || pushLevel == null) {
diff --git a/jdk/src/share/classes/java/util/prefs/Preferences.java b/jdk/src/share/classes/java/util/prefs/Preferences.java
index 1867fca9186..e3f459290b2 100644
--- a/jdk/src/share/classes/java/util/prefs/Preferences.java
+++ b/jdk/src/share/classes/java/util/prefs/Preferences.java
@@ -134,52 +134,52 @@ import java.lang.Double;
* subsequently restore from the backup.
*
* <p>The XML document has the following DOCTYPE declaration:
- * <pre>
- * <!DOCTYPE preferences SYSTEM "http://java.sun.com/dtd/preferences.dtd">
- * </pre>
+ * <pre>{@code
+ * <!DOCTYPE preferences SYSTEM "http://java.sun.com/dtd/preferences.dtd">
+ * }</pre>
* Note that the system URI (http://java.sun.com/dtd/preferences.dtd) is
* <i>not</i> accessed when exporting or importing preferences; it merely
* serves as a string to uniquely identify the DTD, which is:
- * <pre>
- * <?xml version="1.0" encoding="UTF-8"?>
+ * <pre>{@code
+ * <?xml version="1.0" encoding="UTF-8"?>
*
- * <!-- DTD for a Preferences tree. -->
+ * <!-- DTD for a Preferences tree. -->
*
- * <!-- The preferences element is at the root of an XML document
- * representing a Preferences tree. -->
- * <!ELEMENT preferences (root)>
+ * <!-- The preferences element is at the root of an XML document
+ * representing a Preferences tree. -->
+ * <!ELEMENT preferences (root)>
*
- * <!-- The preferences element contains an optional version attribute,
- * which specifies version of DTD. -->
- * <!ATTLIST preferences EXTERNAL_XML_VERSION CDATA "0.0" >
+ * <!-- The preferences element contains an optional version attribute,
+ * which specifies version of DTD. -->
+ * <!ATTLIST preferences EXTERNAL_XML_VERSION CDATA "0.0" >
*
- * <!-- The root element has a map representing the root's preferences
- * (if any), and one node for each child of the root (if any). -->
- * <!ELEMENT root (map, node*) >
+ * <!-- The root element has a map representing the root's preferences
+ * (if any), and one node for each child of the root (if any). -->
+ * <!ELEMENT root (map, node*) >
*
- * <!-- Additionally, the root contains a type attribute, which
- * specifies whether it's the system or user root. -->
- * <!ATTLIST root
- * type (system|user) #REQUIRED >
+ * <!-- Additionally, the root contains a type attribute, which
+ * specifies whether it's the system or user root. -->
+ * <!ATTLIST root
+ * type (system|user) #REQUIRED >
*
- * <!-- Each node has a map representing its preferences (if any),
- * and one node for each child (if any). -->
- * <!ELEMENT node (map, node*) >
+ * <!-- Each node has a map representing its preferences (if any),
+ * and one node for each child (if any). -->
+ * <!ELEMENT node (map, node*) >
*
- * <!-- Additionally, each node has a name attribute -->
- * <!ATTLIST node
- * name CDATA #REQUIRED >
+ * <!-- Additionally, each node has a name attribute -->
+ * <!ATTLIST node
+ * name CDATA #REQUIRED >
*
- * <!-- A map represents the preferences stored at a node (if any). -->
- * <!ELEMENT map (entry*) >
+ * <!-- A map represents the preferences stored at a node (if any). -->
+ * <!ELEMENT map (entry*) >
*
- * <!-- An entry represents a single preference, which is simply
- * a key-value pair. -->
- * <!ELEMENT entry EMPTY >
- * <!ATTLIST entry
+ * <!-- An entry represents a single preference, which is simply
+ * a key-value pair. -->
+ * <!ELEMENT entry EMPTY >
+ * <!ATTLIST entry
* key CDATA #REQUIRED
- * value CDATA #REQUIRED >
- * </pre>
+ * value CDATA #REQUIRED >
+ * }</pre>
*
* Every <tt>Preferences</tt> implementation must have an associated {@link
* PreferencesFactory} implementation. Every Java(TM) SE implementation must provide
@@ -1161,9 +1161,9 @@ public abstract class Preferences {
* This XML document is, in effect, an offline backup of the node.
*
* <p>The XML document will have the following DOCTYPE declaration:
- * <pre>
- * <!DOCTYPE preferences SYSTEM "http://java.sun.com/dtd/preferences.dtd">
- * </pre>
+ * <pre>{@code
+ * <!DOCTYPE preferences SYSTEM "http://java.sun.com/dtd/preferences.dtd">
+ * }</pre>
* The UTF-8 character encoding will be used.
*
* <p>This method is an exception to the general rule that the results of
@@ -1192,9 +1192,9 @@ public abstract class Preferences {
* effect, an offline backup of the subtree rooted at the node.
*
* <p>The XML document will have the following DOCTYPE declaration:
- * <pre>
- * <!DOCTYPE preferences SYSTEM "http://java.sun.com/dtd/preferences.dtd">
- * </pre>
+ * <pre>{@code
+ * <!DOCTYPE preferences SYSTEM "http://java.sun.com/dtd/preferences.dtd">
+ * }</pre>
* The UTF-8 character encoding will be used.
*
* <p>This method is an exception to the general rule that the results of
@@ -1228,9 +1228,9 @@ public abstract class Preferences {
* do not exist, the nodes will be created.
*
* <p>The XML document must have the following DOCTYPE declaration:
- * <pre>
- * <!DOCTYPE preferences SYSTEM "http://java.sun.com/dtd/preferences.dtd">
- * </pre>
+ * <pre>{@code
+ * <!DOCTYPE preferences SYSTEM "http://java.sun.com/dtd/preferences.dtd">
+ * }</pre>
* (This method is designed for use in conjunction with
* {@link #exportNode(OutputStream)} and
* {@link #exportSubtree(OutputStream)}.
diff --git a/jdk/src/share/classes/java/util/regex/MatchResult.java b/jdk/src/share/classes/java/util/regex/MatchResult.java
index 9b52331808f..9767d286377 100644
--- a/jdk/src/share/classes/java/util/regex/MatchResult.java
+++ b/jdk/src/share/classes/java/util/regex/MatchResult.java
@@ -79,7 +79,7 @@ public interface MatchResult {
/**
* Returns the offset after the last character matched. </p>
*
- * @return @return The offset after the last character matched
+ * @return The offset after the last character matched
*
* @throws IllegalStateException
* If no match has yet been attempted,
diff --git a/jdk/src/share/classes/java/util/regex/Pattern.java b/jdk/src/share/classes/java/util/regex/Pattern.java
index 14cde68c552..ae7468758c8 100644
--- a/jdk/src/share/classes/java/util/regex/Pattern.java
+++ b/jdk/src/share/classes/java/util/regex/Pattern.java
@@ -108,7 +108,7 @@ import java.util.stream.StreamSupport;
* <tr><td valign="top" headers="construct characters"><tt>\x</tt><i>{h...h}</i></td>
* <td headers="matches">The character with hexadecimal value <tt>0x</tt><i>h...h</i>
* ({@link java.lang.Character#MIN_CODE_POINT Character.MIN_CODE_POINT}
- * <= <tt>0x</tt><i>h...h</i> <= 
+ * <= <tt>0x</tt><i>h...h</i> <=
* {@link java.lang.Character#MAX_CODE_POINT Character.MAX_CODE_POINT})</td></tr>
* <tr><td valign="top" headers="matches"><tt>\t</tt></td>
* <td headers="matches">The tab character (<tt>'\u0009'</tt>)</td></tr>
diff --git a/jdk/src/share/classes/java/util/stream/package-info.java b/jdk/src/share/classes/java/util/stream/package-info.java
index 4dfb1e998d2..39509ffffc6 100644
--- a/jdk/src/share/classes/java/util/stream/package-info.java
+++ b/jdk/src/share/classes/java/util/stream/package-info.java
@@ -141,7 +141,7 @@
* parallelism is explicitly requested. For example, {@code Collection} has methods
* {@link java.util.Collection#stream} and {@link java.util.Collection#parallelStream},
* which produce sequential and parallel streams respectively; other stream-bearing methods
- * such as {@link java.util.stream.Streams#intRange(int, int)} produce sequential
+ * such as {@link java.util.stream.IntStream#range(int, int)} produce sequential
* streams but these can be efficiently parallelized by calling {@code parallel()} on the
* result. The set of operations on serial and parallel streams is identical. To execute the
* "sum of weights of blocks" query in parallel, we would do:
diff --git a/jdk/src/share/classes/java/util/zip/DeflaterInputStream.java b/jdk/src/share/classes/java/util/zip/DeflaterInputStream.java
index a996b14e0eb..cdca7f63bfc 100644
--- a/jdk/src/share/classes/java/util/zip/DeflaterInputStream.java
+++ b/jdk/src/share/classes/java/util/zip/DeflaterInputStream.java
@@ -97,7 +97,7 @@ public class DeflaterInputStream extends FilterInputStream {
* @param in input stream to read the uncompressed data to
* @param defl compressor ("deflater") for this stream
* @param bufLen compression buffer size
- * @throws IllegalArgumentException if {@code bufLen} is <= 0
+ * @throws IllegalArgumentException if {@code bufLen <= 0}
* @throws NullPointerException if {@code in} or {@code defl} is null
*/
public DeflaterInputStream(InputStream in, Deflater defl, int bufLen) {
@@ -163,8 +163,7 @@ public class DeflaterInputStream extends FilterInputStream {
* @param len maximum number of compressed bytes to read into {@code b}
* @return the actual number of bytes read, or -1 if the end of the
* uncompressed input stream is reached
- * @throws IndexOutOfBoundsException if {@code len} > {@code b.length -
- * off}
+ * @throws IndexOutOfBoundsException if {@code len > b.length - off}
* @throws IOException if an I/O error occurs or if this input stream is
* already closed
*/
diff --git a/jdk/src/share/classes/java/util/zip/DeflaterOutputStream.java b/jdk/src/share/classes/java/util/zip/DeflaterOutputStream.java
index c19a222e5dc..7cb0f8388c4 100644
--- a/jdk/src/share/classes/java/util/zip/DeflaterOutputStream.java
+++ b/jdk/src/share/classes/java/util/zip/DeflaterOutputStream.java
@@ -71,7 +71,7 @@ class DeflaterOutputStream extends FilterOutputStream {
* {@link Deflater#SYNC_FLUSH} before flushing the output
* stream, otherwise only flushes the output stream
*
- * @throws IllegalArgumentException if size is <= 0
+ * @throws IllegalArgumentException if {@code size <= 0}
*
* @since 1.7
*/
@@ -101,7 +101,7 @@ class DeflaterOutputStream extends FilterOutputStream {
* @param out the output stream
* @param def the compressor ("deflater")
* @param size the output buffer size
- * @exception IllegalArgumentException if size is <= 0
+ * @exception IllegalArgumentException if {@code size <= 0}
*/
public DeflaterOutputStream(OutputStream out, Deflater def, int size) {
this(out, def, size, false);
diff --git a/jdk/src/share/classes/java/util/zip/GZIPInputStream.java b/jdk/src/share/classes/java/util/zip/GZIPInputStream.java
index 74a5c60f1a8..b3d9240ba01 100644
--- a/jdk/src/share/classes/java/util/zip/GZIPInputStream.java
+++ b/jdk/src/share/classes/java/util/zip/GZIPInputStream.java
@@ -71,7 +71,7 @@ class GZIPInputStream extends InflaterInputStream {
* @exception ZipException if a GZIP format error has occurred or the
* compression method used is unsupported
* @exception IOException if an I/O error has occurred
- * @exception IllegalArgumentException if size is <= 0
+ * @exception IllegalArgumentException if {@code size <= 0}
*/
public GZIPInputStream(InputStream in, int size) throws IOException {
super(in, new Inflater(true), size);
diff --git a/jdk/src/share/classes/java/util/zip/GZIPOutputStream.java b/jdk/src/share/classes/java/util/zip/GZIPOutputStream.java
index d5edcf1226a..e454956a127 100644
--- a/jdk/src/share/classes/java/util/zip/GZIPOutputStream.java
+++ b/jdk/src/share/classes/java/util/zip/GZIPOutputStream.java
@@ -61,8 +61,7 @@ class GZIPOutputStream extends DeflaterOutputStream {
* @param out the output stream
* @param size the output buffer size
* @exception IOException If an I/O error has occurred.
- * @exception IllegalArgumentException if size is <= 0
-
+ * @exception IllegalArgumentException if {@code size <= 0}
*/
public GZIPOutputStream(OutputStream out, int size) throws IOException {
this(out, size, false);
@@ -81,7 +80,7 @@ class GZIPOutputStream extends DeflaterOutputStream {
* {@link Deflater#SYNC_FLUSH} before flushing the output
* stream, otherwise only flushes the output stream
* @exception IOException If an I/O error has occurred.
- * @exception IllegalArgumentException if size is <= 0
+ * @exception IllegalArgumentException if {@code size <= 0}
*
* @since 1.7
*/
diff --git a/jdk/src/share/classes/java/util/zip/InflaterInputStream.java b/jdk/src/share/classes/java/util/zip/InflaterInputStream.java
index b948905d0e8..23cb9d943d2 100644
--- a/jdk/src/share/classes/java/util/zip/InflaterInputStream.java
+++ b/jdk/src/share/classes/java/util/zip/InflaterInputStream.java
@@ -75,7 +75,7 @@ class InflaterInputStream extends FilterInputStream {
* @param in the input stream
* @param inf the decompressor ("inflater")
* @param size the input buffer size
- * @exception IllegalArgumentException if size is <= 0
+ * @exception IllegalArgumentException if {@code size <= 0}
*/
public InflaterInputStream(InputStream in, Inflater inf, int size) {
super(in);
@@ -191,7 +191,7 @@ class InflaterInputStream extends FilterInputStream {
* @param n the number of bytes to skip
* @return the actual number of bytes skipped.
* @exception IOException if an I/O error has occurred
- * @exception IllegalArgumentException if n < 0
+ * @exception IllegalArgumentException if {@code n < 0}
*/
public long skip(long n) throws IOException {
if (n < 0) {
diff --git a/jdk/src/share/classes/java/util/zip/InflaterOutputStream.java b/jdk/src/share/classes/java/util/zip/InflaterOutputStream.java
index ab90ccb0300..53f8b5dedee 100644
--- a/jdk/src/share/classes/java/util/zip/InflaterOutputStream.java
+++ b/jdk/src/share/classes/java/util/zip/InflaterOutputStream.java
@@ -97,7 +97,7 @@ public class InflaterOutputStream extends FilterOutputStream {
* @param out output stream to write the uncompressed data to
* @param infl decompressor ("inflater") for this stream
* @param bufLen decompression buffer size
- * @throws IllegalArgumentException if {@code bufLen} is <= 0
+ * @throws IllegalArgumentException if {@code bufLen <= 0}
* @throws NullPointerException if {@code out} or {@code infl} is null
*/
public InflaterOutputStream(OutputStream out, Inflater infl, int bufLen) {
@@ -211,8 +211,8 @@ public class InflaterOutputStream extends FilterOutputStream {
* the output stream
* @param off starting offset of the compressed data within {@code b}
* @param len number of bytes to decompress from {@code b}
- * @throws IndexOutOfBoundsException if {@code off} < 0, or if
- * {@code len} < 0, or if {@code len} > {@code b.length - off}
+ * @throws IndexOutOfBoundsException if {@code off < 0}, or if
+ * {@code len < 0}, or if {@code len > b.length - off}
* @throws IOException if an I/O error occurs or this stream is already
* closed
* @throws NullPointerException if {@code b} is null
diff --git a/jdk/src/share/classes/java/util/zip/ZipInputStream.java b/jdk/src/share/classes/java/util/zip/ZipInputStream.java
index 5c315d452c0..fee9f5108d3 100644
--- a/jdk/src/share/classes/java/util/zip/ZipInputStream.java
+++ b/jdk/src/share/classes/java/util/zip/ZipInputStream.java
@@ -232,7 +232,7 @@ class ZipInputStream extends InflaterInputStream implements ZipConstants {
* @return the actual number of bytes skipped
* @exception ZipException if a ZIP file error has occurred
* @exception IOException if an I/O error has occurred
- * @exception IllegalArgumentException if n < 0
+ * @exception IllegalArgumentException if {@code n < 0}
*/
public long skip(long n) throws IOException {
if (n < 0) {
diff --git a/jdk/src/share/classes/javax/crypto/spec/IvParameterSpec.java b/jdk/src/share/classes/javax/crypto/spec/IvParameterSpec.java
index e396c5b45f2..fa1eaedd2f2 100644
--- a/jdk/src/share/classes/javax/crypto/spec/IvParameterSpec.java
+++ b/jdk/src/share/classes/javax/crypto/spec/IvParameterSpec.java
@@ -68,7 +68,7 @@ public class IvParameterSpec implements AlgorithmParameterSpec {
* starts.
* @param len the number of IV bytes.
* @throws IllegalArgumentException if <code>iv</code> is <code>null</code>
- * or <code>(iv.length - offset < len)</code>
+ * or {@code (iv.length - offset < len)}
* @throws ArrayIndexOutOfBoundsException is thrown if <code>offset</code>
* or <code>len</code> index bytes outside the <code>iv</code>.
*/
diff --git a/jdk/src/share/classes/javax/crypto/spec/RC5ParameterSpec.java b/jdk/src/share/classes/javax/crypto/spec/RC5ParameterSpec.java
index 7248eefa804..499480c2c5f 100644
--- a/jdk/src/share/classes/javax/crypto/spec/RC5ParameterSpec.java
+++ b/jdk/src/share/classes/javax/crypto/spec/RC5ParameterSpec.java
@@ -80,7 +80,7 @@ public class RC5ParameterSpec implements AlgorithmParameterSpec {
* </code> bytes of the buffer are copied to protect against subsequent
* modification.
* @exception IllegalArgumentException if <code>iv</code> is
- * <code>null</code> or <code>(iv.length < 2 * (wordSize / 8))</code>
+ * <code>null</code> or {@code (iv.length < 2 * (wordSize / 8))}
*/
public RC5ParameterSpec(int version, int rounds, int wordSize, byte[] iv) {
this(version, rounds, wordSize, iv, 0);
@@ -107,7 +107,7 @@ public class RC5ParameterSpec implements AlgorithmParameterSpec {
* @param offset the offset in <code>iv</code> where the IV starts.
* @exception IllegalArgumentException if <code>iv</code> is
* <code>null</code> or
- * <code>(iv.length - offset < 2 * (wordSize / 8))</code>
+ * {@code (iv.length - offset < 2 * (wordSize / 8))}
*/
public RC5ParameterSpec(int version, int rounds, int wordSize,
byte[] iv, int offset) {
diff --git a/jdk/src/share/classes/javax/crypto/spec/SecretKeySpec.java b/jdk/src/share/classes/javax/crypto/spec/SecretKeySpec.java
index 827be0f5274..586399dea4f 100644
--- a/jdk/src/share/classes/javax/crypto/spec/SecretKeySpec.java
+++ b/jdk/src/share/classes/javax/crypto/spec/SecretKeySpec.java
@@ -130,7 +130,7 @@ public class SecretKeySpec implements KeySpec, SecretKey {
* for information about standard algorithm names.
* @exception IllegalArgumentException if <code>algorithm</code>
* is null or <code>key</code> is null, empty, or too short,
- * i.e. <code>key.length-offset<len</code>.
+ * i.e. {@code key.length-offset<len}.
* @exception ArrayIndexOutOfBoundsException is thrown if
* <code>offset</code> or <code>len</code> index bytes outside the
* <code>key</code>.
diff --git a/jdk/src/share/classes/javax/naming/BinaryRefAddr.java b/jdk/src/share/classes/javax/naming/BinaryRefAddr.java
index 541c0342094..711a834087b 100644
--- a/jdk/src/share/classes/javax/naming/BinaryRefAddr.java
+++ b/jdk/src/share/classes/javax/naming/BinaryRefAddr.java
@@ -89,9 +89,9 @@ public class BinaryRefAddr extends RefAddr {
* @param src The non-null contents of the address as a byte array.
* The contents of src is copied into the new BinaryRefAddr.
* @param offset The starting index in src to get the bytes.
- * 0 <= offset <= src.length.
+ * {@code 0 <= offset <= src.length}.
* @param count The number of bytes to extract from src.
- * 0 <= count <= src.length-offset.
+ * {@code 0 <= count <= src.length-offset}.
*/
public BinaryRefAddr(String addrType, byte[] src, int offset, int count) {
super(addrType);
diff --git a/jdk/src/share/classes/javax/naming/directory/Attribute.java b/jdk/src/share/classes/javax/naming/directory/Attribute.java
index fda9e3de264..6ed0d9ad530 100644
--- a/jdk/src/share/classes/javax/naming/directory/Attribute.java
+++ b/jdk/src/share/classes/javax/naming/directory/Attribute.java
@@ -265,7 +265,7 @@ public interface Attribute extends Cloneable, java.io.Serializable {
* If the attribute values are unordered,
* this method returns the value that happens to be at that index.
* @param ix The index of the value in the ordered list of attribute values.
- * 0 <= <tt>ix</tt> < <tt>size()</tt>.
+ * {@code 0 <= ix < size()}.
* @return The possibly null attribute value at index <tt>ix</tt>;
* null if the attribute value is null.
* @exception NamingException If a naming exception was encountered while
@@ -284,7 +284,7 @@ public interface Attribute extends Cloneable, java.io.Serializable {
* the front of the list (and their indices decremented by one).
*
* @param ix The index of the value to remove.
- * 0 <= <tt>ix</tt> < <tt>size()</tt>.
+ * {@code 0 <= ix < size()}.
* @return The possibly null attribute value at index <tt>ix</tt> that was removed;
* null if the attribute value is null.
* @exception IndexOutOfBoundsException If <tt>ix</tt> is outside the specified range.
@@ -302,7 +302,7 @@ public interface Attribute extends Cloneable, java.io.Serializable {
* <tt>IllegalStateException</tt> is thrown.
*
* @param ix The index in the ordered list of attribute values to add the new value.
- * 0 <= <tt>ix</tt> <= <tt>size()</tt>.
+ * {@code 0 <= ix <= size()}.
* @param attrVal The possibly null attribute value to add; if null, null is
* the value added.
* @exception IndexOutOfBoundsException If <tt>ix</tt> is outside the specified range.
@@ -322,7 +322,7 @@ public interface Attribute extends Cloneable, java.io.Serializable {
* In that case, <tt>IllegalStateException</tt> is thrown.
*
* @param ix The index of the value in the ordered list of attribute values.
- * 0 <= <tt>ix</tt> < <tt>size()</tt>.
+ * {@code 0 <= ix < size()}.
* @param attrVal The possibly null attribute value to use.
* If null, 'null' replaces the old value.
* @return The possibly null attribute value at index ix that was replaced.
diff --git a/jdk/src/share/classes/javax/naming/ldap/LdapName.java b/jdk/src/share/classes/javax/naming/ldap/LdapName.java
index 256f7530cdc..ce94537062d 100644
--- a/jdk/src/share/classes/javax/naming/ldap/LdapName.java
+++ b/jdk/src/share/classes/javax/naming/ldap/LdapName.java
@@ -443,7 +443,7 @@ public class LdapName implements Name {
* @throws InvalidNameException if <tt>suffix</tt> is not a valid LDAP
* name, or if the addition of the components would violate the
* syntax rules of this LDAP name.
- * @throws IndexOutOfBoundsException.
+ * @throws IndexOutOfBoundsException
* If posn is outside the specified range.
*/
public Name addAll(int posn, Name suffix)
@@ -474,7 +474,7 @@ public class LdapName implements Name {
* Must be in the range [0,size()].
*
* @return The updated name (not a new instance).
- * @throws IndexOutOfBoundsException.
+ * @throws IndexOutOfBoundsException
* If posn is outside the specified range.
*/
public Name addAll(int posn, List<Rdn> suffixRdns) {
@@ -527,7 +527,7 @@ public class LdapName implements Name {
* Must be in the range [0,size()].
* @return The updated LdapName, not a new instance.
* Cannot be null.
- * @exception IndexOutOfBoundsException.
+ * @exception IndexOutOfBoundsException
* If posn is outside the specified range.
* @exception InvalidNameException If adding comp at the
* specified position would violate the name's syntax.
diff --git a/jdk/src/share/classes/javax/naming/ldap/PagedResultsControl.java b/jdk/src/share/classes/javax/naming/ldap/PagedResultsControl.java
index 07e29b7a36f..18c08e59933 100644
--- a/jdk/src/share/classes/javax/naming/ldap/PagedResultsControl.java
+++ b/jdk/src/share/classes/javax/naming/ldap/PagedResultsControl.java
@@ -36,7 +36,7 @@ import com.sun.jndi.ldap.BerEncoder;
* at which it invokes search operations.
* <p>
* The following code sample shows how the class may be used:
- * <pre>
+ * <pre>{@code
*
* // Open an LDAP association
* LdapContext ctx = new InitialLdapContext();
@@ -89,13 +89,13 @@ import com.sun.jndi.ldap.BerEncoder;
* ctx.close();
* ...
*
- * </pre>
+ * } </pre>
* <p>
* This class implements the LDAPv3 Control for paged-results as defined in
* <a href="http://www.ietf.org/rfc/rfc2696.txt">RFC 2696</a>.
*
* The control's value has the following ASN.1 definition:
- * <pre>
+ * <pre>{@code
*
* realSearchControlValue ::= SEQUENCE {
* size INTEGER (0..maxInt),
@@ -104,7 +104,7 @@ import com.sun.jndi.ldap.BerEncoder;
* cookie OCTET STRING
* }
*
- * </pre>
+ * }</pre>
*
* @since 1.5
* @see PagedResultsResponseControl
diff --git a/jdk/src/share/classes/javax/naming/ldap/SortControl.java b/jdk/src/share/classes/javax/naming/ldap/SortControl.java
index 486600f72fd..3aef9fdd9ec 100644
--- a/jdk/src/share/classes/javax/naming/ldap/SortControl.java
+++ b/jdk/src/share/classes/javax/naming/ldap/SortControl.java
@@ -40,7 +40,7 @@ import com.sun.jndi.ldap.BerEncoder;
* then the search operation is not performed and an error is returned.
* <p>
* The following code sample shows how the class may be used:
- * <pre>
+ * <pre>{@code
*
* // Open an LDAP association
* LdapContext ctx = new InitialLdapContext();
@@ -85,7 +85,7 @@ import com.sun.jndi.ldap.BerEncoder;
* ctx.close();
* ...
*
- * </pre>
+ * }</pre>
* <p>
* This class implements the LDAPv3 Request Control for server-side sorting
* as defined in
diff --git a/jdk/src/share/classes/javax/net/ssl/SNIHostName.java b/jdk/src/share/classes/javax/net/ssl/SNIHostName.java
index 1d02104e172..588a8547e11 100644
--- a/jdk/src/share/classes/javax/net/ssl/SNIHostName.java
+++ b/jdk/src/share/classes/javax/net/ssl/SNIHostName.java
@@ -295,8 +295,8 @@ public final class SNIHostName extends SNIServerName {
* representing the hostname(s) to match
* @throws NullPointerException if {@code regex} is
* {@code null}
- * @throws PatternSyntaxException if the regular expression's syntax
- * is invalid
+ * @throws java.util.regex.PatternSyntaxException if the regular expression's
+ * syntax is invalid
*/
public static SNIMatcher createSNIMatcher(String regex) {
if (regex == null) {
diff --git a/jdk/src/share/classes/javax/net/ssl/SSLEngine.java b/jdk/src/share/classes/javax/net/ssl/SSLEngine.java
index 433361c6a6b..92e838623f4 100644
--- a/jdk/src/share/classes/javax/net/ssl/SSLEngine.java
+++ b/jdk/src/share/classes/javax/net/ssl/SSLEngine.java
@@ -211,7 +211,7 @@ import java.nio.ReadOnlyBufferException;
* that the source buffer has enough room to hold a record (enlarging if
* necessary), and then obtain more inbound data.
*
- * <pre>
+ * <pre>{@code
* SSLEngineResult r = engine.unwrap(src, dst);
* switch (r.getStatus()) {
* BUFFER_OVERFLOW:
@@ -238,7 +238,7 @@ import java.nio.ReadOnlyBufferException;
* break;
* // other cases: CLOSED, OK.
* }
- * </pre>
+ * }</pre>
*
* <P>
* Unlike <code>SSLSocket</code>, all methods of SSLEngine are
@@ -442,7 +442,7 @@ public abstract class SSLEngine {
* <blockquote><pre>
* {@link #wrap(ByteBuffer [], int, int, ByteBuffer)
* engine.wrap(new ByteBuffer [] { src }, 0, 1, dst);}
- * </pre</blockquote>
+ * </pre></blockquote>
*
* @param src
* a <code>ByteBuffer</code> containing outbound application data
@@ -478,7 +478,7 @@ public abstract class SSLEngine {
* <blockquote><pre>
* {@link #wrap(ByteBuffer [], int, int, ByteBuffer)
* engine.wrap(srcs, 0, srcs.length, dst);}
- * </pre</blockquote>
+ * </pre></blockquote>
*
* @param srcs
* an array of <code>ByteBuffers</code> containing the
@@ -597,7 +597,7 @@ public abstract class SSLEngine {
* <blockquote><pre>
* {@link #unwrap(ByteBuffer, ByteBuffer [], int, int)
* engine.unwrap(src, new ByteBuffer [] { dst }, 0, 1);}
- * </pre</blockquote>
+ * </pre></blockquote>
*
* @param src
* a <code>ByteBuffer</code> containing inbound network data.
@@ -633,7 +633,7 @@ public abstract class SSLEngine {
* <blockquote><pre>
* {@link #unwrap(ByteBuffer, ByteBuffer [], int, int)
* engine.unwrap(src, dsts, 0, dsts.length);}
- * </pre</blockquote>
+ * </pre></blockquote>
*
* @param src
* a <code>ByteBuffer</code> containing inbound network data.
diff --git a/jdk/src/share/classes/javax/net/ssl/SSLEngineResult.java b/jdk/src/share/classes/javax/net/ssl/SSLEngineResult.java
index 45dcddbdeca..93ad6a7b383 100644
--- a/jdk/src/share/classes/javax/net/ssl/SSLEngineResult.java
+++ b/jdk/src/share/classes/javax/net/ssl/SSLEngineResult.java
@@ -173,7 +173,7 @@ public class SSLEngineResult {
*
* @throws IllegalArgumentException
* if the <code>status</code> or <code>handshakeStatus</code>
- * arguments are null, or if <<code>bytesConsumed</code> or
+ * arguments are null, or if <code>bytesConsumed</code> or
* <code>bytesProduced</code> is negative.
*/
public SSLEngineResult(Status status, HandshakeStatus handshakeStatus,
diff --git a/jdk/src/share/classes/javax/net/ssl/SSLSessionContext.java b/jdk/src/share/classes/javax/net/ssl/SSLSessionContext.java
index 61f1ddcccce..3459545e96d 100644
--- a/jdk/src/share/classes/javax/net/ssl/SSLSessionContext.java
+++ b/jdk/src/share/classes/javax/net/ssl/SSLSessionContext.java
@@ -90,7 +90,7 @@ public interface SSLSessionContext {
* @param seconds the new session timeout limit in seconds; zero means
* there is no limit.
*
- * @exception IllegalArgumentException if the timeout specified is < 0.
+ * @exception IllegalArgumentException if the timeout specified is {@code < 0}.
* @see #getSessionTimeout
*/
public void setSessionTimeout(int seconds)
@@ -122,7 +122,7 @@ public interface SSLSessionContext {
*
* @param size the new session cache size limit; zero means there is no
* limit.
- * @exception IllegalArgumentException if the specified size is < 0.
+ * @exception IllegalArgumentException if the specified size is {@code < 0}.
* @see #getSessionCacheSize
*/
public void setSessionCacheSize(int size)
diff --git a/jdk/src/share/classes/javax/script/ScriptEngineFactory.java b/jdk/src/share/classes/javax/script/ScriptEngineFactory.java
index ae064acf9b7..ca22d163590 100644
--- a/jdk/src/share/classes/javax/script/ScriptEngineFactory.java
+++ b/jdk/src/share/classes/javax/script/ScriptEngineFactory.java
@@ -144,8 +144,7 @@ public interface ScriptEngineFactory {
* of the supported scripting language. For instance, an implementaton for a Javascript
* engine might be;
* <p>
- * <pre>
- * <code>
+ * <pre>{@code
* public String getMethodCallSyntax(String obj,
* String m, String... args) {
* String ret = obj;
@@ -159,8 +158,7 @@ public interface ScriptEngineFactory {
* ret += ")";
* return ret;
* }
- *</code>
- *</pre>
+ * } </pre>
* <p>
*
* @param obj The name representing the object whose method is to be invoked. The
@@ -200,17 +198,17 @@ public interface ScriptEngineFactory {
* Returns A valid scripting language executable progam with given statements.
* For instance an implementation for a PHP engine might be:
* <p>
- * <pre><code>
+ * <pre>{@code
* public String getProgram(String... statements) {
- * $retval = "<?\n";
+ * $retval = "<?\n";
* int len = statements.length;
* for (int i = 0; i < len; i++) {
* $retval += statements[i] + ";\n";
* }
- * $retval += "?>";
+ * $retval += "?>";
*
* }
- * </code></pre>
+ * }</pre>
*
* @param statements The statements to be executed. May be return values of
* calls to the <code>getMethodCallSyntax</code> and <code>getOutputStatement</code> methods.
diff --git a/jdk/src/share/classes/javax/security/auth/callback/CallbackHandler.java b/jdk/src/share/classes/javax/security/auth/callback/CallbackHandler.java
index 4c6e9a271fa..843accac99b 100644
--- a/jdk/src/share/classes/javax/security/auth/callback/CallbackHandler.java
+++ b/jdk/src/share/classes/javax/security/auth/callback/CallbackHandler.java
@@ -79,7 +79,7 @@ public interface CallbackHandler {
* This example code is for guidance only. Many details,
* including proper error handling, are left out for simplicity.
*
- * <pre>
+ * <pre>{@code
* public void handle(Callback[] callbacks)
* throws IOException, UnsupportedCallbackException {
*
@@ -133,7 +133,7 @@ public interface CallbackHandler {
* private char[] readPassword(InputStream in) throws IOException {
* // insert code to read a user password from the input stream
* }
- * </pre>
+ * }</pre>
*
* @param callbacks an array of <code>Callback</code> objects provided
* by an underlying security service which contains
diff --git a/jdk/src/share/classes/javax/security/sasl/Sasl.java b/jdk/src/share/classes/javax/security/sasl/Sasl.java
index 6bdc104b98a..bb9fb2eec04 100644
--- a/jdk/src/share/classes/javax/security/sasl/Sasl.java
+++ b/jdk/src/share/classes/javax/security/sasl/Sasl.java
@@ -278,7 +278,7 @@ public class Sasl {
*
* This method uses the
<a href="{@docRoot}/../technotes/guides/security/crypto/CryptoSpec.html#Provider">JCA Security Provider Framework</a>, described in the
- * "Java Cryptography Architecture API Specification & Reference", for
+ * "Java Cryptography Architecture API Specification & Reference", for
* locating and selecting a <tt>SaslClient</tt> implementation.
*
* First, it
@@ -303,7 +303,7 @@ public class Sasl {
* <tt>SaslClientFactory.DIGEST-MD5 com.wiz.sasl.digest.ClientFactory</tt>
*<p>
* See the
- * "Java Cryptography Architecture API Specification & Reference"
+ * "Java Cryptography Architecture API Specification & Reference"
* for information about how to install and configure security service
* providers.
*
@@ -428,7 +428,7 @@ public class Sasl {
* This method uses the
<a href="{@docRoot}/../technotes/guides/security/crypto/CryptoSpec.html#Provider">JCA Security Provider Framework</a>,
* described in the
- * "Java Cryptography Architecture API Specification & Reference", for
+ * "Java Cryptography Architecture API Specification & Reference", for
* locating and selecting a <tt>SaslServer</tt> implementation.
*
* First, it
@@ -453,7 +453,7 @@ public class Sasl {
* <tt>SaslServerFactory.DIGEST-MD5 com.wiz.sasl.digest.ServerFactory</tt>
*<p>
* See the
- * "Java Cryptography Architecture API Specification & Reference"
+ * "Java Cryptography Architecture API Specification & Reference"
* for information about how to install and configure security
* service providers.
*
diff --git a/jdk/src/share/classes/javax/security/sasl/SaslClient.java b/jdk/src/share/classes/javax/security/sasl/SaslClient.java
index 010246c4b13..10f8d3dc3c2 100644
--- a/jdk/src/share/classes/javax/security/sasl/SaslClient.java
+++ b/jdk/src/share/classes/javax/security/sasl/SaslClient.java
@@ -38,13 +38,13 @@ package javax.security.sasl;
*<p>
* Here's an example of how an LDAP library might use a <tt>SaslClient</tt>.
* It first gets an instance of a <tt>SaslClient</tt>:
- *<blockquote><pre>
+ *<blockquote><pre>{@code
* SaslClient sc = Sasl.createSaslClient(mechanisms,
* authorizationId, protocol, serverName, props, callbackHandler);
- *</pre></blockquote>
+ *}</pre></blockquote>
* It can then proceed to use the client for authentication.
* For example, an LDAP library might use the client as follows:
- *<blockquote><pre>
+ *<blockquote><pre>{@code
* // Get initial response and send to server
* byte[] response = (sc.hasInitialResponse() ? sc.evaluateChallenge(new byte[0]) :
* null);
@@ -74,7 +74,7 @@ package javax.security.sasl;
* ldap.out = new SecureOutputStream(sc, ldap.out);
* }
* }
- *</pre></blockquote>
+ *}</pre></blockquote>
*
* If the mechanism has an initial response, the library invokes
* <tt>evaluateChallenge()</tt> with an empty
diff --git a/jdk/src/share/classes/javax/security/sasl/SaslServer.java b/jdk/src/share/classes/javax/security/sasl/SaslServer.java
index 54ba6843411..ec5d20a230d 100644
--- a/jdk/src/share/classes/javax/security/sasl/SaslServer.java
+++ b/jdk/src/share/classes/javax/security/sasl/SaslServer.java
@@ -47,7 +47,7 @@ package javax.security.sasl;
* For example, suppose the LDAP server received an LDAP BIND request
* containing the name of the SASL mechanism and an (optional) initial
* response. It then might use the server as follows:
- *<blockquote><pre>
+ *<blockquote><pre>{@code
* while (!ss.isComplete()) {
* try {
* byte[] challenge = ss.evaluateResponse(response);
@@ -75,7 +75,7 @@ package javax.security.sasl;
* ldap.out = new SecureOutputStream(ss, ldap.out);
* }
* }
- *</pre></blockquote>
+ *}</pre></blockquote>
*
* @since 1.5
*
diff --git a/jdk/src/share/classes/javax/smartcardio/ResponseAPDU.java b/jdk/src/share/classes/javax/smartcardio/ResponseAPDU.java
index 94859e83098..7caa52eb5d6 100644
--- a/jdk/src/share/classes/javax/smartcardio/ResponseAPDU.java
+++ b/jdk/src/share/classes/javax/smartcardio/ResponseAPDU.java
@@ -121,7 +121,7 @@ public final class ResponseAPDU implements java.io.Serializable {
* Returns the value of the status bytes SW1 and SW2 as a single
* status word SW.
* It is defined as
- * <code>(getSW1() << 8) | getSW2()</code>.
+ * {@code (getSW1() << 8) | getSW2()}
*
* @return the value of the status word SW.
*/
diff --git a/jdk/src/share/classes/javax/sql/DataSource.java b/jdk/src/share/classes/javax/sql/DataSource.java
index d4d9d70ddd4..8235d2a2779 100644
--- a/jdk/src/share/classes/javax/sql/DataSource.java
+++ b/jdk/src/share/classes/javax/sql/DataSource.java
@@ -82,7 +82,7 @@ public interface DataSource extends CommonDataSource, Wrapper {
*
* @return a connection to the data source
* @exception SQLException if a database access error occurs
- * @throws SQLTimeoutException when the driver has determined that the
+ * @throws java.sql.SQLTimeoutException when the driver has determined that the
* timeout value specified by the {@code setLoginTimeout} method
* has been exceeded and has at least tried to cancel the
* current database connection attempt
@@ -98,7 +98,7 @@ public interface DataSource extends CommonDataSource, Wrapper {
* @param password the user's password
* @return a connection to the data source
* @exception SQLException if a database access error occurs
- * @throws SQLTimeoutException when the driver has determined that the
+ * @throws java.sql.SQLTimeoutException when the driver has determined that the
* timeout value specified by the {@code setLoginTimeout} method
* has been exceeded and has at least tried to cancel the
* current database connection attempt
diff --git a/jdk/src/share/classes/javax/sql/rowset/BaseRowSet.java b/jdk/src/share/classes/javax/sql/rowset/BaseRowSet.java
index 1019b8de19f..a3b13fa0f5c 100644
--- a/jdk/src/share/classes/javax/sql/rowset/BaseRowSet.java
+++ b/jdk/src/share/classes/javax/sql/rowset/BaseRowSet.java
@@ -109,10 +109,10 @@ import javax.sql.rowset.serial.*;
* <code>CachedRowSet</code><sup><font size=-2>TM</font></sup>
* object <code>crs</code> might have its command property set. Note that if a
* tool is used to set properties, this is the code that the tool would use.
- * <PRE>
+ * <PRE>{@code
* crs.setCommand("SELECT FIRST_NAME, LAST_NAME, ADDRESS FROM CUSTOMERS" +
* "WHERE CREDIT_LIMIT > ? AND REGION = ?");
- * </PRE>
+ * }</PRE>
* <P>
* In this example, the values for <code>CREDIT_LIMIT</code> and
* <code>REGION</code> are placeholder parameters, which are indicated with a
@@ -129,16 +129,16 @@ import javax.sql.rowset.serial.*;
* <P>
* The following code fragment demonstrates
* setting the two parameters in the query from the previous example.
- * <PRE>
+ * <PRE>{@code
* crs.setInt(1, 5000);
* crs.setString(2, "West");
- * </PRE>
+ * }</PRE>
* If the <code>execute</code> method is called at this point, the query
* sent to the DBMS will be:
- * <PRE>
+ * <PRE>{@code
* "SELECT FIRST_NAME, LAST_NAME, ADDRESS FROM CUSTOMERS" +
* "WHERE CREDIT_LIMIT > 5000 AND REGION = 'West'"
- * </PRE>
+ * }</PRE>
* NOTE: Setting <code>Array</code>, <code>Clob</code>, <code>Blob</code> and
* <code>Ref</code> objects as a command parameter, stores these values as
* <code>SerialArray</code>, <code>SerialClob</code>, <code>SerialBlob</code>
@@ -158,7 +158,7 @@ import javax.sql.rowset.serial.*;
* When the method <code>execute</code> is called, the values in the
* <code>Hashtable</code> object are substituted for the appropriate placeholder
* parameters in the command.
- * <P)>
+ * <P>
* A call to the method <code>getParams</code> returns the values stored in the
* <code>Hashtable</code> object as an array of <code>Object</code> instances.
* An element in this array may be a simple <code>Object</code> instance or an
@@ -2535,7 +2535,7 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
* specific abstract data types.
* <P>
* The parameter value set by this method is stored internally and
- * will be supplied as the appropriate parameter in this <code>RowSet</code
+ * will be supplied as the appropriate parameter in this <code>RowSet</code>
* object's command when the method <code>execute</code> is called.
* Methods such as <code>execute</code> and <code>populate</code> must be
* provided in any class that extends this class and implements one or
diff --git a/jdk/src/share/classes/javax/sql/rowset/CachedRowSet.java b/jdk/src/share/classes/javax/sql/rowset/CachedRowSet.java
index 7861223911b..1a8517520a2 100644
--- a/jdk/src/share/classes/javax/sql/rowset/CachedRowSet.java
+++ b/jdk/src/share/classes/javax/sql/rowset/CachedRowSet.java
@@ -118,7 +118,7 @@ import javax.sql.rowset.spi.*;
* <P>
* There are two ways for a <code>CachedRowSet</code> object to specify which
* <code>SyncProvider</code> object it will use.
- * <UL)
+ * <UL>
* <LI>Supplying the name of the implementation to the constructor<BR>
* The following line of code creates the <code>CachedRowSet</code>
* object <i>crs2</i> that is initialized with default values except that its
@@ -135,7 +135,7 @@ import javax.sql.rowset.spi.*;
* <PRE>
* crs.setSyncProvider("com.fred.providers.HighAvailabilityProvider");
* </PRE>
- * </UL)
+ * </UL>
* See the comments for <code>SyncFactory</code> and <code>SyncProvider</code> for
* more details.
*
@@ -426,10 +426,10 @@ import javax.sql.rowset.spi.*;
* The following code fragment illustrates how the <code>CachedRowSet</code>
* object <code>crs</code> might have its command property set. Note that if a
* tool is used to set properties, this is the code that the tool would use.
- * <PRE>
+ * <PRE>{@code
* crs.setCommand("SELECT FIRST_NAME, LAST_NAME, ADDRESS FROM CUSTOMERS " +
* "WHERE CREDIT_LIMIT > ? AND REGION = ?");
- * </PRE>
+ * } </PRE>
* <P>
* The values that will be used to set the command's placeholder parameters are
* contained in the <code>RowSet</code> object's <code>params</code> field, which is a
@@ -457,7 +457,7 @@ import javax.sql.rowset.spi.*;
* The following code fragment gives an idea of how the reader
* does this, after obtaining the <code>Connection</code> object
* <code>con</code>.
- * <PRE>
+ * <PRE>{@code
* PreparedStatement pstmt = con.prepareStatement(crs.getCommand());
* reader.decodeParams();
* // decodeParams figures out which setter methods to use and does something
@@ -465,16 +465,16 @@ import javax.sql.rowset.spi.*;
* // for (i = 0; i < params.length; i++) {
* // pstmt.setObject(i + 1, params[i]);
* // }
- * </PRE>
+ * }</PRE>
* <P>
- * At this point, the command for <code>crs</code> is the query <code>"SELECT
+ * At this point, the command for <code>crs</code> is the query {@code "SELECT
* FIRST_NAME, LAST_NAME, ADDRESS FROM CUSTOMERS WHERE CREDIT_LIMIT > 5000
- * AND REGION = "West"</code>. After the <code>readData</code> method executes
+ * AND REGION = "West"}. After the <code>readData</code> method executes
* this command with the following line of code, it will have the data from
* <code>rs</code> with which to populate <code>crs</code>.
- * <PRE>
+ * <PRE>{@code
* ResultSet rs = pstmt.executeQuery();
- * </PRE>
+ * }</PRE>
* <P>
* The preceding code fragments give an idea of what goes on behind the
* scenes; they would not appear in an application, which would not invoke
@@ -484,13 +484,13 @@ import javax.sql.rowset.spi.*;
* the command. Simply by calling the <code>execute</code> method,
* <code>crs</code> populates itself with the requested data from the
* table <code>CUSTOMERS</code>.
- * <PRE>
+ * <PRE>{@code
* crs.setCommand("SELECT FIRST_NAME, LAST_NAME, ADDRESS FROM CUSTOMERS" +
* "WHERE CREDIT_LIMIT > ? AND REGION = ?");
* crs.setInt(1, 5000);
* crs.setString(2, "West");
* crs.execute();
- * </PRE>
+ * }</PRE>
*
* <h3>10.0 Paging Data</h3>
* Because a <code>CachedRowSet</code> object stores data in memory,
diff --git a/jdk/src/share/classes/javax/sql/rowset/Predicate.java b/jdk/src/share/classes/javax/sql/rowset/Predicate.java
index a9672c98e10..eb747602eb0 100644
--- a/jdk/src/share/classes/javax/sql/rowset/Predicate.java
+++ b/jdk/src/share/classes/javax/sql/rowset/Predicate.java
@@ -53,8 +53,7 @@ import java.sql.*;
* and application motivated implementations of <code>Predicate</code> to emerge.
* <p>
* A sample implementation would look something like this:
- * <pre>
- * <code>
+ * <pre>{@code
* public class Range implements Predicate {
*
* private Object lo[];
@@ -79,19 +78,19 @@ import java.sql.*;
* if ((rs.getObject(idx[i]) >= lo[i]) &&
* (rs.getObject(idx[i]) >= hi[i]) {
* bool1 = true; // within filter constraints
+ * } else {
+ * bool2 = true; // outside of filter constraints
+ * }
+ * }
+ *
+ * if (bool2) {
+ * return false;
* } else {
- * bool2 = true; // outside of filter constraints
+ * return true;
* }
* }
- *
- * if (bool2) {
- * return false;
- * } else {
- * return true;
- * }
* }
- * </code>
- * </pre>
+ * }</pre>
* <P>
* The example above implements a simple range predicate. Note, that
* implementations should but are not required to provider <code>String</code>
diff --git a/jdk/src/share/classes/javax/sql/rowset/RowSetMetaDataImpl.java b/jdk/src/share/classes/javax/sql/rowset/RowSetMetaDataImpl.java
index e1b78a9202c..a5c998170c3 100644
--- a/jdk/src/share/classes/javax/sql/rowset/RowSetMetaDataImpl.java
+++ b/jdk/src/share/classes/javax/sql/rowset/RowSetMetaDataImpl.java
@@ -159,7 +159,7 @@ public class RowSetMetaDataImpl implements RowSetMetaData, Serializable {
* @param property <code>true</code> if the given column is
* automatically incremented; <code>false</code>
* otherwise
- * @throws <code>SQLException</code> if a database access error occurs or
+ * @throws SQLException if a database access error occurs or
* the given index is out of bounds
*/
public void setAutoIncrement(int columnIndex, boolean property) throws SQLException {
@@ -195,7 +195,7 @@ public class RowSetMetaDataImpl implements RowSetMetaData, Serializable {
* value can be used in a <code>WHERE</code> clause;
* <code>false</code> otherwise
*
- * @throws <code>SQLException</code> if a database access error occurs or
+ * @throws SQLException if a database access error occurs or
* the given column number is out of bounds
*/
public void setSearchable(int columnIndex, boolean property)
@@ -212,7 +212,7 @@ public class RowSetMetaDataImpl implements RowSetMetaData, Serializable {
* must be between <code>1</code> and the number of columns,
* inclusive between <code>1</code> and the number of columns, inclusive
* @param property true if the value is a cash value; false otherwise.
- * @throws <code>SQLException</code> if a database access error occurs
+ * @throws SQLException if a database access error occurs
* or the given column number is out of bounds
*/
public void setCurrency(int columnIndex, boolean property)
@@ -233,7 +233,7 @@ public class RowSetMetaDataImpl implements RowSetMetaData, Serializable {
* <code>columnNullable</code>, or
* <code>columnNullableUnknown</code>
*
- * @throws <code>SQLException</code> if a database access error occurs,
+ * @throws SQLException if a database access error occurs,
* the given column number is out of bounds, or the value supplied
* for the <i>property</i> parameter is not one of the following
* constants:
diff --git a/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java b/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java
index 10e6158e77b..e9b10bdcbfb 100644
--- a/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java
+++ b/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java
@@ -627,8 +627,6 @@ public class SyncFactory {
* required
* @throws java.lang.SecurityException if a security manager exists and its
* {@code checkPermission} method denies calling {@code setLogger}
- * @throws java.util.logging.LoggingPermission if a security manager exists and its
- * {@code checkPermission} method denies calling {@code setLevel}
* @throws NullPointerException if the logger is null
* @see SecurityManager#checkPermission
* @see LoggingPermission
diff --git a/jdk/src/share/classes/javax/sql/rowset/spi/SyncResolver.java b/jdk/src/share/classes/javax/sql/rowset/spi/SyncResolver.java
index 87b5393a725..c1180cf9251 100644
--- a/jdk/src/share/classes/javax/sql/rowset/spi/SyncResolver.java
+++ b/jdk/src/share/classes/javax/sql/rowset/spi/SyncResolver.java
@@ -193,7 +193,7 @@ import java.sql.SQLException;
* code fragment, the value in <i>crs</i> is the one set as the resolved value, which means
* that it will be used to overwrite the conflict value in the data source.
*
- * <PRE>
+ * <PRE>{@code
* try {
*
* crs.acceptChanges(con);
@@ -202,8 +202,8 @@ import java.sql.SQLException;
*
* SyncResolver resolver = spe.getSyncResolver();
*
- * Object crsValue; // value in the <code>RowSet</code> object
- * Object resolverValue: // value in the <code>SyncResolver</code> object
+ * Object crsValue; // value in the RowSet object
+ * Object resolverValue: // value in the SyncResolver object
* Object resolvedValue: // value to be persisted
*
* while(resolver.nextConflict()) {
@@ -227,7 +227,7 @@ import java.sql.SQLException;
* }
* }
* }
- * </PRE>
+ * }</PRE>
* @author Jonathan Bruce
*/
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/Manifest.java b/jdk/src/share/classes/javax/xml/crypto/dsig/Manifest.java
index 7df2c230681..8c7662640be 100644
--- a/jdk/src/share/classes/javax/xml/crypto/dsig/Manifest.java
+++ b/jdk/src/share/classes/javax/xml/crypto/dsig/Manifest.java
@@ -35,15 +35,15 @@ import java.util.List;
* the <a href="http://www.w3.org/TR/xmldsig-core/">
* W3C Recommendation for XML-Signature Syntax and Processing</a>.
* The XML Schema Definition is defined as:
- * <pre><code>
- * <element name="Manifest" type="ds:ManifestType"/>
- * <complexType name="ManifestType">
- * <sequence>
- * <element ref="ds:Reference" maxOccurs="unbounded"/>
- * </sequence>
- * <attribute name="Id" type="ID" use="optional"/>
- * </complexType>
- * </code></pre>
+ * <pre>{@code
+ * <element name="Manifest" type="ds:ManifestType"/>
+ * <complexType name="ManifestType">
+ * <sequence>
+ * <element ref="ds:Reference" maxOccurs="unbounded"/>
+ * </sequence>
+ * <attribute name="Id" type="ID" use="optional"/>
+ * </complexType>
+ * }</pre>
*
* A <code>Manifest</code> instance may be created by invoking
* one of the {@link XMLSignatureFactory#newManifest newManifest}