From 4239598cedeb7ad875077f6ffb7fb71ac27d6782 Mon Sep 17 00:00:00 2001
From: Peter Brunet <peter.brunet@oracle.com>
Date: Mon, 26 May 2014 16:37:25 +0400
Subject: [PATCH] 8009883: REGRESSION:
 test/closed/javax/swing/AbstractButton/4246045/bug4246045.java fails

Remove redundant focus handler that was causing a second focus event

Reviewed-by: alexsch, pchelko
---
 jdk/src/share/classes/javax/swing/JComponent.java | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/jdk/src/share/classes/javax/swing/JComponent.java b/jdk/src/share/classes/javax/swing/JComponent.java
index 4eb85b23a53..c7bd205aac6 100644
--- a/jdk/src/share/classes/javax/swing/JComponent.java
+++ b/jdk/src/share/classes/javax/swing/JComponent.java
@@ -3679,8 +3679,8 @@ public abstract class JComponent extends Container implements Serializable,
         private volatile transient int propertyListenersCount = 0;
 
         /**
-         * This field duplicates the one in java.awt.Component.AccessibleAWTComponent,
-         * so it has been deprecated.
+         * This field duplicates the function of the accessibleAWTFocusHandler field
+         * in java.awt.Component.AccessibleAWTComponent, so it has been deprecated.
          */
         @Deprecated
         protected FocusListener accessibleFocusHandler = null;
@@ -3738,14 +3738,10 @@ public abstract class JComponent extends Container implements Serializable,
          * @param listener  the PropertyChangeListener to be added
          */
         public void addPropertyChangeListener(PropertyChangeListener listener) {
-            if (accessibleFocusHandler == null) {
-                accessibleFocusHandler = new AccessibleFocusHandler();
-            }
             if (accessibleContainerHandler == null) {
                 accessibleContainerHandler = new AccessibleContainerHandler();
             }
             if (propertyListenersCount++ == 0) {
-                JComponent.this.addFocusListener(accessibleFocusHandler);
                 JComponent.this.addContainerListener(accessibleContainerHandler);
             }
             super.addPropertyChangeListener(listener);
@@ -3760,7 +3756,6 @@ public abstract class JComponent extends Container implements Serializable,
          */
         public void removePropertyChangeListener(PropertyChangeListener listener) {
             if (--propertyListenersCount == 0) {
-                JComponent.this.removeFocusListener(accessibleFocusHandler);
                 JComponent.this.removeContainerListener(accessibleContainerHandler);
             }
             super.removePropertyChangeListener(listener);