ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/main/java/util/concurrent/Future.java
(Generate patch)

Comparing jsr166/src/main/java/util/concurrent/Future.java (file contents):
Revision 1.22 by dl, Sat Dec 27 19:26:25 2003 UTC vs.
Revision 1.23 by dl, Mon Feb 9 00:23:55 2004 UTC

# Line 66 | Line 66 | public interface Future<V> {
66       * or could not be cancelled for some other reason. If successful,
67       * and this task has not started when <tt>cancel</tt> is called,
68       * this task should never run.  If the task has already started,
69 <     * then the <tt>interruptIfRunning</tt> parameter determines
69 >     * then the <tt>mayInterruptIfRunning</tt> parameter determines
70       * whether the thread executing this task should be interrupted in
71       * an attempt to stop the task.
72       *
# Line 99 | Line 99 | public interface Future<V> {
99      boolean isDone();
100  
101      /**
102 <     * Waits if necessary for computation to complete, and then
102 >     * Waits if necessary for the computation to complete, and then
103       * retrieves its result.
104       *
105 <     * @return computed result
106 <     * @throws CancellationException if this future was cancelled.
107 <     * @throws ExecutionException if underlying computation threw an
105 >     * @return the computed result
106 >     * @throws CancellationException if the computation was cancelled
107 >     * @throws ExecutionException if the computation threw an
108       * exception
109 <     * @throws InterruptedException if current thread was interrupted
109 >     * @throws InterruptedException if the current thread was interrupted
110       * while waiting
111       */
112      V get() throws InterruptedException, ExecutionException;
113  
114      /**
115       * Waits if necessary for at most the given time for the computation
116 <     * to complete, and then retrieves its result.
116 >     * to complete, and then retrieves its result, if available.
117       *
118       * @param timeout the maximum time to wait
119       * @param unit the time unit of the timeout argument
120 <     * @return computed result
121 <     * @throws CancellationException if this future was cancelled.
122 <     * @throws ExecutionException if underlying computation threw an
120 >     * @return the computed result
121 >     * @throws CancellationException if the computation was cancelled
122 >     * @throws ExecutionException if the computation threw an
123       * exception
124 <     * @throws InterruptedException if current thread was interrupted
124 >     * @throws InterruptedException if the current thread was interrupted
125       * while waiting
126       * @throws TimeoutException if the wait timed out
127       */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines