removes unnecessary Component.validateComponent() added earlier

hansonr · hansonr · commit b06495ed6c8a · 2019-01-08T20:04:21.000-06:00
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
@@ -2634,10 +2634,6 @@ public void layout() {
 	 * @since JDK1.0
 	 */
 	public void validate() {
-		validateComponent();
-	}
-
-	public void validateComponent() {
 		synchronized (getTreeLock()) {
 			ComponentPeer peer = this.peer;
 			boolean wasValid = isValid();
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
@@ -1614,7 +1614,7 @@ protected void validateTree() {
                 ((ContainerPeer)peer).endLayout();
             }
         }
-        validateComponent();
+        super.validate();
     }
 
     /**
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
@@ -27,6 +27,7 @@
  */
 package java.awt;
 
+import java.awt.event.KeyListener;
 import java.awt.peer.ComponentPeer;
 import java.beans.PropertyChangeListener;
 import java.util.Arrays;
@@ -309,9 +310,9 @@ protected void invalidateComp() {
   }
   
   @Override
-  public void validateComponent() {
+  public void validate() {
 	  boolean wasValid = isValid();
-	  super.validateComponent();
+	  super.validate();
 	  if (ui != null && !wasValid)
 		  ((JSComponentUI)ui).endValidate();
 	  
@@ -329,5 +330,18 @@ public void paintWithBackgroundCheck(Graphics g) {
 		checkBackgroundPainted(getJSGraphic2D(g));
 	}
 
+	@Override
+	public void addKeyListener(KeyListener l) {
+		super.addKeyListener(l);
+		if (l != null && ui != null)
+			((JSComponentUI)ui).enableJSKeys(true);
+	}
+
+	@Override
+	public void removeKeyListener(KeyListener l) {
+		super.removeKeyListener(l);
+		if (keyListener == null && ui != null)
+			((JSComponentUI)ui).enableJSKeys(false);
+	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -1614,7 +1614,7 @@ protected void validateTree() {`
`1614`	`1614`	`((ContainerPeer)peer).endLayout();`
`1615`	`1615`	`}`
`1616`	`1616`	`}`
`1617`		`- validateComponent();`
	`1617`	`+ super.validate();`
`1618`	`1618`	`}`
`1619`	`1619`
`1620`	`1620`	`/**`