From d94cfc192510593c61e2914bcdf3b587eea4e436 Mon Sep 17 00:00:00 2001 From: OpenJDK Team Date: Wed, 16 Oct 2024 10:41:47 +0200 Subject: [PATCH] jdk-getAccessibleValue Gbp-Pq: Name jdk-getAccessibleValue.diff --- .../share/classes/javax/swing/JTable.java | 49 ++++++++++++++++--- .../share/classes/javax/swing/JTree.java | 6 +-- .../javax/swing/table/JTableHeader.java | 28 +++++++++-- .../accessibility/internal/AccessBridge.java | 6 +-- 4 files changed, 72 insertions(+), 17 deletions(-) diff --git a/src/java.desktop/share/classes/javax/swing/JTable.java b/src/java.desktop/share/classes/javax/swing/JTable.java index 7d7c8d657..94d2a88d2 100644 --- a/src/java.desktop/share/classes/javax/swing/JTable.java +++ b/src/java.desktop/share/classes/javax/swing/JTable.java @@ -8443,7 +8443,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; + } } /** @@ -8453,7 +8458,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; + } } /** @@ -8463,7 +8473,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; + } } @@ -9223,7 +9238,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 +9265,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 +9280,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 +9295,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 7cecd30d6..6393fa21e 100644 --- a/src/java.desktop/share/classes/javax/swing/JTree.java +++ b/src/java.desktop/share/classes/javax/swing/JTree.java @@ -5153,7 +5153,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; } @@ -5168,7 +5168,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; } @@ -5183,7 +5183,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 941297ab5..1d1b08e66 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 4ad2ff3e6..ebcbcf309 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 @@ -6636,7 +6636,7 @@ public final class AccessBridge { public AccessibleSelection getAccessibleSelection() { AccessibleContext ac = getCurrentAccessibleContext(); if (ac != null && isLeaf) { - return getCurrentAccessibleContext().getAccessibleSelection(); + return ac.getAccessibleSelection(); } else { return this; } @@ -6651,7 +6651,7 @@ public final class AccessBridge { public AccessibleText getAccessibleText() { AccessibleContext ac = getCurrentAccessibleContext(); if (ac != null) { - return getCurrentAccessibleContext().getAccessibleText(); + return ac.getAccessibleText(); } else { return null; } @@ -6666,7 +6666,7 @@ public final class AccessBridge { public AccessibleValue getAccessibleValue() { AccessibleContext ac = getCurrentAccessibleContext(); if (ac != null) { - return getCurrentAccessibleContext().getAccessibleValue(); + return ac.getAccessibleValue(); } else { return null; } -- 2.30.2