proper calls to preferredSize()

hansonr · hansonr · commit 0baae96204a4 · 2019-03-16T11:12:50.000-05:00
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/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);
 	}
 
 	/**
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/A2SContainer.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/A2SContainer.java
@@ -1,5 +1,6 @@
 package swingjs.a2s;
 
+// Applet, Dialog, Frame
 public interface A2SContainer {
 
    public A2SListener getA2SListener();

Original file line number	Diff line number	Diff line change
`@@ -1470,7 +1470,7 @@ public Dimension getPreferredSize() {`
`1470`	`1470`	`public Dimension getPrefSizeJComp() {`
`1471`	`1471`	`Dimension size = (!isPreferredSizeSet() && ui != null ? ui`
`1472`	`1472`	`.getPreferredSize(this) : null);`
`1473`		`- return (size == null ? super.preferredSize() : size);`
	`1473`	`+ return (size == null ? preferredSize() : size);`
`1474`	`1474`	`}`
`1475`	`1475`
`1476`	`1476`	`/**`