3.2.4.01(Runtime) BH 2018.10.01

hansonr · hansonr · commit dd8a50582aa5 · 2018-10-01T18:34:32.000-05:00
fix for AWT applets and frames not automatically
activating their childrens' mouse listeners.
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 @@
-20180928065911 
+20181001183306 
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/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp
@@ -1 +1 @@
-20180928065911 
+20181001183306 
diff --git a/sources/net.sf.j2s.java.core/dist/DEV_NOTES.txt b/sources/net.sf.j2s.java.core/dist/DEV_NOTES.txt
@@ -0,0 +1,5 @@
+BH 2018.10.01
+
+fix for AWT applets and frames not automatically 
+activating their childrens' mouse listeners.
+
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/a2s/A2SEvent.java b/sources/net.sf.j2s.java.core/src/a2s/A2SEvent.java
@@ -2,6 +2,7 @@
 
 import java.awt.AWTEvent;
 import java.awt.Component;
+import java.awt.Container;
 import java.awt.Event;
 import java.awt.Point;
 import java.awt.event.ActionEvent;
@@ -39,6 +40,9 @@ public A2SEvent(AWTEvent e) {
 	public void run() {
 	  Event e = this.e;
 	  Component target = (Component) this.target;
+	  if (target instanceof Container)
+		  target = ((Container)target).getMouseEventTarget(e.x, e.y, true, null, false);
+
 		
 		/**
 		 * Otherwise the states have not changed
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/Container.java b/sources/net.sf.j2s.java.core/src/java/awt/Container.java
@@ -2246,9 +2246,10 @@ Component getMouseEventTarget(int x, int y, boolean includeSelf) {
      * @param searchHeavyweights if <code>false</code>, the method
      *        will bypass heavyweight components during the search.
      */
-    private Component getMouseEventTarget(int x, int y, boolean includeSelf,
+    public Component getMouseEventTarget(int x, int y, boolean includeSelf,
                                           EventTargetFilter filter,
                                           boolean searchHeavyweights) {
+    	// was default package-specific
         Component comp = null;
 //        if (searchHeavyweights) {
 //            comp = getMouseEventTargetImpl(x, y, includeSelf, filter,
@@ -2320,7 +2321,8 @@ private Component getMouseEventTargetImpl(int x, int y, boolean includeSelf,
                             return deeper;
                         }
                     } else {
-                        if (filter.accept(comp)) {
+                    	// SwingJS adding filter == null for AWT events for A2SListener
+                        if (filter == null || filter.accept(comp)) {
                             // there isn't a deeper target, but this component
                             // is a target
                             return comp;
@@ -2341,7 +2343,7 @@ private Component getMouseEventTargetImpl(int x, int y, boolean includeSelf,
 
             // didn't find a child target, return this component if it's
             // a possible target
-            if (isMouseOverMe && isPeerOK && filter.accept(this)) {
+            if (isMouseOverMe && isPeerOK && (filter == null || filter.accept(this))) {
                 return this;
             }
             // no possible target
@@ -4399,7 +4401,7 @@ private boolean processMouseEvent(MouseEvent e) {
 
 		trackMouseEnterExit(mouseOver, e);
 
-		Component actualTarget;
+		Component actualTarget; 
 
 		switch (id) {
 		case MouseEvent.MOUSE_DRAGGED:
@@ -4729,7 +4731,7 @@ void retargetMouseEvent(Component target, int id, MouseEvent e) {
 
 		int x = e.getX(), y = e.getY();
 		Component component = target;
-		if (target.parent == null) {
+		if (target.parent == null && component != nativeContainer) {
 			component = ((JSComponentUI) ((JSComponent) target).getUI()).getTargetParent();
 			if (component != null)
 				target = component;
diff --git a/sources/net.sf.j2s.java.core/src/java/math/BigDecimal.java b/sources/net.sf.j2s.java.core/src/java/math/BigDecimal.java
@@ -4787,7 +4787,7 @@ private static BigDecimal multiplyDivideAndRound(long dividend0, long dividend1,
         return divideAndRound128(dividendHi, dividendLo, divisor, qsign, scale, roundingMode, preferredScale);
     }
 
-    private static final long DIV_NUM_BASE = BigInteger.TWO_TO_32; // Number base (32 bits).
+    private static final long DIV_NUM_BASE = BigInteger.FIRST_HIGH; // Number base (32 bits).
 
     /*
      * divideAndRound 128-bit value by long divisor.
diff --git a/sources/net.sf.j2s.java.core/src/java/math/BigInteger.java b/sources/net.sf.j2s.java.core/src/java/math/BigInteger.java
@@ -35,7 +35,12 @@
 
 /**
  * 
- * SwingJS note: This is only a minimal implementation. 
+ * SwingJS note: Because of the limitations of JavaScript with regard
+ * to long-integer bit storage as a double, this implementation drops
+ * the integer storage bit length to 26, giving 52 for long and leaving
+ * the last 12 bits for the exponent of the double number. This should
+ * not affect performance significantly. It does increase the storage 
+ * size by about 25%.    
  * 
  * Immutable arbitrary-precision integers.  All operations behave as if
  * BigIntegers were represented in two's-complement notation (like Java's
@@ -226,33 +231,38 @@ public class BigInteger extends Number implements Comparable<BigInteger> {
     @Deprecated
     private int firstNonzeroIntNum;
 
+	private long THIRD_CARRY = 0x155556L;//for 26-bit; 32-bit is 0x55555556L;
+    private long THIRD_MULT = 0x2AAAAABL;//for 26-bit; 32-bit is 0xAAAAAAABL
 	private static Random myRandom;
 
     /**
      * This mask is used to obtain the value of an int as if it were unsigned.
      * 
      * SwingJS : ANDing and ORing in JavaScript result in 32-bit numbers
      */
-    static long LONG_MASK = /** @j2sNative Math.pow(2,32) - 1 ||*/ 0xffffffffL;
+	
+	static int N_BITS = 26;
+	static int SPARE_BITS = 32 - N_BITS;
+    static long LONG_MASK = (1 << N_BITS) - 1;// 0xffffffffL;
 
-    static long TWO_TO_32 = LONG_MASK + 1;
+    static long FIRST_HIGH = LONG_MASK + 1;
 
 
-	static final double[] TWO_TO_THE = new double[55];
+	static final double[] TWO_TO_THE = new double[52];
 	// can't use << in JavaScript for large numbers
 	static {
 		TWO_TO_THE[0] = 1;
-		for (int i = 1; i <= 54; i++)
+		for (int i = 1; i <= N_BITS * 2; i++)
 			TWO_TO_THE[i] = TWO_TO_THE[i - 1] * 2;
 	}
 
 	static int longNumberOfLeadingZeros(long x) {    	
-		int n = 0;
+		int n = -SPARE_BITS;
 		long y = getHighBits(x); 
 		if (y == 0) {
 			x = getLowBits(x);
 		} else {
-			n = 32;
+			n = N_BITS - 2 * SPARE_BITS;
 			x = y;   		
 		}
 		return n + Integer.numberOfLeadingZeros((int) x);
@@ -261,11 +271,11 @@ static int longNumberOfLeadingZeros(long x) {
 	static long getLowBits(long y) {
     	// was y & LONG_MASK;
     	y = ((int) y) | 0;
-		return (y < 0 ? TWO_TO_32 + y : y);
+		return (y < 0 ? FIRST_HIGH + y : y);
 	}
 
 	static long toHighBits(long x) {
-		return longLeftShift(getLowBits(x), 32);
+		return longLeftShift(getLowBits(x), N_BITS);
 	}
 	
 	static long longLeftShift(long x, int n) {
@@ -277,7 +287,7 @@ static long toLongBits(long highbits, long lowbits) {
 	}
 
 	static long getHighBits(long x) {
-		return longRightShift(x, 32);
+		return longRightShift(x, N_BITS);
 	}
 	
 	static long longRightShift(long x, int n) {
@@ -286,7 +296,7 @@ static long longRightShift(long x, int n) {
 		long tttn = doubleToLong(TWO_TO_THE[n]);
     	x = (x - getLowBits((x & (tttn - 1)))) / tttn;
     	// clear high bits if necessary
-    	return (x < 0 && n > 32 ? x & (doubleToLong(TWO_TO_THE[64 - n]) - 1) : x);
+    	return x;//(x < 0 && n > 32 ? x & (doubleToLong(TWO_TO_THE[ - n]) - 1) : x);
     }
     
     private static long doubleToLong(double d) {
@@ -645,7 +655,7 @@ public BigInteger(String val, int radix) {
         // Pre-allocate array of expected size. May be too large but can
         // never be too small. Typically exact.
         long numBits = ((numDigits * bitsPerDigit[radix]) >>> 10) + 1;
-        if (numBits + 31 >= TWO_TO_32) {
+        if (numBits + 31 >= FIRST_HIGH) {
             reportOverflow();
         }
         int numWords = (int) (numBits + 31) >>> 5;
@@ -703,7 +713,7 @@ public BigInteger(String val, int radix) {
             numWords = 1;
         } else {
             long numBits = ((numDigits * bitsPerDigit[10]) >>> 10) + 1;
-            if (numBits + 31 >= TWO_TO_32) {
+            if (numBits + 31 >= FIRST_HIGH) {
                 reportOverflow();
             }
             numWords = (int) (numBits + 31) >>> 5;
@@ -1479,7 +1489,7 @@ private static int[] subtract(long val, int[] little) {
                 long difference = getLowBits(val) - getLowBits(little[0]);
                 result[1] = (int)difference;
                 // Subtract remainder of longer number while borrow propagates
-                boolean borrow = (difference >> 32 != 0);
+                boolean borrow = (getHighBits(difference) != 0);
                 if (borrow) {
                     result[0] = highWord - 1;
                 } else {        // Copy remainder of longer number
@@ -1488,9 +1498,9 @@ private static int[] subtract(long val, int[] little) {
                 return result;
             } else { // little.length == 2
                 long difference = getLowBits(val) - getLowBits(little[1]);
-                result[1] = (int)difference;
-                difference = getLowBits(highWord) - getLowBits(little[0]) + (difference >> 32);
-                result[0] = (int)difference;
+                result[1] = (int) difference;
+                difference = getLowBits(highWord) - getLowBits(little[0]) + getHighBits(difference);
+                result[0] = (int) difference;
                 return result;
             }
         }
@@ -1515,12 +1525,12 @@ private static int[] subtract(int[] big, long val) {
         } else {
             difference = getLowBits(big[--bigIndex]) - getLowBits(val);
             result[bigIndex] = (int)difference;
-            difference = getLowBits(big[--bigIndex]) - getLowBits(highWord) + (difference >> 32);
+            difference = getLowBits(big[--bigIndex]) - getLowBits(highWord) + getHighBits(difference);
             result[bigIndex] = (int)difference;
         }
 
         // Subtract remainder of longer number while borrow propagates
-        boolean borrow = (difference >> 32 != 0);
+        boolean borrow = (getHighBits(difference) != 0);
         while (bigIndex > 0 && borrow)
             borrow = ((result[--bigIndex] = big[bigIndex] - 1) == -1);
 
@@ -1570,12 +1580,12 @@ private static int[] subtract(int[] big, int[] little) {
         while (littleIndex > 0) {
             difference = getLowBits(big[--bigIndex]) -
             		getLowBits(little[--littleIndex]) +
-                         (difference >> 32);
+                         getHighBits(difference);
             result[bigIndex] = (int)difference;
         }
 
         // Subtract remainder of longer number while borrow propagates
-        boolean borrow = (difference >> 32 != 0);
+        boolean borrow = (getHighBits(difference) != 0);
         while (bigIndex > 0 && borrow)
             borrow = ((result[--bigIndex] = big[bigIndex] - 1) == -1);
 
@@ -1762,7 +1772,10 @@ private static BigInteger multiplyKaratsuba(BigInteger x, BigInteger y) {
         BigInteger p3 = xh.add(xl).multiply(yh.add(yl));
 
         // result = p1 * 2^(32*2*half) + (p3 - p1 - p2) * 2^(32*half) + p2
-        BigInteger result = p1.shiftLeft(32*half).add(p3.subtract(p1).subtract(p2)).shiftLeft(32*half).add(p2);
+        BigInteger result = p1.shiftLeft(N_BITS*half)
+        			.add(p3.subtract(p1).subtract(p2))
+        			.shiftLeft(N_BITS*half)
+        			.add(p2);
 
         if (x.signum != y.signum) {
             return result.negate();
@@ -1849,9 +1862,12 @@ private static BigInteger multiplyToomCook3(BigInteger a, BigInteger b) {
         tm1 = tm1.subtract(t2);
 
         // Number of bits to shift left.
-        int ss = k*32;
+        int ss = k*N_BITS;
 
-        BigInteger result = vinf.shiftLeft(ss).add(t2).shiftLeft(ss).add(t1).shiftLeft(ss).add(tm1).shiftLeft(ss).add(v0);
+        BigInteger result = vinf.shiftLeft(ss).add(t2)
+        		.shiftLeft(ss).add(t1)
+        		.shiftLeft(ss).add(tm1)
+        		.shiftLeft(ss).add(v0);
 
         if (a.signum != b.signum) {
             return result.negate();
@@ -1939,14 +1955,15 @@ private BigInteger exactDivideBy3() {
             // 0xAAAAAAAB is the modular inverse of 3 (mod 2^32).  Thus,
             // the effect of this is to divide by 3 (mod 2^32).
             // This is much faster than division on most architectures.
-            q = getLowBits((w * 0xAAAAAAABL));
+            q = getLowBits((w * THIRD_MULT));
             result[i] = (int) q;
 
+            // SWINGJS TODO - CHECK THIS
             // Now check the borrow. The second check can of course be
             // eliminated if the first fails.
-            if (q >= 0x55555556L) {
+            if (q >= THIRD_CARRY ) {
                 borrow++;
-                if (q >= 0xAAAAAAABL)
+                if (q >= THIRD_MULT)
                     borrow++;
             }
         }
@@ -2099,7 +2116,9 @@ private BigInteger squareKaratsuba() {
         BigInteger xls = xl.square();  // xls = xl^2
 
         // xh^2 << 64  +  (((xl+xh)^2 - (xh^2 + xl^2)) << 32) + xl^2
-        return xhs.shiftLeft(half*32).add(xl.add(xh).square().subtract(xhs.add(xls))).shiftLeft(half*32).add(xls);
+        return xhs.shiftLeft(half*N_BITS).add(xl.add(xh)
+        		.square().subtract(xhs.add(xls)))
+        		.shiftLeft(half*N_BITS).add(xls);
     }
 
     /**
@@ -2149,9 +2168,12 @@ private BigInteger squareToomCook3() {
         tm1 = tm1.subtract(t2);
 
         // Number of bits to shift left.
-        int ss = k*32;
+        int ss = k*N_BITS;
 
-        return vinf.shiftLeft(ss).add(t2).shiftLeft(ss).add(t1).shiftLeft(ss).add(tm1).shiftLeft(ss).add(v0);
+        return vinf.shiftLeft(ss).add(t2)
+        		.shiftLeft(ss).add(t1)
+        		.shiftLeft(ss).add(tm1)
+        		.shiftLeft(ss).add(v0);
     }
 
     // Division
@@ -2903,11 +2925,11 @@ private static int subN(int[] a, int[] b, int len) {
 
         while (--len >= 0) {
             sum = getLowBits(a[len]) -
-            		getLowBits(b[len]) + (sum >> 32);
+            		getLowBits(b[len]) + getHighBits(sum);
             a[len] = (int)sum;
         }
 
-        return (int)(sum >> 32);
+        return (int)getHighBits(sum);
     }
 
     /**
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,9 +7,7 @@
 
 // Google closure compiler cannot handle Clazz.new or Clazz.super
 
-// TODO: CharacterSequence does not implement Java 8 default methods chars() or codePoints()
-//       It is possible that these might be loaded dynamically.
-
+// BH 10/1/2018 3.2.4.01 fixes problem with AWT mouseXxx(Event) not activating in children of Applet
 // BH 9/29/2018 3.2.4.00 adds JAXB support
 // BH 9/23/2018 3.2.3.00 adds direct non-Swing applet support (java.applet.Applet and java.awt.*); no need for converting source to a2s.*
 // BH 9/15/2018 3.2.2.06 adds JScrollBar block and unit increments; fixes JLabel ui getMaximumSize
@@ -106,8 +104,8 @@ window["j2s.clazzloaded"] = true;
   _debugging: false,
   _loadcore: true,
   _nooutput: 0,
-  _VERSION_R: "3.2.3.00",
-  _VERSION_T: "3.2.3.00",
+  _VERSION_R: "3.2.4.01",
+  _VERSION_T: "3.2.4.00",
 };
 
 ;(function(Clazz, J2S) {
diff --git a/sources/net.sf.j2s.java.core/srcjs/swingjs2.js b/sources/net.sf.j2s.java.core/srcjs/swingjs2.js
@@ -13552,9 +13552,7 @@ if (!J2S._version)
 
 // Google closure compiler cannot handle Clazz.new or Clazz.super
 
-// TODO: CharacterSequence does not implement Java 8 default methods chars() or codePoints()
-//       It is possible that these might be loaded dynamically.
-
+// BH 10/1/2018 3.2.4.01 fixes problem with AWT mouseXxx(Event) not activating in children of Applet
 // BH 9/29/2018 3.2.4.00 adds JAXB support
 // BH 9/23/2018 3.2.3.00 adds direct non-Swing applet support (java.applet.Applet and java.awt.*); no need for converting source to a2s.*
 // BH 9/15/2018 3.2.2.06 adds JScrollBar block and unit increments; fixes JLabel ui getMaximumSize
@@ -13651,8 +13649,8 @@ window["j2s.clazzloaded"] = true;
   _debugging: false,
   _loadcore: true,
   _nooutput: 0,
-  _VERSION_R: "3.2.3.00",
-  _VERSION_T: "3.2.3.00",
+  _VERSION_R: "3.2.4.01",
+  _VERSION_T: "3.2.4.00",
 };
 
 ;(function(Clazz, J2S) {

Original file line number	Diff line number	Diff line change
`@@ -4787,7 +4787,7 @@ private static BigDecimal multiplyDivideAndRound(long dividend0, long dividend1,`
`4787`	`4787`	`return divideAndRound128(dividendHi, dividendLo, divisor, qsign, scale, roundingMode, preferredScale);`
`4788`	`4788`	`}`
`4789`	`4789`
`4790`		`- private static final long DIV_NUM_BASE = BigInteger.TWO_TO_32; // Number base (32 bits).`
	`4790`	`+ private static final long DIV_NUM_BASE = BigInteger.FIRST_HIGH; // Number base (32 bits).`
`4791`	`4791`
`4792`	`4792`	`/*`
`4793`	`4793`	`* divideAndRound 128-bit value by long divisor.`