JInternalFrame should not addNotify the way JFrame does

hansonr · hansonr · commit 253cb6aaa2c3 · 2019-07-13T10:09:26.000+01: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
@@ -722,4 +722,9 @@ protected boolean canPaint() {
 		return 秘isDesktop;
 	}
 
+	protected void 秘frameAddNodify(JRootPane rootPane) {
+		addNotify(); // BH added; applet will not do this automatically
+		rootPane.addNotify(); // builds a peer for the root pane
+	} 
+
 }
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
@@ -245,25 +245,24 @@ public JFrame(String title) {
 	 * This constructor sets the component's locale property to the value returned
 	 * by <code>JComponent.getDefaultLocale</code>.
 	 * 
-	 * @param title
-	 *          the title to be displayed in the frame's border. A
-	 *          <code>null</code> value is treated as an empty string, "".
-	 * @param gc
-	 *          the <code>GraphicsConfiguration</code> that is used to construct
-	 *          the new <code>JFrame</code> with; if <code>gc</code> is
-	 *          <code>null</code>, the system default
-	 *          <code>GraphicsConfiguration</code> is assumed
-	 * @exception IllegalArgumentException
-	 *              if <code>gc</code> is not from a screen device. This exception
-	 *              is always thrown when GraphicsEnvironment.isHeadless() returns
-	 *              true.
+	 * @param title the title to be displayed in the frame's border. A
+	 *              <code>null</code> value is treated as an empty string, "".
+	 * @param gc    the <code>GraphicsConfiguration</code> that is used to construct
+	 *              the new <code>JFrame</code> with; if <code>gc</code> is
+	 *              <code>null</code>, the system default
+	 *              <code>GraphicsConfiguration</code> is assumed
+	 * @exception IllegalArgumentException if <code>gc</code> is not from a screen
+	 *                                     device. This exception is always thrown
+	 *                                     when GraphicsEnvironment.isHeadless()
+	 *                                     returns true.
 	 * @see java.awt.GraphicsEnvironment#isHeadless
 	 * @see JComponent#getDefaultLocale
 	 * @since 1.3
 	 * 
 	 */
 	public JFrame(String title, GraphicsConfiguration gc) {
-    	秘paintClass = 秘updateClass = /**@j2sNative C$ || */null;
+		秘paintClass = 秘updateClass = /** @j2sNative C$ || */
+				null;
 		initTitleGC(title, gc);
 		enableEvents(AWTEvent.KEY_EVENT_MASK | AWTEvent.WINDOW_EVENT_MASK);
 		setLocale(JComponent.getDefaultLocale());
@@ -272,17 +271,15 @@ public JFrame(String title, GraphicsConfiguration gc) {
 		setBackground(UIManager.getColor("control"));
 		setRootPaneCheckingEnabled(true);
 		if (JFrame.isDefaultLookAndFeelDecorated()) {
-			boolean supportsWindowDecorations = UIManager.getLookAndFeel()
-					.getSupportsWindowDecorations();
+			boolean supportsWindowDecorations = UIManager.getLookAndFeel().getSupportsWindowDecorations();
 			if (supportsWindowDecorations) {
 				setUndecorated(true);
 				getRootPane().setWindowDecorationStyle(JRootPane.FRAME);
 			}
 		}
-    updateUI();
-    addNotify(); // BH added; applet will not do this automatically
-		rootPane.addNotify(); // builds a peer for the root pane
-	}
+		updateUI();
+		秘frameAddNodify(rootPane);
+	}	
 
 	public JFrame(Object object, Object object2, Object object3, Object object4) {
 		// For SwingJS JInternalFrame constructor
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/JInternalFrame.java b/sources/net.sf.j2s.java.core/src/javax/swing/JInternalFrame.java
@@ -2095,4 +2095,10 @@ public void addNotify() {
 		((JComponent) parent).getTopLevelAncestor().秘setIsDesktop();
 	}
 
+	@Override
+	protected void 秘frameAddNodify(JRootPane rootPane) {
+		// actual JFrame only
+	}
+
+
 }

Original file line number	Diff line number	Diff line change
`@@ -722,4 +722,9 @@ protected boolean canPaint() {`
`722`	`722`	`return 秘isDesktop;`
`723`	`723`	`}`
`724`	`724`
	`725`	`+ protected void 秘frameAddNodify(JRootPane rootPane) {`
	`726`	`+ addNotify(); // BH added; applet will not do this automatically`
	`727`	`+ rootPane.addNotify(); // builds a peer for the root pane`
	`728`	`+ }`
	`729`	`+`
`725`	`730`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2095,4 +2095,10 @@ public void addNotify() {`
`2095`	`2095`	`((JComponent) parent).getTopLevelAncestor().秘setIsDesktop();`
`2096`	`2096`	`}`
`2097`	`2097`
	`2098`	`+ @Override`
	`2099`	`+ protected void 秘frameAddNodify(JRootPane rootPane) {`
	`2100`	`+ // actual JFrame only`
	`2101`	`+ }`
	`2102`	`+`
	`2103`	`+`
`2098`	`2104`	`}`