Adds Java 9 InputStream.transferTo, readAllBytes

BobHanson · BobHanson · commit c14cb37b95ac · 2020-04-14T12:42:03.000-05:00
diff --git a/sources/net.sf.j2s.java.core/src/java/io/ByteArrayInputStream.java b/sources/net.sf.j2s.java.core/src/java/io/ByteArrayInputStream.java
@@ -232,7 +232,7 @@ public synchronized long skip(long n) {
 	 * @throws IOException
 	 */
 	@Override
-	public long transferTo​(OutputStream out)
+	public long transferTo(OutputStream out)
             throws IOException {
 		byte[] b = (pos == 0 ? buf : readAllBytes());
 		out.write(b);
diff --git a/sources/net.sf.j2s.java.core/src/java/io/FileInputStream.java b/sources/net.sf.j2s.java.core/src/java/io/FileInputStream.java
@@ -426,10 +426,9 @@ protected void finalize() throws IOException {
 	 * @throws IOException
 	 */
 	@Override
-	public long transferTo​(OutputStream out)
-            throws IOException {
+	public long transferTo(OutputStream out)  throws IOException {
 		if (channel != null) { 
-			return super.transferTo​(out);
+			return super.transferTo(out);
 		}
 		byte[] b = (is.pos == 0 ? is.buf : is.readAllBytes());
 		out.write(b);
diff --git a/sources/net.sf.j2s.java.core/src/java/io/FileOutputStream.java b/sources/net.sf.j2s.java.core/src/java/io/FileOutputStream.java
@@ -370,8 +370,7 @@ public void close() throws IOException {
 				if (channel == null) {
 					bos.close();
 					fd._file.秘bytes = 秘bytes = bos.toByteArray();
-					if (!fd._isTempFile())
-						JSUtil.saveFile(path, 秘bytes, null, null);
+					JSUtil.saveFile(path, 秘bytes, null, null);
 				} else {
 					channel.close();
 				}
diff --git a/sources/net.sf.j2s.java.core/src/java/io/InputStream.java b/sources/net.sf.j2s.java.core/src/java/io/InputStream.java
@@ -218,8 +218,7 @@ public long skip(long n) throws IOException {
 	 * @return
 	 * @throws IOException
 	 */
-	public long transferTo​(OutputStream out)
-            throws IOException {
+	public long transferTo(OutputStream out) throws IOException {
 		long n = available();
 		out.write(readAllBytes());
 		return n;
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSUtil.java b/sources/net.sf.j2s.java.core/src/swingjs/JSUtil.java
@@ -119,7 +119,8 @@ public static Object removeCachedFileData(String path) {
 	 */
 	@SuppressWarnings("unused")
 	private static Object getFileContents(Object uriOrJSFile, boolean asBytes) {
-		if (uriOrJSFile instanceof File) {
+		boolean isFile = (uriOrJSFile instanceof File);
+		if (isFile) {
 			byte[] bytes = /** @j2sNative uriOrJSFile.秘bytes || */
 					null;
 			if (bytes != null)
@@ -142,15 +143,18 @@ private static Object getFileContents(Object uriOrJSFile, boolean asBytes) {
 		}
 		if (data == null && !uri.startsWith("./")) {
 			// Java applications may use "./" here
-			try {
-				BufferedInputStream stream = (BufferedInputStream) new URL(uri).getContent();
-				data = (asBytes ? Rdr.getStreamAsBytes(stream, null) : Rdr.streamToUTF8String(stream));
-			} catch (Exception e) {
-				// bypasses AjaxURLConnection
-				data = J2S.getFileData(uri, null, false, asBytes);
-				if (data == null)
-					removeCachedFileData(uri);
+			if (!isFile) {
+				try {
+					BufferedInputStream stream = (BufferedInputStream) new URL(uri).getContent();
+					return (asBytes ? Rdr.getStreamAsBytes(stream, null) : Rdr.streamToUTF8String(stream));
+				} catch (Exception e) {
+				}
 			}
+			// bypasses AjaxURLConnection
+			data = J2S.getFileData(uri, null, false, asBytes);
+			if (data == null)
+				removeCachedFileData(uri);
+
 		}
 		return data;
 	}
@@ -596,6 +600,14 @@ public static BufferedInputStream getURLInputStream(URL url, boolean andDelete)
 		return null;
 	}
 
+	/**
+	 * Display the web page in the give target, such as "_blank"
+	 */
+	@Override
+	public void displayURL(String url, String target) {
+		showWebPage((URL)(Object)url, target);
+	}
+	
 	public static void showWebPage(URL url, Object target) {
 			/**
 			 * @j2sNative
@@ -604,6 +616,8 @@ public static void showWebPage(URL url, Object target) {
 			 *            window.open(url.toString());
 			 */
 	  }
+	
+	
 
 	/**
 	 * important warnings for TODO list
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/api/JSUtilI.java b/sources/net.sf.j2s.java.core/src/swingjs/api/JSUtilI.java
@@ -192,4 +192,6 @@ public interface JSUtilI {
 	 */
 	byte[] addJSCachedBytes(Object URLorURIorFile);
 
+	void displayURL(String url, String target);
+
 }

Original file line number	Diff line number	Diff line change
`@@ -192,4 +192,6 @@ public interface JSUtilI {`
`192`	`192`	`*/`
`193`	`193`	`byte[] addJSCachedBytes(Object URLorURIorFile);`
`194`	`194`
	`195`	`+ void displayURL(String url, String target);`
	`196`	`+`
`195`	`197`	`}`