From 36736be8baa432ebfe0d7bfa0042496402d06459 Mon Sep 17 00:00:00 2001
From: Martin Buchholz
Date: Wed, 29 Jul 2009 13:56:15 -0700
Subject: [PATCH] 6866554: Misc. javadoc warnings
Reviewed-by: alanb
---
.../share/classes/java/nio/channels/DatagramChannel.java | 2 +-
jdk/src/share/classes/java/nio/channels/package-info.java | 4 ++--
jdk/src/share/classes/java/nio/file/DirectoryStream.java | 2 +-
jdk/src/share/classes/java/nio/file/Path.java | 2 +-
.../share/classes/java/nio/file/attribute/package-info.java | 4 ++--
.../classes/java/util/concurrent/ConcurrentLinkedQueue.java | 3 ++-
.../classes/java/util/concurrent/LinkedBlockingDeque.java | 6 ++++--
.../classes/java/util/concurrent/LinkedBlockingQueue.java | 3 ++-
8 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/jdk/src/share/classes/java/nio/channels/DatagramChannel.java b/jdk/src/share/classes/java/nio/channels/DatagramChannel.java
index cbf402f5933..1dde1d7a399 100644
--- a/jdk/src/share/classes/java/nio/channels/DatagramChannel.java
+++ b/jdk/src/share/classes/java/nio/channels/DatagramChannel.java
@@ -421,7 +421,7 @@ public abstract class DatagramChannel
* invocation of this method will block until the first operation is
* complete. If this channel's socket is not bound then this method will
* first cause the socket to be bound to an address that is assigned
- * automatically, as if by invoking the {@link #bind bind) method with a
+ * automatically, as if by invoking the {@link #bind bind} method with a
* parameter of {@code null}.
*
* @param src
diff --git a/jdk/src/share/classes/java/nio/channels/package-info.java b/jdk/src/share/classes/java/nio/channels/package-info.java
index 47a1cb5f979..36a40840260 100644
--- a/jdk/src/share/classes/java/nio/channels/package-info.java
+++ b/jdk/src/share/classes/java/nio/channels/package-info.java
@@ -115,8 +115,8 @@
* Reads, writes, maps, and manipulates files |
* | {@link java.nio.channels.FileLock} |
* A lock on a (region of a) file |
- * | {@link java.nio.MappedByteBuffer}/{@link java.nio.MappedBigByteBuffer} |
- * A direct byte buffer or big byte buffer mapped to a region of a file |
+ * | {@link java.nio.MappedByteBuffer} |
+ * A direct byte buffer mapped to a region of a file |
*
*
* The {@link java.nio.channels.FileChannel} class supports the usual
diff --git a/jdk/src/share/classes/java/nio/file/DirectoryStream.java b/jdk/src/share/classes/java/nio/file/DirectoryStream.java
index 001f22b0723..f0be02172d6 100644
--- a/jdk/src/share/classes/java/nio/file/DirectoryStream.java
+++ b/jdk/src/share/classes/java/nio/file/DirectoryStream.java
@@ -53,7 +53,7 @@ import java.io.IOException;
* invoking the {@link #close close} method. Closing the directory stream
* releases any resources associated with the stream. Once a directory stream
* is closed, all further method invocations on the iterator throw {@link
- * java.util.concurrent.ConcurrentModificationException} with cause {@link
+ * java.util.ConcurrentModificationException} with cause {@link
* ClosedDirectoryStreamException}.
*
*
A directory stream is not required to be asynchronously closeable.
diff --git a/jdk/src/share/classes/java/nio/file/Path.java b/jdk/src/share/classes/java/nio/file/Path.java
index 113a7c58067..d9ba6de7835 100644
--- a/jdk/src/share/classes/java/nio/file/Path.java
+++ b/jdk/src/share/classes/java/nio/file/Path.java
@@ -987,7 +987,7 @@ public abstract class Path
* exception then it is propogated to the iterator's {@link Iterator#hasNext()
* hasNext} or {@link Iterator#next() next} method. Where an {@code
* IOException} is thrown, it is propogated as a {@link
- * java.util.concurrent.ConcurrentModificationException} with the {@code
+ * java.util.ConcurrentModificationException} with the {@code
* IOException} as the cause.
*
*
When an implementation supports operations on entries in the
diff --git a/jdk/src/share/classes/java/nio/file/attribute/package-info.java b/jdk/src/share/classes/java/nio/file/attribute/package-info.java
index c5301b1f840..b2192b89237 100644
--- a/jdk/src/share/classes/java/nio/file/attribute/package-info.java
+++ b/jdk/src/share/classes/java/nio/file/attribute/package-info.java
@@ -102,9 +102,9 @@
*
The {@link java.nio.file.attribute.UserPrincipalLookupService}
* interface defines methods to lookup user or group principals.
*
- * The {@link java.nio.file.attribute.Attribute} interface
+ * The {@link java.nio.file.attribute.FileAttribute} interface
* represents the value of an attribute for cases where the attribute value is
- * require to be set atomically when creating an object in the file system.
+ * required to be set atomically when creating an object in the file system.
*
*
*
diff --git a/jdk/src/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java b/jdk/src/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java
index fe2bb9d8bca..5e31adea247 100644
--- a/jdk/src/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java
+++ b/jdk/src/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java
@@ -562,7 +562,8 @@ public class ConcurrentLinkedQueue extends AbstractQueue
/**
* Returns an iterator over the elements in this queue in proper sequence.
* The returned iterator is a "weakly consistent" iterator that
- * will never throw {@link ConcurrentModificationException},
+ * will never throw {@link java.util.ConcurrentModificationException
+ * ConcurrentModificationException},
* and guarantees to traverse elements as they existed upon
* construction of the iterator, and may (but is not guaranteed to)
* reflect any modifications subsequent to construction.
diff --git a/jdk/src/share/classes/java/util/concurrent/LinkedBlockingDeque.java b/jdk/src/share/classes/java/util/concurrent/LinkedBlockingDeque.java
index 7db94a6efba..dd34d0dc6b7 100644
--- a/jdk/src/share/classes/java/util/concurrent/LinkedBlockingDeque.java
+++ b/jdk/src/share/classes/java/util/concurrent/LinkedBlockingDeque.java
@@ -988,7 +988,8 @@ public class LinkedBlockingDeque
* Returns an iterator over the elements in this deque in proper sequence.
* The elements will be returned in order from first (head) to last (tail).
* The returned {@code Iterator} is a "weakly consistent" iterator that
- * will never throw {@link ConcurrentModificationException},
+ * will never throw {@link java.util.ConcurrentModificationException
+ * ConcurrentModificationException},
* and guarantees to traverse elements as they existed upon
* construction of the iterator, and may (but is not guaranteed to)
* reflect any modifications subsequent to construction.
@@ -1004,7 +1005,8 @@ public class LinkedBlockingDeque
* sequential order. The elements will be returned in order from
* last (tail) to first (head).
* The returned {@code Iterator} is a "weakly consistent" iterator that
- * will never throw {@link ConcurrentModificationException},
+ * will never throw {@link java.util.ConcurrentModificationException
+ * ConcurrentModificationException},
* and guarantees to traverse elements as they existed upon
* construction of the iterator, and may (but is not guaranteed to)
* reflect any modifications subsequent to construction.
diff --git a/jdk/src/share/classes/java/util/concurrent/LinkedBlockingQueue.java b/jdk/src/share/classes/java/util/concurrent/LinkedBlockingQueue.java
index 9c1c6cc7b1f..10f2b6540cd 100644
--- a/jdk/src/share/classes/java/util/concurrent/LinkedBlockingQueue.java
+++ b/jdk/src/share/classes/java/util/concurrent/LinkedBlockingQueue.java
@@ -728,7 +728,8 @@ public class LinkedBlockingQueue extends AbstractQueue
/**
* Returns an iterator over the elements in this queue in proper sequence.
* The returned {@code Iterator} is a "weakly consistent" iterator that
- * will never throw {@link ConcurrentModificationException},
+ * will never throw {@link java.util.ConcurrentModificationException
+ * ConcurrentModificationException},
* and guarantees to traverse elements as they existed upon
* construction of the iterator, and may (but is not guaranteed to)
* reflect any modifications subsequent to construction.