Minor JSMOuse update and Float/Double efficiencies

BobHanson · BobHanson · commit efaa9f8c2c02 · 2023-12-13T11:03:42.000-07:00
diff --git a/sources/net.sf.j2s.core/dist/swingjs/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20231210191429 
+20231213085117 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/5.0.1/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/5.0.1/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/5.0.1/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/5.0.1/timestamp
@@ -1 +1 @@
-20231210191429 
+20231213085117 
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/java/lang/String9.java b/sources/net.sf.j2s.java.core/src/java/lang/String9.java
@@ -14,10 +14,10 @@ public final class String9 {
     static final byte LATIN1 = 0;
     static final byte UTF16  = 1;
 
-    private boolean isLatin1() {
-        return COMPACT_STRINGS && coder == LATIN1;
-    }
-
+//    private boolean isLatin1() {
+//        return COMPACT_STRINGS && coder == LATIN1;
+//    }
+//
 
     /*
      * StringIndexOutOfBoundsException  if {@code index} is
diff --git a/sources/net.sf.j2s.java.core/src/sun/misc/DoubleConsts.java b/sources/net.sf.j2s.java.core/src/sun/misc/DoubleConsts.java
@@ -106,12 +106,12 @@ private DoubleConsts() {}
      */
     public static final long    SIGNIF_BIT_MASK = 0x000FFFFFFFFFFFFFL;
 
-    static {
-        // verify bit masks cover all bit positions and that the bit
-        // masks are non-overlapping
-        assert(((SIGN_BIT_MASK | EXP_BIT_MASK | SIGNIF_BIT_MASK) == ~0L) &&
-               (((SIGN_BIT_MASK & EXP_BIT_MASK) == 0L) &&
-                ((SIGN_BIT_MASK & SIGNIF_BIT_MASK) == 0L) &&
-                ((EXP_BIT_MASK & SIGNIF_BIT_MASK) == 0L)));
-    }
+//    static {
+//        // verify bit masks cover all bit positions and that the bit
+//        // masks are non-overlapping
+//        assert(((SIGN_BIT_MASK | EXP_BIT_MASK | SIGNIF_BIT_MASK) == ~0L) &&
+//               (((SIGN_BIT_MASK & EXP_BIT_MASK) == 0L) &&
+//                ((SIGN_BIT_MASK & SIGNIF_BIT_MASK) == 0L) &&
+//                ((EXP_BIT_MASK & SIGNIF_BIT_MASK) == 0L)));
+//    }
 }
diff --git a/sources/net.sf.j2s.java.core/src/sun/misc/FloatConsts.java b/sources/net.sf.j2s.java.core/src/sun/misc/FloatConsts.java
@@ -101,12 +101,12 @@ private FloatConsts() {}
      */
     public static final int     SIGNIF_BIT_MASK = 0x007FFFFF;
 
-    static {
-        // verify bit masks cover all bit positions and that the bit
-        // masks are non-overlapping
-        assert(((SIGN_BIT_MASK | EXP_BIT_MASK | SIGNIF_BIT_MASK) == ~0) &&
-               (((SIGN_BIT_MASK & EXP_BIT_MASK) == 0) &&
-                ((SIGN_BIT_MASK & SIGNIF_BIT_MASK) == 0) &&
-                ((EXP_BIT_MASK & SIGNIF_BIT_MASK) == 0)));
-    }
+//    static {
+//        // verify bit masks cover all bit positions and that the bit
+//        // masks are non-overlapping
+//        assert(((SIGN_BIT_MASK | EXP_BIT_MASK | SIGNIF_BIT_MASK) == ~0) &&
+//               (((SIGN_BIT_MASK & EXP_BIT_MASK) == 0) &&
+//                ((SIGN_BIT_MASK & SIGNIF_BIT_MASK) == 0) &&
+//                ((EXP_BIT_MASK & SIGNIF_BIT_MASK) == 0)));
+//    }
 }
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSMouse.java b/sources/net.sf.j2s.java.core/src/swingjs/JSMouse.java
@@ -68,7 +68,9 @@ public boolean processEvent(int id, int x, int y, int modifiers, long time, Obje
 		case KeyEvent.KEY_RELEASED:
 			return keyAction(id, jqevent, time);
 		}	
-		if (id != MouseEvent.MOUSE_WHEEL && id != MouseEvent.MOUSE_MOVED)
+		if (id != MouseEvent.MOUSE_WHEEL 
+				&& id != MouseEvent.MOUSE_MOVED
+				&& id != MouseEvent.MOUSE_DRAGGED)
 			modifiers = applyLeftMouse(modifiers);
 		switch (id) {	
 		case MouseEvent.MOUSE_WHEEL:
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/api/js/DOMNode.java b/sources/net.sf.j2s.java.core/src/swingjs/api/js/DOMNode.java
@@ -14,20 +14,6 @@
  *
  */
 public interface DOMNode {
-	
-	
-	public default void x(){
-	  Consumer<String> x = new Consumer<String>(){
-
-		@Override
-		public void accept(String t) {
-			// TODO Auto-generated method stub
-			
-		}
-		  
-	  };
-	}
-	
 	/**
 	 * avoiding GCC inability to handle .finally and .catch
 	 * 
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Long.java b/sources/net.sf.j2s.java.core/src/test/Test_Long.java
@@ -757,7 +757,7 @@ private static void testBoxed() {
 		Integer IJ = null; 
 		assert(L != O);
 		assert(II == IJ);
-		assert(L == L);
+//		assert(L == L);
 		assert(P != L);
 		assert(P.equals(L));
 		assert(L != null);
