--- a/src/share/classes/java/nio/file/CopyOption.java Thu Sep 04 19:18:31 2008 +0100
+++ b/src/share/classes/java/nio/file/CopyOption.java Thu Sep 04 19:29:20 2008 +0100
@@ -26,9 +26,14 @@ package java.nio.file;
package java.nio.file;
/**
- * An object that configures how to copy or move a file. The {@link
- * StandardCopyOption} enumeration type defines <i>standard</i> options for
- * the {@link Path#copyTo copyTo} and {@link Path#moveTo moveTo} methods.
+ * An object that configures how to copy or move a file.
+ *
+ * <p> Objects of this type may be used in parameters to the {@link Path#copyTo
+ * copyTo} and {@link Path#moveTo moveTo} methods to configure how a file is
+ * copied or moved.
+ *
+ * <p> The {@link StandardCopyOption} enumeration type defines the
+ * <i>standard</i> options.
*
* @since 1.7
*/
--- a/src/share/classes/java/nio/file/OpenOption.java Thu Sep 04 19:18:31 2008 +0100
+++ b/src/share/classes/java/nio/file/OpenOption.java Thu Sep 04 19:29:20 2008 +0100
@@ -26,10 +26,14 @@ package java.nio.file;
package java.nio.file;
/**
- * An object that configures how to open or create a file. The {@link
- * StandardOpenOption} enumeration type defines <i>standard</i> options when
- * opening a file by invoking the {@link FileRef#newSeekableByteChannel
- * newSeekableByteChannel} method.
+ * An object that configures how to open or create a file.
+ *
+ * <p> Objects of this type may be used in parameters to methods such as the
+ * {@link FileRef#newSeekableByteChannel newSeekableByteChannel} method when
+ * opening or creating a file.
+ *
+ * <p> The {@link StandardOpenOption} enumeration type defines the
+ * <i>standard</i> options.
*
* @since 1.7
*
--- a/src/share/classes/java/nio/file/SecureDirectoryStream.java Thu Sep 04 19:18:31 2008 +0100
+++ b/src/share/classes/java/nio/file/SecureDirectoryStream.java Thu Sep 04 19:29:20 2008 +0100
@@ -147,9 +147,10 @@ public abstract class SecureDirectoryStr
* @throws ClosedDirectoryStreamException
* If the directory stream is closed
* @throws IllegalArgumentException
- * If an attribute cannot be set atomically when creating the file,
- * or the options set includes an invalid option or combination of
- * options
+ * If the set contains an invalid combination of options
+ * @throws UnsupportedOperationException
+ * If an unsupported open option is specified or the array contains
+ * attributes that cannot be set atomically when creating the file
* @throws FileAlreadyExistsException
* If a file of that name already exists and the {@link
* StandardOpenOption#CREATE_NEW CREATE_NEW} option is specified
--- a/src/share/classes/java/nio/file/attribute/AclFileAttributeView.java Thu Sep 04 19:18:31 2008 +0100
+++ b/src/share/classes/java/nio/file/attribute/AclFileAttributeView.java Thu Sep 04 19:29:20 2008 +0100
@@ -135,6 +135,7 @@ public interface AclFileAttributeView
* or its {@link SecurityManager#checkRead(String) checkRead} method
* denies read access to the file.
*/
+ @Override
Object getAttribute(String attribute) throws IOException;
/**
@@ -151,6 +152,7 @@ public interface AclFileAttributeView
* or its {@link SecurityManager#checkRead(String) checkWrite} method
* denies write access to the file.
*/
+ @Override
AclFileAttributeView setAttribute(String attribute, Object value)
throws IOException;
--- a/src/share/classes/java/nio/file/attribute/AttributeView.java Thu Sep 04 19:18:31 2008 +0100
+++ b/src/share/classes/java/nio/file/attribute/AttributeView.java Thu Sep 04 19:29:20 2008 +0100
@@ -33,7 +33,7 @@ import java.io.IOException;
* associated with an object in a filesystem. This interface is extended or
* implemented by specific attribute views that define the attributes supported
* by the view. Implementors of {@code AttributeView} should ensure that the
- * attribute names do not include period (':') or comma (',') characters.
+ * attribute names do not include colon (':') or comma (',') characters.
*
* @since 1.7
*/
--- a/src/share/classes/java/nio/file/attribute/DosFileAttributeView.java Thu Sep 04 19:18:31 2008 +0100
+++ b/src/share/classes/java/nio/file/attribute/DosFileAttributeView.java Thu Sep 04 19:29:20 2008 +0100
@@ -76,6 +76,7 @@ public interface DosFileAttributeView
* @throws IOException {@inheritDoc}
* @throws SecurityException {@inheritDoc}
*/
+ @Override
DosFileAttributeView setAttribute(String attribute, Object value)
throws IOException;
--- a/src/share/classes/java/nio/file/attribute/FileStoreSpaceAttributeView.java Thu Sep 04 19:18:31 2008 +0100
+++ b/src/share/classes/java/nio/file/attribute/FileStoreSpaceAttributeView.java Thu Sep 04 19:29:20 2008 +0100
@@ -53,6 +53,7 @@ public interface FileStoreSpaceAttribute
*
* @throws UnsupportedOperationException {@inheritDoc}
*/
+ @Override
FileStoreSpaceAttributeView setAttribute(String attribute, Object value)
throws IOException;
--- a/src/share/classes/java/nio/file/attribute/NamedAttributeView.java Thu Sep 04 19:18:31 2008 +0100
+++ b/src/share/classes/java/nio/file/attribute/NamedAttributeView.java Thu Sep 04 19:29:20 2008 +0100
@@ -80,6 +80,7 @@ public interface NamedAttributeView
*
* @throws IOException {@inheritDoc}
*/
+ @Override
Object getAttribute(String attribute) throws IOException;
/**
@@ -92,6 +93,7 @@ public interface NamedAttributeView
* @throws UnsupportedOperationException {@inheritDoc}
* @throws IOException {@inheritDoc}
*/
+ @Override
NamedAttributeView setAttribute(String attribute, Object value)
throws IOException;
@@ -188,7 +190,7 @@ public interface NamedAttributeView
int read(String name, ByteBuffer dst) throws IOException;
/**
- * Writes the value of an extended attribute from a buffer.
+ * Writes the value of an named attribute from a buffer.
*
* <p> This method writes the value of the attribute from a given buffer as
* a sequence of bytes. The size of the value to transfer is {@code r},
--- a/src/share/classes/java/nio/file/attribute/package-info.java Thu Sep 04 19:18:31 2008 +0100
+++ b/src/share/classes/java/nio/file/attribute/package-info.java Thu Sep 04 19:29:20 2008 +0100
@@ -24,7 +24,7 @@
*/
/**
- * Interfaces and classes providing access to file and file syste attributes.
+ * Interfaces and classes providing access to file and file system attributes.
*
* <blockquote><table cellspacing=1 cellpadding=0 summary="Attribute views">
* <tr><th><p align="left">Attribute views</p></th><th><p align="left">Description</p></th></tr>