better Component.peer initialization.

hansonr · hansonr · commit 5d274e6d197f · 2019-03-07T21:28:46.000-06:00
In Java, the peer is set when the control gets added to the DOM.
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/Component.java b/sources/net.sf.j2s.java.core/src/java/awt/Component.java
@@ -914,7 +914,7 @@ public synchronized void setDropTarget(DropTarget dt) {
 		DropTarget old;
 
 		if ((old = dropTarget) != null) {
-			getOrCreatePeer();
+//			getOrCreatePeer();
 			if (peer != null)
 				dropTarget.removeNotify(peer);
 
@@ -1307,7 +1307,7 @@ public void enable() {
 		if (!enabled) {
 			// synchronized (getTreeLock()) {
 			enabled = true;
-			ComponentPeer peer = getOrCreatePeer();// this.peer;
+//			ComponentPeer peer = getOrCreatePeer();// this.peer;
 			if (peer != null) {
 				peer.setEnabled(true);// SwingJS was enable();
 				if (visible) {
@@ -1356,7 +1356,7 @@ public void disable() {
 			// // makes sense to the user.
 			// transferFocus(false);
 			// }
-			ComponentPeer peer = getOrCreatePeer();
+			//ComponentPeer peer = getOrCreatePeer();
 			if (peer != null) {
 				peer.setEnabled(false); // SwingJS was disable();
 				if (visible) {
@@ -1572,7 +1572,7 @@ protected Color getForeground_NoClient() {
 	 */
 	public void setForeground(Color c) {
 		Color oldColor = foreground;
-		ComponentPeer peer = getOrCreatePeer();
+		//ComponentPeer peer = getOrCreatePeer();
 		foreground = c;
 		if (peer != null) {
 			c = getForeground();
@@ -1635,7 +1635,7 @@ protected Color getBackground_NoClient() {
 	 */
 	public void setBackground(Color c) {
 		Color oldColor = background;
-		ComponentPeer peer = getOrCreatePeer();
+		//ComponentPeer peer = getOrCreatePeer();
 		background = c;
 		if (peer != null) {
 			c = getBackground();
@@ -1706,7 +1706,7 @@ public void setFont(Font f) {
 //		synchronized (getTreeLock()) {
 //			synchronized (this) {
 //			}
-			ComponentPeer peer = getOrCreatePeer();
+			//ComponentPeer peer = getOrCreatePeer();
 			if (peer != null) {
 				f = getFont();
 				if (f != null) {
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
@@ -554,7 +554,7 @@ private boolean removeDelicately(Component comp, Container newParent, int newInd
             comp.createHierarchyEvents(HierarchyEvent.HIERARCHY_CHANGED, comp,
                                        this, HierarchyEvent.PARENT_CHANGED,
                                        Toolkit.enabledOnToolkit(AWTEvent.HIERARCHY_EVENT_MASK));
-            if (peer != null && layoutMgr == null && isVisible()) {
+            if (layoutMgr == null && isDisplayable() && isVisible()) {
                 updateCursorImmediately();
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -554,7 +554,7 @@ private boolean removeDelicately(Component comp, Container newParent, int newInd`
`554`	`554`	`comp.createHierarchyEvents(HierarchyEvent.HIERARCHY_CHANGED, comp,`
`555`	`555`	`this, HierarchyEvent.PARENT_CHANGED,`
`556`	`556`	`Toolkit.enabledOnToolkit(AWTEvent.HIERARCHY_EVENT_MASK));`
`557`		`- if (peer != null && layoutMgr == null && isVisible()) {`
	`557`	`+ if (layoutMgr == null && isDisplayable() && isVisible()) {`
`558`	`558`	`updateCursorImmediately();`
`559`	`559`	`}`
`560`	`560`	`}`