better handling of Frame-embedded JApplet

BobHanson · BobHanson · commit 12a032c920f0 · 2020-01-20T06:07:19.000-06:00
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
@@ -105,8 +105,8 @@ public interface A2SWrappedComponent {
 	 */
 	public Action 秘keyAction;
 
-	protected boolean 秘isAppletFrame;
-	public boolean 秘isFramedApplet;
+//	protected boolean 秘isAppletFrame;
+//	public boolean 秘isFramedApplet;
 
 	public String 秘htmlName;
 
@@ -746,6 +746,7 @@ protected boolean canPaint() {
 			// applet or frame or window of some sort
 			// take just the content pane
 			jc = (JComponent) jc.getRootPane().getContentPane();
+			jc.秘isContentPane = false;
 			jc.getRootPane().setContentPane(new JPanel());
 		}
 		jc.秘frameViewer = 秘frameViewer;
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/JFrame.java b/sources/net.sf.j2s.java.core/src/javax/swing/JFrame.java
@@ -150,14 +150,14 @@ public class JFrame extends JSFrame implements WindowConstants,
 	 */
 	protected JRootPane rootPane;
 
-    @Override
-	public void add(Component comp, Object constraints) {
-    	if (comp instanceof JApplet) {
-    		秘isAppletFrame = true;
-    		((JApplet) comp).getLayeredPane().秘isFramedApplet = true;
-    	}
-    	super.add(comp, constraints);
-     }
+//    @Override
+//	public void add(Component comp, Object constraints) {
+//    	if (comp instanceof JApplet) {
+//    		秘isAppletFrame = true;
+//    		((JApplet) comp).getLayeredPane().秘isFramedApplet = true;
+//    	}
+//    	super.add(comp, constraints);
+//     }
 
 	/**
 	 * If true then calls to <code>add</code> and <code>setLayout</code> will be
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/JPanel.java b/sources/net.sf.j2s.java.core/src/javax/swing/JPanel.java
@@ -27,6 +27,7 @@
  */
 package javax.swing;
 
+import java.awt.Component;
 import java.awt.FlowLayout;
 import java.awt.LayoutManager;
 
@@ -124,5 +125,19 @@ private JPanel(LayoutManager layout, boolean isDoubleBuffered, boolean isAWTCont
         setUIProperty("opaque", Boolean.TRUE);
         updateUI();
 	}
+	
+	@Override
+	public Component add(Component comp) {
+		return super.add(秘transferFrameTo((JComponent) comp));
+	}
+	
+    @Override
+	public Component add(String name, Component comp) {
+		return super.add(name, 秘transferFrameTo((JComponent) comp));
+    }
 
+    @Override
+	public Component add(Component comp, int index) {
+		return super.add(秘transferFrameTo((JComponent) comp), index);
+    }
 }
