From 097efbb0e20004ffe0e261c199cc9325e8877554 Mon Sep 17 00:00:00 2001 From: Sergey Lugovoy Date: Mon, 18 Nov 2013 17:00:23 +0400 Subject: [PATCH] 8028049: Tidy warnings cleanup for packages java.nio/java.io Reviewed-by: alanb, darcy --- jdk/src/share/classes/java/io/EOFException.java | 1 - jdk/src/share/classes/java/io/FilePermission.java | 2 +- .../classes/java/nio/channels/AsynchronousChannelGroup.java | 1 - .../classes/java/nio/channels/AsynchronousFileChannel.java | 2 +- jdk/src/share/classes/java/nio/channels/FileChannel.java | 2 +- jdk/src/share/classes/java/nio/charset/Charset.java | 4 ++-- jdk/src/share/classes/java/nio/file/FileSystem.java | 1 - jdk/src/share/classes/java/nio/file/Files.java | 2 +- jdk/src/share/classes/java/nio/package.html | 4 ++-- 9 files changed, 8 insertions(+), 11 deletions(-) diff --git a/jdk/src/share/classes/java/io/EOFException.java b/jdk/src/share/classes/java/io/EOFException.java index ed6ca0fad12..0f9a326c3fa 100644 --- a/jdk/src/share/classes/java/io/EOFException.java +++ b/jdk/src/share/classes/java/io/EOFException.java @@ -32,7 +32,6 @@ package java.io; * This exception is mainly used by data input streams to signal end of * stream. Note that many other input operations return a special value on * end of stream rather than throwing an exception. - *

* * @author Frank Yellin * @see java.io.DataInputStream diff --git a/jdk/src/share/classes/java/io/FilePermission.java b/jdk/src/share/classes/java/io/FilePermission.java index 89f2c33287a..bac39d30459 100644 --- a/jdk/src/share/classes/java/io/FilePermission.java +++ b/jdk/src/share/classes/java/io/FilePermission.java @@ -380,7 +380,7 @@ public final class FilePermission extends Permission implements Serializable { /** * Checks two FilePermission objects for equality. Checks that obj is * a FilePermission, and has the same pathname and actions as this object. - *

+ * * @param obj the object we are testing for equality with this object. * @return true if obj is a FilePermission, and has the same * pathname and actions as this FilePermission object, diff --git a/jdk/src/share/classes/java/nio/channels/AsynchronousChannelGroup.java b/jdk/src/share/classes/java/nio/channels/AsynchronousChannelGroup.java index aa56bbf38a2..8f7cdd6490e 100644 --- a/jdk/src/share/classes/java/nio/channels/AsynchronousChannelGroup.java +++ b/jdk/src/share/classes/java/nio/channels/AsynchronousChannelGroup.java @@ -66,7 +66,6 @@ import java.util.concurrent.TimeUnit; * Description * * - * * {@code java.nio.channels.DefaultThreadPool.threadFactory} * The value of this property is taken to be the fully-qualified name * of a concrete {@link java.util.concurrent.ThreadFactory ThreadFactory} diff --git a/jdk/src/share/classes/java/nio/channels/AsynchronousFileChannel.java b/jdk/src/share/classes/java/nio/channels/AsynchronousFileChannel.java index c40fb376287..24ec4df7490 100644 --- a/jdk/src/share/classes/java/nio/channels/AsynchronousFileChannel.java +++ b/jdk/src/share/classes/java/nio/channels/AsynchronousFileChannel.java @@ -178,7 +178,7 @@ public abstract class AsynchronousFileChannel * written synchronously to the underlying storage device. (see Synchronized I/O file * integrity). - * + * * * {@link StandardOpenOption#DSYNC DSYNC} * Requires that every update to the file's content be written diff --git a/jdk/src/share/classes/java/nio/channels/FileChannel.java b/jdk/src/share/classes/java/nio/channels/FileChannel.java index 57ce3e10d9e..f6f332ae6b9 100644 --- a/jdk/src/share/classes/java/nio/channels/FileChannel.java +++ b/jdk/src/share/classes/java/nio/channels/FileChannel.java @@ -229,7 +229,7 @@ public abstract class FileChannel * written synchronously to the underlying storage device. (see Synchronized I/O file * integrity). - * + * * * {@link StandardOpenOption#DSYNC DSYNC} * Requires that every update to the file's content be written diff --git a/jdk/src/share/classes/java/nio/charset/Charset.java b/jdk/src/share/classes/java/nio/charset/Charset.java index 3d946f1d4bc..ae0566174b5 100644 --- a/jdk/src/share/classes/java/nio/charset/Charset.java +++ b/jdk/src/share/classes/java/nio/charset/Charset.java @@ -118,10 +118,10 @@ import sun.security.action.GetPropertyAction; * {@link java.io.InputStreamReader#getEncoding InputStreamReader} and {@link * java.io.OutputStreamWriter#getEncoding OutputStreamWriter} classes. * - *

If a charset listed in the If a charset listed in the IANA Charset * Registry is supported by an implementation of the Java platform then - * its canonical name must be the name listed in the registry. Many charsets + * its canonical name must be the name listed in the registry. Many charsets * are given more than one name in the registry, in which case the registry * identifies one of the names as MIME-preferred. If a charset has more * than one registry name then its canonical name must be the MIME-preferred diff --git a/jdk/src/share/classes/java/nio/file/FileSystem.java b/jdk/src/share/classes/java/nio/file/FileSystem.java index 2a961fb8ecf..a5dbe0f1d49 100644 --- a/jdk/src/share/classes/java/nio/file/FileSystem.java +++ b/jdk/src/share/classes/java/nio/file/FileSystem.java @@ -325,7 +325,6 @@ public abstract class FileSystem * Matches file names containing a dot * * - * * {@code *.{java,class}} * Matches file names ending with {@code .java} or {@code .class} * diff --git a/jdk/src/share/classes/java/nio/file/Files.java b/jdk/src/share/classes/java/nio/file/Files.java index 920ac93d097..5c8d8be171a 100644 --- a/jdk/src/share/classes/java/nio/file/Files.java +++ b/jdk/src/share/classes/java/nio/file/Files.java @@ -284,7 +284,7 @@ public final class Files { * written synchronously to the underlying storage device. (see Synchronized I/O file * integrity). - * + * * * {@link StandardOpenOption#DSYNC DSYNC} * Requires that every update to the file's content be written diff --git a/jdk/src/share/classes/java/nio/package.html b/jdk/src/share/classes/java/nio/package.html index 27059e7df3f..1f02634d65e 100644 --- a/jdk/src/share/classes/java/nio/package.html +++ b/jdk/src/share/classes/java/nio/package.html @@ -62,7 +62,7 @@ the platform's default implementations or to construct alternative implementations. - +

@@ -115,7 +115,7 @@ other buffer classes: best effort to perform native I/O operations directly upon it.

  • A byte buffer can be created by {@link - java.nio.channels.FileChannel#map mapping} a region of a + java.nio.channels.FileChannel#map mapping} a region of a file directly into memory, in which case a few additional file-related operations defined in the {@link java.nio.MappedByteBuffer} class are available.

    • Buffers

    Description