java2script · BobHanson · Jun 28, 2019 · Jun 17, 2019 · Jun 18, 2019 · Jun 27, 2019
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 @@
-20190617071320 
+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 @@
-20190617071320 
+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/java/awt/AWTEvent.java b/sources/net.sf.j2s.java.core/src/java/awt/AWTEvent.java
@@ -131,6 +131,7 @@ public abstract class AWTEvent extends EventObject {
 //
     transient boolean focusManagerIsDispatching = false;
     transient boolean isPosted;
+
 
 //    /**
 //     * Indicates whether this AWTEvent was generated by the system as
@@ -281,6 +282,12 @@ public abstract class AWTEvent extends EventObject {
 	// public void setPosted(AWTEvent ev) {
 	// ev.isPosted = true;
 	// }
+
+    public void setPosted() {
+    	// swingJS
+    	isPosted = true;
+    }
+
 	//
 	// public AccessControlContext getAccessControlContext(AWTEvent ev) {
 	// return ev.getAccessControlContext();

diff --git a/sources/net.sf.j2s.java.core/src/java/awt/Component.java b/sources/net.sf.j2s.java.core/src/java/awt/Component.java
@@ -68,7 +68,7 @@
 import java.util.Set;
 import java.util.Vector;
 
-import javax.swing.JInternalFrame;
+import javax.swing.JComponent;
 
 import sun.awt.AppContext;
 import sun.awt.CausedFocusEvent;
@@ -390,7 +390,7 @@ public AppContext getAppContext() {
 	 * @see #getFocusTraversalKeysEnabled
 	 * @since 1.4
 	 */
-	private boolean focusTraversalKeysEnabled = false;// true;
+	private boolean focusTraversalKeysEnabled = true;
 
 	/**
 	 * The locking object for AWT component-tree and layout operations.
@@ -740,6 +740,8 @@ void setBoundsOp(int op) {
 	// return comp.getAccessControlContext();
 	// }
 	//
+
+
 	// public void setBackgroundEraseDisabled(Component comp, boolean disabled)
 	// {
 	// comp.backgroundEraseDisabled = disabled;
@@ -749,10 +751,16 @@ void setBoundsOp(int op) {
 	// return comp.backgroundEraseDisabled;
 	// }
 	//
-	public Rectangle getBounds(Component comp) {
-		return new Rectangle(comp.x, comp.y, comp.width, comp.height);
+
+	public void setBackgroundEraseDisabled(boolean disabled) {
+		backgroundEraseDisabled = disabled;
+	}
+
+	public boolean getBackgroundEraseDisabled() {
+		return backgroundEraseDisabled;
 	}
 
+
 	public boolean requestFocusInWindow(Component comp, CausedFocusEvent.Cause cause) {
 		return comp.requestFocusInWindow(cause);
 	}
@@ -1123,7 +1131,7 @@ public boolean isVisible() {
 		return isVisible_NoClientCode();
 	}
 
-	protected final boolean isVisible_NoClientCode() {
+	public final boolean isVisible_NoClientCode() {
 		return visible;
 	}
 
@@ -3050,6 +3058,10 @@ public void repaint(int x, int y, int width, int height) {
 	 * @since JDK1.0
 	 */
 	public void repaint(long tm, int x, int y, int width, int height) {
+		秘repaintCmp(tm, x, y, width, height);
+	}
+
+	protected void 秘repaintCmp(long tm, int x, int y, int width, int height) {
 		// System.out.println("C repaint " + this.name);
 		if (canPaint()) {
 			// System.out.println("C firing Paint event on " + this.name);
@@ -6347,7 +6359,7 @@ public void requestFocus() {
 		requestFocusHelper(false, true);
 	}
 
-	void requestFocus(CausedFocusEvent.Cause cause) {
+	public void requestFocus(CausedFocusEvent.Cause cause) {
 		requestFocusHelper(false, true, cause);
 	}
 
@@ -6625,17 +6637,20 @@ private boolean isRequestFocusAccepted(boolean temporary, boolean focusedWindowC
 			return true;
 		}
 
+		if (requestFocusController == null)
+			requestFocusController = JComponent.focusController;
 		boolean ret = requestFocusController.acceptRequestFocus(focusOwner, this, temporary, focusedWindowChangeAllowed,
 				cause);
 		return ret;
 	}
 
-	private static RequestFocusController requestFocusController = new DummyRequestFocusController();
+	private static RequestFocusController requestFocusController;// = new DummyRequestFocusController();
 
 	// Swing access this method through reflection to implement
 	// InputVerifier's functionality.
 	// Perhaps, we should make this method public (later ;)
 	private static class DummyRequestFocusController implements RequestFocusController {
+		@Override
 		public boolean acceptRequestFocus(Component from, Component to, boolean temporary,
 				boolean focusedWindowChangeAllowed, CausedFocusEvent.Cause cause) {
 			return true;

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
@@ -288,6 +288,7 @@ Component[] getChildArray() {
      */
     public Container() {
     	component = new Lst<Component>();
+		 秘paintClass = 秘updateClass = /**@j2sNative C$ || */null;
     }
 
 		@Override
@@ -1284,7 +1285,8 @@ public void remove(Component comp) {
      * @see #add
      * @see #remove
      */
-    public void removeAll() { 
+    @Override
+	public void removeAll() { 
         synchronized (getTreeLock()) {
             adjustListeningChildren(AWTEvent.HIERARCHY_EVENT_MASK,
                                     -listeningChildren);
@@ -1565,16 +1567,18 @@ public void invalidate() {
 	@Override
 	public void validate() {
 		/* Avoid grabbing lock unless really necessary. */
-		if (!isValid()) {
+		if (!isValid() && peer != null) {
 			synchronized (getTreeLock()) {
 
+				// validation in AWT prior to addNotify will cause NPE for TextArea without font
+
 				// for SwingJS ALL components must have peers. might as well do that
 				// now.
 				// I think there was a notification threading issue that the root pane
 				// was not
 				// getting its peer in time for validation.
-				if (peer == null)
-					peer = getToolkit().createComponent(this);
+//				if (peer == null)
+//					peer = getToolkit().createComponent(this);
 				int n = component.size();
 				if (!isValid() && peer != null && n > 0) {
 					ContainerPeer p = null;
@@ -3296,23 +3300,22 @@ void clearMostRecentFocusOwnerOnHide() {
 
     @Override
     protected void clearCurrentFocusCycleRootOnHide() {
-//        KeyboardFocusManager kfm =
-//            KeyboardFocusManager.getCurrentKeyboardFocusManager();
-//        Container cont = kfm.getCurrentFocusCycleRoot();
-//
-//        if (cont == this || isParentOf(cont)) {
-//            kfm.setGlobalCurrentFocusCycleRoot(null);
-//        }
+        KeyboardFocusManager kfm =
+            KeyboardFocusManager.getCurrentKeyboardFocusManager();
+        Container cont = kfm.getCurrentFocusCycleRoot();
+
+        if (cont == this || isParentOf(cont)) {
+            kfm.setGlobalCurrentFocusCycleRoot(null);
+        }
     }
 
     @Override
 	final Container getTraversalRoot() {
-//        if (isFocusCycleRoot()) {
-//            return findTraversalRoot();
-//        }
-//
-//        return super.getTraversalRoot();
-    	return null;
+        if (isFocusCycleRoot()) {
+            return findTraversalRoot();
+        }
+
+        return super.getTraversalRoot();
     }
 
     /**
@@ -3372,6 +3375,9 @@ public FocusTraversalPolicy getFocusTraversalPolicy() {
         Container rootAncestor = getFocusCycleRootAncestor();
         if (rootAncestor != null) {
             return rootAncestor.getFocusTraversalPolicy();
+        } else if (秘isAWT()) {
+            return KeyboardFocusManager.getCurrentKeyboardFocusManager().
+                    getDefaultAWTFocusTraversalPolicy();
         } else {
             return KeyboardFocusManager.getCurrentKeyboardFocusManager().
                 getDefaultFocusTraversalPolicy();