various fixes

BobHanson · BobHanson · commit c66f0dd65153 · 2023-01-15T12:33:20.000-06:00
-adds AU.doubleLength(double[])
-fixes new int[2][3][] not initializing properly
-J2S._j2sargs missing "_"
-JSComponentUI incorrectly using Component.visible rather than
Component.isVisible() -- difference with JPopupMenu
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/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20230101211500 
+20230112135435 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/timestamp
@@ -1 +1 @@
-20230101211500 
+20230112135435 
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/src/javajs/util/AU.java b/sources/net.sf.j2s.java.core/src/javajs/util/AU.java
@@ -82,10 +82,16 @@ public static Object doubleLength(Object array) {
 		return arrayCopyObject(array, (array == null ? 16 : 2 * getLength(array)));
 	}
 
+
+	
 	public static String[] doubleLengthS(String[] array) {
 		return arrayCopyS(array, (array == null ? 16 : 2 * array.length));
 	}
 
+	public static double[] doubleLengthD(double[] array) {
+	    return arrayCopyD(array, (array == null ? 16 : 2 * array.length));
+    }
+
 	public static float[] doubleLengthF(float[] array) {
 		return arrayCopyF(array, (array == null ? 16 : 2 * array.length));
 	}
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
@@ -1319,8 +1319,10 @@ public void propertyChange(PropertyChangeEvent e) {
 			updatePropertyAncestor(false);
 			if (value == null)
 				return;
-			if ((isDisposed || isTainted) && c.visible)
+			if ((isDisposed || isTainted) && c.isVisible()) {
+				// c.visible not the same as c.isVisible() for popup!!
 				setVisible(true);
+			}
 		}
 		propertyChangedCUI(e, prop);
 	}
@@ -2387,7 +2389,7 @@ public void setBounds(int x, int y, int width, int height, int op) {
 		if (isBounded && !boundsSet) {
 			// now we can set it to be visible, because its bounds have
 			// been explicitly set.
-			if (c.visible && cellComponent == null)
+			if (c.isVisible() && cellComponent == null)
 				setVisible(true);
 			boundsSet = true;
 		}
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
@@ -33,12 +33,14 @@
  * this.setName("myframe");
  * 
  * 
- * 3) On the web page somewhere, create a div with id (name + "-div") and styles
- * position:absolute, left, and right. If you wish, you can set the width and
- * height, but that is optional. All four of these values override whatever is
- * given in the constructor.
+ * 3) On the web page somewhere, create a div with id (appletname-name-div)
+ * where appletname is the applet name (e.g. "testApplet") and styles
+ * position:absolute;left:<nnn>px;top:<nnn>px.
  * 
