jdk-sandbox: comparison jdk/src/java.base/share/classes/java/nio/file/Files.java

equal deleted inserted replaced

-:826d3d9a874a
+:2cf6bc8c2d2c
 *
 * <p> In the case of the default provider, the returned seekable byte channel
 * is a {@link java.nio.channels.FileChannel}.
 *
 * <p> <b>Usage Examples:</b>
-* <pre>
+* <pre>{@code
 *     Path path = ...
 *
 *     // open file for reading
 *     ReadableByteChannel rbc = Files.newByteChannel(path, EnumSet.of(READ)));
 *
 *     // open file for writing to the end of an existing file, creating
 *     // the file if it doesn't already exist
 *     WritableByteChannel wbc = Files.newByteChannel(path, EnumSet.of(CREATE,APPEND));
 *
 *     // create file with initial permissions, opening it for both reading and writing
-*     {@code FileAttribute<Set<PosixFilePermission>> perms = ...}
+*     FileAttribute<Set<PosixFilePermission>> perms = ...
-*     SeekableByteChannel sbc = Files.newByteChannel(path, EnumSet.of(CREATE_NEW,READ,WRITE), perms);
+*     SeekableByteChannel sbc =
-* </pre>
+*         Files.newByteChannel(path, EnumSet.of(CREATE_NEW,READ,WRITE), perms);
+* }</pre>
 *
 * @param   path
 *          the path to the file to open or create
 * @param   options
 *          options specifying how the file is opened
 *    BasicFileAttributes attrs = Files.readAttributes(path, BasicFileAttributes.class);
 * </pre>
 * Alternatively, suppose we want to read file's POSIX attributes without
 * following symbolic links:
 * <pre>
-*    PosixFileAttributes attrs = Files.readAttributes(path, PosixFileAttributes.class, NOFOLLOW_LINKS);
+*    PosixFileAttributes attrs =
+*        Files.readAttributes(path, PosixFileAttributes.class, NOFOLLOW_LINKS);
 * </pre>
 *
 * @param   <A>
 *          The {@code BasicFileAttributes} type
 * @param   path
 *          options specifying how the file is opened
 *
 * @return  a new buffered writer, with default buffer size, to write text
 *          to the file
 *
+* @throws  IllegalArgumentException
+*          if {@code options} contains an invalid combination of options
 * @throws  IOException
 *          if an I/O error occurs opening or creating the file
 * @throws  UnsupportedOperationException
 *          if an unsupported option is specified
 * @throws  SecurityException
 *          options specifying how the file is opened
 *
 * @return  a new buffered writer, with default buffer size, to write text
 *          to the file
 *
+* @throws  IllegalArgumentException
+*          if {@code options} contains an invalid combination of options
 * @throws  IOException
 *          if an I/O error occurs opening or creating the file
 * @throws  UnsupportedOperationException
 *          if an unsupported option is specified
 * @throws  SecurityException
 *          installed, the {@link SecurityManager#checkWrite(String) checkWrite}
 *          method is invoked to check write access to the file.
 *
 * @since 1.8
 */
-public static BufferedWriter newBufferedWriter(Path path, OpenOption... options) throws IOException {
+public static BufferedWriter newBufferedWriter(Path path, OpenOption... options)
+throws IOException
+{
 return newBufferedWriter(path, StandardCharsets.UTF_8, options);
 }
 /**
 * Reads all bytes from an input stream and writes them to an output stream.
 * @param   options
 *          options specifying how the file is opened
 *
 * @return  the path
 *
+* @throws  IllegalArgumentException
+*          if {@code options} contains an invalid combination of options
 * @throws  IOException
 *          if an I/O error occurs writing to or creating the file
 * @throws  UnsupportedOperationException
 *          if an unsupported option is specified
 * @throws  SecurityException
 * @param   options
 *          options specifying how the file is opened
 *
 * @return  the path
 *
+* @throws  IllegalArgumentException
+*          if {@code options} contains an invalid combination of options
 * @throws  IOException
 *          if an I/O error occurs writing to or creating the file, or the
 *          text cannot be encoded using the specified charset
 * @throws  UnsupportedOperationException
 *          if an unsupported option is specified
 * @param   options
 *          options specifying how the file is opened
 *
 * @return  the path
 *
+* @throws  IllegalArgumentException
+*          if {@code options} contains an invalid combination of options
 * @throws  IOException
 *          if an I/O error occurs writing to or creating the file, or the
 *          text cannot be encoded as {@code UTF-8}
 * @throws  UnsupportedOperationException
 *          if an unsupported option is specified
 DirectoryStream<Path> ds = Files.newDirectoryStream(dir);
 try {
 final Iterator<Path> delegate = ds.iterator();
 // Re-wrap DirectoryIteratorException to UncheckedIOException
-Iterator<Path> it = new Iterator<Path>() {
+Iterator<Path> iterator = new Iterator<Path>() {
 @Override
 public boolean hasNext() {
 try {
 return delegate.hasNext();
 } catch (DirectoryIteratorException e) {
 throw new UncheckedIOException(e.getCause());
 }
 }
 };
-return StreamSupport.stream(Spliterators.spliteratorUnknownSize(it, Spliterator.DISTINCT), false)
+Spliterator<Path> spliterator =
+Spliterators.spliteratorUnknownSize(iterator, Spliterator.DISTINCT);
+return StreamSupport.stream(spliterator, false)
 .onClose(asUncheckedRunnable(ds));
 } catch (Error|RuntimeException e) {
 try {
 ds.close();
 } catch (IOException ex) {
 FileVisitOption... options)
 throws IOException
 {
 FileTreeIterator iterator = new FileTreeIterator(start, maxDepth, options);
 try {
-return StreamSupport.stream(Spliterators.spliteratorUnknownSize(iterator, Spliterator.DISTINCT), false)
+Spliterator<FileTreeWalker.Event> spliterator =
+Spliterators.spliteratorUnknownSize(iterator, Spliterator.DISTINCT);
+return StreamSupport.stream(spliterator, false)
 .onClose(iterator::close)
 .map(entry -> entry.file());
 } catch (Error|RuntimeException e) {
 iterator.close();
 throw e;
 FileVisitOption... options)
 throws IOException
 {
 FileTreeIterator iterator = new FileTreeIterator(start, maxDepth, options);
 try {
-return StreamSupport.stream(Spliterators.spliteratorUnknownSize(iterator, Spliterator.DISTINCT), false)
+Spliterator<FileTreeWalker.Event> spliterator =
+Spliterators.spliteratorUnknownSize(iterator, Spliterator.DISTINCT);
+return StreamSupport.stream(spliterator, false)
 .onClose(iterator::close)
 .filter(entry -> matcher.test(entry.file(), entry.attributes()))
 .map(entry -> entry.file());
 } catch (Error|RuntimeException e) {
 iterator.close();

changeset 27339	2cf6bc8c2d2c
parent 26960	d280345c2cfb
child 27775	4ee8b208017c
child 27565	729f9700483a