updated _j2sclasslist.txt, fixed mousemoveoutjsmol/mouseupoutjsmol

hansonr · hansonr · commit af97ef40587b · 2019-07-02T20:39:14.000+02:00
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
@@ -14,8 +14,10 @@ java/awt/Color.js
 java/awt/color/ColorSpace.js
 java/awt/Component.js
 java/awt/ComponentOrientation.js
+java/awt/ContainerOrderFocusTraversalPolicy.js
 java/awt/Container.js
 java/awt/Cursor.js
+java/awt/DefaultFocusTraversalPolicy.js
 java/awt/DefaultKeyboardFocusManager.js
 java/awt/Dialog.js
 java/awt/Dimension.js
diff --git a/sources/net.sf.j2s.core/dist/swingjs/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20190702100854 
+20190702193235 
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
@@ -14,8 +14,10 @@ java/awt/Color.js
 java/awt/color/ColorSpace.js
 java/awt/Component.js
 java/awt/ComponentOrientation.js
+java/awt/ContainerOrderFocusTraversalPolicy.js
 java/awt/Container.js
 java/awt/Cursor.js
+java/awt/DefaultFocusTraversalPolicy.js
 java/awt/DefaultKeyboardFocusManager.js
 java/awt/Dialog.js
 java/awt/Dimension.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 @@
-20190702100854 
+20190702193235 
diff --git a/sources/net.sf.j2s.java.core/_j2sclasslist.txt b/sources/net.sf.j2s.java.core/_j2sclasslist.txt
@@ -14,8 +14,10 @@ java/awt/Color.js
 java/awt/color/ColorSpace.js
 java/awt/Component.js
 java/awt/ComponentOrientation.js
+java/awt/ContainerOrderFocusTraversalPolicy.js
 java/awt/Container.js
 java/awt/Cursor.js
+java/awt/DefaultFocusTraversalPolicy.js
 java/awt/DefaultKeyboardFocusManager.js
 java/awt/Dialog.js
 java/awt/Dimension.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
@@ -14,8 +14,10 @@ java/awt/Color.js
 java/awt/color/ColorSpace.js
 java/awt/Component.js
 java/awt/ComponentOrientation.js
+java/awt/ContainerOrderFocusTraversalPolicy.js
 java/awt/Container.js
 java/awt/Cursor.js
+java/awt/DefaultFocusTraversalPolicy.js
 java/awt/DefaultKeyboardFocusManager.js
 java/awt/Dialog.js
 java/awt/Dimension.js
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Applet_Scroll.java b/sources/net.sf.j2s.java.core/src/test/Test_Applet_Scroll.java
@@ -19,6 +19,7 @@
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
 import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionListener;
 import java.awt.event.MouseWheelEvent;
 import java.awt.event.MouseWheelListener;
@@ -42,7 +43,7 @@
 import javax.swing.plaf.ViewportUI;
 
 @SuppressWarnings("serial")
-public class Test_Applet_Scroll extends JApplet implements ChangeListener, MouseMotionListener {
+public class Test_Applet_Scroll extends JApplet implements ChangeListener, MouseListener, MouseMotionListener {
 
 	static {
 		/**
@@ -190,6 +191,7 @@ public void actionPerformed(ActionEvent event) {
 		JScrollPane sp = new JScrollPane();
 		
 		sp.addMouseMotionListener(this);
+		sp.addMouseListener(this);
 
 
 		panel2 = new JPanel();
@@ -315,4 +317,34 @@ public void mouseMoved(MouseEvent e) {
 		
 	}
 
+	@Override
+	public void mouseClicked(MouseEvent e) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void mousePressed(MouseEvent e) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void mouseReleased(MouseEvent e) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void mouseEntered(MouseEvent e) {
+		System.out.println("Test_Applet_Scroll mouseEntered " + e);
+		
+	}
+
+	@Override
+	public void mouseExited(MouseEvent e) {
+		System.out.println("Test_Applet_Scroll mouseExited " + e);
+		
+	}
+
 }
diff --git a/sources/net.sf.j2s.java.core/srcjs/swingjs2.js b/sources/net.sf.j2s.java.core/srcjs/swingjs2.js
@@ -12215,11 +12215,11 @@ if (ev.keyCode == 9 && ev.target["data-focuscomponent"]) {
 
 		J2S.traceMouse = function(what,ev) {
 			System.out.println(["tracemouse:" + what 
-				,"type:",ev.type
+				,"type:",ev.type,ev.pageX,ev.pageY
 				,"target.id:",ev.target.id
-				,"\n  relatedtarget.id:",ev.originalEvent.relatedTarget && ev.originalEvent.relatedTarget.id
+				,"\n  relatedtarget.id:",(ev.originalEvent.relatedTarget && ev.originalEvent.relatedTarget.id)
 				,"\n  who:", who.id
-				,"\n  dragging:", J2S._mouseOwner && J2S._mouseOwner.isDragging
+				,"\n  dragging:", (J2S._mouseOwner && J2S._mouseOwner.isDragging)
 				,"doignore:",doIgnore(ev,1)
 				,"role:",ev.target.getAttribute && ev.target.getAttribute("role")
 				,"data-ui:",ev.target["data-ui"]
@@ -12443,30 +12443,23 @@ if (ev.keyCode == 9 && ev.target["data-focuscomponent"]) {
 
 		J2S.$bind(who, 'mousemoveoutjsmol', function(evspecial, target, ev) {
 
-			if (who.isDragging)
+			if (!who.isDragging || who != J2S._mouseOwner)
+				return;
+
 			if (J2S._traceMouse)
 				J2S.traceMouse("OUTJSMOL", ev);
 
-			if (doIgnore(ev))
-				return true;
-		
-			if (who == J2S._mouseOwner && who.isDragging)
-				return J2S._drag(who, ev, 503);
-			return true;
+			return J2S._drag(who, ev, 503);
 		});
 
 		J2S.$bind(who, 'mouseupoutjsmol', function(evspecial, target, ev) {
 
-			if (who.isDragging)
+			if (!who.isDragging || who != J2S._mouseOwner)
+				return true;
 			if (J2S._traceMouse)
 				J2S.traceMouse("UPJSMOL", ev);
 
-			if (doIgnore(ev))
-				return true;
-		
-			if (who == J2S._mouseOwner && who.isDragging)
-				return J2S._drag(who, ev, 502);
-			return true;
+			return J2S._drag(who, ev, 502);
 		});
 
 		if (who.applet._is2D && !who.applet._isApp) {
