summaryrefslogtreecommitdiffstats
path: root/concurrent/src
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-07-29 13:59:24 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-07-29 13:59:24 -0700
commitf3d98d58c4890503f52a96bdf6650048df09a7e9 (patch)
treef2b056f16fb07d88f3d2d613c210e6fc7b008e1e /concurrent/src
parent9ad964cce1c86e1493902340147fba223c52c2d7 (diff)
parent9190768f495e452dd61c6183413be2b16a035eb5 (diff)
downloadlibcore-f3d98d58c4890503f52a96bdf6650048df09a7e9.zip
libcore-f3d98d58c4890503f52a96bdf6650048df09a7e9.tar.gz
libcore-f3d98d58c4890503f52a96bdf6650048df09a7e9.tar.bz2
Merge change 9014
* changes: Fixing some broken links in the concurrent Javadoc.
Diffstat (limited to 'concurrent/src')
-rw-r--r--concurrent/src/main/java/java/util/concurrent/BlockingQueue.java4
-rw-r--r--concurrent/src/main/java/java/util/concurrent/locks/package-info.java11
-rw-r--r--concurrent/src/main/java/java/util/concurrent/package-info.java4
3 files changed, 6 insertions, 13 deletions
diff --git a/concurrent/src/main/java/java/util/concurrent/BlockingQueue.java b/concurrent/src/main/java/java/util/concurrent/BlockingQueue.java
index 85945b9..d01c097 100644
--- a/concurrent/src/main/java/java/util/concurrent/BlockingQueue.java
+++ b/concurrent/src/main/java/java/util/concurrent/BlockingQueue.java
@@ -42,7 +42,7 @@ import java.util.Queue;
* <td>{@link #add add(e)}</td>
* <td>{@link #offer offer(e)}</td>
* <td>{@link #put put(e)}</td>
- * <td>{@link #offer(Object, long, TimeUnit) offer(e, time, unit)}</td>
+ * <td>{@link #offer offer(e, time, unit)}</td>
* </tr>
* <tr>
* <td><b>Remove</b></td>
@@ -156,7 +156,7 @@ public interface BlockingQueue<E> extends Queue<E> {
* <tt>true</tt> upon success and throwing an
* <tt>IllegalStateException</tt> if no space is currently available.
* When using a capacity-restricted queue, it is generally preferable to
- * use {@link #offer(Object) offer}.
+ * use {@link #offer offer}.
*
* @param e the element to add
* @return <tt>true</tt> (as specified by {@link Collection#add})
diff --git a/concurrent/src/main/java/java/util/concurrent/locks/package-info.java b/concurrent/src/main/java/java/util/concurrent/locks/package-info.java
index 12560af..801ee9b 100644
--- a/concurrent/src/main/java/java/util/concurrent/locks/package-info.java
+++ b/concurrent/src/main/java/java/util/concurrent/locks/package-info.java
@@ -34,13 +34,10 @@
*
* <p>The {@link java.util.concurrent.locks.AbstractQueuedSynchronizer}
* class serves as a useful superclass for defining locks and other
- * synchronizers that rely on queuing blocked threads. The {@link
- * java.util.concurrent.locks.AbstractQueuedLongSynchronizer} class
- * provides the same functionality but extends support to 64 bits of
- * synchronization state. The {@link java.util.concurrent.locks.LockSupport}
- * class provides lower-level blocking and unblocking support that is
- * useful for those developers implementing their own customized lock
- * classes.
+ * synchronizers that rely on queuing blocked threads. The
+ * {@link java.util.concurrent.locks.LockSupport} class provides
+ * lower-level blocking and unblocking support that is useful for those
+ * developers implementing their own customized lock classes.
*
* @since 1.5
*/
diff --git a/concurrent/src/main/java/java/util/concurrent/package-info.java b/concurrent/src/main/java/java/util/concurrent/package-info.java
index f77e16a..d49ef25 100644
--- a/concurrent/src/main/java/java/util/concurrent/package-info.java
+++ b/concurrent/src/main/java/java/util/concurrent/package-info.java
@@ -41,10 +41,6 @@
* a function, allows determination of whether execution has
* completed, and provides a means to cancel execution.
*
- * A {@link java.util.concurrent.RunnableFuture} is a {@code Future}
- * that possesses a {@code run} method that upon execution,
- * sets its results.
- *
* <p>
*
* <b>Implementations.</b>