提交 5559baa7 编写于 作者: S serb

8009883: REGRESSION: test/closed/javax/swing/AbstractButton/4246045/bug4246045.java fails

Summary: remove redundant focus handler that was causing a second focus event
Reviewed-by: alexsch, pchelko
Contributed-by: peter.brunet@oracle.com
上级 2526f0cf
......@@ -3676,8 +3676,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;
......@@ -3735,14 +3735,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);
......@@ -3757,7 +3753,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);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册