archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-17 09:34:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6714324: Removing a component from a JTabbedPane does not clear its accessibleParent

Browse source 
Reviewed-by: serb, sveerabhadra
This commit is contained in:
Krishna Addepalli 2018-12-17 14:19:06 +05:30
parent 153777cbe4
commit 9767b537ee
2 changed files with 148 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/java.desktop/share/classes/javax/swing/JTabbedPane.java
View file

@ -24,15 +24,39 @@
*/
package javax.swing;
import java.awt.*;
import java.awt.event.*;
import java.awt.Component;
import java.awt.Color;
import java.awt.Point;
import java.awt.Dimension;
import java.awt.Rectangle;
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Cursor;
import java.awt.event.MouseEvent;
import java.awt.event.FocusListener;
import java.beans.JavaBean;
import java.beans.BeanProperty;
import java.beans.Transient;
import java.util.*;
import javax.swing.event.*;
import javax.swing.plaf.*;
import javax.accessibility.*;
import java.util.Locale;
import java.util.ArrayList;
import javax.swing.event.ChangeListener;
import javax.swing.event.ChangeEvent;
import javax.swing.plaf.TabbedPaneUI;
import javax.swing.plaf.UIResource;
import javax.accessibility.AccessibleContext;
import javax.accessibility.Accessible;
import javax.accessibility.AccessibleRole;
import javax.accessibility.AccessibleComponent;
import javax.accessibility.AccessibleStateSet;
import javax.accessibility.AccessibleIcon;
import javax.accessibility.AccessibleSelection;
import javax.accessibility.AccessibleState;
import sun.swing.SwingUtilities2;
@ -923,6 +947,13 @@ public class JTabbedPane extends JComponent
}
}
private void clearAccessibleParent(Component c) {
AccessibleContext ac = c.getAccessibleContext();
if (ac != null) {
ac.setAccessibleParent(null);
}
}
/**
* Removes the tab at <code>index</code>.
* After the component associated with <code>index</code> is removed,
@ -1005,6 +1036,7 @@ public class JTabbedPane extends JComponent
if (components[i] == component) {
super.remove(i);
component.setVisible(true);
clearAccessibleParent(component);
break;
}
}
@ -1552,6 +1584,7 @@ public class JTabbedPane extends JComponent
for (int i = 0; i < count; i++) {
if (children[i] == page.component) {
super.remove(i);
clearAccessibleParent(children[i]);
}
}
}