reinstates JSDummyApplet; fixes JSFrameUI.java for independent

hansonr · hansonr · commit 2d535808f59c · 2019-05-19T12:35:26.000-05:00
(DesktopPane-hidden) InternalFrame; moves Info.readyFunction callback to
post-main() execution.
diff --git a/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/_j2sclasslist.txt b/sources/net.sf.j2s.core/dist/swingjs/_j2sclasslist.txt
@@ -172,6 +172,7 @@ javajs/util/JSThread.js
 javajs/util/Lst.js
 javajs/util/PT.js
 javajs/util/SB.js
+javax/net/ssl/HttpsUrlConnection.js
 javax/swing/AbstractAction.js
 javax/swing/AbstractButton.js
 javax/swing/AbstractListModel.js
diff --git a/sources/net.sf.j2s.core/dist/swingjs/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20190516132838 
+20190519072139 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/_j2sclasslist.txt b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/_j2sclasslist.txt
@@ -172,6 +172,7 @@ javajs/util/JSThread.js
 javajs/util/Lst.js
 javajs/util/PT.js
 javajs/util/SB.js
+javax/net/ssl/HttpsUrlConnection.js
 javax/swing/AbstractAction.js
 javax/swing/AbstractButton.js
 javax/swing/AbstractListModel.js
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp
@@ -1 +1 @@
-20190516132838 
+20190519072139 
diff --git a/sources/net.sf.j2s.java.core/_j2sclasslist.txt b/sources/net.sf.j2s.java.core/_j2sclasslist.txt
@@ -172,6 +172,7 @@ javajs/util/JSThread.js
 javajs/util/Lst.js
 javajs/util/PT.js
 javajs/util/SB.js
+javax/net/ssl/HttpsUrlConnection.js
 javax/swing/AbstractAction.js
 javax/swing/AbstractButton.js
 javax/swing/AbstractListModel.js
diff --git a/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip b/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.java.core/dist/_j2sclasslist.txt b/sources/net.sf.j2s.java.core/dist/_j2sclasslist.txt
@@ -172,6 +172,7 @@ javajs/util/JSThread.js
 javajs/util/Lst.js
 javajs/util/PT.js
 javajs/util/SB.js
+javax/net/ssl/HttpsUrlConnection.js
 javax/swing/AbstractAction.js
 javax/swing/AbstractButton.js
 javax/swing/AbstractListModel.js
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSAppletViewer.java b/sources/net.sf.j2s.java.core/src/swingjs/JSAppletViewer.java
@@ -506,8 +506,7 @@ public int run1(int mode) {
 				Object args = params.get("args");
 				if (args instanceof String)
 					args = PT.split((String) args, " ");
-				((JSDummyApplet) applet).runMain(main, (String[]) args);
-				JSUtil.readyCallback(appletName, fullName, applet, this);
+				((JSDummyApplet) applet).runMain(this, (String[]) args);
 				break;
 			case APPLET_QUIT:
 				break;
@@ -535,7 +534,7 @@ private void runLoader() {
 				throw new InstantiationException("\"code\" or \"main\" must be specified.");
 			}
 			if (code == null)
-				code = "swingjs.JSApplet";
+				code = "swingjs.JSDummyApplet";
 			else if (code.indexOf(".") < 0)
 				code = "_." + code;
 			top = applet = (JApplet) JSUtil.getInstance(code);
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSDummyApplet.java b/sources/net.sf.j2s.java.core/src/swingjs/JSDummyApplet.java
@@ -9,7 +9,8 @@
  */
 public class JSDummyApplet extends JApplet {
 
-	public Class<?> runMain(String className, String[] args) {
+	public Class<?> runMain(JSAppletViewer v, String[] args) {
+		String className = v.main;
 		Class<?> theClass = null;
 		try {
 			theClass = Class.forName(className);
@@ -24,11 +25,16 @@ public Class<?> runMain(String className, String[] args) {
 	  /**
 	   * @j2sNative
 	   * 
-	   * setTimeout(function(){theClass.$clazz$.main$SA.call(null, args || []);},1);
+	   * setTimeout(function(){
+	   *   theClass.$clazz$.main$SA.call(null, args || []);
+	   */
+	   JSUtil.readyCallback(v.appletName, v.fullName, v.applet, v);
+	   /**
+	   * @j2sNative
+	   *   
+	   *   },1);
 	   * 
 	   */
-		{
-		}
 		return theClass;			
 	}
 }
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSFrameUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSFrameUI.java
@@ -1,6 +1,7 @@
 package swingjs.plaf;
 
 import java.awt.Color;
+import java.awt.Desktop;
 import java.awt.Dimension;
 import java.awt.Insets;
 import java.awt.Rectangle;
@@ -184,6 +185,8 @@ public DOMNode updateDOMNode() {
 
 	 @Override
 	  protected boolean isFrameIndependent() {
+		 	if (isInternalFrame && frame.parent != null && frame.parent.getUIClassID() != "DesktopPaneUI")
+		 		return false;
 		 	return (!isInternalFrame || embeddingNode == null || !doEmbed); 
 	  }
 
