From ce75448fbe33c50d2e1643bbb48ea695711b244c Mon Sep 17 00:00:00 2001 From: OpenJDK Team Date: Wed, 20 Jul 2022 17:04:41 +0100 Subject: [PATCH] jdk-getAccessibleValue Gbp-Pq: Name jdk-getAccessibleValue.diff --- .../share/classes/javax/swing/JTable.java | 28 ++++++++++++++++--- .../share/classes/javax/swing/JTree.java | 6 ++-- .../javax/swing/table/JTableHeader.java | 28 ++++++++++++++++--- .../accessibility/internal/AccessBridge.java | 6 ++-- 4 files changed, 54 insertions(+), 14 deletions(-) diff --git a/src/java.desktop/share/classes/javax/swing/JTable.java b/src/java.desktop/share/classes/javax/swing/JTable.java index ee17b69fa..82a7a9a09 100644 --- a/src/java.desktop/share/classes/javax/swing/JTable.java +++ b/src/java.desktop/share/classes/javax/swing/JTable.java @@ -9223,7 +9223,12 @@ public class JTable extends JComponent implements TableModelListener, Scrollable * @return the AccessibleAction, or null */ public AccessibleAction getAccessibleAction() { - return getCurrentAccessibleContext().getAccessibleAction(); + AccessibleContext ac = getCurrentAccessibleContext(); + if (ac != null) { + return ac.getAccessibleAction(); + } else { + return null; + } } /** @@ -9245,7 +9250,12 @@ public class JTable extends JComponent implements TableModelListener, Scrollable * null */ public AccessibleSelection getAccessibleSelection() { - return getCurrentAccessibleContext().getAccessibleSelection(); + AccessibleContext ac = getCurrentAccessibleContext(); + if (ac != null) { + return ac.getAccessibleSelection(); + } else { + return null; + } } /** @@ -9255,7 +9265,12 @@ public class JTable extends JComponent implements TableModelListener, Scrollable * @return the AccessibleText, or null */ public AccessibleText getAccessibleText() { - return getCurrentAccessibleContext().getAccessibleText(); + AccessibleContext ac = getCurrentAccessibleContext(); + if (ac != null) { + return ac.getAccessibleText(); + } else { + return null; + } } /** @@ -9265,7 +9280,12 @@ public class JTable extends JComponent implements TableModelListener, Scrollable * @return the AccessibleValue, or null */ public AccessibleValue getAccessibleValue() { - return getCurrentAccessibleContext().getAccessibleValue(); + AccessibleContext ac = getCurrentAccessibleContext(); + if (ac != null) { + return ac.getAccessibleValue(); + } else { + return null; + } } diff --git a/src/java.desktop/share/classes/javax/swing/JTree.java b/src/java.desktop/share/classes/javax/swing/JTree.java index f1ba5b9d3..a9cd2bbb9 100644 --- a/src/java.desktop/share/classes/javax/swing/JTree.java +++ b/src/java.desktop/share/classes/javax/swing/JTree.java @@ -5133,7 +5133,7 @@ public class JTree extends JComponent implements Scrollable, Accessible public AccessibleSelection getAccessibleSelection() { AccessibleContext ac = getCurrentAccessibleContext(); if (ac != null && isLeaf) { - return getCurrentAccessibleContext().getAccessibleSelection(); + return ac.getAccessibleSelection(); } else { return this; } @@ -5148,7 +5148,7 @@ public class JTree extends JComponent implements Scrollable, Accessible public AccessibleText getAccessibleText() { AccessibleContext ac = getCurrentAccessibleContext(); if (ac != null) { - return getCurrentAccessibleContext().getAccessibleText(); + return ac.getAccessibleText(); } else { return null; } @@ -5163,7 +5163,7 @@ public class JTree extends JComponent implements Scrollable, Accessible public AccessibleValue getAccessibleValue() { AccessibleContext ac = getCurrentAccessibleContext(); if (ac != null) { - return getCurrentAccessibleContext().getAccessibleValue(); + return ac.getAccessibleValue(); } else { return null; } diff --git a/src/java.desktop/share/classes/javax/swing/table/JTableHeader.java b/src/java.desktop/share/classes/javax/swing/table/JTableHeader.java index f36b5646e..b9ef2f4d1 100644 --- a/src/java.desktop/share/classes/javax/swing/table/JTableHeader.java +++ b/src/java.desktop/share/classes/javax/swing/table/JTableHeader.java @@ -1143,7 +1143,12 @@ public class JTableHeader extends JComponent implements TableColumnModelListener } public AccessibleAction getAccessibleAction() { - return getCurrentAccessibleContext().getAccessibleAction(); + AccessibleContext ac = getCurrentAccessibleContext(); + if (ac != null) { + return ac.getAccessibleAction(); + } else { + return null; + } } /** @@ -1159,15 +1164,30 @@ public class JTableHeader extends JComponent implements TableColumnModelListener } public AccessibleSelection getAccessibleSelection() { - return getCurrentAccessibleContext().getAccessibleSelection(); + AccessibleContext ac = getCurrentAccessibleContext(); + if (ac != null) { + return ac.getAccessibleSelection(); + } else { + return null; + } } public AccessibleText getAccessibleText() { - return getCurrentAccessibleContext().getAccessibleText(); + AccessibleContext ac = getCurrentAccessibleContext(); + if (ac != null) { + return ac.getAccessibleText(); + } else { + return null; + } } public AccessibleValue getAccessibleValue() { - return getCurrentAccessibleContext().getAccessibleValue(); + AccessibleContext ac = getCurrentAccessibleContext(); + if (ac != null) { + return ac.getAccessibleValue(); + } else { + return null; + } } diff --git a/src/jdk.accessibility/windows/classes/com/sun/java/accessibility/internal/AccessBridge.java b/src/jdk.accessibility/windows/classes/com/sun/java/accessibility/internal/AccessBridge.java index 6818a89b7..e662f37e8 100644 --- a/src/jdk.accessibility/windows/classes/com/sun/java/accessibility/internal/AccessBridge.java +++ b/src/jdk.accessibility/windows/classes/com/sun/java/accessibility/internal/AccessBridge.java @@ -6562,7 +6562,7 @@ final public class AccessBridge { public AccessibleSelection getAccessibleSelection() { AccessibleContext ac = getCurrentAccessibleContext(); if (ac != null && isLeaf) { - return getCurrentAccessibleContext().getAccessibleSelection(); + return ac.getAccessibleSelection(); } else { return this; } @@ -6577,7 +6577,7 @@ final public class AccessBridge { public AccessibleText getAccessibleText() { AccessibleContext ac = getCurrentAccessibleContext(); if (ac != null) { - return getCurrentAccessibleContext().getAccessibleText(); + return ac.getAccessibleText(); } else { return null; } @@ -6592,7 +6592,7 @@ final public class AccessBridge { public AccessibleValue getAccessibleValue() { AccessibleContext ac = getCurrentAccessibleContext(); if (ac != null) { - return getCurrentAccessibleContext().getAccessibleValue(); + return ac.getAccessibleValue(); } else { return null; } -- 2.30.2