adds JSUtilI.java interface

BobHanson · BobHanson · commit f31832847028 · 2020-03-19T15:25:35.000-05:00
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSFrameViewer.java b/sources/net.sf.j2s.java.core/src/swingjs/JSFrameViewer.java
@@ -209,7 +209,7 @@ public Graphics getGraphics(int wNew, int hNew, RootPaneContainer window) {
 	private HTML5Canvas newCanvas(int width, int height, RootPaneContainer window) {
 		if (isApplet) {
 			// applets create their own canvas
-			HTML5Canvas c = html5Applet._getHtml5Canvas();
+			HTML5Canvas c = (HTML5Canvas) html5Applet._getHtml5Canvas();
 			if (c != null) {
 				return canvas = c;
 			}
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSUtil.java b/sources/net.sf.j2s.java.core/src/swingjs/JSUtil.java
@@ -105,7 +105,7 @@ public static Object removeCachedFileData(String path) {
 	@SuppressWarnings("unused")
 	private static Object getFileContents(Object uriOrJSFile, boolean asBytes) {
 		if (uriOrJSFile instanceof File) {
-			byte[] bytes = /** @j2sNative uriOrJSFile.ç§˜bytes || */
+			byte[] bytes = /** @j2sNative uriOrJSFile.秘bytes || */
 					null;
 			if (bytes != null)
 				return bytes;
@@ -731,12 +731,12 @@ public static Color getColorFromName(String c) {
 	}
 
 	public static byte[] getFileBytes(File f) {
-		return f.ç§˜bytes;
+		return f.秘bytes;
 	}
 	
 	@Override
 	public byte[] getBytes(File f) {
-		return f.ç§˜bytes;
+		return f.秘bytes;
 	}
 	
 	@Override
@@ -768,19 +768,19 @@ public static HTML5Applet getHTML5Applet(Component c) {
 	public static boolean setFileBytesStatic(File f, Object isOrBytes) {
 		// Used in JalviewJS
 		if (isOrBytes instanceof InputStream) {
-			f.ç§˜bytes = /**
+			f.秘bytes = /**
 						 * @j2sNative (isOrBytes.$in.$in || isOrBytes.$in).buf ||
 						 */
 					null;
 		} else if (isOrBytes instanceof byte[]) {
-			f.ç§˜bytes = /**
+			f.秘bytes = /**
 						 * @j2sNative isOrBytes ||
 						 */
 				null;
 		} else {
-			f.ç§˜bytes = null;
+			f.秘bytes = null;
 		}
-		return (f.ç§˜bytes != null);
+		return (f.秘bytes != null);
 	} 
 
 	@Override
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSAppletUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSAppletUI.java
@@ -56,7 +56,7 @@ public void adjustCanvasForMenuBar() {
 	}
 
 	public HTML5Canvas getCanvas() {
-		return c.getAppContext().getThreadGroup().秘html5Applet._getHtml5Canvas();
+		return (HTML5Canvas) c.getAppContext().getThreadGroup().秘html5Applet._getHtml5Canvas();
 	}
 
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSComponentUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSComponentUI.java
@@ -1876,7 +1876,7 @@ protected DOMNode setHTMLElementCUI() {
 						if (jc.getFrameViewer().isApplet) {
 							// If the applet's root pane, we insert it into the applet's
 							// content
-							DOMNode cdiv = swingjs.JSToolkit.getHTML5Applet(jc)._getContentLayer();
+							DOMNode cdiv = (DOMNode) swingjs.JSToolkit.getHTML5Applet(jc)._getContentLayer();
 							DOMNode.appendChildSafely(cdiv, outerNode);
 						}
 					}

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ public Graphics getGraphics(int wNew, int hNew, RootPaneContainer window) {`
`209`	`209`	`private HTML5Canvas newCanvas(int width, int height, RootPaneContainer window) {`
`210`	`210`	`if (isApplet) {`
`211`	`211`	`// applets create their own canvas`
`212`		`- HTML5Canvas c = html5Applet._getHtml5Canvas();`
	`212`	`+ HTML5Canvas c = (HTML5Canvas) html5Applet._getHtml5Canvas();`
`213`	`213`	`if (c != null) {`
`214`	`214`	`return canvas = c;`
`215`	`215`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public void adjustCanvasForMenuBar() {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`public HTML5Canvas getCanvas() {`
`59`		`- return c.getAppContext().getThreadGroup().秘html5Applet._getHtml5Canvas();`
	`59`	`+ return (HTML5Canvas) c.getAppContext().getThreadGroup().秘html5Applet._getHtml5Canvas();`
`60`	`60`	`}`
`61`	`61`
`62`	`62`
Original file line number	Diff line number	Diff line change
`@@ -1876,7 +1876,7 @@ protected DOMNode setHTMLElementCUI() {`
`1876`	`1876`	`if (jc.getFrameViewer().isApplet) {`
`1877`	`1877`	`// If the applet's root pane, we insert it into the applet's`
`1878`	`1878`	`// content`
`1879`		`- DOMNode cdiv = swingjs.JSToolkit.getHTML5Applet(jc)._getContentLayer();`
	`1879`	`+ DOMNode cdiv = (DOMNode) swingjs.JSToolkit.getHTML5Applet(jc)._getContentLayer();`
`1880`	`1880`	`DOMNode.appendChildSafely(cdiv, outerNode);`
`1881`	`1881`	`}`
`1882`	`1882`	`}`