8076224: some tidy warnings from core libs
Summary: minor HTML markup fix
Reviewed-by: rriggs, lancea
--- a/jdk/src/java.base/share/classes/java/lang/Runtime.java Tue Apr 28 10:12:15 2015 -0700
+++ b/jdk/src/java.base/share/classes/java/lang/Runtime.java Tue Apr 28 21:30:10 2015 +0400
@@ -32,9 +32,9 @@
/**
* Every Java application has a single instance of class
- * <code>Runtime</code> that allows the application to interface with
+ * {@code Runtime} that allows the application to interface with
* the environment in which the application is running. The current
- * runtime can be obtained from the <code>getRuntime</code> method.
+ * runtime can be obtained from the {@code getRuntime} method.
* <p>
* An application cannot create its own instance of this class.
*
@@ -48,10 +48,10 @@
/**
* Returns the runtime object associated with the current Java application.
- * Most of the methods of class <code>Runtime</code> are instance
+ * Most of the methods of class {@code Runtime} are instance
* methods and must be invoked with respect to the current runtime object.
*
- * @return the <code>Runtime</code> object associated with the current
+ * @return the {@code Runtime} object associated with the current
* Java application.
*/
public static Runtime getRuntime() {
@@ -72,8 +72,7 @@
* if any, are started in some unspecified order and allowed to run
* concurrently until they finish. In the second phase all uninvoked
* finalizers are run if {@link #runFinalizersOnExit finalization-on-exit}
- * has been enabled. Once this is done the virtual machine {@link #halt
- * halts}.
+ * has been enabled. Once this is done the virtual machine {@link #halt halts}.
*
* <p> If this method is invoked after the virtual machine has begun its
* shutdown sequence then if shutdown hooks are being run this method will
@@ -82,7 +81,7 @@
* with the given status code if the status is nonzero; otherwise, it
* blocks indefinitely.
*
- * <p> The <tt>{@link System#exit(int) System.exit}</tt> method is the
+ * <p> The {@link System#exit(int) System.exit} method is the
* conventional and convenient means of invoking this method.
*
* @param status
@@ -90,8 +89,8 @@
* indicates abnormal termination.
*
* @throws SecurityException
- * If a security manager is present and its <tt>{@link
- * SecurityManager#checkExit checkExit}</tt> method does not permit
+ * If a security manager is present and its
+ * {@link SecurityManager#checkExit checkExit} method does not permit
* exiting with the specified status
*
* @see java.lang.SecurityException
@@ -118,11 +117,11 @@
* <ul>
*
* <li> The program <i>exits</i> normally, when the last non-daemon
- * thread exits or when the <tt>{@link #exit exit}</tt> (equivalently,
+ * thread exits or when the {@link #exit exit} (equivalently,
* {@link System#exit(int) System.exit}) method is invoked, or
*
* <li> The virtual machine is <i>terminated</i> in response to a
- * user interrupt, such as typing <tt>^C</tt>, or a system-wide event,
+ * user interrupt, such as typing {@code ^C}, or a system-wide event,
* such as user logoff or system shutdown.
*
* </ul>
@@ -134,17 +133,16 @@
* run all uninvoked finalizers if finalization-on-exit has been enabled.
* Finally, the virtual machine will halt. Note that daemon threads will
* continue to run during the shutdown sequence, as will non-daemon threads
- * if shutdown was initiated by invoking the <tt>{@link #exit exit}</tt>
- * method.
+ * if shutdown was initiated by invoking the {@link #exit exit} method.
*
* <p> Once the shutdown sequence has begun it can be stopped only by
- * invoking the <tt>{@link #halt halt}</tt> method, which forcibly
+ * invoking the {@link #halt halt} method, which forcibly
* terminates the virtual machine.
*
* <p> Once the shutdown sequence has begun it is impossible to register a
* new shutdown hook or de-register a previously-registered hook.
* Attempting either of these operations will cause an
- * <tt>{@link IllegalStateException}</tt> to be thrown.
+ * {@link IllegalStateException} to be thrown.
*
* <p> Shutdown hooks run at a delicate time in the life cycle of a virtual
* machine and should therefore be coded defensively. They should, in
@@ -156,7 +154,7 @@
* deadlocks.
*
* <p> Shutdown hooks should also finish their work quickly. When a
- * program invokes <tt>{@link #exit exit}</tt> the expectation is
+ * program invokes {@link #exit exit} the expectation is
* that the virtual machine will promptly shut down and exit. When the
* virtual machine is terminated due to user logoff or system shutdown the
* underlying operating system may only allow a fixed amount of time in
@@ -165,17 +163,17 @@
* hook.
*
* <p> Uncaught exceptions are handled in shutdown hooks just as in any
- * other thread, by invoking the <tt>{@link ThreadGroup#uncaughtException
- * uncaughtException}</tt> method of the thread's <tt>{@link
- * ThreadGroup}</tt> object. The default implementation of this method
- * prints the exception's stack trace to <tt>{@link System#err}</tt> and
+ * other thread, by invoking the
+ * {@link ThreadGroup#uncaughtException uncaughtException} method of the
+ * thread's {@link ThreadGroup} object. The default implementation of this
+ * method prints the exception's stack trace to {@link System#err} and
* terminates the thread; it does not cause the virtual machine to exit or
* halt.
*
* <p> In rare circumstances the virtual machine may <i>abort</i>, that is,
* stop running without shutting down cleanly. This occurs when the
* virtual machine is terminated externally, for example with the
- * <tt>SIGKILL</tt> signal on Unix or the <tt>TerminateProcess</tt> call on
+ * {@code SIGKILL} signal on Unix or the {@code TerminateProcess} call on
* Microsoft Windows. The virtual machine may also abort if a native
* method goes awry by, for example, corrupting internal data structures or
* attempting to access nonexistent memory. If the virtual machine aborts
@@ -183,7 +181,7 @@
* will be run.
*
* @param hook
- * An initialized but unstarted <tt>{@link Thread}</tt> object
+ * An initialized but unstarted {@link Thread} object
*
* @throws IllegalArgumentException
* If the specified hook has already been registered,
@@ -196,7 +194,7 @@
*
* @throws SecurityException
* If a security manager is present and it denies
- * <tt>{@link RuntimePermission}("shutdownHooks")</tt>
+ * {@link RuntimePermission}("shutdownHooks")
*
* @see #removeShutdownHook
* @see #halt(int)
@@ -212,11 +210,11 @@
}
/**
- * De-registers a previously-registered virtual-machine shutdown hook. <p>
+ * De-registers a previously-registered virtual-machine shutdown hook.
*
* @param hook the hook to remove
- * @return <tt>true</tt> if the specified hook had previously been
- * registered and was successfully de-registered, <tt>false</tt>
+ * @return {@code true} if the specified hook had previously been
+ * registered and was successfully de-registered, {@code false}
* otherwise.
*
* @throws IllegalStateException
@@ -225,7 +223,7 @@
*
* @throws SecurityException
* If a security manager is present and it denies
- * <tt>{@link RuntimePermission}("shutdownHooks")</tt>
+ * {@link RuntimePermission}("shutdownHooks")
*
* @see #addShutdownHook
* @see #exit(int)
@@ -244,23 +242,23 @@
* method never returns normally.
*
* <p> This method should be used with extreme caution. Unlike the
- * <tt>{@link #exit exit}</tt> method, this method does not cause shutdown
+ * {@link #exit exit} method, this method does not cause shutdown
* hooks to be started and does not run uninvoked finalizers if
* finalization-on-exit has been enabled. If the shutdown sequence has
* already been initiated then this method does not wait for any running
* shutdown hooks or finalizers to finish their work.
*
* @param status
- * Termination status. By convention, a nonzero status code
- * indicates abnormal termination. If the <tt>{@link Runtime#exit
- * exit}</tt> (equivalently, <tt>{@link System#exit(int)
- * System.exit}</tt>) method has already been invoked then this
- * status code will override the status code passed to that method.
+ * Termination status. By convention, a nonzero status code
+ * indicates abnormal termination. If the {@link Runtime#exit exit}
+ * (equivalently, {@link System#exit(int) System.exit}) method
+ * has already been invoked then this status code
+ * will override the status code passed to that method.
*
* @throws SecurityException
- * If a security manager is present and its <tt>{@link
- * SecurityManager#checkExit checkExit}</tt> method does not permit
- * an exit with the specified status
+ * If a security manager is present and its
+ * {@link SecurityManager#checkExit checkExit} method
+ * does not permit an exit with the specified status
*
* @see #exit
* @see #addShutdownHook
@@ -282,7 +280,7 @@
* By default, finalization on exit is disabled.
*
* <p>If there is a security manager,
- * its <code>checkExit</code> method is first called
+ * its {@code checkExit} method is first called
* with 0 as its argument to ensure the exit is allowed.
* This could result in a SecurityException.
*
@@ -293,7 +291,7 @@
* behavior or deadlock.
*
* @throws SecurityException
- * if a security manager exists and its <code>checkExit</code>
+ * if a security manager exists and its {@code checkExit}
* method doesn't allow the exit.
*
* @see java.lang.Runtime#exit(int)
@@ -318,9 +316,9 @@
* Executes the specified string command in a separate process.
*
* <p>This is a convenience method. An invocation of the form
- * <tt>exec(command)</tt>
+ * {@code exec(command)}
* behaves in exactly the same way as the invocation
- * <tt>{@link #exec(String, String[], File) exec}(command, null, null)</tt>.
+ * {@link #exec(String, String[], File) exec}{@code (command, null, null)}.
*
* @param command a specified system command.
*
@@ -335,10 +333,10 @@
* If an I/O error occurs
*
* @throws NullPointerException
- * If <code>command</code> is <code>null</code>
+ * If {@code command} is {@code null}
*
* @throws IllegalArgumentException
- * If <code>command</code> is empty
+ * If {@code command} is empty
*
* @see #exec(String[], String[], File)
* @see ProcessBuilder
@@ -352,16 +350,16 @@
* specified environment.
*
* <p>This is a convenience method. An invocation of the form
- * <tt>exec(command, envp)</tt>
+ * {@code exec(command, envp)}
* behaves in exactly the same way as the invocation
- * <tt>{@link #exec(String, String[], File) exec}(command, envp, null)</tt>.
+ * {@link #exec(String, String[], File) exec}{@code (command, envp, null)}.
*
* @param command a specified system command.
*
* @param envp array of strings, each element of which
* has environment variable settings in the format
* <i>name</i>=<i>value</i>, or
- * <tt>null</tt> if the subprocess should inherit
+ * {@code null} if the subprocess should inherit
* the environment of the current process.
*
* @return A new {@link Process} object for managing the subprocess
@@ -375,11 +373,11 @@
* If an I/O error occurs
*
* @throws NullPointerException
- * If <code>command</code> is <code>null</code>,
- * or one of the elements of <code>envp</code> is <code>null</code>
+ * If {@code command} is {@code null},
+ * or one of the elements of {@code envp} is {@code null}
*
* @throws IllegalArgumentException
- * If <code>command</code> is empty
+ * If {@code command} is empty
*
* @see #exec(String[], String[], File)
* @see ProcessBuilder
@@ -393,29 +391,29 @@
* specified environment and working directory.
*
* <p>This is a convenience method. An invocation of the form
- * <tt>exec(command, envp, dir)</tt>
+ * {@code exec(command, envp, dir)}
* behaves in exactly the same way as the invocation
- * <tt>{@link #exec(String[], String[], File) exec}(cmdarray, envp, dir)</tt>,
- * where <code>cmdarray</code> is an array of all the tokens in
- * <code>command</code>.
+ * {@link #exec(String[], String[], File) exec}{@code (cmdarray, envp, dir)},
+ * where {@code cmdarray} is an array of all the tokens in
+ * {@code command}.
*
- * <p>More precisely, the <code>command</code> string is broken
+ * <p>More precisely, the {@code command} string is broken
* into tokens using a {@link StringTokenizer} created by the call
- * <code>new {@link StringTokenizer}(command)</code> with no
+ * {@code new {@link StringTokenizer}(command)} with no
* further modification of the character categories. The tokens
* produced by the tokenizer are then placed in the new string
- * array <code>cmdarray</code>, in the same order.
+ * array {@code cmdarray}, in the same order.
*
* @param command a specified system command.
*
* @param envp array of strings, each element of which
* has environment variable settings in the format
* <i>name</i>=<i>value</i>, or
- * <tt>null</tt> if the subprocess should inherit
+ * {@code null} if the subprocess should inherit
* the environment of the current process.
*
* @param dir the working directory of the subprocess, or
- * <tt>null</tt> if the subprocess should inherit
+ * {@code null} if the subprocess should inherit
* the working directory of the current process.
*
* @return A new {@link Process} object for managing the subprocess
@@ -429,11 +427,11 @@
* If an I/O error occurs
*
* @throws NullPointerException
- * If <code>command</code> is <code>null</code>,
- * or one of the elements of <code>envp</code> is <code>null</code>
+ * If {@code command} is {@code null},
+ * or one of the elements of {@code envp} is {@code null}
*
* @throws IllegalArgumentException
- * If <code>command</code> is empty
+ * If {@code command} is empty
*
* @see ProcessBuilder
* @since 1.3
@@ -454,9 +452,9 @@
* Executes the specified command and arguments in a separate process.
*
* <p>This is a convenience method. An invocation of the form
- * <tt>exec(cmdarray)</tt>
+ * {@code exec(cmdarray)}
* behaves in exactly the same way as the invocation
- * <tt>{@link #exec(String[], String[], File) exec}(cmdarray, null, null)</tt>.
+ * {@link #exec(String[], String[], File) exec}{@code (cmdarray, null, null)}.
*
* @param cmdarray array containing the command to call and
* its arguments.
@@ -472,12 +470,12 @@
* If an I/O error occurs
*
* @throws NullPointerException
- * If <code>cmdarray</code> is <code>null</code>,
- * or one of the elements of <code>cmdarray</code> is <code>null</code>
+ * If {@code cmdarray} is {@code null},
+ * or one of the elements of {@code cmdarray} is {@code null}
*
* @throws IndexOutOfBoundsException
- * If <code>cmdarray</code> is an empty array
- * (has length <code>0</code>)
+ * If {@code cmdarray} is an empty array
+ * (has length {@code 0})
*
* @see ProcessBuilder
*/
@@ -490,9 +488,9 @@
* with the specified environment.
*
* <p>This is a convenience method. An invocation of the form
- * <tt>exec(cmdarray, envp)</tt>
+ * {@code exec(cmdarray, envp)}
* behaves in exactly the same way as the invocation
- * <tt>{@link #exec(String[], String[], File) exec}(cmdarray, envp, null)</tt>.
+ * {@link #exec(String[], String[], File) exec}{@code (cmdarray, envp, null)}.
*
* @param cmdarray array containing the command to call and
* its arguments.
@@ -500,7 +498,7 @@
* @param envp array of strings, each element of which
* has environment variable settings in the format
* <i>name</i>=<i>value</i>, or
- * <tt>null</tt> if the subprocess should inherit
+ * {@code null} if the subprocess should inherit
* the environment of the current process.
*
* @return A new {@link Process} object for managing the subprocess
@@ -514,13 +512,13 @@
* If an I/O error occurs
*
* @throws NullPointerException
- * If <code>cmdarray</code> is <code>null</code>,
- * or one of the elements of <code>cmdarray</code> is <code>null</code>,
- * or one of the elements of <code>envp</code> is <code>null</code>
+ * If {@code cmdarray} is {@code null},
+ * or one of the elements of {@code cmdarray} is {@code null},
+ * or one of the elements of {@code envp} is {@code null}
*
* @throws IndexOutOfBoundsException
- * If <code>cmdarray</code> is an empty array
- * (has length <code>0</code>)
+ * If {@code cmdarray} is an empty array
+ * (has length {@code 0})
*
* @see ProcessBuilder
*/
@@ -533,17 +531,17 @@
* Executes the specified command and arguments in a separate process with
* the specified environment and working directory.
*
- * <p>Given an array of strings <code>cmdarray</code>, representing the
- * tokens of a command line, and an array of strings <code>envp</code>,
+ * <p>Given an array of strings {@code cmdarray}, representing the
+ * tokens of a command line, and an array of strings {@code envp},
* representing "environment" variable settings, this method creates
* a new process in which to execute the specified command.
*
- * <p>This method checks that <code>cmdarray</code> is a valid operating
+ * <p>This method checks that {@code cmdarray} is a valid operating
* system command. Which commands are valid is system-dependent,
* but at the very least the command must be a non-empty list of
* non-null strings.
*
- * <p>If <tt>envp</tt> is <tt>null</tt>, the subprocess inherits the
+ * <p>If {@code envp} is {@code null}, the subprocess inherits the
* environment settings of the current process.
*
* <p>A minimal set of system dependent environment variables may
@@ -554,14 +552,14 @@
* <p>{@link ProcessBuilder#start()} is now the preferred way to
* start a process with a modified environment.
*
- * <p>The working directory of the new subprocess is specified by <tt>dir</tt>.
- * If <tt>dir</tt> is <tt>null</tt>, the subprocess inherits the
+ * <p>The working directory of the new subprocess is specified by {@code dir}.
+ * If {@code dir} is {@code null}, the subprocess inherits the
* current working directory of the current process.
*
* <p>If a security manager exists, its
* {@link SecurityManager#checkExec checkExec}
* method is invoked with the first component of the array
- * <code>cmdarray</code> as its argument. This may result in a
+ * {@code cmdarray} as its argument. This may result in a
* {@link SecurityException} being thrown.
*
* <p>Starting an operating system process is highly system-dependent.
@@ -586,11 +584,11 @@
* @param envp array of strings, each element of which
* has environment variable settings in the format
* <i>name</i>=<i>value</i>, or
- * <tt>null</tt> if the subprocess should inherit
+ * {@code null} if the subprocess should inherit
* the environment of the current process.
*
* @param dir the working directory of the subprocess, or
- * <tt>null</tt> if the subprocess should inherit
+ * {@code null} if the subprocess should inherit
* the working directory of the current process.
*
* @return A new {@link Process} object for managing the subprocess
@@ -607,13 +605,13 @@
* If an I/O error occurs
*
* @throws NullPointerException
- * If <code>cmdarray</code> is <code>null</code>,
- * or one of the elements of <code>cmdarray</code> is <code>null</code>,
- * or one of the elements of <code>envp</code> is <code>null</code>
+ * If {@code cmdarray} is {@code null},
+ * or one of the elements of {@code cmdarray} is {@code null},
+ * or one of the elements of {@code envp} is {@code null}
*
* @throws IndexOutOfBoundsException
- * If <code>cmdarray</code> is an empty array
- * (has length <code>0</code>)
+ * If {@code cmdarray} is an empty array
+ * (has length {@code 0})
*
* @see ProcessBuilder
* @since 1.3
@@ -643,8 +641,8 @@
/**
* Returns the amount of free memory in the Java Virtual Machine.
* Calling the
- * <code>gc</code> method may result in increasing the value returned
- * by <code>freeMemory.</code>
+ * {@code gc} method may result in increasing the value returned
+ * by {@code freeMemory.}
*
* @return an approximation to the total amount of memory currently
* available for future allocated objects, measured in bytes.
@@ -665,9 +663,9 @@
public native long totalMemory();
/**
- * Returns the maximum amount of memory that the Java virtual machine will
- * attempt to use. If there is no inherent limit then the value {@link
- * java.lang.Long#MAX_VALUE} will be returned.
+ * Returns the maximum amount of memory that the Java virtual machine
+ * will attempt to use. If there is no inherent limit then the value
+ * {@link java.lang.Long#MAX_VALUE} will be returned.
*
* @return the maximum amount of memory that the virtual machine will
* attempt to use, measured in bytes
@@ -683,10 +681,10 @@
* returns from the method call, the virtual machine has made
* its best effort to recycle all discarded objects.
* <p>
- * The name <code>gc</code> stands for "garbage
+ * The name {@code gc} stands for "garbage
* collector". The virtual machine performs this recycling
* process automatically as needed, in a separate thread, even if the
- * <code>gc</code> method is not invoked explicitly.
+ * {@code gc} method is not invoked explicitly.
* <p>
* The method {@link System#gc()} is the conventional and convenient
* means of invoking this method.
@@ -699,15 +697,15 @@
/**
* Runs the finalization methods of any objects pending finalization.
* Calling this method suggests that the Java virtual machine expend
- * effort toward running the <code>finalize</code> methods of objects
- * that have been found to be discarded but whose <code>finalize</code>
+ * effort toward running the {@code finalize} methods of objects
+ * that have been found to be discarded but whose {@code finalize}
* methods have not yet been run. When control returns from the
* method call, the virtual machine has made a best effort to
* complete all outstanding finalizations.
* <p>
* The virtual machine performs the finalization process
* automatically as needed, in a separate thread, if the
- * <code>runFinalization</code> method is not invoked explicitly.
+ * {@code runFinalization} method is not invoked explicitly.
* <p>
* The method {@link System#runFinalization()} is the conventional
* and convenient means of invoking this method.
@@ -720,7 +718,7 @@
/**
* Enables/Disables tracing of instructions.
- * If the <code>boolean</code> argument is <code>true</code>, this
+ * If the {@code boolean} argument is {@code true}, this
* method suggests that the Java virtual machine emit debugging
* information for each instruction in the virtual machine as it
* is executed. The format of this information, and the file or other
@@ -729,18 +727,18 @@
* this feature. The destination of the trace output is system
* dependent.
* <p>
- * If the <code>boolean</code> argument is <code>false</code>, this
+ * If the {@code boolean} argument is {@code false}, this
* method causes the virtual machine to stop performing the
* detailed instruction trace it is performing.
*
- * @param on <code>true</code> to enable instruction tracing;
- * <code>false</code> to disable this feature.
+ * @param on {@code true} to enable instruction tracing;
+ * {@code false} to disable this feature.
*/
public void traceInstructions(boolean on) { }
/**
* Enables/Disables tracing of method calls.
- * If the <code>boolean</code> argument is <code>true</code>, this
+ * If the {@code boolean} argument is {@code true}, this
* method suggests that the Java virtual machine emit debugging
* information for each method in the virtual machine as it is
* called. The format of this information, and the file or other output
@@ -751,8 +749,8 @@
* Calling this method with argument false suggests that the
* virtual machine cease emitting per-call debugging information.
*
- * @param on <code>true</code> to enable instruction tracing;
- * <code>false</code> to disable this feature.
+ * @param on {@code true} to enable instruction tracing;
+ * {@code false} to disable this feature.
*/
public void traceMethodCalls(boolean on) { }
@@ -760,7 +758,7 @@
* Loads the native library specified by the filename argument. The filename
* argument must be an absolute path name.
* (for example
- * <code>Runtime.getRuntime().load("/home/avh/lib/libX11.so");</code>).
+ * {@code Runtime.getRuntime().load("/home/avh/lib/libX11.so");}).
*
* If the filename argument, when stripped of any platform-specific library
* prefix, path, and file extension, indicates a library whose name is,
@@ -773,8 +771,8 @@
* Otherwise, the filename argument is mapped to a native library image in
* an implementation-dependent manner.
* <p>
- * First, if there is a security manager, its <code>checkLink</code>
- * method is called with the <code>filename</code> as its argument.
+ * First, if there is a security manager, its {@code checkLink}
+ * method is called with the {@code filename} as its argument.
* This may result in a security exception.
* <p>
* This is similar to the method {@link #loadLibrary(String)}, but it
@@ -786,14 +784,14 @@
*
* @param filename the file to load.
* @exception SecurityException if a security manager exists and its
- * <code>checkLink</code> method doesn't allow
+ * {@code checkLink} method doesn't allow
* loading of the specified dynamic library
* @exception UnsatisfiedLinkError if either the filename is not an
* absolute path name, the native library is not statically
* linked with the VM, or the library cannot be mapped to
* a native library image by the host system.
- * @exception NullPointerException if <code>filename</code> is
- * <code>null</code>
+ * @exception NullPointerException if {@code filename} is
+ * {@code null}
* @see java.lang.Runtime#getRuntime()
* @see java.lang.SecurityException
* @see java.lang.SecurityManager#checkLink(java.lang.String)
@@ -816,26 +814,26 @@
}
/**
- * Loads the native library specified by the <code>libname</code>
- * argument. The <code>libname</code> argument must not contain any platform
+ * Loads the native library specified by the {@code libname}
+ * argument. The {@code libname} argument must not contain any platform
* specific prefix, file extension or path. If a native library
- * called <code>libname</code> is statically linked with the VM, then the
- * JNI_OnLoad_<code>libname</code> function exported by the library is invoked.
+ * called {@code libname} is statically linked with the VM, then the
+ * JNI_OnLoad_{@code libname} function exported by the library is invoked.
* See the JNI Specification for more details.
*
* Otherwise, the libname argument is loaded from a system library
* location and mapped to a native library image in an implementation-
* dependent manner.
* <p>
- * First, if there is a security manager, its <code>checkLink</code>
- * method is called with the <code>libname</code> as its argument.
+ * First, if there is a security manager, its {@code checkLink}
+ * method is called with the {@code libname} as its argument.
* This may result in a security exception.
* <p>
* The method {@link System#loadLibrary(String)} is the conventional
* and convenient means of invoking this method. If native
* methods are to be used in the implementation of a class, a standard
* strategy is to put the native code in a library file (call it
- * <code>LibFile</code>) and then to put a static initializer:
+ * {@code LibFile}) and then to put a static initializer:
* <blockquote><pre>
* static { System.loadLibrary("LibFile"); }
* </pre></blockquote>
@@ -848,14 +846,14 @@
*
* @param libname the name of the library.
* @exception SecurityException if a security manager exists and its
- * <code>checkLink</code> method doesn't allow
+ * {@code checkLink} method doesn't allow
* loading of the specified dynamic library
* @exception UnsatisfiedLinkError if either the libname argument
* contains a file path, the native library is not statically
* linked with the VM, or the library cannot be mapped to a
* native library image by the host system.
- * @exception NullPointerException if <code>libname</code> is
- * <code>null</code>
+ * @exception NullPointerException if {@code libname} is
+ * {@code null}
* @see java.lang.SecurityException
* @see java.lang.SecurityManager#checkLink(java.lang.String)
*/
@@ -878,7 +876,7 @@
/**
* Creates a localized version of an input stream. This method takes
- * an <code>InputStream</code> and returns an <code>InputStream</code>
+ * an {@code InputStream} and returns an {@code InputStream}
* equivalent to the argument in all respects except that it is
* localized: as characters in the local character set are read from
* the stream, they are automatically converted from the local
@@ -894,7 +892,7 @@
* @see java.io.InputStreamReader#InputStreamReader(java.io.InputStream)
* @deprecated As of JDK 1.1, the preferred way to translate a byte
* stream in the local encoding into a character stream in Unicode is via
- * the <code>InputStreamReader</code> and <code>BufferedReader</code>
+ * the {@code InputStreamReader} and {@code BufferedReader}
* classes.
*/
@Deprecated
@@ -904,8 +902,8 @@
/**
* Creates a localized version of an output stream. This method
- * takes an <code>OutputStream</code> and returns an
- * <code>OutputStream</code> equivalent to the argument in all respects
+ * takes an {@code OutputStream} and returns an
+ * {@code OutputStream} equivalent to the argument in all respects
* except that it is localized: as Unicode characters are written to
* the stream, they are automatically converted to the local
* character set.
@@ -915,8 +913,8 @@
*
* @deprecated As of JDK 1.1, the preferred way to translate a
* Unicode character stream into a byte stream in the local encoding is via
- * the <code>OutputStreamWriter</code>, <code>BufferedWriter</code>, and
- * <code>PrintWriter</code> classes.
+ * the {@code OutputStreamWriter}, {@code BufferedWriter}, and
+ * {@code PrintWriter} classes.
*
* @param out OutputStream to localize
* @return a localized output stream
--- a/jdk/src/java.base/share/classes/java/util/JapaneseImperialCalendar.java Tue Apr 28 10:12:15 2015 -0700
+++ b/jdk/src/java.base/share/classes/java/util/JapaneseImperialCalendar.java Tue Apr 28 21:30:10 2015 +0400
@@ -53,9 +53,9 @@
* ------------------------------------------------------
* }</pre>
*
- * <p><code>ERA</code> value 0 specifies the years before Meiji and
- * the Gregorian year values are used. Unlike {@link
- * GregorianCalendar}, the Julian to Gregorian transition is not
+ * <p>{@code ERA} value 0 specifies the years before Meiji and
+ * the Gregorian year values are used. Unlike
+ * {@link GregorianCalendar}, the Julian to Gregorian transition is not
* supported because it doesn't make any sense to the Japanese
* calendar systems used before Meiji. To represent the years before
* Gregorian year 1, 0 and negative values are used. The Japanese
@@ -66,7 +66,7 @@
* <p>A new era can be specified using property
* jdk.calendar.japanese.supplemental.era. The new era is added to the
* predefined eras. The syntax of the property is as follows.
- * <p><pre>
+ * <pre>
* {@code name=<name>,abbr=<abbr>,since=<time['u']>}
* </pre>
* where
@@ -83,7 +83,7 @@
* ignored.
*
* <p>The following is an example of the property usage.
- * <p><pre>
+ * <pre>
* java -Djdk.calendar.japanese.supplemental.era="name=NewEra,abbr=N,since=253374307200000"
* </pre>
* The property specifies an era change to NewEra at 9999-02-11T00:00:00 local time.
@@ -315,7 +315,7 @@
private transient int[] originalFields;
/**
- * Constructs a <code>JapaneseImperialCalendar</code> based on the current time
+ * Constructs a {@code JapaneseImperialCalendar} based on the current time
* in the given time zone with the given locale.
*
* @param zone the given time zone.
@@ -351,16 +351,16 @@
}
/**
- * Compares this <code>JapaneseImperialCalendar</code> to the specified
- * <code>Object</code>. The result is <code>true</code> if and
- * only if the argument is a <code>JapaneseImperialCalendar</code> object
+ * Compares this {@code JapaneseImperialCalendar} to the specified
+ * {@code Object}. The result is {@code true} if and
+ * only if the argument is a {@code JapaneseImperialCalendar} object
* that represents the same time value (millisecond offset from
* the <a href="Calendar.html#Epoch">Epoch</a>) under the same
- * <code>Calendar</code> parameters.
+ * {@code Calendar} parameters.
*
* @param obj the object to compare with.
- * @return <code>true</code> if this object is equal to <code>obj</code>;
- * <code>false</code> otherwise.
+ * @return {@code true} if this object is equal to {@code obj};
+ * {@code false} otherwise.
* @see Calendar#compareTo(Calendar)
*/
@Override
@@ -371,7 +371,7 @@
/**
* Generates the hash code for this
- * <code>JapaneseImperialCalendar</code> object.
+ * {@code JapaneseImperialCalendar} object.
*/
@Override
public int hashCode() {
@@ -382,27 +382,27 @@
* Adds the specified (signed) amount of time to the given calendar field,
* based on the calendar's rules.
*
- * <p><em>Add rule 1</em>. The value of <code>field</code>
- * after the call minus the value of <code>field</code> before the
- * call is <code>amount</code>, modulo any overflow that has occurred in
- * <code>field</code>. Overflow occurs when a field value exceeds its
+ * <p><em>Add rule 1</em>. The value of {@code field}
+ * after the call minus the value of {@code field} before the
+ * call is {@code amount}, modulo any overflow that has occurred in
+ * {@code field}. Overflow occurs when a field value exceeds its
* range and, as a result, the next larger field is incremented or
* decremented and the field value is adjusted back into its range.</p>
*
* <p><em>Add rule 2</em>. If a smaller field is expected to be
* invariant, but it is impossible for it to be equal to its
* prior value because of changes in its minimum or maximum after
- * <code>field</code> is changed, then its value is adjusted to be as close
+ * {@code field} is changed, then its value is adjusted to be as close
* as possible to its expected value. A smaller field represents a
- * smaller unit of time. <code>HOUR</code> is a smaller field than
- * <code>DAY_OF_MONTH</code>. No adjustment is made to smaller fields
+ * smaller unit of time. {@code HOUR} is a smaller field than
+ * {@code DAY_OF_MONTH}. No adjustment is made to smaller fields
* that are not expected to be invariant. The calendar system
* determines what fields are expected to be invariant.</p>
*
* @param field the calendar field.
* @param amount the amount of date or time to be added to the field.
- * @exception IllegalArgumentException if <code>field</code> is
- * <code>ZONE_OFFSET</code>, <code>DST_OFFSET</code>, or unknown,
+ * @exception IllegalArgumentException if {@code field} is
+ * {@code ZONE_OFFSET}, {@code DST_OFFSET}, or unknown,
* or if any calendar fields have out-of-range values in
* non-lenient mode.
*/
@@ -548,12 +548,12 @@
* <p>This method calls {@link #complete()} before adding the
* amount so that all the calendar fields are normalized. If there
* is any calendar field having an out-of-range value in non-lenient mode, then an
- * <code>IllegalArgumentException</code> is thrown.
+ * {@code IllegalArgumentException} is thrown.
*
* @param field the calendar field.
- * @param amount the signed amount to add to <code>field</code>.
- * @exception IllegalArgumentException if <code>field</code> is
- * <code>ZONE_OFFSET</code>, <code>DST_OFFSET</code>, or unknown,
+ * @param amount the signed amount to add to {@code field}.
+ * @exception IllegalArgumentException if {@code field} is
+ * {@code ZONE_OFFSET}, {@code DST_OFFSET}, or unknown,
* or if any calendar fields have out-of-range values in
* non-lenient mode.
* @see #roll(int,boolean)
@@ -1055,9 +1055,9 @@
/**
* Returns the minimum value for the given calendar field of this
- * <code>Calendar</code> instance. The minimum value is
- * defined as the smallest value returned by the {@link
- * Calendar#get(int) get} method for any possible time value,
+ * {@code Calendar} instance. The minimum value is
+ * defined as the smallest value returned by the
+ * {@link Calendar#get(int) get} method for any possible time value,
* taking into consideration the current values of the
* {@link Calendar#getFirstDayOfWeek() getFirstDayOfWeek},
* {@link Calendar#getMinimalDaysInFirstWeek() getMinimalDaysInFirstWeek},
@@ -1077,9 +1077,9 @@
/**
* Returns the maximum value for the given calendar field of this
- * <code>GregorianCalendar</code> instance. The maximum value is
- * defined as the largest value returned by the {@link
- * Calendar#get(int) get} method for any possible time value,
+ * {@code GregorianCalendar} instance. The maximum value is
+ * defined as the largest value returned by the
+ * {@link Calendar#get(int) get} method for any possible time value,
* taking into consideration the current values of the
* {@link Calendar#getFirstDayOfWeek() getFirstDayOfWeek},
* {@link Calendar#getMinimalDaysInFirstWeek() getMinimalDaysInFirstWeek},
@@ -1108,7 +1108,7 @@
/**
* Returns the highest minimum value for the given calendar field
- * of this <code>GregorianCalendar</code> instance. The highest
+ * of this {@code GregorianCalendar} instance. The highest
* minimum value is defined as the largest value returned by
* {@link #getActualMinimum(int)} for any possible time value,
* taking into consideration the current values of the
@@ -1130,7 +1130,7 @@
/**
* Returns the lowest maximum value for the given calendar field
- * of this <code>GregorianCalendar</code> instance. The lowest
+ * of this {@code GregorianCalendar} instance. The lowest
* maximum value is defined as the smallest value returned by
* {@link #getActualMaximum(int)} for any possible time value,
* taking into consideration the current values of the
@@ -1166,7 +1166,7 @@
*
* @param field the calendar field
* @return the minimum of the given field for the time value of
- * this <code>JapaneseImperialCalendar</code>
+ * this {@code JapaneseImperialCalendar}
* @see #getMinimum(int)
* @see #getMaximum(int)
* @see #getGreatestMinimum(int)
@@ -1269,13 +1269,13 @@
* and
* {@link Calendar#getTimeZone() getTimeZone} methods.
* For example, if the date of this instance is Heisei 16February 1,
- * the actual maximum value of the <code>DAY_OF_MONTH</code> field
+ * the actual maximum value of the {@code DAY_OF_MONTH} field
* is 29 because Heisei 16 is a leap year, and if the date of this
* instance is Heisei 17 February 1, it's 28.
*
* @param field the calendar field
* @return the maximum of the given field for the time value of
- * this <code>JapaneseImperialCalendar</code>
+ * this {@code JapaneseImperialCalendar}
* @see #getMinimum(int)
* @see #getMaximum(int)
* @see #getGreatestMinimum(int)
@@ -1558,7 +1558,7 @@
* href="Calendar.html#Epoch">Epoch</a>) to calendar field values.
* The time is <em>not</em>
* recomputed first; to recompute the time, then the fields, call the
- * <code>complete</code> method.
+ * {@code complete} method.
*
* @see Calendar#complete
*/
--- a/jdk/src/java.base/share/classes/jdk/net/NetworkPermission.java Tue Apr 28 10:12:15 2015 -0700
+++ b/jdk/src/java.base/share/classes/jdk/net/NetworkPermission.java Tue Apr 28 21:30:10 2015 +0400
@@ -33,7 +33,7 @@
* name, but no actions list. Callers either possess the permission or not.
* <p>
* The following targets are defined:
- * <p>
+ *
* <table border=1 cellpadding=5 summary="permission target name,
* what the target allows,and associated risks">
* <tr>
--- a/jdk/src/java.management/share/classes/com/sun/management/DiagnosticCommandMBean.java Tue Apr 28 10:12:15 2015 -0700
+++ b/jdk/src/java.management/share/classes/com/sun/management/DiagnosticCommandMBean.java Tue Apr 28 21:30:10 2015 +0400
@@ -93,7 +93,7 @@
* returns the diagnostic command description
* (the same as the one return in the 'help' command)</li>
* <li>{@link javax.management.MBeanOperationInfo#getImpact() getImpact()}
- * returns <code>ACTION_INFO</code></li>
+ * returns {@code ACTION_INFO}</li>
* <li>{@link javax.management.MBeanOperationInfo#getReturnType() getReturnType()}
* returns {@code java.lang.String}</li>
* <li>{@link javax.management.MBeanOperationInfo#getDescriptor() getDescriptor()}
@@ -105,7 +105,6 @@
* meta-data for a JMX element. A field is a name and an associated value.
* The additional meta-data provided for an operation associated with a
* diagnostic command are described in the table below:
- * <p>
*
* <table border="1" cellpadding="5">
* <tr>
@@ -161,7 +160,6 @@
* arguments supported by the diagnostic command (see below)</td>
* </tr>
* </table>
- * <p>
*
* <p>The description of parameters (options or arguments) of a diagnostic
* command is provided within a Descriptor instance. In this Descriptor,
--- a/jdk/src/java.management/share/classes/com/sun/management/GarbageCollectionNotificationInfo.java Tue Apr 28 10:12:15 2015 -0700
+++ b/jdk/src/java.management/share/classes/com/sun/management/GarbageCollectionNotificationInfo.java Tue Apr 28 21:30:10 2015 +0400
@@ -41,14 +41,14 @@
* when the Java virtual machine completes a garbage collection action
* The notification emitted will contain the garbage collection notification
* information about the status of the memory:
- * <u1>
+ * <ul>
* <li>The name of the garbage collector used to perform the collection.</li>
* <li>The action performed by the garbage collector.</li>
* <li>The cause of the garbage collection action.</li>
* <li>A {@link GcInfo} object containing some statistics about the GC cycle
(start time, end time) and the memory usage before and after
the GC cycle.</li>
- * </u1>
+ * </ul>
*
* <p>
* A {@link CompositeData CompositeData} representing
@@ -81,7 +81,7 @@
* <li>A {@linkplain #GARBAGE_COLLECTION_NOTIFICATION garbage collection notification}.
* <br>Used by every notification emitted by the garbage collector, the details about
* the notification are provided in the {@linkplain #getGcAction action} String
- * <p></li>
+ * </li>
* </ul>
**/
--- a/jdk/src/java.management/share/classes/com/sun/management/GcInfo.java Tue Apr 28 10:12:15 2015 -0700
+++ b/jdk/src/java.management/share/classes/com/sun/management/GcInfo.java Tue Apr 28 21:30:10 2015 +0400
@@ -52,13 +52,13 @@
* </blockquote>
*
* <p>
- * <tt>GcInfo</tt> is a {@link CompositeData CompositeData}
+ * {@code GcInfo} is a {@link CompositeData CompositeData}
* The GC-specific attributes can be obtained via the CompositeData
* interface. This is a historical relic, and other classes should
* not copy this pattern. Use {@link CompositeDataView} instead.
*
* <h4>MXBean Mapping</h4>
- * <tt>GcInfo</tt> is mapped to a {@link CompositeData CompositeData}
+ * {@code GcInfo} is mapped to a {@link CompositeData CompositeData}
* with attributes as specified in the {@link #from from} method.
*
* @author Mandy Chung
@@ -152,11 +152,11 @@
* Returns the memory usage of all memory pools
* at the beginning of this GC.
* This method returns
- * a <tt>Map</tt> of the name of a memory pool
+ * a {@code Map} of the name of a memory pool
* to the memory usage of the corresponding
* memory pool before GC starts.
*
- * @return a <tt>Map</tt> of memory pool names to the memory
+ * @return a {@code Map} of memory pool names to the memory
* usage of a memory pool before GC starts.
*/
public Map<String, MemoryUsage> getMemoryUsageBeforeGc() {
@@ -167,11 +167,11 @@
* Returns the memory usage of all memory pools
* at the end of this GC.
* This method returns
- * a <tt>Map</tt> of the name of a memory pool
+ * a {@code Map} of the name of a memory pool
* to the memory usage of the corresponding
* memory pool when GC finishes.
*
- * @return a <tt>Map</tt> of memory pool names to the memory
+ * @return a {@code Map} of memory pool names to the memory
* usage of a memory pool when GC finishes.
*/
public Map<String, MemoryUsage> getMemoryUsageAfterGc() {
@@ -179,12 +179,11 @@
}
/**
- * Returns a <tt>GcInfo</tt> object represented by the
- * given <tt>CompositeData</tt>. The given
- * <tt>CompositeData</tt> must contain
+ * Returns a {@code GcInfo} object represented by the
+ * given {@code CompositeData}. The given
+ * {@code CompositeData} must contain
* all the following attributes:
*
- * <p>
* <blockquote>
* <table border>
* <tr>
@@ -193,33 +192,33 @@
* </tr>
* <tr>
* <td>index</td>
- * <td><tt>java.lang.Long</tt></td>
+ * <td>{@code java.lang.Long}</td>
* </tr>
* <tr>
* <td>startTime</td>
- * <td><tt>java.lang.Long</tt></td>
+ * <td>{@code java.lang.Long}</td>
* </tr>
* <tr>
* <td>endTime</td>
- * <td><tt>java.lang.Long</tt></td>
+ * <td>{@code java.lang.Long}</td>
* </tr>
* <tr>
* <td>memoryUsageBeforeGc</td>
- * <td><tt>javax.management.openmbean.TabularData</tt></td>
+ * <td>{@code javax.management.openmbean.TabularData}</td>
* </tr>
* <tr>
* <td>memoryUsageAfterGc</td>
- * <td><tt>javax.management.openmbean.TabularData</tt></td>
+ * <td>{@code javax.management.openmbean.TabularData}</td>
* </tr>
* </table>
* </blockquote>
*
- * @throws IllegalArgumentException if <tt>cd</tt> does not
- * represent a <tt>GcInfo</tt> object with the attributes
+ * @throws IllegalArgumentException if {@code cd} does not
+ * represent a {@code GcInfo} object with the attributes
* described above.
*
- * @return a <tt>GcInfo</tt> object represented by <tt>cd</tt>
- * if <tt>cd</tt> is not <tt>null</tt>; <tt>null</tt> otherwise.
+ * @return a {@code GcInfo} object represented by {@code cd}
+ * if {@code cd} is not {@code null}; {@code null} otherwise.
*/
public static GcInfo from(CompositeData cd) {
if (cd == null) {
@@ -272,7 +271,7 @@
}
/**
- * <p>Return the {@code CompositeData} representation of this
+ * Return the {@code CompositeData} representation of this
* {@code GcInfo}, including any GC-specific attributes. The
* returned value will have at least all the attributes described
* in the {@link #from(CompositeData) from} method, plus optionally
--- a/jdk/src/java.management/share/classes/com/sun/management/VMOption.java Tue Apr 28 10:12:15 2015 -0700
+++ b/jdk/src/java.management/share/classes/com/sun/management/VMOption.java Tue Apr 28 21:30:10 2015 +0400
@@ -42,10 +42,10 @@
* be set dynamically via a management interface after
* the VM was started.
*
- * A <tt>VMOption</tt> contains the value of a VM option
- * and the origin of that value at the time this <tt>VMOption</tt>
+ * A {@code VMOption} contains the value of a VM option
+ * and the origin of that value at the time this {@code VMOption}
* object was constructed. The value of the VM option
- * may be changed after the <tt>VMOption</tt> object was constructed,
+ * may be changed after the {@code VMOption} object was constructed,
*
* @see <a href="{@docRoot}/../../../../technotes/guides/vm/index.html">
* Java Virtual Machine</a>
@@ -108,15 +108,15 @@
}
/**
- * Constructs a <tt>VMOption</tt>.
+ * Constructs a {@code VMOption}.
*
* @param name Name of a VM option.
* @param value Value of a VM option.
- * @param writeable <tt>true</tt> if a VM option can be set dynamically,
- * or <tt>false</tt> otherwise.
+ * @param writeable {@code true} if a VM option can be set dynamically,
+ * or {@code false} otherwise.
* @param origin where the value of a VM option came from.
*
- * @throws NullPointerException if the name or value is <tt>null</tt>
+ * @throws NullPointerException if the name or value is {@code null}
*/
public VMOption(String name, String value, boolean writeable, Origin origin) {
this.name = name;
@@ -126,7 +126,7 @@
}
/**
- * Constructs a <tt>VMOption</tt> object from a
+ * Constructs a {@code VMOption} object from a
* {@link CompositeData CompositeData}.
*/
private VMOption(CompositeData cd) {
@@ -150,10 +150,10 @@
/**
* Returns the value of this VM option at the time when
- * this <tt>VMOption</tt> was created. The value could have been changed.
+ * this {@code VMOption} was created. The value could have been changed.
*
* @return the value of the VM option at the time when
- * this <tt>VMOption</tt> was created.
+ * this {@code VMOption} was created.
*/
public String getValue() {
return value;
@@ -174,7 +174,7 @@
* it can be set by the {@link HotSpotDiagnosticMXBean#setVMOption
* HotSpotDiagnosticMXBean.setVMOption} method.
*
- * @return <tt>true</tt> if this VM option is writeable; <tt>false</tt>
+ * @return {@code true} if this VM option is writeable; {@code false}
* otherwise.
*/
public boolean isWriteable() {
@@ -189,10 +189,10 @@
}
/**
- * Returns a <tt>VMOption</tt> object represented by the
- * given <tt>CompositeData</tt>. The given <tt>CompositeData</tt>
+ * Returns a {@code VMOption} object represented by the
+ * given {@code CompositeData}. The given {@code CompositeData}
* must contain the following attributes:
- * <p>
+ *
* <blockquote>
* <table border>
* <tr>
@@ -201,32 +201,32 @@
* </tr>
* <tr>
* <td>name</td>
- * <td><tt>java.lang.String</tt></td>
+ * <td>{@code java.lang.String}</td>
* </tr>
* <tr>
* <td>value</td>
- * <td><tt>java.lang.String</tt></td>
+ * <td>{@code java.lang.String}</td>
* </tr>
* <tr>
* <td>origin</td>
- * <td><tt>java.lang.String</tt></td>
+ * <td>{@code java.lang.String}</td>
* </tr>
* <tr>
* <td>writeable</td>
- * <td><tt>java.lang.Boolean</tt></td>
+ * <td>{@code java.lang.Boolean}</td>
* </tr>
* </table>
* </blockquote>
*
- * @param cd <tt>CompositeData</tt> representing a <tt>VMOption</tt>
+ * @param cd {@code CompositeData} representing a {@code VMOption}
*
- * @throws IllegalArgumentException if <tt>cd</tt> does not
- * represent a <tt>VMOption</tt> with the attributes described
+ * @throws IllegalArgumentException if {@code cd} does not
+ * represent a {@code VMOption} with the attributes described
* above.
*
- * @return a <tt>VMOption</tt> object represented by <tt>cd</tt>
- * if <tt>cd</tt> is not <tt>null</tt>;
- * <tt>null</tt> otherwise.
+ * @return a {@code VMOption} object represented by {@code cd}
+ * if {@code cd} is not {@code null};
+ * {@code null} otherwise.
*/
public static VMOption from(CompositeData cd) {
if (cd == null) {
--- a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AgentInitializationException.java Tue Apr 28 10:12:15 2015 -0700
+++ b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AgentInitializationException.java Tue Apr 28 21:30:10 2015 +0400
@@ -29,15 +29,15 @@
* The exception thrown when an agent fails to initialize in the target
* Java virtual machine.
*
- * <p> This exception is thrown by {@link
- * com.sun.tools.attach.VirtualMachine#loadAgent VirtualMachine.loadAgent},
+ * <p> This exception is thrown by
+ * {@link com.sun.tools.attach.VirtualMachine#loadAgent VirtualMachine.loadAgent},
* {@link com.sun.tools.attach.VirtualMachine#loadAgentLibrary
- * VirtualMachine.loadAgentLibrary}, {@link
- * com.sun.tools.attach.VirtualMachine#loadAgentPath VirtualMachine.loadAgentPath}
+ * VirtualMachine.loadAgentLibrary},
+ * {@link com.sun.tools.attach.VirtualMachine#loadAgentPath VirtualMachine.loadAgentPath}
* methods if an agent, or agent library, cannot be initialized.
- * When thrown by <tt>VirtualMachine.loadAgentLibrary</tt>, or
- * <tt>VirtualMachine.loadAgentPath</tt> then the exception encapsulates
- * the error returned by the agent's <code>Agent_OnAttach</code> function.
+ * When thrown by {@code VirtualMachine.loadAgentLibrary}, or
+ * {@code VirtualMachine.loadAgentPath} then the exception encapsulates
+ * the error returned by the agent's {@code Agent_OnAttach} function.
* This error code can be obtained by invoking the {@link #returnValue() returnValue} method.
*/
@jdk.Exported
@@ -49,7 +49,7 @@
private int returnValue;
/**
- * Constructs an <code>AgentInitializationException</code> with
+ * Constructs an {@code AgentInitializationException} with
* no detail message.
*/
public AgentInitializationException() {
@@ -58,7 +58,7 @@
}
/**
- * Constructs an <code>AgentInitializationException</code> with
+ * Constructs an {@code AgentInitializationException} with
* the specified detail message.
*
* @param s the detail message.
@@ -69,9 +69,9 @@
}
/**
- * Constructs an <code>AgentInitializationException</code> with
+ * Constructs an {@code AgentInitializationException} with
* the specified detail message and the return value from the
- * execution of the agent's <code>Agent_OnAttach</code> function.
+ * execution of the agent's {@code Agent_OnAttach} function.
*
* @param s the detail message.
* @param returnValue the return value
@@ -83,8 +83,8 @@
/**
* If the exception was created with the return value from the agent
- * <code>Agent_OnAttach</code> function then this returns that value,
- * otherwise returns <code>0</code>. </p>
+ * {@code Agent_OnAttach} function then this returns that value,
+ * otherwise returns {@code 0}.
*
* @return the return value
*/
--- a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/spi/AttachProvider.java Tue Apr 28 10:12:15 2015 -0700
+++ b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/spi/AttachProvider.java Tue Apr 28 21:30:10 2015 +0400
@@ -41,7 +41,7 @@
*
* <p> An attach provider is a concrete subclass of this class that has a
* zero-argument constructor and implements the abstract methods specified
- * below. </p>
+ * below.
*
* <p> An attach provider implementation is typically tied to a Java virtual
* machine implementation, version, or even mode of operation. That is, a specific
@@ -51,7 +51,7 @@
* Sun's <i>HotSpot</i> virtual machine. In general, if an environment
* consists of Java virtual machines of different versions and from different
* vendors then there will be an attach provider implementation for each
- * <i>family</i> of implementations or versions. </p>
+ * <i>family</i> of implementations or versions.
*
* <p> An attach provider is identified by its {@link #name <i>name</i>} and
* {@link #type <i>type</i>}. The <i>name</i> is typically, but not required to
@@ -61,15 +61,15 @@
* implementation that uses the Doors inter-process communication mechanism
* might use the type <i>"doors"</i>. The purpose of the name and type is to
* identify providers in environments where there are multiple providers
- * installed. </p>
+ * installed.
*
* <p> AttachProvider implementations are loaded and instantiated at the first
* invocation of the {@link #providers() providers} method. This method
* attempts to load all provider implementations that are installed on the
- * platform. </p>
+ * platform.
*
* <p> All of the methods in this class are safe for use by multiple
- * concurrent threads. </p>
+ * concurrent threads.
*
* @since 1.6
*/
@@ -81,12 +81,12 @@
private static List<AttachProvider> providers = null;
/**
- * Initializes a new instance of this class. </p>
+ * Initializes a new instance of this class.
*
* @throws SecurityException
* If a security manager has been installed and it denies
* {@link com.sun.tools.attach.AttachPermission AttachPermission}
- * <tt>("createAttachProvider")</tt>
+ * ("{@code createAttachProvider}")
*/
protected AttachProvider() {
SecurityManager sm = System.getSecurityManager();
@@ -95,14 +95,14 @@
}
/**
- * Return this provider's name. </p>
+ * Return this provider's name.
*
* @return The name of this provider
*/
public abstract String name();
/**
- * Return this provider's type. </p>
+ * Return this provider's type.
*
* @return The type of this provider
*/
@@ -113,18 +113,18 @@
*
* <p> A Java virtual machine is identified by an abstract identifier. The
* nature of this identifier is platform dependent but in many cases it will be the
- * string representation of the process identifier (or pid). </p>
+ * string representation of the process identifier (or pid).
*
* <p> This method parses the identifier and maps the identifier to a Java
* virtual machine (in an implementation dependent manner). If the identifier
- * cannot be parsed by the provider then an {@link
- * com.sun.tools.attach.AttachNotSupportedException AttachNotSupportedException}
+ * cannot be parsed by the provider then an
+ * {@link com.sun.tools.attach.AttachNotSupportedException AttachNotSupportedException}
* is thrown. Once parsed this method attempts to attach to the Java virtual machine.
* If the provider detects that the identifier corresponds to a Java virtual machine
* that does not exist, or it corresponds to a Java virtual machine that does not support
* the attach mechanism implemented by this provider, or it detects that the
* Java virtual machine is a version to which this provider cannot attach, then
- * an <code>AttachNotSupportedException</code> is thrown. </p>
+ * an {@code AttachNotSupportedException} is thrown.
*
* @param id
* The abstract identifier that identifies the Java virtual machine.
@@ -134,7 +134,7 @@
* @throws SecurityException
* If a security manager has been installed and it denies
* {@link com.sun.tools.attach.AttachPermission AttachPermission}
- * <tt>("attachVirtualMachine")</tt>, or other permission
+ * ("{@code attachVirtualMachine}"), or other permission
* required by the implementation.
*
* @throws AttachNotSupportedException
@@ -147,7 +147,7 @@
* If some other I/O error occurs
*
* @throws NullPointerException
- * If <code>id</code> is <code>null</code>
+ * If {@code id} is {@code null}
*/
public abstract VirtualMachine attachVirtualMachine(String id)
throws AttachNotSupportedException, IOException;
@@ -155,10 +155,10 @@
/**
* Attaches to a Java virtual machine.
*
- * <p> A Java virtual machine can be described using a {@link
- * com.sun.tools.attach.VirtualMachineDescriptor VirtualMachineDescriptor}.
- * This method invokes the descriptor's {@link
- * com.sun.tools.attach.VirtualMachineDescriptor#provider() provider()} method
+ * <p> A Java virtual machine can be described using a
+ * {@link com.sun.tools.attach.VirtualMachineDescriptor VirtualMachineDescriptor}.
+ * This method invokes the descriptor's
+ * {@link com.sun.tools.attach.VirtualMachineDescriptor#provider() provider()} method
* to check that it is equal to this provider. It then attempts to attach to the
* Java virtual machine.
*
@@ -170,20 +170,20 @@
* @throws SecurityException
* If a security manager has been installed and it denies
* {@link com.sun.tools.attach.AttachPermission AttachPermission}
- * <tt>("attachVirtualMachine")</tt>, or other permission
+ * ("{@code attachVirtualMachine}"), or other permission
* required by the implementation.
*
* @throws AttachNotSupportedException
- * If the descriptor's {@link
- * com.sun.tools.attach.VirtualMachineDescriptor#provider() provider()} method
- * returns a provider that is not this provider, or it does not correspond
- * to a Java virtual machine to which this provider can attach.
+ * If the descriptor's
+ * {@link com.sun.tools.attach.VirtualMachineDescriptor#provider() provider()}
+ * method returns a provider that is not this provider, or it does not
+ * correspond to a Java virtual machine to which this provider can attach.
*
* @throws IOException
* If some other I/O error occurs
*
* @throws NullPointerException
- * If <code>vmd</code> is <code>null</code>
+ * If {@code vmd} is {@code null}
*/
public VirtualMachine attachVirtualMachine(VirtualMachineDescriptor vmd)
throws AttachNotSupportedException, IOException
@@ -197,12 +197,13 @@
/**
* Lists the Java virtual machines known to this provider.
*
- * <p> This method returns a list of {@link
- * com.sun.tools.attach.VirtualMachineDescriptor} elements. Each
- * <code>VirtualMachineDescriptor</code> describes a Java virtual machine
+ * <p> This method returns a list of
+ * {@link com.sun.tools.attach.VirtualMachineDescriptor} elements. Each
+ * {@code VirtualMachineDescriptor} describes a Java virtual machine
* to which this provider can <i>potentially</i> attach. There isn't any
- * guarantee that invoking {@link #attachVirtualMachine(VirtualMachineDescriptor)
- * attachVirtualMachine} on each descriptor in the list will succeed.
+ * guarantee that invoking
+ * {@link #attachVirtualMachine(VirtualMachineDescriptor) attachVirtualMachine}
+ * on each descriptor in the list will succeed.
*
* @return The list of virtual machine descriptors which describe the
* Java virtual machines known to this provider (may be empty).
@@ -216,31 +217,31 @@
* <p> An AttachProvider is installed on the platform if:
*
* <ul>
- * <li><p>It is installed in a JAR file that is visible to the defining
+ * <li>It is installed in a JAR file that is visible to the defining
* class loader of the AttachProvider type (usually, but not required
* to be, the {@link java.lang.ClassLoader#getSystemClassLoader system
- * class loader}).</p></li>
+ * class loader}).</li>
*
- * <li><p>The JAR file contains a provider configuration named
- * <tt>com.sun.tools.attach.spi.AttachProvider</tt> in the resource directory
- * <tt>META-INF/services</tt>. </p></li>
+ * <li>The JAR file contains a provider configuration named
+ * {@code com.sun.tools.attach.spi.AttachProvider} in the resource directory
+ * {@code META-INF/services}.</li>
*
- * <li><p>The provider configuration file lists the full-qualified class
- * name of the AttachProvider implementation. </p></li>
+ * <li>The provider configuration file lists the full-qualified class
+ * name of the AttachProvider implementation.</li>
* </ul>
*
* <p> The format of the provider configuration file is one fully-qualified
* class name per line. Space and tab characters surrounding each class name,
* as well as blank lines are ignored. The comment character is
- * <tt>'#'</tt> (<tt>0x23</tt>), and on each line all characters following
+ * {@code '#'} ({@code 0x23}), and on each line all characters following
* the first comment character are ignored. The file must be encoded in
- * UTF-8. </p>
+ * UTF-8.
*
* <p> AttachProvider implementations are loaded and instantiated
* (using the zero-arg constructor) at the first invocation of this method.
* The list returned by the first invocation of this method is the list
* of providers. Subsequent invocations of this method return a list of the same
- * providers. The list is unmodifable.</p>
+ * providers. The list is unmodifable.
*
* @return A list of the installed attach providers.
*/
--- a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Filter.java Tue Apr 28 10:12:15 2015 -0700
+++ b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Filter.java Tue Apr 28 21:30:10 2015 +0400
@@ -72,7 +72,7 @@
* exchange handler will not be invoked.
* @param exchange the HttpExchange
* @throws IOException let exceptions pass up the stack
- * @throws NullPointerException if exchange is <code>null</code>
+ * @throws NullPointerException if exchange is {@code null}
*/
public void doFilter (HttpExchange exchange) throws IOException {
if (!iter.hasNext()) {
@@ -86,14 +86,14 @@
/**
* Asks this filter to pre/post-process the given exchange. The filter
- * can :-
+ * can:
* <ul><li>examine or modify the request headers</li>
* <li>filter the request body or the response body, by creating suitable
* filter streams and calling
* {@link HttpExchange#setStreams(InputStream,OutputStream)}</li>
* <li>set attribute Objects in the exchange, which other filters or the
* exchange handler can access.</li>
- * <li>decide to either :-<ol>
+ * <li>decide to either<ol>
* <li>invoke the next filter in the chain, by calling
* {@link Filter.Chain#doFilter(HttpExchange)}</li>
* <li>terminate the chain of invocation, by <b>not</b> calling
@@ -102,12 +102,13 @@
* filters in the Chain have been called, and the response headers can be
* examined or modified.</li>
* <li>if option 2. above taken, then this Filter must use the HttpExchange
- * to send back an appropriate response</li></ul><p>
- * @param exchange the <code>HttpExchange</code> to be filtered.
+ * to send back an appropriate response</li></ul>
+ *
+ * @param exchange the {@code HttpExchange} to be filtered.
* @param chain the Chain which allows the next filter to be invoked.
* @throws IOException may be thrown by any filter module, and if
* caught, must be rethrown again.
- * @throws NullPointerException if either exchange or chain are <code>null</code>
+ * @throws NullPointerException if either exchange or chain are {@code null}
*/
public abstract void doFilter (HttpExchange exchange, Chain chain)
throws IOException;
--- a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Headers.java Tue Apr 28 10:12:15 2015 -0700
+++ b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Headers.java Tue Apr 28 21:30:10 2015 +0400
@@ -29,18 +29,21 @@
/**
* HTTP request and response headers are represented by this class which implements
- * the interface {@link java.util.Map}<
- * {@link java.lang.String},{@link java.util.List}<{@link java.lang.String}>>.
+ * the interface
+ * {@link java.util.Map}{@literal <}{@link java.lang.String}, {@link java.util.List}
+ * {@literal <}{@link java.lang.String}{@literal >>}.
* The keys are case-insensitive Strings representing the header names and
- * the value associated with each key is a {@link List}<{@link String}> with one
+ * the value associated with each key is
+ * a {@link List}{@literal <}{@link String}{@literal >} with one
* element for each occurrence of the header name in the request or response.
* <p>
- * For example, if a response header instance contains one key "HeaderName" with two values "value1 and value2"
+ * For example, if a response header instance contains
+ * one key "HeaderName" with two values "value1 and value2"
* then this object is output as two header lines:
* <blockquote><pre>
* HeaderName: value1
* HeaderName: value2
- * </blockquote></pre>
+ * </pre></blockquote>
* <p>
* All the normal {@link java.util.Map} methods are provided, but the following
* additional convenience methods are most likely to be used:
--- a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpExchange.java Tue Apr 28 10:12:15 2015 -0700
+++ b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpExchange.java Tue Apr 28 21:30:10 2015 +0400
@@ -116,9 +116,9 @@
public abstract HttpContext getHttpContext ();
/**
- * Ends this exchange by doing the following in sequence:<p><ol>
- * <li>close the request InputStream, if not already closed<p></li>
- * <li>close the response OutputStream, if not already closed. </li>
+ * Ends this exchange by doing the following in sequence:<ol>
+ * <li>close the request InputStream, if not already closed;</li>
+ * <li>close the response OutputStream, if not already closed.</li>
* </ol>
*/
public abstract void close () ;
@@ -163,9 +163,9 @@
* and the numeric response code as specified in this method. The response body length is also specified
* as follows. If the response length parameter is greater than zero, this specifies an exact
* number of bytes to send and the application must send that exact amount of data.
- * If the response length parameter is <code>zero</code>, then chunked transfer encoding is
+ * If the response length parameter is {@code zero}, then chunked transfer encoding is
* used and an arbitrary amount of data may be sent. The application terminates the
- * response body by closing the OutputStream. If response length has the value <code>-1</code>
+ * response body by closing the OutputStream. If response length has the value {@code -1}
* then no response body is being sent.
* <p>
* If the content-length response header has not already been set then
@@ -192,7 +192,7 @@
/**
* Returns the response code, if it has already been set
- * @return the response code, if available. <code>-1</code> if not available yet.
+ * @return the response code, if available. {@code -1} if not available yet.
*/
public abstract int getResponseCode ();
@@ -219,7 +219,7 @@
* available.
* @param name the name of the attribute to retrieve
* @return the attribute object, or null if it does not exist
- * @throws NullPointerException if name is <code>null</code>
+ * @throws NullPointerException if name is {@code null}
*/
public abstract Object getAttribute (String name) ;
@@ -231,9 +231,9 @@
* Each Filter class will document the attributes which they make
* available.
* @param name the name to associate with the attribute value
- * @param value the object to store as the attribute value. <code>null</code>
+ * @param value the object to store as the attribute value. {@code null}
* value is permitted.
- * @throws NullPointerException if name is <code>null</code>
+ * @throws NullPointerException if name is {@code null}
*/
public abstract void setAttribute (String name, Object value) ;
@@ -248,9 +248,9 @@
* required to be) sub-classes of {@link java.io.FilterInputStream}
* and {@link java.io.FilterOutputStream}.
* @param i the filtered input stream to set as this object's inputstream,
- * or <code>null</code> if no change.
+ * or {@code null} if no change.
* @param o the filtered output stream to set as this object's outputstream,
- * or <code>null</code> if no change.
+ * or {@code null} if no change.
*/
public abstract void setStreams (InputStream i, OutputStream o);
@@ -259,7 +259,7 @@
* If an authenticator is set on the HttpContext that owns this exchange,
* then this method will return the {@link HttpPrincipal} that represents
* the authenticated user for this HttpExchange.
- * @return the HttpPrincipal, or <code>null</code> if no authenticator is set.
+ * @return the HttpPrincipal, or {@code null} if no authenticator is set.
*/
public abstract HttpPrincipal getPrincipal ();
}
--- a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpServer.java Tue Apr 28 10:12:15 2015 -0700
+++ b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpServer.java Tue Apr 28 21:30:10 2015 +0400
@@ -58,8 +58,8 @@
* whose path is the longest matching prefix of the request URI's path.
* Paths are matched literally, which means that the strings are compared
* case sensitively, and with no conversion to or from any encoded forms.
- * For example. Given a HttpServer with the following HttpContexts configured.<p>
- * <table >
+ * For example. Given a HttpServer with the following HttpContexts configured.
+ * <table>
* <tr><td><i>Context</i></td><td><i>Context path</i></td></tr>
* <tr><td>ctx1</td><td>"/"</td></tr>
* <tr><td>ctx2</td><td>"/apps/"</td></tr>
@@ -67,7 +67,7 @@
* </table>
* <p>
* the following table shows some request URIs and which, if any context they would
- * match with.<p>
+ * match with.
* <table>
* <tr><td><i>Request URI</i></td><td><i>Matches context</i></td></tr>
* <tr><td>"http://foo.com/apps/foo/bar"</td><td>ctx3</td></tr>
@@ -181,7 +181,7 @@
* approximately <i>delay</i> seconds have elapsed (whichever happens
* sooner). Then, all open TCP connections are closed, the background
* thread created by start() exits, and the method returns.
- * Once stopped, a HttpServer cannot be re-used. <p>
+ * Once stopped, a HttpServer cannot be re-used.
*
* @param delay the maximum time in seconds to wait until exchanges have finished.
* @throws IllegalArgumentException if delay is less than zero.
--- a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsConfigurator.java Tue Apr 28 10:12:15 2015 -0700
+++ b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsConfigurator.java Tue Apr 28 21:30:10 2015 +0400
@@ -42,8 +42,8 @@
* the default configuration.
* <p>
* The following <a name="example">example</a> shows how this may be done:
- * <p>
- * <pre><blockquote>
+ *
+ * <blockquote><pre>
* SSLContext sslContext = SSLContext.getInstance (....);
* HttpsServer server = HttpsServer.create();
*
@@ -64,7 +64,7 @@
* params.setSSLParameters(sslparams);
* }
* });
- * </blockquote></pre>
+ * </pre></blockquote>
* @since 1.6
*/
@jdk.Exported
@@ -102,7 +102,7 @@
* <p>
* The default implementation of this method uses the
* SSLParameters returned from <p>
- * <code>getSSLContext().getDefaultSSLParameters()</code>
+ * {@code getSSLContext().getDefaultSSLParameters()}
* <p>
* configure() may be overridden in order to modify this behavior.
* See, the example <a href="#example">above</a>.
--- a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/package-info.java Tue Apr 28 10:12:15 2015 -0700
+++ b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/package-info.java Tue Apr 28 21:30:10 2015 +0400
@@ -58,7 +58,7 @@
server.createContext("/applications/myapp", new MyHandler());
server.setExecutor(null); // creates a default executor
server.start();
- </blockquote></pre>
+ </pre></blockquote>
<p>The example above creates a simple HttpServer which uses the calling
application thread to invoke the handle() method for incoming http
requests directed to port 8000, and to the path /applications/myapp/.
@@ -92,7 +92,7 @@
SSLContext ssl = SSLContext.getInstance("TLS");
ssl.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
- </blockquote></pre>
+ </pre></blockquote>
<p>
In the example above, a keystore file called "testkeys", created with the keytool utility
is used as a certificate store for client and server certificates.
@@ -119,8 +119,8 @@
}
});
- </blockquote></pre>
- <p>
+ </pre></blockquote>
+
@since 1.6
*/
@jdk.Exported