allows for applet.resize(width,height) in JavaScript or Java

BobHanson · BobHanson · commit 8574afe1a1f5 · 2018-02-27T21:12:23.000-06:00
diff --git a/sources/net.sf.j2s.java.core/SwingJS-site.zip b/sources/net.sf.j2s.java.core/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.java.core/src/java/applet/Applet.java b/sources/net.sf.j2s.java.core/src/java/applet/Applet.java
@@ -36,6 +36,10 @@
 import java.awt.Panel;
 import java.util.Locale;
 
+import swingjs.JSToolkit;
+import swingjs.JSUtil;
+import swingjs.api.js.HTML5Applet;
+
 /**
  * An applet is a small program that is intended not to be run on
  * its own, but rather to be embedded inside another application.
@@ -51,6 +55,19 @@
  */
 public class Applet extends Panel {
 
+	static {
+		
+		/**
+		 * SwingJS providing unqualified resize(w,h) as a convenience only
+		 * 
+		 * @j2sNative
+		 * 
+		 * C$.prototype.resize = C$.prototype.resize$I$I;  
+		 *  
+		 */
+
+	}
+
     /**
      * Constructs a new Applet.
      * <p>
@@ -200,19 +217,28 @@ public void setVisible(boolean b) {
      * @param   width    the new requested width for the applet.
      * @param   height   the new requested height for the applet.
      */
-    @SuppressWarnings("deprecation")
 	@Override
-		public void resize(int width, int height) {
+	public void resize(int width, int height) {
+		if (appletViewer == null) {
+	    	resizeOriginal(width, height);
+		} else {
+			// use J2S.Applet._resizeApplet.
+			appletViewer.html5Applet._resizeApplet(new int[] {width, height});
+		}
+    }
+	
+    @SuppressWarnings("deprecation")
+    public void resizeOriginal(int width, int height) {
         Dimension d = size();
         if ((d.width != width) || (d.height != height)) {
             super.resize(width, height);
             if (stub != null) {
                 stub.appletResize(width, height);
             }
         }
-    }
+	}
 
-    /**
+	/**
      * Requests that this applet be resized.
      *
      * @param   d   an object giving the new width and height.
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/Component.java b/sources/net.sf.j2s.java.core/src/java/awt/Component.java
@@ -67,7 +67,6 @@
 
 import sun.awt.AppContext;
 import sun.awt.SunToolkit;
-import swingjs.JSImagekit;
 import swingjs.JSToolkit;
 
 /**
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/JSComponent.java b/sources/net.sf.j2s.java.core/src/java/awt/JSComponent.java
@@ -28,7 +28,6 @@
 package java.awt;
 
 import java.awt.peer.ComponentPeer;
-import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 
 import javax.swing.JComponent;
@@ -50,6 +49,22 @@
  */
 public abstract class JSComponent extends Component {
 
+	/**
+	 * overridden in Applet
+	 * 
+	 * SwingJS Applet repurposes resize(width, height) to call
+	 * J2S.Applet.prototype._resizeApplet in order to take care
+	 * of all the HTML5 business associated with this applet. 
+	 * 
+	 * 
+	 * @param width
+	 * @param height
+	 */
+	@SuppressWarnings("deprecation")
+	public void resizeOriginal(int width, int height) {
+		resize(width, height);
+	}
+
 	/**
 	 * For modal dialogs, make sure the parent component, if there is one, is a
 	 * PropertyChangeListener for this component (JOptionPane, JFileChooser, or
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSAppletViewer.java b/sources/net.sf.j2s.java.core/src/swingjs/JSAppletViewer.java
@@ -13,7 +13,6 @@
 import java.awt.Insets;
 import java.awt.Toolkit;
 import java.awt.Window;
-import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLStreamHandlerFactory;
@@ -411,7 +410,7 @@ public int run1(int mode) {
 				}
 				System.out.println("JSAppletViewer init");
 				japplet.setFont(new Font(Font.DIALOG, Font.PLAIN, 12));
-				japplet.resize(defaultAppletSize);
+				japplet.resizeOriginal(defaultAppletSize.width, defaultAppletSize.height);
 				japplet.init();
 				// Need the default(fallback) font to be created in this
 				// AppContext
@@ -430,7 +429,7 @@ public int run1(int mode) {
 				japplet.getRootPane().addNotify();
 				// force peer creation now
 				System.out.println("JSAppletViewer start" + currentAppletSize);
-				japplet.resize(currentAppletSize);
+				japplet.resizeOriginal(currentAppletSize.width, currentAppletSize.height);
 				japplet.start();
 				// japplet.repaint();
 				status = APPLET_START;
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSFrameViewer.java b/sources/net.sf.j2s.java.core/src/swingjs/JSFrameViewer.java
@@ -141,7 +141,7 @@ public void setScreenDimension(int width, int height) {
 		setGraphics((Graphics) (Object)(jsgraphics = null), width, height);
 		//resize(width, height);
 		if (top != null)
-			top.resize(width, height);
+			top.resizeOriginal(width, height);
 	}
 
 	/**
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/Resizer.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/Resizer.java
@@ -8,6 +8,8 @@
 import java.awt.Dimension;
 import java.awt.JSComponent;
 import java.awt.Rectangle;
+
+import javax.swing.JApplet;
 import javax.swing.JFrame;
 import javax.swing.JRootPane;
 import javax.swing.RootPaneContainer;
@@ -146,8 +148,7 @@ protected void fHandleDOMResize(Object event, int dw, int dh) {
 		if (jframe == null) {
 			rootPane.getGraphics().setColor(Color.WHITE);
 			rootPane.getGraphics().fillRect(0, 0, r.width, r.height);
-			rootPane.appletViewer.html5Applet._resizeApplet(new int[] { r.width,
-					r.height });
+			((JApplet) rootPane.getParent()).resize(r.width, r.height);
 		} else {
 			jframe.setPreferredSize(new Dimension(r.width, r.height));
 			jframe.invalidate();

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ public void setScreenDimension(int width, int height) {`
`141`	`141`	`setGraphics((Graphics) (Object)(jsgraphics = null), width, height);`
`142`	`142`	`//resize(width, height);`
`143`	`143`	`if (top != null)`
`144`		`- top.resize(width, height);`
	`144`	`+ top.resizeOriginal(width, height);`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`/**`