JFrame fix for Window->JComponent

BobHanson · BobHanson · commit 750010f1608e · 2018-06-24T09:57:54.000+01:00
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
@@ -1649,6 +1649,10 @@ public Dimension getPreferredSize() {
     @Override
 		@Deprecated
     public Dimension preferredSize() {
+    	return preferredSizeContainer();
+    }
+
+    protected Dimension preferredSizeContainer() {
         /* Avoid grabbing the lock if a reasonable cached size value
          * is available.
          */
@@ -1662,9 +1666,9 @@ public Dimension preferredSize() {
             }
         }
         return (dim == null ? null : new Dimension(dim));
-    }
+	}
 
-    /**
+	/**
      * Returns the minimum size of this container.  If the minimum size has
      * not been set explicitly by {@link Component#setMinimumSize(Dimension)}
      * and this {@code Container} has a {@code non-null} {@link LayoutManager},
@@ -1858,12 +1862,7 @@ public void paintContainer(Graphics g) {
      */
     @Override
 		public void update(Graphics g) {
-        if (isShowing()) {
-//            if (! (peer instanceof LightweightPeer)) {
-                g.clearRect(0, 0, width, height);
-//            }
-            paint(g);
-        }
+    		updateContainer(g);
     }
 
 //    /**
@@ -1901,7 +1900,17 @@ public void update(Graphics g) {
 //        }
 //    }
 
-    /**
+    protected void updateContainer(Graphics g) {
+		
+        if (isShowing()) {
+//            if (! (peer instanceof LightweightPeer)) {
+                g.clearRect(0, 0, width, height);
+//            }
+            paint(g);
+        }
+	}
+
+	/**
      * Paints each of the components in this container.
      * @param     g   the graphics context.
      * @see       Component#paint
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
@@ -830,6 +830,23 @@ public void paint(Graphics g) {
        paintContainer(g); 
      }
 
+    @Override
+		public void update(Graphics g) {
+    		updateContainer(g);
+    }
+
+	@Override
+	public void printAll(Graphics g) {
+		// untested
+		super.printAll(g);
+	}
+		
+	@Override
+	public Dimension getPreferredSize() {
+		return preferredSizeContainer();
+	}
+	
+	
     /**
      * Shows or hides this {@code Window} depending on the value of parameter
      * {@code b}.
