java2script · BobHanson · Mar 17, 2019 · Mar 16, 2019 · Mar 16, 2019 · Mar 16, 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 @@
-20190315122942 
+20190316185356 
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 @@
-20190315122942 
+20190316185356 
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/awt/Container.java b/sources/net.sf.j2s.java.core/src/java/awt/Container.java
@@ -1070,9 +1070,13 @@ protected void addImpl(Component comp, Object constraints, int index) {
     	addImplCont(comp, constraints, index);
     }
 
+	@SuppressWarnings("unused")
 	protected void addImplCont(Component comp, Object constraints, int index) {
 		synchronized (getTreeLock()) {
-
+
+			if (/** @j2sNative comp.getWrap$  && !this.isWrapper$ || */ false) {
+				comp = ((A2SWrappedComponent) comp).getWrap$();
+			}
 			// SwingJS used for all add methods
 
 			/*
@@ -1246,8 +1250,15 @@ public void remove(int index) {
      * @see #validate
      * @see #remove(int)
      */
-    public void remove(Component comp) {
+    @SuppressWarnings("unused")
+	public void remove(Component comp) {
 		synchronized (getTreeLock()) {
+
+			if (/** @j2sNative comp.getWrap$ && !this.isWrapper$ || */ false) {
+				comp = ((A2SWrappedComponent) comp).getWrap$();
+			}
+
+
 			if (comp.parent == this) {
 				int index = component.indexOf(comp);
 				if (index >= 0) {

diff --git a/sources/net.sf.j2s.java.core/src/java/awt/JSComponent.java b/sources/net.sf.j2s.java.core/src/java/awt/JSComponent.java
@@ -27,7 +27,6 @@
  */
 package java.awt;
 
-import java.applet.JSApplet;
 import java.awt.event.KeyListener;
 import java.awt.peer.ComponentPeer;
 import java.beans.PropertyChangeListener;
@@ -67,6 +66,32 @@
  */
 public abstract class JSComponent extends Component {
 
+	/**
+	 * A marker for the SwingJS version of JViewPort to indicate that it 
+	 * can add an A2SWrappedComponent, not pass it back for wrapping.
+	 * 
+	 * @author hansonr
+	 *
+	 */
+	public interface A2SComponentWrapper {
+
+		public void isWrapper$();
+	}
+
+	/**
+	 * For JViewPort. 
+	 * 
+	 * Implementations of java.awt.List require a JScrollPane/JViewPort
+	 * wrapper.  
+	 * 
+	 * @author hansonr
+	 *
+	 */
+	public interface A2SWrappedComponent {
+
+	   public Component getWrap$();
+
+	}
 	/**
 	 * overridden in Applet
 	 * 

diff --git a/sources/net.sf.j2s.java.core/src/java/awt/JSDialog.java b/sources/net.sf.j2s.java.core/src/java/awt/JSDialog.java
@@ -27,6 +27,7 @@
  */
 package java.awt;
 
+import java.awt.Dialog.ModalityType;
 import java.awt.event.ComponentEvent;
 import java.awt.event.HierarchyEvent;
 import java.awt.event.WindowEvent;
@@ -35,6 +36,8 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 
+import swingjs.plaf.JSDialogUI;
+
 /**
  * A Dialog is a top-level window with a title and a border
  * that is typically used to take some form of input from the user.
@@ -839,10 +842,14 @@ private boolean conditionalShow(Component toFocus, Long time) {
 
 		closeSplashScreen();
 
-		// synchronized (getTreeLock()) {
+    	if (ui != null && ((JSDialogUI) ui).isDisposed)
+    		addNotify();
+    	// synchronized (getTreeLock()) {
 		// if (peer == null) {
 		// addNotify();
 		// }
+
+
 		validate();
 		if (visible) {
 			toFront();

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
@@ -58,6 +58,7 @@
 //import java.util.logging.Logger;
 import swingjs.JSUtil;
 import swingjs.plaf.JSComponentUI;
+import swingjs.plaf.JSWindowUI;
 
 /**
  * 
@@ -842,7 +843,7 @@ public void printAll(Graphics g) {
 
 	@Override
 	public Dimension getPreferredSize() {
-		return preferredSizeContainer();
+		return preferredSize();// for AWT classes
 	}
 
 
@@ -890,6 +891,9 @@ public void setVisible(boolean b) {
     @Override
 		@Deprecated
     public void show() {
+
+    	if (ui != null && ((JSWindowUI) ui).isDisposed)
+    		addNotify();
 //        if (peer == null) {
 //            addNotify();
 //        }

diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/JComponent.java b/sources/net.sf.j2s.java.core/src/javax/swing/JComponent.java
@@ -1470,7 +1470,7 @@ public Dimension getPreferredSize() {
 	public Dimension getPrefSizeJComp() {
 		Dimension size = (!isPreferredSizeSet() && ui != null ? ui
 				.getPreferredSize(this) : null);
-		return (size == null ? super.preferredSize() : size);
+		return (size == null ? preferredSize() : size);
 	}
 
 	/**