passes bytes through to URI and Files.readAllBytes

BobHanson · BobHanson · commit e344808fd143 · 2020-01-20T06:04:40.000-06:00
diff --git a/sources/net.sf.j2s.java.core/src/java/io/File.java b/sources/net.sf.j2s.java.core/src/java/io/File.java
@@ -701,11 +701,12 @@ private static String slashify(String path, boolean isDirectory) {
 //     */
     public URI toURI() {
         try {
-            File f = getAbsoluteFile();
-            String sp = slashify(f.getPath(), f.isDirectory());
+            String sp = slashify(getAbsoluteFile().getPath(), false);
             if (sp.startsWith("//"))
                 sp = "//" + sp;
-            return new URI("file", null, sp, null);
+            URI uri = new URI("file", null, sp, null);
+            uri.秘bytes = 秘bytes;
+            return uri;
         } catch (URISyntaxException x) {
             throw new Error(x);         // Can't happen
         }
diff --git a/sources/net.sf.j2s.java.core/src/java/net/URI.java b/sources/net.sf.j2s.java.core/src/java/net/URI.java
@@ -506,6 +506,12 @@ public final class URI
     private volatile String string;             // The only serializable field
 
 
+    /**
+     * Possibly transmitted from File object
+     */
+	public byte[] 秘bytes;
+
+
 
     // -- Constructors and factories --
 
diff --git a/sources/net.sf.j2s.java.core/src/java/nio/file/Files.java b/sources/net.sf.j2s.java.core/src/java/nio/file/Files.java
@@ -77,6 +77,8 @@
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
+import swingjs.JSFileSystem.JSPath;
+
 /**
  * This class consists exclusively of static methods that operate on files,
  * directories, or other types of files.
@@ -3125,40 +3127,41 @@ private static byte[] read(InputStream source, int initialSize) throws IOExcepti
         return (capacity == nread) ? buf : Arrays.copyOf(buf, nread);
     }
 
-    /**
-     * Reads all the bytes from a file. The method ensures that the file is
-     * closed when all bytes have been read or an I/O error, or other runtime
-     * exception, is thrown.
-     *
-     * <p> Note that this method is intended for simple cases where it is
-     * convenient to read all bytes into a byte array. It is not intended for
-     * reading in large files.
-     *
-     * @param   path
-     *          the path to the file
-     *
-     * @return  a byte array containing the bytes read from the file
-     *
-     * @throws  IOException
-     *          if an I/O error occurs reading from the stream
-     * @throws  OutOfMemoryError
-     *          if an array of the required size cannot be allocated, for
-     *          example the file is larger that {@code 2GB}
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkRead(String) checkRead}
-     *          method is invoked to check read access to the file.
-     */
-    public static byte[] readAllBytes(Path path) throws IOException {
-        try (SeekableByteChannel sbc = Files.newByteChannel(path);
-             InputStream in = Channels.newInputStream(sbc)) {
-            long size = sbc.size();
-            if (size > (long)MAX_BUFFER_SIZE)
-                throw new OutOfMemoryError("Required array size too large");
-
-            return read(in, (int)size);
-        }
-    }
+	/**
+	 * Reads all the bytes from a file. The method ensures that the file is closed
+	 * when all bytes have been read or an I/O error, or other runtime exception, is
+	 * thrown.
+	 *
+	 * <p>
+	 * Note that this method is intended for simple cases where it is convenient to
+	 * read all bytes into a byte array. It is not intended for reading in large
+	 * files.
+	 *
+	 * @param path the path to the file
+	 *
+	 * @return a byte array containing the bytes read from the file
+	 *
+	 * @throws IOException       if an I/O error occurs reading from the stream
+	 * @throws OutOfMemoryError  if an array of the required size cannot be
+	 *                           allocated, for example the file is larger that
+	 *                           {@code 2GB}
+	 * @throws SecurityException In the case of the default provider, and a security
+	 *                           manager is installed, the
+	 *                           {@link SecurityManager#checkRead(String) checkRead}
+	 *                           method is invoked to check read access to the file.
+	 */
+	public static byte[] readAllBytes(Path path) throws IOException {
+		byte[] bytes = ((JSPath) path).秘bytes;
+		if (bytes == null) {
+			try (SeekableByteChannel sbc = Files.newByteChannel(path); InputStream in = Channels.newInputStream(sbc)) {
+				long size = sbc.size();
+				if (size > (long) MAX_BUFFER_SIZE) // 2.1 GB; no reason that could not be higher?
+					throw new OutOfMemoryError("Required array size too large");
+				((JSPath) path).秘bytes = bytes = read(in, (int) size);
+			}
+		}
+		return bytes;
+	}
 
     /**
      * Read all lines from a file. This method ensures that the file is
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSFileSystem.java b/sources/net.sf.j2s.java.core/src/swingjs/JSFileSystem.java
@@ -933,7 +933,9 @@ public FileSystem getFileSystem(URI uri) {
 
 		@Override
 		public Path getPath(URI uri) {
-			return getFileSystem(uri).getPath(uri.toString());
+			JSPath p = (JSPath) getFileSystem(uri).getPath(uri.toString());
+			p.秘bytes = uri.秘bytes;
+			return p;
 		}
 
 		@Override

Original file line number	Diff line number	Diff line change
`@@ -933,7 +933,9 @@ public FileSystem getFileSystem(URI uri) {`
`933`	`933`
`934`	`934`	`@Override`
`935`	`935`	`public Path getPath(URI uri) {`
`936`		`- return getFileSystem(uri).getPath(uri.toString());`
	`936`	`+ JSPath p = (JSPath) getFileSystem(uri).getPath(uri.toString());`
	`937`	`+ p.秘bytes = uri.秘bytes;`
	`938`	`+ return p;`
`937`	`939`	`}`
`938`	`940`
`939`	`941`	`@Override`