From 4d81c909f5b55d61a653c070ecc17fd685f86ff4 Mon Sep 17 00:00:00 2001 From: juh Date: Mon, 8 Jul 2013 19:24:22 -0700 Subject: [PATCH] 8020091: Fix HTML doclint issues in java.io Reviewed-by: darcy --- src/share/classes/java/io/DataInput.java | 18 +++++++++--------- src/share/classes/java/io/FileInputStream.java | 2 +- .../classes/java/io/FileOutputStream.java | 4 ++-- .../classes/java/io/InputStreamReader.java | 8 ++++---- .../classes/java/io/OutputStreamWriter.java | 10 +++++----- .../classes/java/io/PipedInputStream.java | 14 +++++++------- .../classes/java/io/RandomAccessFile.java | 12 ++++++------ 7 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/share/classes/java/io/DataInput.java b/src/share/classes/java/io/DataInput.java index 1480c9f04..4dad59d55 100644 --- a/src/share/classes/java/io/DataInput.java +++ b/src/share/classes/java/io/DataInput.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -66,10 +66,10 @@ package java.io; * summary="Bit values and bytes"> * * - * Bit Values + * Bit Values * * - * Byte 1 + * Byte 1 * * * @@ -92,10 +92,10 @@ package java.io; * summary="Bit values and bytes"> * * - * + * * * - * + * *
Bit ValuesBit Values
Byte 1Byte 1 * * @@ -108,7 +108,7 @@ package java.io; * * * - * + * *
Byte 2Byte 2 * * @@ -131,10 +131,10 @@ package java.io; * summary="Bit values and bytes"> * * - * + * * * - * + * *
Bit ValuesBit Values
Byte 1Byte 1 * * @@ -148,7 +148,7 @@ package java.io; * * * - * + * *
Byte 2Byte 2 * * diff --git a/src/share/classes/java/io/FileInputStream.java b/src/share/classes/java/io/FileInputStream.java index 90d1ad5cc..3e67fb855 100644 --- a/src/share/classes/java/io/FileInputStream.java +++ b/src/share/classes/java/io/FileInputStream.java @@ -331,7 +331,7 @@ class FileInputStream extends InputStream * object associated with this file input stream. * *

