JSTempFile uses JSUtil.setFileBytesStatic; getHtmlApplet returns Object

BobHanson · BobHanson · commit 2c8a27e5ae6c · 2020-03-20T12:21:10.000-05:00
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSTempFile.java b/sources/net.sf.j2s.java.core/src/swingjs/JSTempFile.java
@@ -28,20 +28,12 @@ public void cacheBytes() {
 	}
 
 	public boolean setBytes(Object isOrBytes) {
-		if (isOrBytes instanceof InputStream) {
-			秘bytes = /**
-						 * @j2sNative (isOrBytes.$in.$in || isOrBytes.$in).buf ||
-						 */
-					null;
-		} else if (isOrBytes instanceof byte[]) {
-			秘bytes = /**
-						 * @j2sNative isOrBytes ||
-						 */
-				null;
-		} else {
-			秘bytes = null;
+		boolean ok = JSUtil.setFileBytesStatic((File) this, isOrBytes);
+		if (ok) {
+			String path = getAbsolutePath();
+			JSUtil.cacheFileData(path, 秘bytes);
 		}
-		return 秘bytes != null;
+		return ok;
 	}
 
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSToolkit.java b/sources/net.sf.j2s.java.core/src/swingjs/JSToolkit.java
@@ -477,8 +477,7 @@ public static void setIsDispatchThread(boolean b) {
 	 * @return
 	 */
 	public static HTML5Applet getHTML5Applet(Component c) {
-		ThreadGroup g = (c == null ? Thread.currentThread().getThreadGroup() : c.getAppContext().getThreadGroup());
-		return ((JSThreadGroup) g).getHtmlApplet();
+		return JSUtil.getHTML5Applet(c);
 	}
 
 	public static void taintUI(Component c) {

Original file line number	Diff line number	Diff line change
`@@ -477,8 +477,7 @@ public static void setIsDispatchThread(boolean b) {`
`477`	`477`	`* @return`
`478`	`478`	`*/`
`479`	`479`	`public static HTML5Applet getHTML5Applet(Component c) {`
`480`		`- ThreadGroup g = (c == null ? Thread.currentThread().getThreadGroup() : c.getAppContext().getThreadGroup());`
`481`		`- return ((JSThreadGroup) g).getHtmlApplet();`
	`480`	`+ return JSUtil.getHTML5Applet(c);`
`482`	`481`	`}`
`483`	`482`
`484`	`483`	`public static void taintUI(Component c) {`