tab-focus work

hansonr · hansonr · commit d254a0e907f8 · 2019-06-28T08:49:16.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
@@ -15,9 +15,7 @@ java/awt/color/ColorSpace.js
 java/awt/Component.js
 java/awt/ComponentOrientation.js
 java/awt/Container.js
-java/awt/ContainerOrderFocusTraversalPolicy.js
 java/awt/Cursor.js
-java/awt/DefaultFocusTraversalPolicy.js
 java/awt/DefaultKeyboardFocusManager.js
 java/awt/Dialog.js
 java/awt/Dimension.js
@@ -212,6 +210,13 @@ javax/swing/event/ListDataEvent.js
 javax/swing/event/ListDataListener.js
 javax/swing/event/UndoableEditEvent.js
 javax/swing/event/UndoableEditListener.js
+javax/swing/FocusManager.js
+javax/swing/InternalFrameFocusTraversalPolicy.js
+javax/swing/LayoutComparator.js
+javax/swing/LayoutFocusTraversalPolicy.js
+javax/swing/SortingFocusTraversalPolicy.js
+javax/swing/SwingContainerOrderFocusTraversalPolicy.js
+javax/swing/SwingDefaultFocusTraversalPolicy.js
 javax/swing/InputMap.js
 javax/swing/JApplet.js
 javax/swing/JButton.js
diff --git a/sources/net.sf.j2s.core/dist/swingjs/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20190627113444 
+20190627231814 
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
@@ -15,9 +15,7 @@ java/awt/color/ColorSpace.js
 java/awt/Component.js
 java/awt/ComponentOrientation.js
 java/awt/Container.js
-java/awt/ContainerOrderFocusTraversalPolicy.js
 java/awt/Cursor.js
-java/awt/DefaultFocusTraversalPolicy.js
 java/awt/DefaultKeyboardFocusManager.js
 java/awt/Dialog.js
 java/awt/Dimension.js
@@ -212,6 +210,13 @@ javax/swing/event/ListDataEvent.js
 javax/swing/event/ListDataListener.js
 javax/swing/event/UndoableEditEvent.js
 javax/swing/event/UndoableEditListener.js
+javax/swing/FocusManager.js
+javax/swing/InternalFrameFocusTraversalPolicy.js
+javax/swing/LayoutComparator.js
+javax/swing/LayoutFocusTraversalPolicy.js
+javax/swing/SortingFocusTraversalPolicy.js
+javax/swing/SwingContainerOrderFocusTraversalPolicy.js
+javax/swing/SwingDefaultFocusTraversalPolicy.js
 javax/swing/InputMap.js
 javax/swing/JApplet.js
 javax/swing/JButton.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 @@
-20190627113444 
+20190627231814 
diff --git a/sources/net.sf.j2s.java.core/_j2sclasslist.txt b/sources/net.sf.j2s.java.core/_j2sclasslist.txt
@@ -15,9 +15,7 @@ java/awt/color/ColorSpace.js
 java/awt/Component.js
 java/awt/ComponentOrientation.js
 java/awt/Container.js
-java/awt/ContainerOrderFocusTraversalPolicy.js
 java/awt/Cursor.js
-java/awt/DefaultFocusTraversalPolicy.js
 java/awt/DefaultKeyboardFocusManager.js
 java/awt/Dialog.js
 java/awt/Dimension.js
@@ -212,6 +210,13 @@ javax/swing/event/ListDataEvent.js
 javax/swing/event/ListDataListener.js
 javax/swing/event/UndoableEditEvent.js
 javax/swing/event/UndoableEditListener.js
+javax/swing/FocusManager.js
+javax/swing/InternalFrameFocusTraversalPolicy.js
+javax/swing/LayoutComparator.js
+javax/swing/LayoutFocusTraversalPolicy.js
+javax/swing/SortingFocusTraversalPolicy.js
+javax/swing/SwingContainerOrderFocusTraversalPolicy.js
+javax/swing/SwingDefaultFocusTraversalPolicy.js
 javax/swing/InputMap.js
 javax/swing/JApplet.js
 javax/swing/JButton.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
@@ -15,9 +15,7 @@ java/awt/color/ColorSpace.js
 java/awt/Component.js
 java/awt/ComponentOrientation.js
 java/awt/Container.js
-java/awt/ContainerOrderFocusTraversalPolicy.js
 java/awt/Cursor.js
-java/awt/DefaultFocusTraversalPolicy.js
 java/awt/DefaultKeyboardFocusManager.js
 java/awt/Dialog.js
 java/awt/Dimension.js
@@ -212,6 +210,13 @@ javax/swing/event/ListDataEvent.js
 javax/swing/event/ListDataListener.js
 javax/swing/event/UndoableEditEvent.js
 javax/swing/event/UndoableEditListener.js
+javax/swing/FocusManager.js
+javax/swing/InternalFrameFocusTraversalPolicy.js
+javax/swing/LayoutComparator.js
+javax/swing/LayoutFocusTraversalPolicy.js
+javax/swing/SortingFocusTraversalPolicy.js
+javax/swing/SwingContainerOrderFocusTraversalPolicy.js
+javax/swing/SwingDefaultFocusTraversalPolicy.js
 javax/swing/InputMap.js
 javax/swing/JApplet.js
 javax/swing/JButton.js
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
@@ -958,7 +958,9 @@ public boolean focus() {
 	 */
 	protected void setComponentFocus() {
 		jc.requestFocus();
-		jc.getFocusTraversalPolicy().getDefaultComponent(jc).requestFocus();
+		Component c = jc.getFocusTraversalPolicy().getDefaultComponent(jc);
+		if (c != null)
+			c.requestFocus();
 	}
 
 	/**
diff --git a/sources/net.sf.j2s.java.core/src/test/JalviewJSTest.java b/sources/net.sf.j2s.java.core/src/test/JalviewJSTest.java
@@ -188,10 +188,10 @@ public void keyReleased(KeyEvent e) {
 			@Override
 			public void mouseClicked(MouseEvent e) {
 				
-				frame.dispose();
-				System.out.println("frame after dispose " + frame.isValid());
-				frame.show();
-				
+//				frame.dispose();
+//				System.out.println("frame after dispose " + frame.isValid());
+//				frame.show();
+//				
 			}
 
 			@Override