The initial {@link java.nio.channels.FileChannel#position() - * position} of the returned channel will be equal to the + * position} of the returned channel will be equal to the * number of bytes read from the file so far. Reading bytes from this * stream will increment the channel's position. Changing the channel's * position, either explicitly or by reading, will change this stream's diff --git a/src/share/classes/java/io/FileOutputStream.java b/src/share/classes/java/io/FileOutputStream.java index 928e4f3cf..44f472870 100644 --- a/src/share/classes/java/io/FileOutputStream.java +++ b/src/share/classes/java/io/FileOutputStream.java @@ -358,10 +358,10 @@ class FileOutputStream extends OutputStream /** * Returns the unique {@link java.nio.channels.FileChannel FileChannel} - * object associated with this file output stream.

+ * object associated with this file output stream. * *

The initial {@link java.nio.channels.FileChannel#position() - * position} of the returned channel will be equal to the + * position} of the returned channel will be equal to the * number of bytes written to the file so far unless this stream is in * append mode, in which case it will be equal to the size of the file. * Writing bytes to this stream will increment the channel's position diff --git a/src/share/classes/java/io/InputStreamReader.java b/src/share/classes/java/io/InputStreamReader.java index 1f6d5f611..e131dca30 100644 --- a/src/share/classes/java/io/InputStreamReader.java +++ b/src/share/classes/java/io/InputStreamReader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -33,7 +33,7 @@ import sun.nio.cs.StreamDecoder; /** * An InputStreamReader is a bridge from byte streams to character streams: It * reads bytes and decodes them into characters using a specified {@link - * java.nio.charset.Charset charset}. The charset that it uses + * java.nio.charset.Charset charset}. The charset that it uses * may be specified by name or may be given explicitly, or the platform's * default charset may be accepted. * @@ -101,7 +101,7 @@ public class InputStreamReader extends Reader { } /** - * Creates an InputStreamReader that uses the given charset.

+ * Creates an InputStreamReader that uses the given charset. * * @param in An InputStream * @param cs A charset @@ -117,7 +117,7 @@ public class InputStreamReader extends Reader { } /** - * Creates an InputStreamReader that uses the given charset decoder.

+ * Creates an InputStreamReader that uses the given charset decoder. * * @param in An InputStream * @param dec A charset decoder diff --git a/src/share/classes/java/io/OutputStreamWriter.java b/src/share/classes/java/io/OutputStreamWriter.java index b4e4b9e32..5f7b9e34b 100644 --- a/src/share/classes/java/io/OutputStreamWriter.java +++ b/src/share/classes/java/io/OutputStreamWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -33,7 +33,7 @@ import sun.nio.cs.StreamEncoder; /** * An OutputStreamWriter is a bridge from character streams to byte streams: * Characters written to it are encoded into bytes using a specified {@link - * java.nio.charset.Charset charset}. The charset that it uses + * java.nio.charset.Charset charset}. The charset that it uses * may be specified by name or may be given explicitly, or the platform's * default charset may be accepted. * @@ -86,7 +86,7 @@ public class OutputStreamWriter extends Writer { * * @param charsetName * The name of a supported - * {@link java.nio.charset.Charset
charset} + * {@link java.nio.charset.Charset charset} * * @exception UnsupportedEncodingException * If the named encoding is not supported @@ -115,7 +115,7 @@ public class OutputStreamWriter extends Writer { } /** - * Creates an OutputStreamWriter that uses the given charset.

+ * Creates an OutputStreamWriter that uses the given charset. * * @param out * An OutputStream @@ -134,7 +134,7 @@ public class OutputStreamWriter extends Writer { } /** - * Creates an OutputStreamWriter that uses the given charset encoder.

+ * Creates an OutputStreamWriter that uses the given charset encoder. * * @param out * An OutputStream diff --git a/src/share/classes/java/io/PipedInputStream.java b/src/share/classes/java/io/PipedInputStream.java index 4ad8fbd81..af07de5b4 100644 --- a/src/share/classes/java/io/PipedInputStream.java +++ b/src/share/classes/java/io/PipedInputStream.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -39,7 +39,7 @@ package java.io; * The piped input stream contains a buffer, * decoupling read operations from write operations, * within limits. - * A pipe is said to be broken if a + * A pipe is said to be broken if a * thread that was providing data bytes to the connected * piped output stream is no longer alive. * @@ -193,7 +193,7 @@ public class PipedInputStream extends InputStream { * Receives a byte of data. This method will block if no input is * available. * @param b the byte being received - * @exception IOException If the pipe is broken, + * @exception IOException If the pipe is broken, * {@link #connect(java.io.PipedOutputStream) unconnected}, * closed, or if an I/O error occurs. * @since JDK1.1 @@ -219,7 +219,7 @@ public class PipedInputStream extends InputStream { * @param b the buffer into which the data is received * @param off the start offset of the data * @param len the maximum number of bytes received - * @exception IOException If the pipe is broken, + * @exception IOException If the pipe is broken, * {@link #connect(java.io.PipedOutputStream) unconnected}, * closed,or if an I/O error occurs. */ @@ -298,7 +298,7 @@ public class PipedInputStream extends InputStream { * stream is reached. * @exception IOException if the pipe is * {@link #connect(java.io.PipedOutputStream) unconnected}, - * broken, closed, + * broken, closed, * or if an I/O error occurs. */ public synchronized int read() throws IOException { @@ -361,7 +361,7 @@ public class PipedInputStream extends InputStream { * @exception IndexOutOfBoundsException If off is negative, * len is negative, or len is greater than * b.length - off - * @exception IOException if the pipe is broken, + * @exception IOException if the pipe is broken, * {@link #connect(java.io.PipedOutputStream) unconnected}, * closed, or if an I/O error occurs. */ @@ -419,7 +419,7 @@ public class PipedInputStream extends InputStream { * without blocking, or {@code 0} if this input stream has been * closed by invoking its {@link #close()} method, or if the pipe * is {@link #connect(java.io.PipedOutputStream) unconnected}, or - * broken. + * broken. * * @exception IOException if an I/O error occurs. * @since JDK1.0.2 diff --git a/src/share/classes/java/io/RandomAccessFile.java b/src/share/classes/java/io/RandomAccessFile.java index adccfbc75..5e32ad5db 100644 --- a/src/share/classes/java/io/RandomAccessFile.java +++ b/src/share/classes/java/io/RandomAccessFile.java @@ -123,11 +123,11 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable { * write to, the file specified by the {@link File} argument. A new {@link * FileDescriptor} object is created to represent this file connection. * - *

The mode argument specifies the access mode + *

The mode argument specifies the access mode * in which the file is to be opened. The permitted values and their * meanings are: * - *

+ *
* * * - *

Value

Meaning

"r" Open for reading only. Invoking any of the write @@ -144,7 +144,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable { * Open for reading and writing, as with "rw", and also * require that every update to the file's content be written * synchronously to the underlying storage device.
+ *
* * The "rws" and "rwd" modes work much like the {@link * java.nio.channels.FileChannel#force(boolean) force(boolean)} method of @@ -158,13 +158,13 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable { * event of a system crash. If the file does not reside on a local device * then no such guarantee is made. * - *

The "rwd" mode can be used to reduce the number of I/O + *

The "rwd" mode can be used to reduce the number of I/O * operations performed. Using "rwd" only requires updates to the * file's content to be written to storage; using "rws" requires * updates to both the file's content and its metadata to be written, which * generally requires at least one more low-level I/O operation. * - *

If there is a security manager, its {@code checkRead} method is + *

If there is a security manager, its {@code checkRead} method is * called with the pathname of the {@code file} argument as its * argument to see if read access to the file is allowed. If the mode * allows writing, the security manager's {@code checkWrite} method is @@ -238,7 +238,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable { /** * Returns the opaque file descriptor object associated with this - * stream.

+ * stream. * * @return the file descriptor object associated with this stream. * @exception IOException if an I/O error occurs. -- GitLab