summaryrefslogtreecommitdiff
path: root/debian/patches/jdk-getAccessibleValue.diff
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/jdk-getAccessibleValue.diff')
-rw-r--r--debian/patches/jdk-getAccessibleValue.diff272
1 files changed, 272 insertions, 0 deletions
diff --git a/debian/patches/jdk-getAccessibleValue.diff b/debian/patches/jdk-getAccessibleValue.diff
new file mode 100644
index 0000000..f2b95c1
--- /dev/null
+++ b/debian/patches/jdk-getAccessibleValue.diff
@@ -0,0 +1,272 @@
+--- a/jdk/src/share/classes/javax/swing/JList.java
++++ b/jdk/src/share/classes/javax/swing/JList.java
+@@ -3371,7 +3371,12 @@ public class JList<E> extends JComponent
+ }
+
+ public AccessibleAction getAccessibleAction() {
+- return getCurrentAccessibleContext().getAccessibleAction();
++ AccessibleContext ac = getCurrentAccessibleContext();
++ if (ac != null) {
++ return ac.getAccessibleAction();
++ } else {
++ return null;
++ }
+ }
+
+ /**
+@@ -3387,15 +3392,30 @@ public class JList<E> extends JComponent
+ }
+
+ 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;
++ }
+ }
+
+
+--- a/jdk/src/share/classes/javax/swing/JTree.java
++++ b/jdk/src/share/classes/javax/swing/JTree.java
+@@ -4962,7 +4962,7 @@ public class JTree extends JComponent im
+ public AccessibleSelection getAccessibleSelection() {
+ AccessibleContext ac = getCurrentAccessibleContext();
+ if (ac != null && isLeaf) {
+- return getCurrentAccessibleContext().getAccessibleSelection();
++ return ac.getAccessibleSelection();
+ } else {
+ return this;
+ }
+@@ -4977,7 +4977,7 @@ public class JTree extends JComponent im
+ public AccessibleText getAccessibleText() {
+ AccessibleContext ac = getCurrentAccessibleContext();
+ if (ac != null) {
+- return getCurrentAccessibleContext().getAccessibleText();
++ return ac.getAccessibleText();
+ } else {
+ return null;
+ }
+@@ -4992,7 +4992,7 @@ public class JTree extends JComponent im
+ public AccessibleValue getAccessibleValue() {
+ AccessibleContext ac = getCurrentAccessibleContext();
+ if (ac != null) {
+- return getCurrentAccessibleContext().getAccessibleValue();
++ return ac.getAccessibleValue();
+ } else {
+ return null;
+ }
+--- a/jdk/src/share/classes/javax/swing/table/JTableHeader.java
++++ b/jdk/src/share/classes/javax/swing/table/JTableHeader.java
+@@ -1083,7 +1083,12 @@ public class JTableHeader extends JCompo
+ }
+
+ public AccessibleAction getAccessibleAction() {
+- return getCurrentAccessibleContext().getAccessibleAction();
++ AccessibleContext ac = getCurrentAccessibleContext();
++ if (ac != null) {
++ return ac.getAccessibleAction();
++ } else {
++ return null;
++ }
+ }
+
+ /**
+@@ -1099,15 +1104,30 @@ public class JTableHeader extends JCompo
+ }
+
+ 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;
++ }
+ }
+
+
+--- a/jdk/src/share/classes/javax/swing/JTable.java
++++ b/jdk/src/share/classes/javax/swing/JTable.java
+@@ -8218,7 +8218,12 @@ public class JTable extends JComponent i
+ * @return the <code>AccessibleAction</code>, or <code>null</code>
+ */
+ public AccessibleAction getAccessibleAction() {
+- return getCurrentAccessibleContext().getAccessibleAction();
++ AccessibleContext ac = getCurrentAccessibleContext();
++ if (ac != null) {
++ return ac.getAccessibleAction();
++ } else {
++ return null;
++ }
+ }
+
+ /**
+@@ -8240,7 +8245,12 @@ public class JTable extends JComponent i
+ * <code>null</code>
+ */
+ public AccessibleSelection getAccessibleSelection() {
+- return getCurrentAccessibleContext().getAccessibleSelection();
++ AccessibleContext ac = getCurrentAccessibleContext();
++ if (ac != null) {
++ return ac.getAccessibleSelection();
++ } else {
++ return null;
++ }
+ }
+
+ /**
+@@ -8250,7 +8260,12 @@ public class JTable extends JComponent i
+ * @return the <code>AccessibleText</code>, or <code>null</code>
+ */
+ public AccessibleText getAccessibleText() {
+- return getCurrentAccessibleContext().getAccessibleText();
++ AccessibleContext ac = getCurrentAccessibleContext();
++ if (ac != null) {
++ return ac.getAccessibleText();
++ } else {
++ return null;
++ }
+ }
+
+ /**
+@@ -8260,7 +8275,12 @@ public class JTable extends JComponent i
+ * @return the <code>AccessibleValue</code>, or <code>null</code>
+ */
+ public AccessibleValue getAccessibleValue() {
+- return getCurrentAccessibleContext().getAccessibleValue();
++ AccessibleContext ac = getCurrentAccessibleContext();
++ if (ac != null) {
++ return ac.getAccessibleValue();
++ } else {
++ return null;
++ }
+ }
+
+
+@@ -9019,7 +9039,12 @@ public class JTable extends JComponent i
+ * @return the <code>AccessibleAction</code>, or <code>null</code>
+ */
+ public AccessibleAction getAccessibleAction() {
+- return getCurrentAccessibleContext().getAccessibleAction();
++ AccessibleContext ac = getCurrentAccessibleContext();
++ if (ac != null) {
++ return ac.getAccessibleAction();
++ } else {
++ return null;
++ }
+ }
+
+ /**
+@@ -9041,7 +9066,12 @@ public class JTable extends JComponent i
+ * <code>null</code>
+ */
+ public AccessibleSelection getAccessibleSelection() {
+- return getCurrentAccessibleContext().getAccessibleSelection();
++ AccessibleContext ac = getCurrentAccessibleContext();
++ if (ac != null) {
++ return ac.getAccessibleSelection();
++ } else {
++ return null;
++ }
+ }
+
+ /**
+@@ -9051,7 +9081,12 @@ public class JTable extends JComponent i
+ * @return the <code>AccessibleText</code>, or <code>null</code>
+ */
+ public AccessibleText getAccessibleText() {
+- return getCurrentAccessibleContext().getAccessibleText();
++ AccessibleContext ac = getCurrentAccessibleContext();
++ if (ac != null) {
++ return ac.getAccessibleText();
++ } else {
++ return null;
++ }
+ }
+
+ /**
+@@ -9061,7 +9096,12 @@ public class JTable extends JComponent i
+ * @return the <code>AccessibleValue</code>, or <code>null</code>
+ */
+ public AccessibleValue getAccessibleValue() {
+- return getCurrentAccessibleContext().getAccessibleValue();
++ AccessibleContext ac = getCurrentAccessibleContext();
++ if (ac != null) {
++ return ac.getAccessibleValue();
++ } else {
++ return null;
++ }
+ }
+
+
+--- a/jdk/src/windows/classes/com/sun/java/accessibility/AccessBridge.java
++++ b/jdk/src/windows/classes/com/sun/java/accessibility/AccessBridge.java
+@@ -6509,7 +6509,7 @@ final public class AccessBridge extends
+ public AccessibleSelection getAccessibleSelection() {
+ AccessibleContext ac = getCurrentAccessibleContext();
+ if (ac != null && isLeaf) {
+- return getCurrentAccessibleContext().getAccessibleSelection();
++ return ac.getAccessibleSelection();
+ } else {
+ return this;
+ }
+@@ -6524,7 +6524,7 @@ final public class AccessBridge extends
+ public AccessibleText getAccessibleText() {
+ AccessibleContext ac = getCurrentAccessibleContext();
+ if (ac != null) {
+- return getCurrentAccessibleContext().getAccessibleText();
++ return ac.getAccessibleText();
+ } else {
+ return null;
+ }
+@@ -6539,7 +6539,7 @@ final public class AccessBridge extends
+ public AccessibleValue getAccessibleValue() {
+ AccessibleContext ac = getCurrentAccessibleContext();
+ if (ac != null) {
+- return getCurrentAccessibleContext().getAccessibleValue();
++ return ac.getAccessibleValue();
+ } else {
+ return null;
+ }
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-09 07:10:54 +0000