- * &lt;div id="myframe-div"
+ * If you wish, you can set the width and height, but that is optional. All four
+ * of these values override whatever is given in the constructor.
+ * 
+ * &lt;div id="testApplet-myframe-div"
  * style="position:absolute;left:100px;top:200px;width:400px;height:300px"
  * &gt;&lt;/div&gt;
  * 
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Array.java b/sources/net.sf.j2s.java.core/src/test/Test_Array.java
@@ -7,6 +7,10 @@
 
 class Test_Array extends Test_ {
 
+	static Object ax1 =new int[2][];
+	static Object ax = new int[2][3][];
+
+
 	static int[] i0 = new int[0];
 	static Object ono = new Class<?>[0];
 
@@ -25,6 +29,8 @@ class Test_Array extends Test_ {
 		y = x;
 		Test_Array[] a = new Test_Array[3];
 	}
+	
+	
 	static Object oo = Array.newInstance(Test_Array[].class, 0);
 
 	static Object tType3__ = Array.newInstance(Test_Array[][].class, 3);
@@ -137,7 +143,10 @@ public static void main(String[] args) {
 		assert ((i33 instanceof int[][]));
 		assert ((iType3_ instanceof int[][]));
 		assert (!(i33 instanceof int[]));
-
+		assert ((new int[2][])[0] == null);
+		assert ((new int[2][3][])[0][0] == null);
+		assert(((int[][])i33)[0][0] == 0);
+		assert(((char[][][][])c33__)[0][0] == null);
 		int[] ii3 = new int[] { 1, 2, 3 };
 		ii3[Integer.valueOf(2)] = 1;
 		int j = ii3[Integer.valueOf(2)];
diff --git a/sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js b/sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js
@@ -1,5 +1,6 @@
 // j2sApplet.js BH = Bob Hanson hansonr@stolaf.edu
 
+// BH 2023.01.10 j2sargs typo
 // BH 2022.08.27 fix frame resizing for browsers reporting noninteger pageX, pageY
 // BH 2022.06.23 implements J2S._lastAppletID
 // BH 2022.01.12 adds pointer option
@@ -2746,7 +2747,7 @@ if (ev.keyCode == 9 && ev.target["data-focuscomponent"]) {
 			}
 			J2S._registerApplet(applet._id, applet);
 			if (J2S._appArgs || applet.__Info.args == "?") {
-				applet.__Info.args = (J2S._appArgs ? decodeURIComponent(J2S.appArgs).split("|") : []);
+				applet.__Info.args = (J2S._appArgs ? decodeURIComponent(J2S._appArgs).split("|") : []);
 			}
 			J2S._lang && (applet.__Info.language = J2S._lang);
 			var isApp = applet._isApp = !!applet.__Info.main; 
diff --git a/sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js b/sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js
@@ -7,6 +7,7 @@
 
 // Google closure compiler cannot handle Clazz.new or Clazz.super
 
+// BH 2023.01.15 fix for int[2][3][] not initializing properly
 // BH 2022.12.03 fix for Double.isInfinite should not be true for NaN
 // BH 2022.12.03 fix for Double.parseDouble("") and new Double(NaN) should be NaN, not 0
 // BH 2022.09.20 fix for Class.forName not loading static inner classes directly
@@ -1232,17 +1233,21 @@ var newTypedA = function(baseClass, args, nBits, ndims, isClone) {
   var last = args.length - 1;
   var paramType = args[last];
   var val = args[last - 1];
-  if (ndims > 1) {
-     // array of arrays
+  if (ndims < -1 || Math.abs(ndims) > 1) {
+     //array of arrays;  -2: when x[30][]
     var xargs = new Array(last--); 
     for (var i = 0; i <= last; i++)
       xargs[i] = args[i + 1];
     // SAA -> SA
     xargs[last] = paramType.substring(0, paramType.length - 1);    
     var arr = new Array(dim);
-    for (var i = 0; i < dim; i++)
-      arr[i] = newTypedA(baseClass, xargs, nBits, ndims - 1); // Call
-																// recursively
+    if (args[1] != null) {
+        // arg[1] is null, we set the array type but do not fill in the array
+    	// otherwise, call recursively
+    	for (var i = 0; i < dim; i++) {    		 
+    		arr[i] = newTypedA(baseClass, xargs, nBits, ndims - (ndims < 0 ? -1 : 1)); 
+    	}
+    }
   } else {
     // Clazz.newIntA(new int[5][] val = null
     // Clazz.newA(5 ,null, "SA") new String[5] val = null
@@ -3308,6 +3313,7 @@ var fixAgent = function(agent) {return "" + ((agent = agent.split(";")[0]),
 			"java.vendor" : "java2script/SwingJS/OpenJDK",
 			"java.vendor.url" : "https://github.com/BobHanson/java2script",
 			"java.version" : "1.8",
+			"java.vm.name":"Java SwingJS",
 			"java.vm.version" : "1.8",
 			"java.specification.version" : "1.8",
 			"java.io.tmpdir" : J2S.getGlobal("j2s.tmpdir"),
diff --git a/sources/net.sf.j2s.java.core/srcjs/swingjs2.js b/sources/net.sf.j2s.java.core/srcjs/swingjs2.js
@@ -10686,6 +10686,7 @@ return jQuery;
 })(jQuery,document,"click mousemove mouseup touchmove touchend", "outjsmol");
 // j2sApplet.js BH = Bob Hanson hansonr@stolaf.edu
 
+// BH 2023.01.10 j2sargs typo
 // BH 2022.08.27 fix frame resizing for browsers reporting noninteger pageX, pageY
 // BH 2022.06.23 implements J2S._lastAppletID
 // BH 2022.01.12 adds pointer option
@@ -13432,7 +13433,7 @@ if (ev.keyCode == 9 && ev.target["data-focuscomponent"]) {
 			}
 			J2S._registerApplet(applet._id, applet);
 			if (J2S._appArgs || applet.__Info.args == "?") {
-				applet.__Info.args = (J2S._appArgs ? decodeURIComponent(J2S.appArgs).split("|") : []);
+				applet.__Info.args = (J2S._appArgs ? decodeURIComponent(J2S._appArgs).split("|") : []);
 			}
 			J2S._lang && (applet.__Info.language = J2S._lang);
 			var isApp = applet._isApp = !!applet.__Info.main; 
@@ -14045,6 +14046,7 @@ if (ev.keyCode == 9 && ev.target["data-focuscomponent"]) {
 
 // Google closure compiler cannot handle Clazz.new or Clazz.super
 
+// BH 2023.01.15 fix for int[2][3][] not initializing properly
 // BH 2022.12.03 fix for Double.isInfinite should not be true for NaN
 // BH 2022.12.03 fix for Double.parseDouble("") and new Double(NaN) should be NaN, not 0
 // BH 2022.09.20 fix for Class.forName not loading static inner classes directly
@@ -15270,17 +15272,21 @@ var newTypedA = function(baseClass, args, nBits, ndims, isClone) {
   var last = args.length - 1;
   var paramType = args[last];
   var val = args[last - 1];
-  if (ndims > 1) {
-     // array of arrays
+  if (ndims < -1 || Math.abs(ndims) > 1) {
+     //array of arrays;  -2: when x[30][]
     var xargs = new Array(last--); 
     for (var i = 0; i <= last; i++)
       xargs[i] = args[i + 1];
     // SAA -> SA
     xargs[last] = paramType.substring(0, paramType.length - 1);    
     var arr = new Array(dim);
-    for (var i = 0; i < dim; i++)
-      arr[i] = newTypedA(baseClass, xargs, nBits, ndims - 1); // Call
-																// recursively
+    if (args[1] != null) {
+        // arg[1] is null, we set the array type but do not fill in the array
+    	// otherwise, call recursively
+    	for (var i = 0; i < dim; i++) {    		 
+    		arr[i] = newTypedA(baseClass, xargs, nBits, ndims - (ndims < 0 ? -1 : 1)); 
+    	}
+    }
   } else {
     // Clazz.newIntA(new int[5][] val = null
     // Clazz.newA(5 ,null, "SA") new String[5] val = null
@@ -17346,6 +17352,7 @@ var fixAgent = function(agent) {return "" + ((agent = agent.split(";")[0]),
 			"java.vendor" : "java2script/SwingJS/OpenJDK",
 			"java.vendor.url" : "https://github.com/BobHanson/java2script",
 			"java.version" : "1.8",
+			"java.vm.name":"Java SwingJS",
 			"java.vm.version" : "1.8",
 			"java.specification.version" : "1.8",
 			"java.io.tmpdir" : J2S.getGlobal("j2s.tmpdir"),

Original file line number	Diff line number	Diff line change
`@@ -82,10 +82,16 @@ public static Object doubleLength(Object array) {`
`82`	`82`	`return arrayCopyObject(array, (array == null ? 16 : 2 * getLength(array)));`
`83`	`83`	`}`
`84`	`84`
	`85`	`+`
	`86`	`+`
`85`	`87`	`public static String[] doubleLengthS(String[] array) {`
`86`	`88`	`return arrayCopyS(array, (array == null ? 16 : 2 * array.length));`
`87`	`89`	`}`
`88`	`90`
	`91`	`+ public static double[] doubleLengthD(double[] array) {`
	`92`	`+ return arrayCopyD(array, (array == null ? 16 : 2 * array.length));`
	`93`	`+ }`
	`94`	`+`
`89`	`95`	`public static float[] doubleLengthF(float[] array) {`
`90`	`96`	`return arrayCopyF(array, (array == null ? 16 : 2 * array.length));`
`91`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,12 +33,14 @@`
`33`	`33`	`* this.setName("myframe");`
`34`	`34`	`*`
`35`	`35`	`*`
`36`		`- * 3) On the web page somewhere, create a div with id (name + "-div") and styles`
`37`		`- * position:absolute, left, and right. If you wish, you can set the width and`
`38`		`- * height, but that is optional. All four of these values override whatever is`
`39`		`- * given in the constructor.`
	`36`	`+ * 3) On the web page somewhere, create a div with id (appletname-name-div)`
	`37`	`+ * where appletname is the applet name (e.g. "testApplet") and styles`
	`38`	`+ * position:absolute;left:<nnn>px;top:<nnn>px.`
`40`	`39`	`*`
`41`		`- * <div id="myframe-div"`
	`40`	`+ * If you wish, you can set the width and height, but that is optional. All four`
	`41`	`+ * of these values override whatever is given in the constructor.`
	`42`	`+ *`
	`43`	`+ * <div id="testApplet-myframe-div"`
`42`	`44`	`* style="position:absolute;left:100px;top:200px;width:400px;height:300px"`
`43`	`45`	`* ></div>`
`44`	`46`	`*`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`// j2sApplet.js BH = Bob Hanson hansonr@stolaf.edu`
`2`	`2`
	`3`	`+// BH 2023.01.10 j2sargs typo`
`3`	`4`	`// BH 2022.08.27 fix frame resizing for browsers reporting noninteger pageX, pageY`
`4`	`5`	`// BH 2022.06.23 implements J2S._lastAppletID`
`5`	`6`	`// BH 2022.01.12 adds pointer option`
`@@ -2746,7 +2747,7 @@ if (ev.keyCode == 9 && ev.target["data-focuscomponent"]) {`
`2746`	`2747`	`}`
`2747`	`2748`	`J2S._registerApplet(applet._id, applet);`
`2748`	`2749`	`if (J2S._appArgs \|\| applet.__Info.args == "?") {`
`2749`		`- applet.__Info.args = (J2S._appArgs ? decodeURIComponent(J2S.appArgs).split("\|") : []);`
	`2750`	`+ applet.__Info.args = (J2S._appArgs ? decodeURIComponent(J2S._appArgs).split("\|") : []);`
`2750`	`2751`	`}`
`2751`	`2752`	`J2S._lang && (applet.__Info.language = J2S._lang);`
`2752`	`2753`	`var isApp = applet._isApp = !!applet.__Info.main;`