new tests; minor fixes

BobHanson · BobHanson · commit 492584476281 · 2020-06-30T07:27:31.000-05:00
j2sApplet fix allows file:/ for code and document paths
j2sClazz fix for Array.newInstance(Integer.TYPE, 1, 2, 3);
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 @@
-20200625205024 
+20200630071831 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/timestamp
@@ -1 +1 @@
-20200625205024 
+20200630071831 
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/swingjs/plaf/JSButtonUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSButtonUI.java
@@ -93,6 +93,7 @@ public DOMNode updateDOMNode() {
 			allowPaintedBackground = false;
 			setDoPropagate();
 			domNode = enableNode = buttonNode = newDOMObject("button", id + "_dom", "type", "button", "style", "padding:0");
+			//DOMNode.setStyles(domNode, "outline", "none");
 			//DOMNode.setStyles(domNode,"transform","translateY(0.5px)translateX(0.5px)");
 			addClass(domNode, "j2sbutton");
 			setFocusable();
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Applet_1.java b/sources/net.sf.j2s.java.core/src/test/Test_Applet_1.java
@@ -17,6 +17,7 @@
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JScrollBar;
+import javax.swing.SwingUtilities;
 import javax.swing.border.LineBorder;
 
 /**
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
@@ -31,6 +31,7 @@ class Test_Array extends Test_ {
 	static Object iType3_ = Array.newInstance(int[].class, 3);
 	static Object iType3 = Array.newInstance(Integer.TYPE, 3);
 	static Object iType123_ = Array.newInstance(Integer.TYPE, 1, 2, 3);
+	static Object fType123_ = Array.newInstance(Float.TYPE, 1, 2, 3);
 	static Object i3def = new int[] { 3, 4, 5 };
 	static Object i3 = new int[3];
 	static Object i3_ = new int[3][];
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Image.java b/sources/net.sf.j2s.java.core/src/test/Test_Image.java
@@ -2,6 +2,7 @@
 
 import java.awt.Color;
 import java.awt.Graphics;
+import java.awt.GraphicsEnvironment;
 import java.awt.Image;
 import java.awt.Toolkit;
 import java.awt.color.ColorSpace;
@@ -178,78 +179,79 @@ private static void testWrite() {
 	}
 
 	private static void testGray() {
-	    BufferedImage image = new BufferedImage(100,100, BufferedImage.TYPE_USHORT_GRAY);
-	    ColorModel cm = image.getColorModel();
-	    
-	    // Tests stolen buffer, though it is not used.
-	    
-	    short[] bwData = ((DataBufferUShort) image.getRaster().getDataBuffer()).getData();
-	    ColorSpace x = image.getColorModel().getColorSpace();
-	    System.out.println(cm instanceof PackedColorModel);
-	    System.out.println(cm instanceof ColorModel);
-	    System.out.println(cm instanceof ComponentColorModel);
-	    
-	    PixelConverter pc = PixelConverter.UshortGray.instance;
-	    int rgb, p;
-
-	    rgb = 0xFFFFFF00;
-	    image.setRGB(0, 0, rgb);
-	    p = image.getRGB(0, 0);
-	    System.out.println(p + " " + Integer.toHexString(rgb));
-	    rgb = pc.pixelToRgb(p, null);
-	    System.out.println(p + " " + Integer.toHexString(rgb));
-
-	    rgb = 0xFFFF0000;
-	    p = pc.rgbToPixel(rgb, null);
-	    System.out.println(p + " " + Integer.toHexString(rgb));
-	    rgb = pc.pixelToRgb(p, null);
-	    System.out.println(p + " " + Integer.toHexString(rgb));
-
-	    rgb = 0xFF00FF00;
-	    p = pc.rgbToPixel(rgb, null);
-	    System.out.println(p + " " + Integer.toHexString(rgb));
-	    rgb = pc.pixelToRgb(p, null);
-	    System.out.println(p + " " + Integer.toHexString(rgb));
-
-	    rgb = 0xFF0000FF;
-	    p = pc.rgbToPixel(rgb, null);
-	    System.out.println(p + " " + Integer.toHexString(rgb));
-	    rgb = pc.pixelToRgb(p, null);
-	    System.out.println(p + " " + Integer.toHexString(rgb));
-
-	    rgb = 0xFFFF0000;
-	    p = pc.rgbToPixel(rgb, null);
-	    System.out.println(p + " " + Integer.toHexString(rgb));
-	    rgb = pc.pixelToRgb(p, null);
-	    System.out.println(p + " " + Integer.toHexString(rgb));
-	    
-
-	    rgb = 0xFF4c4c4c;
-	    p = pc.rgbToPixel(rgb, null);
-	    System.out.println(p + " " + Integer.toHexString(rgb));
-	    rgb = pc.pixelToRgb(p, null);
-	    System.out.println(p + " " + Integer.toHexString(rgb));
-
+		BufferedImage image = new BufferedImage(100, 100, BufferedImage.TYPE_USHORT_GRAY);
+		ColorModel cm = image.getColorModel();
+
+		// Tests stolen buffer, though it is not used.
+
+		short[] bwData = ((DataBufferUShort) image.getRaster().getDataBuffer()).getData();
+		ColorSpace x = image.getColorModel().getColorSpace();
+		System.out.println(cm instanceof PackedColorModel);
+		System.out.println(cm instanceof ColorModel);
+		System.out.println(cm instanceof ComponentColorModel);
+
+		PixelConverter pc = PixelConverter.UshortGray.instance;
+		int rgb, p;
+
+		rgb = 0xFFFFFF00;
+		image.setRGB(0, 0, rgb);
+		p = image.getRGB(0, 0);
+		System.out.println(p + " " + Integer.toHexString(rgb));
+		rgb = pc.pixelToRgb(p, null);
+		System.out.println(p + " " + Integer.toHexString(rgb));
+
+		rgb = 0xFFFF0000;
+		p = pc.rgbToPixel(rgb, null);
+		System.out.println(p + " " + Integer.toHexString(rgb));
+		rgb = pc.pixelToRgb(p, null);
+		System.out.println(p + " " + Integer.toHexString(rgb));
+
+		rgb = 0xFF00FF00;
+		p = pc.rgbToPixel(rgb, null);
+		System.out.println(p + " " + Integer.toHexString(rgb));
+		rgb = pc.pixelToRgb(p, null);
+		System.out.println(p + " " + Integer.toHexString(rgb));
+
+		rgb = 0xFF0000FF;
+		p = pc.rgbToPixel(rgb, null);
+		System.out.println(p + " " + Integer.toHexString(rgb));
+		rgb = pc.pixelToRgb(p, null);
+		System.out.println(p + " " + Integer.toHexString(rgb));
+
+		rgb = 0xFFFF0000;
+		p = pc.rgbToPixel(rgb, null);
+		System.out.println(p + " " + Integer.toHexString(rgb));
+		rgb = pc.pixelToRgb(p, null);
+		System.out.println(p + " " + Integer.toHexString(rgb));
+
+		rgb = 0xFF4c4c4c;
+		p = pc.rgbToPixel(rgb, null);
+		System.out.println(p + " " + Integer.toHexString(rgb));
+		rgb = pc.pixelToRgb(p, null);
+		System.out.println(p + " " + Integer.toHexString(rgb));
 
 		int[] pixels = new int[10000];
-		for (int i = 0; i < 10000; i++)  {
-			int pixel = (int) ((i % 100)* 2.55);
-			pixels[i] =  ((((((0xff << 8) | pixel) << 8) | pixel) << 8) | pixel); // ((i % 100)*0xFFFFFF/100) | 0xFF000000;//Math.random() * 0xFFFFFF);
+		for (int i = 0; i < 10000; i++) {
+			int pixel = (int) ((i % 100) * 2.55);
+			pixels[i] = ((((((0xff << 8) | pixel) << 8) | pixel) << 8) | pixel); // ((i % 100)*0xFFFFFF/100) |
+																					// 0xFF000000;//Math.random() *
+																					// 0xFFFFFF);
 		}
-		image.setRGB(0,  0,  100, 100, pixels, 0, 100);
+		image.setRGB(0, 0, 100, 100, pixels, 0, 100);
 
 		// test to send color to a gray-scale image
 		Graphics g = image.getGraphics();
 		g.setColor(Color.green);
 		System.out.println(Integer.toHexString(g.getColor().getRGB()));
 		g.fillRect(25, 25, 50, 50);
 		showImage(image);
-
-		JFrame f = new JFrame();
-		f.add(new JLabel(new ImageIcon(image)));
-		f.pack();
-		f.show();
-}
+		if (!GraphicsEnvironment.isHeadless()) {
+			JFrame f = new JFrame();
+			f.add(new JLabel(new ImageIcon(image)));
+			f.pack();
+			f.show();
+		}
+	}
 
 	private static void testPacked() {
 		
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Label.java b/sources/net.sf.j2s.java.core/src/test/Test_Label.java
@@ -195,7 +195,7 @@ Container getVisualPaneContent() {
 
 		ImageIcon icon1 = new ImageIcon("test/zoom.gif");
 		// either <br> or <br/> is fine.
-		JLabel l = new JLabel("<html>this is<br/>a<br> test</html>", null, SwingConstants.LEADING);
+		JLabel l = new JLabel("<html>this is<br/>a<br> t<sub>e</sub>st</html>", null, SwingConstants.LEADING);
 		l.setBounds(300,300,20,20);
 		add(l);
 //
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Regex.java b/sources/net.sf.j2s.java.core/src/test/Test_Regex.java
@@ -10,8 +10,25 @@ public class Test_Regex extends Test_ {
 
 	public static void main(String[] args) {
 
+		
+		
+		
 		String s;
 		Pattern p;
+		String formatSpecifier
+        = "%(\\d+\\$)?([-#+ 0,(\\<]*)?(\\d+)?(\\.\\d+)?([tT])?([a-zA-Z%])";
+		Pattern fsPattern = Pattern.compile(formatSpecifier);
+		Matcher fm = fsPattern.matcher("%d");
+		fm.find(0);
+		System.out.println(fm.groupCount());
+		for (int i = 0; i < fm.groupCount();i++) {
+			s = fm.group(i);
+			// note that in JavaScript ([-#+ 0,(\\<]*)? returns null, not (as in Java) ""
+			System.out.println(s);
+		}
+		s = String.format("val=%5.3f Completed %d%%.", new Object[] { new Float(3.5), Integer.valueOf(100)});
+		System.out.println(s);
+		assert(s.equals("val=3.500 Completed 100%."));
 
 		System.out.println("testRE pattern def");
 		s = Pattern.compile("''").matcher("ab'cd''ef'''gh''''").replaceAll("X");
diff --git a/sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js b/sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js
@@ -904,7 +904,9 @@ if (database == "_" && J2S._serverUrl.indexOf("//your.server.here/") >= 0) {
 		else if (fileName.indexOf("http://./") == 0)
 			fileName = fileName.substring(9);
 		else if (fileName.indexOf("file:/") >= 0 
-				&& fileName.indexOf(J2S.thisApplet.__Info.j2sPath) != 0)
+				&& Clazz.loadClass("swingjs.JSUtil") != null
+				&& fileName.indexOf(swingjs.JSUtil.getAppletDocumentPath$()) != 0
+				&& fileName.indexOf(swingjs.JSUtil.getAppletCodePath$()) != 0)
 			fileName = "./" + fileName.substring(5);
 		isBinary = (isBinary || J2S.isBinaryUrl(fileName));
 		var isPDB = !noProxy && (fileName.indexOf("pdb.gz") >= 0 && fileName
@@ -3139,6 +3141,7 @@ if (ev.keyCode == 9 && ev.target["data-focuscomponent"]) {
 			if (!J2S._dmouseOwner || tag.isDragging && J2S._dmouseOwner == tag) {
 				x = pageX0 + (dx = ev.pageX - pageX);
 				y = pageY0 + (dy = ev.pageY - pageY);
+				if (isNaN(x))return;
 				if (fDrag) {
 					fDrag({
 						x : x,
@@ -3158,6 +3161,7 @@ if (ev.keyCode == 9 && ev.target["data-focuscomponent"]) {
 			if (J2S._dmouseOwner == tag) {
 				tag.isDragging = false;
 				J2S._dmouseOwner = null
+				if (isNaN(x))return;
 				fUp && fUp({
 					x : x,
 					y : y,
diff --git a/sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js b/sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js
@@ -200,7 +200,12 @@ var _array = function(baseClass, paramType, ndims, params, isClone) {
         break;
       }
     }
-    params.push(initValue);
+    var p = params; // an Int32Array
+    var n = p.length;
+    params = new Array(n + 1);
+    for (var i = 0; i < n; i++)
+    	params[i] = p[i];
+    params[n] = initValue;
   }
   params.push(paramType);
   var nbits = 0;
diff --git a/sources/net.sf.j2s.java.core/srcjs/swingjs2.js b/sources/net.sf.j2s.java.core/srcjs/swingjs2.js
@@ -11573,7 +11573,9 @@ if (database == "_" && J2S._serverUrl.indexOf("//your.server.here/") >= 0) {
 		else if (fileName.indexOf("http://./") == 0)
 			fileName = fileName.substring(9);
 		else if (fileName.indexOf("file:/") >= 0 
-				&& fileName.indexOf(J2S.thisApplet.__Info.j2sPath) != 0)
+				&& Clazz.loadClass("swingjs.JSUtil") != null
+				&& fileName.indexOf(swingjs.JSUtil.getAppletDocumentPath$()) != 0
+				&& fileName.indexOf(swingjs.JSUtil.getAppletCodePath$()) != 0)
 			fileName = "./" + fileName.substring(5);
 		isBinary = (isBinary || J2S.isBinaryUrl(fileName));
 		var isPDB = !noProxy && (fileName.indexOf("pdb.gz") >= 0 && fileName
@@ -13808,6 +13810,7 @@ if (ev.keyCode == 9 && ev.target["data-focuscomponent"]) {
 			if (!J2S._dmouseOwner || tag.isDragging && J2S._dmouseOwner == tag) {
 				x = pageX0 + (dx = ev.pageX - pageX);
 				y = pageY0 + (dy = ev.pageY - pageY);
+				if (isNaN(x))return;
 				if (fDrag) {
 					fDrag({
 						x : x,
@@ -13827,6 +13830,7 @@ if (ev.keyCode == 9 && ev.target["data-focuscomponent"]) {
 			if (J2S._dmouseOwner == tag) {
 				tag.isDragging = false;
 				J2S._dmouseOwner = null
+				if (isNaN(x))return;
 				fUp && fUp({
 					x : x,
 					y : y,
@@ -14195,7 +14199,12 @@ var _array = function(baseClass, paramType, ndims, params, isClone) {
         break;
       }
     }
-    params.push(initValue);
+    var p = params; // an Int32Array
+    var n = p.length;
+    params = new Array(n + 1);
+    for (var i = 0; i < n; i++)
+    	params[i] = p[i];
+    params[n] = initValue;
   }
   params.push(paramType);
   var nbits = 0;
