diff -r b518cd4045bc -r d25399d849bc jdk/src/share/classes/java/util/concurrent/Future.java --- a/jdk/src/share/classes/java/util/concurrent/Future.java Tue Jul 09 10:44:49 2013 +0200 +++ b/jdk/src/share/classes/java/util/concurrent/Future.java Tue Jul 09 16:04:25 2013 +0200 @@ -36,19 +36,19 @@ package java.util.concurrent; /** - * A Future represents the result of an asynchronous + * A {@code Future} represents the result of an asynchronous * computation. Methods are provided to check if the computation is * complete, to wait for its completion, and to retrieve the result of * the computation. The result can only be retrieved using method - * get when the computation has completed, blocking if + * {@code get} when the computation has completed, blocking if * necessary until it is ready. Cancellation is performed by the - * cancel method. Additional methods are provided to + * {@code cancel} method. Additional methods are provided to * determine if the task completed normally or was cancelled. Once a * computation has completed, the computation cannot be cancelled. - * If you would like to use a Future for the sake + * If you would like to use a {@code Future} for the sake * of cancellability but not provide a usable result, you can * declare types of the form {@code Future>} and - * return null as a result of the underlying task. + * return {@code null} as a result of the underlying task. * *
* Sample Usage (Note that the following classes are all @@ -72,9 +72,9 @@ * } * }} * - * The {@link FutureTask} class is an implementation of Future that - * implements Runnable, and so may be executed by an Executor. - * For example, the above construction with submit could be replaced by: + * The {@link FutureTask} class is an implementation of {@code Future} that + * implements {@code Runnable}, and so may be executed by an {@code Executor}. + * For example, the above construction with {@code submit} could be replaced by: *
{@code * FutureTaskfuture = * new FutureTask (new Callable () { @@ -91,7 +91,7 @@ * @see Executor * @since 1.5 * @author Doug Lea - * @param The result type returned by this Future's get method + * @param The result type returned by this Future's {@code get} method */ public interface Future { @@ -99,41 +99,41 @@ * Attempts to cancel execution of this task. This attempt will * fail if the task has already completed, has already been cancelled, * or could not be cancelled for some other reason. If successful, - * and this task has not started when cancel is called, + * and this task has not started when {@code cancel} is called, * this task should never run. If the task has already started, - * then the mayInterruptIfRunning parameter determines + * then the {@code mayInterruptIfRunning} parameter determines * whether the thread executing this task should be interrupted in * an attempt to stop the task. * * After this method returns, subsequent calls to {@link #isDone} will - * always return true. Subsequent calls to {@link #isCancelled} - * will always return true if this method returned true. + * always return {@code true}. Subsequent calls to {@link #isCancelled} + * will always return {@code true} if this method returned {@code true}. * - * @param mayInterruptIfRunning true if the thread executing this + * @param mayInterruptIfRunning {@code true} if the thread executing this * task should be interrupted; otherwise, in-progress tasks are allowed * to complete - * @return false if the task could not be cancelled, + * @return {@code false} if the task could not be cancelled, * typically because it has already completed normally; - * true otherwise + * {@code true} otherwise */ boolean cancel(boolean mayInterruptIfRunning); /** - * Returns true if this task was cancelled before it completed + * Returns {@code true} if this task was cancelled before it completed * normally. * - * @return true if this task was cancelled before it completed + * @return {@code true} if this task was cancelled before it completed */ boolean isCancelled(); /** - * Returns true if this task completed. + * Returns {@code true} if this task completed. * * Completion may be due to normal termination, an exception, or * cancellation -- in all of these cases, this method will return - * true. + * {@code true}. * - * @return true if this task completed + * @return {@code true} if this task completed */ boolean isDone();