java.nio.Files support, including swingjs.JSFileSystem

Author: hansonr

sources/net.sf.j2s.java.core/src/java/io/FileInputStream.java

@@ -28,7 +28,7 @@
 import java.nio.channels.FileChannel;
 //import sun.nio.ch.FileChannelImpl;
 
-import swingjs.JSFileChannel;
+import swingjs.JSFileSystem.JSFileChannel;
 import swingjs.JSTempFile;
 import swingjs.JSUtil;
 

sources/net.sf.j2s.java.core/src/java/io/FileOutputStream.java

@@ -26,8 +26,8 @@
 package java.io;
 
 import java.nio.channels.FileChannel;
-import sun.nio.ch.FileChannelImpl;
-import swingjs.JSFileChannel;
+
+import swingjs.JSFileSystem.JSFileChannel;
 import swingjs.JSTempFile;
 import javajs.util.OC;
 

sources/net.sf.j2s.java.core/src/java/nio/channels/Channels.java

@@ -123,7 +123,7 @@ private static void writeFully(WritableByteChannel ch, ByteBuffer bb)
      */
     public static InputStream newInputStream(ReadableByteChannel ch) {
         checkNotNull(ch, "ch");
-        return ((JSFileSystem.JSSeekableByteChannel) ch).getInputStream();
+        return ((JSFileSystem.JSByteChannel) ch).getInputStream();
 //        return new sun.nio.ch.ChannelInputStream(ch);
     }
 

sources/net.sf.j2s.java.core/src/java/nio/channels/FileChannel.java

@@ -288,7 +288,7 @@ public static FileChannel open(Path path,
     }
 
     @SuppressWarnings({"unchecked", "rawtypes"}) // generic array construction
-    private static final FileAttribute<?>[] NO_ATTRIBUTES = new FileAttribute[0];
+    protected static final FileAttribute<?>[] NO_ATTRIBUTES = new FileAttribute[0]; // SwingJS was private
 
     /**
      * Opens or creates a file, returning a file channel to access the file.

sources/net.sf.j2s.java.core/src/java/nio/file/Files.java

@@ -1199,7 +1199,7 @@ public static boolean deleteIfExists(Path path) throws IOException {
      *   <td> Attempts to copy the file attributes associated with this file to
      *     the target file. The exact file attributes that are copied is platform
      *     and file system dependent and therefore unspecified. Minimally, the
-     *     {@link BasicFileAttributes#lastModifiedTime last-modified-time} is
+     *     {@link BasicFileAttributes#lastModified last-modified-time} is
      *     copied to the target file if supported by both the source and target
      *     file stores. Copying of file timestamps may result in precision
      *     loss. </td>
@@ -1329,7 +1329,7 @@ public static Path copy(Path source, Path target, CopyOption... options)
      * implementation specific options.
      *
      * <p> Moving a file will copy the {@link
-     * BasicFileAttributes#lastModifiedTime last-modified-time} to the target
+     * BasicFileAttributes#lastModified last-modified-time} to the target
      * file if supported by both source and target file stores. Copying of file
      * timestamps may result in precision loss. An implementation may also
      * attempt to copy other file attributes but is not required to fail if the
@@ -2258,7 +2258,7 @@ public static boolean isRegularFile(Path path, LinkOption... options) {
      *          installed, its {@link SecurityManager#checkRead(String) checkRead}
      *          method denies read access to the file.
      *
-     * @see BasicFileAttributes#lastModifiedTime
+     * @see BasicFileAttributes#lastModified
      */
     public static FileTime getLastModifiedTime(Path path, LinkOption... options)
         throws IOException