pass 秘bytes on to Path

BobHanson · BobHanson · commit 04243b8df112 · 2020-01-23T06:20:05.000-06:00
diff --git a/sources/net.sf.j2s.java.core/src/java/io/FileDescriptor.java b/sources/net.sf.j2s.java.core/src/java/io/FileDescriptor.java
@@ -56,6 +56,14 @@ public final class FileDescriptor {
 	 */
 	File _file;
 	
+	public byte[] _getBytes(boolean checkDisk) {
+		if (_file.秘bytes == null && checkDisk) {
+			// a check for file existence sets the bytes
+			_file.exists();
+		}
+		return _file.秘bytes;
+	}
+
 	private int pos, len = -1;
 
 	public void _setPosAndLen(int pos, int len) {
@@ -283,5 +291,4 @@ synchronized void closeAll(Closeable releaser) throws IOException {
         }
     }
 
-
 }
diff --git a/sources/net.sf.j2s.java.core/src/java/io/FileSystem.java b/sources/net.sf.j2s.java.core/src/java/io/FileSystem.java
@@ -115,7 +115,7 @@ private boolean _regular(File file) {
 	}
 
 	boolean _exists(File file) {
-		return (file.秘bytes != null || JSUtil.getFileAsBytes(file) != null);
+		return (file.秘bytes != null || (file.秘bytes=JSUtil.getFileAsBytes(file)) != null);
 	}
 
 	boolean _isDir(File file) {
diff --git a/sources/net.sf.j2s.java.core/src/java/nio/channels/ByteChannel.java b/sources/net.sf.j2s.java.core/src/java/nio/channels/ByteChannel.java
@@ -25,9 +25,6 @@
 
 package java.nio.channels;
 
-import java.io.IOException;
-
-
 /**
  * A channel that can read and write bytes.  This interface simply unifies
  * {@link ReadableByteChannel} and {@link WritableByteChannel}; it does not
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSFileSystem.java b/sources/net.sf.j2s.java.core/src/swingjs/JSFileSystem.java
@@ -121,6 +121,8 @@ private JSFileChannel(FileDescriptor fd, String path, boolean readable, boolean
 			this.fd = fd;
 			this.parent = parent;
 			this.path = (JSPath) new File(path).toPath();
+			if (fd != null && (readable || append))
+				this.path.秘bytes = fd._getBytes(true);
 			this.path.setIsTempFile(fd._isTempFile());
 			Set<StandardOpenOption> options = new HashSet<>();
 			if (readable)
@@ -406,6 +408,10 @@ public JSByteChannel(FileDescriptor fd, JSPath path, Set<? extends OpenOption> o
 			boolean truncate = options.contains(StandardOpenOption.TRUNCATE_EXISTING);
 			boolean create = options.contains(StandardOpenOption.CREATE);
 			boolean createNew = options.contains(StandardOpenOption.CREATE_NEW);
+			if ((read ||append)  && path.秘bytes == null && fd != null) {
+				path.秘bytes = fd._getBytes(true);
+			}
+
 			if (read && write) {
 				秘bytes = getBytes();
 				if (秘bytes == null) {

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,14 @@ public final class FileDescriptor {`
`56`	`56`	`*/`
`57`	`57`	`File _file;`
`58`	`58`
	`59`	`+ public byte[] _getBytes(boolean checkDisk) {`
	`60`	`+ if (_file.秘bytes == null && checkDisk) {`
	`61`	`+ // a check for file existence sets the bytes`
	`62`	`+ _file.exists();`
	`63`	`+ }`
	`64`	`+ return _file.秘bytes;`
	`65`	`+ }`
	`66`	`+`
`59`	`67`	`private int pos, len = -1;`
`60`	`68`
`61`	`69`	`public void _setPosAndLen(int pos, int len) {`
`@@ -283,5 +291,4 @@ synchronized void closeAll(Closeable releaser) throws IOException {`
`283`	`291`	`}`
`284`	`292`	`}`
`285`	`293`
`286`		`-`
`287`	`294`	`}`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ private boolean _regular(File file) {`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`boolean _exists(File file) {`
`118`		`- return (file.秘bytes != null \|\| JSUtil.getFileAsBytes(file) != null);`
	`118`	`+ return (file.秘bytes != null \|\| (file.秘bytes=JSUtil.getFileAsBytes(file)) != null);`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`boolean _isDir(File file) {`