BobHanson · BobHanson · Mar 15, 2019 · Mar 12, 2019 · Mar 12, 2019 · Mar 12, 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/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20190307200127 
+20190315122942 
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 @@
-20190307200127 
+20190315122942 
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/applet/JSApplet.java b/sources/net.sf.j2s.java.core/src/java/applet/JSApplet.java
@@ -33,6 +33,8 @@
 import java.awt.HeadlessException;
 import java.awt.Image;
 import java.awt.JSPanel;
+import java.awt.Window;
+import java.awt.event.WindowListener;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Locale;
@@ -94,15 +96,25 @@ public JSApplet()  {
      * @return true
      */
     public boolean isFocusableWindow() {
-    	// mascarading as Window here
+    	// masquerading as Window here
     	return true;
     }
 
     public Dialog getModalBlocker() {
-    	// mascarading as Window here
+    	// masquerading as Window here
         return null; //??
     }
 
+
+    public void addWindowListener(WindowListener w) {
+    	// from popup
+    }
+    public void addOwnedWindow(Window w) {
+    	// from popup
+    }
+
+    void removeOwnedWindow(Window weakWindow) {
+    }
 
     /**
      * Holds the reference to the component which last had focus in this window

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
@@ -180,7 +180,7 @@ public abstract class Component implements ImageObserver/*
 	 * 
 	 * @see #getParent
 	 */
-	protected transient Container parent;
+	public transient Container parent;
 
 	/**
 	 * The <code>AppContext</code> of the component. Applets/Plugin may change the
@@ -2385,10 +2385,13 @@ protected Dimension prefSizeComp() {
 		Dimension dim = prefSize;
 		if (dim == null || !(isPreferredSizeSet() || isValid())) {
 			// synchronized (getTreeLock()) {
+
+			// SwingJS TODO: it is not clear that we should deliver getMinimumSize here. 
+			// 
 			prefSize = // (
 						// peer != null) ?
 						// peer.preferredSize() :
-					getMinimumSize();
+					(width == 0 && height == 0 ? getMinimumSize() : new Dimension(width, height));
 			dim = prefSize;
 		}
 		// }

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
@@ -392,7 +392,8 @@ public Insets insets() {
      * 
      */
     public Component add(Component comp) {
-        return addImpl(comp, null, -1);
+        addImpl(comp, null, -1);
+        return comp;
     }
 
     /**
@@ -406,7 +407,8 @@ public Component add(Component comp) {
      * 
      */
     public Component add(String name, Component comp) {
-        return addImpl(comp, name, -1);
+        addImpl(comp, name, -1);
+        return comp;
     }
 
     /**
@@ -435,7 +437,8 @@ public Component add(String name, Component comp) {
      * 
      */
     public Component add(Component comp, int index) {
-        return addImpl(comp, null, index);
+        addImpl(comp, null, index);
+        return comp;
     }
 
     /**
@@ -998,7 +1001,8 @@ public void add(Component comp, Object constraints) {
      */
 
     public Component add(Component comp, Object constraints, int index) {
-       return addImpl(comp, constraints, index);
+       addImpl(comp, constraints, index);
+       return comp;
     }
 
     /**
@@ -1062,93 +1066,86 @@ public Component add(Component comp, Object constraints, int index) {
      * @see       LayoutManager2
      * @since     JDK1.1
      */
-    protected Component addImpl(Component comp, Object constraints, int index) {
-    	return addImplCont(comp, constraints, index);
+    protected void addImpl(Component comp, Object constraints, int index) {
+    	addImplCont(comp, constraints, index);
     }
 
-    protected Component addImplCont(Component comp, Object constraints, int index) {
-      synchronized (getTreeLock()) {
-
-      	//SwingJS used for all add methods
-
-          /* Check for correct arguments:  index in bounds,
-           * comp cannot be one of this container's parents,
-           * and comp cannot be a window.
-           * comp and container must be on the same GraphicsDevice.
-           * if comp is container, all sub-components must be on
-           * same GraphicsDevice.
-           */
+	protected void addImplCont(Component comp, Object constraints, int index) {
+		synchronized (getTreeLock()) {
+
+			// SwingJS used for all add methods
+
+			/*
+			 * Check for correct arguments: index in bounds, comp cannot be one of this
+			 * container's parents, and comp cannot be a window. comp and container must be
+			 * on the same GraphicsDevice. if comp is container, all sub-components must be
+			 * on same GraphicsDevice.
+			 */
 //          GraphicsConfiguration thisGC = this.getGraphicsConfiguration();
 
-          if (index > component.size() || (index < 0 && index != -1)) {
-              throw new IllegalArgumentException(
-                        "illegal component position");
-          }
-          checkAddToSelf(comp);
-      	// Here we do not allow JSApplet, but we do allow JInternalFrame, which is a JFrame now
-          if (comp.isJ2SWindowButNotJInternalFrame()) {
-              throw new IllegalArgumentException("adding a window to a container");
-          }
+			if (index > component.size() || (index < 0 && index != -1)) {
+				throw new IllegalArgumentException("illegal component position");
+			}
+			checkAddToSelf(comp);
+			// Here we do not allow JSApplet, but we do allow JInternalFrame, which is a
+			// JFrame now
+			if (comp.isJ2SWindowButNotJInternalFrame()) {
+				throw new IllegalArgumentException("adding a window to a container");
+			}
 
 //          checkNotAWindow(comp);
 //      if (thisGC != null) {
 //          comp.checkGD(thisGC.getDevice().getIDstring());
 //      }
 
-          /* Reparent the component and tidy up the tree's state. */
-          if (comp.parent != null) {
-              comp.parent.remove(comp);
-                  if (index > component.size()) {
-                      throw new IllegalArgumentException("illegal component position");
-                  }
-          }
-
-          //index == -1 means add to the end.
-          if (index == -1) {
-              component.add(comp);
-          } else {
-              component.add(index, comp);
-          }
-          _childTainted = true;
-          comp.parent = this;
-
-          adjustListeningChildren(AWTEvent.HIERARCHY_EVENT_MASK,
-              comp.numListening(AWTEvent.HIERARCHY_EVENT_MASK));
-          adjustListeningChildren(AWTEvent.HIERARCHY_BOUNDS_EVENT_MASK,
-              comp.numListening(AWTEvent.HIERARCHY_BOUNDS_EVENT_MASK));
-          adjustDescendants(comp.countHierarchyMembers());
-
-          invalidateIfValid();
-          if (peer != null) {
-              comp.addNotify();
-          }
-
-          /* Notify the layout manager of the added component. */
-          if (layoutMgr != null) {
-              if (layoutMgr instanceof LayoutManager2) {
-                  ((LayoutManager2)layoutMgr).addLayoutComponent(comp, constraints);
-              } else if (constraints instanceof String) {
-                  layoutMgr.addLayoutComponent((String)constraints, comp);
-              }
-          }
-          if (containerListener != null ||
-              (eventMask & AWTEvent.CONTAINER_EVENT_MASK) != 0 ||
-              Toolkit.enabledOnToolkit(AWTEvent.CONTAINER_EVENT_MASK)) {
-              ContainerEvent e = new ContainerEvent(this,
-                                   ContainerEvent.COMPONENT_ADDED,
-                                   comp);
-              dispatchEvent(e);
-          }
-
-          comp.createHierarchyEvents(HierarchyEvent.HIERARCHY_CHANGED, comp,
-                                     this, HierarchyEvent.PARENT_CHANGED,
-                                     Toolkit.enabledOnToolkit(AWTEvent.HIERARCHY_EVENT_MASK));
-          if (peer != null && layoutMgr == null && isVisible()) {
-              updateCursorImmediately();
-          }
-      }
-      return comp;
+			/* Reparent the component and tidy up the tree's state. */
+			if (comp.parent != null) {
+				comp.parent.remove(comp);
+				if (index > component.size()) {
+					throw new IllegalArgumentException("illegal component position");
+				}
+			}
+
+			// index == -1 means add to the end.
+			if (index == -1) {
+				component.add(comp);
+			} else {
+				component.add(index, comp);
+			}
+			_childTainted = true;
+			comp.parent = this;
+
+			adjustListeningChildren(AWTEvent.HIERARCHY_EVENT_MASK, comp.numListening(AWTEvent.HIERARCHY_EVENT_MASK));
+			adjustListeningChildren(AWTEvent.HIERARCHY_BOUNDS_EVENT_MASK,
+					comp.numListening(AWTEvent.HIERARCHY_BOUNDS_EVENT_MASK));
+			adjustDescendants(comp.countHierarchyMembers());
+
+			invalidateIfValid();
+			if (peer != null) {
+				comp.addNotify();
+			}
+
+			/* Notify the layout manager of the added component. */
+			if (layoutMgr != null) {
+				if (layoutMgr instanceof LayoutManager2) {
+					((LayoutManager2) layoutMgr).addLayoutComponent(comp, constraints);
+				} else if (constraints instanceof String) {
+					layoutMgr.addLayoutComponent((String) constraints, comp);
+				}
+			}
+			if (containerListener != null || (eventMask & AWTEvent.CONTAINER_EVENT_MASK) != 0
+					|| Toolkit.enabledOnToolkit(AWTEvent.CONTAINER_EVENT_MASK)) {
+				ContainerEvent e = new ContainerEvent(this, ContainerEvent.COMPONENT_ADDED, comp);
+				dispatchEvent(e);
+			}
+
+			comp.createHierarchyEvents(HierarchyEvent.HIERARCHY_CHANGED, comp, this, HierarchyEvent.PARENT_CHANGED,
+					Toolkit.enabledOnToolkit(AWTEvent.HIERARCHY_EVENT_MASK));
+			if (peer != null && layoutMgr == null && isVisible()) {
+				updateCursorImmediately();
+			}
 		}
+	}
 
 
 
@@ -1716,9 +1713,9 @@ protected Dimension preferredSizeContainer() {
         Dimension dim = prefSize;
         if (dim == null || !(isPreferredSizeSet() || isValid())) {
             synchronized (getTreeLock()) {
-                prefSize = (layoutMgr != null) ?
+                prefSize = (layoutMgr != null ?
                     layoutMgr.preferredLayoutSize(this) :
-                    prefSizeComp();
+                    prefSizeComp());
                 dim = prefSize;
             }
         }

diff --git a/sources/net.sf.j2s.java.core/src/java/awt/Menu.java b/sources/net.sf.j2s.java.core/src/java/awt/Menu.java
@@ -103,7 +103,9 @@ public class Menu extends swingjs.a2s.Menu {//MenuItem implements MenuContainer,
 //     */
 //     private static final long serialVersionUID = -8809584163345499784L;
 
-    /**
+    public boolean isHelpMenu;
+
+	/**
      * Constructs a new menu with an empty label. This menu is not
      * a tear-off menu.
      * @exception HeadlessException if GraphicsEnvironment.isHeadless()

diff --git a/sources/net.sf.j2s.java.core/src/java/awt/Window.java b/sources/net.sf.j2s.java.core/src/java/awt/Window.java
@@ -1022,18 +1022,25 @@ public void dispose() {
      */
     void disposeImpl() {
         dispose();
-//        if (getPeer() != null) {
-//            doDispose();
-//        }
+        if (!_disposed && getPeer() != null) {
+            doDispose();
+        }
     }
 
+    private boolean _disposed;
+
 	void doDispose() {
-		final JComponent me = this;
+		_disposed = true;
+		final Window me = this;
 
 		Runnable action = new Runnable() {
 			@Override
 			public void run() {
 
+				 Window parent = getOwner();
+				 if (parent != null) {
+					 parent.removeOwnedWindow(me);
+				 }
 				JSComponentUI ui = (JSComponentUI) me.getUI();
 				if (ui != null) {
 					ui.reinstallUI(me, null);
@@ -2588,8 +2595,6 @@ public void applyResourceBundle(String rbName) {
     void addOwnedWindow(Window weakWindow) {
         if (weakWindow != null) {
             synchronized(ownedWindowList) {
-                // this if statement should really be an assert, but we don't
-                // have asserts...
                 if (!ownedWindowList.contains(weakWindow)) {
                     ownedWindowList.addElement(weakWindow);
                 }
@@ -3425,14 +3430,12 @@ public void setOpaque(boolean opaque) {
     private static final Color TRANSPARENT_BACKGROUND_COLOR = new Color(0, 0, 0, 0);
 
 	private static void setLayersOpaque(Component component, boolean isOpaque) {
-		// Shouldn't use instanceof to avoid loading Swing classes
-		// if it's a pure AWT application.
 		if (component instanceof RootPaneContainer) {
 			RootPaneContainer rpc = (RootPaneContainer) component;
 			JRootPane root = rpc.getRootPane();
 			JLayeredPane lp = root.getLayeredPane();
 			Container c = root.getContentPane();
-			JComponent content = (c instanceof JComponent) ? (JComponent) c : null;
+			JComponent content = (c instanceof JComponent ? (JComponent) c : null);
 //			JComponent gp = (rpc.getGlassPane() instanceof JComponent) ? (JComponent) rpc
 //					.getGlassPane() : null;
 			// if (gp != null) {

diff --git a/sources/net.sf.j2s.java.core/src/java/lang/Class.java b/sources/net.sf.j2s.java.core/src/java/lang/Class.java
@@ -3570,4 +3570,21 @@ public XmlRootElement getAnnotation(Class<XmlRootElement> c) {
 		return null;
 	}
 
+	public static Class<?> getJ2SSuperclassFor(Class<?> cl) {
+		Class<?> c = null;
+		/**
+		 * 
+		 * @j2sNative
+		 * 
+		 * 			c = cl.getSuperclass$ && cl.getSuperclass$();
+		 */
+		{
+			cl.getSuperclass();
+		}
+		if (c == null && cl != Object.class) {
+			c = Object.class;
+		}
+		return c;
+	}
+
 }
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/AbstractButton.java b/sources/net.sf.j2s.java.core/src/javax/swing/AbstractButton.java
@@ -1760,8 +1760,11 @@ public void setModel(ButtonModel newModel) {
         }
 
         model = newModel;
-
         if (newModel != null) {
+            /** @j2sNative
+             * this.model.isAWT$ = !!this.isAWT$
+             */
+
             changeListener = createChangeListener();
             actionListener = createActionListener();
             itemListener = createItemListener();
@@ -1841,11 +1844,11 @@ public void setUI(ButtonUI ui) {
      * @since 1.5
      */
     @Override
-		protected Component addImpl(Component comp, Object constraints, int index) {
+		protected void addImpl(Component comp, Object constraints, int index) {
         if (!setLayout) {
             setLayout(new OverlayLayout(this));
         }
-        return addImplCont(comp, constraints, index);
+        addImplCont(comp, constraints, index);
     }
 
     /**