[java-atk-wrapper: 1/2] Fix more missing tests for getAccessibleContext returning null



commit 7b56ccdbe493d03963ba28e4a054fe90e7e9fc9c
Author: Samuel Thibault <samuel thibault ens-lyon org>
Date:   Mon Apr 1 23:19:06 2019 +0200

    Fix more missing tests for getAccessibleContext returning null
    
    Fixes https://bugzilla.gnome.org/show_bug.cgi?id=768347

 wrapper/org/GNOME/Accessibility/AtkTable.java      | 10 ++++++++--
 wrapper/org/GNOME/Accessibility/AtkWrapper.java.in |  5 ++++-
 2 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/wrapper/org/GNOME/Accessibility/AtkTable.java b/wrapper/org/GNOME/Accessibility/AtkTable.java
index a2aaca1..d547ba3 100644
--- a/wrapper/org/GNOME/Accessibility/AtkTable.java
+++ b/wrapper/org/GNOME/Accessibility/AtkTable.java
@@ -100,7 +100,10 @@ public class AtkTable {
                        acc_table.getAccessibleColumnDescription(column);
 
                if (accessible != null) {
-                       return accessible.getAccessibleContext().getAccessibleDescription();
+                       AccessibleContext ac = accessible.getAccessibleContext();
+                       if (ac != null) {
+                               return ac.getAccessibleDescription();
+                       }
                }
 
                return "";
@@ -124,7 +127,10 @@ public class AtkTable {
                        acc_table.getAccessibleRowDescription(row);
 
                if (accessible != null) {
-                       return accessible.getAccessibleContext().getAccessibleDescription();
+                       AccessibleContext ac = accessible.getAccessibleContext();
+                       if (ac != null) {
+                               return ac.getAccessibleDescription();
+                       }
                }
 
                return "";
diff --git a/wrapper/org/GNOME/Accessibility/AtkWrapper.java.in 
b/wrapper/org/GNOME/Accessibility/AtkWrapper.java.in
index 0fbb196..b7b1b9d 100644
--- a/wrapper/org/GNOME/Accessibility/AtkWrapper.java.in
+++ b/wrapper/org/GNOME/Accessibility/AtkWrapper.java.in
@@ -581,7 +581,10 @@ public class AtkWrapper {
         javax.accessibility.AccessibleRole role = ac.getAccessibleRole();
         javax.accessibility.AccessibleRole parent_role = null;
         if (parent != null) {
-          parent_role = parent.getAccessibleContext().getAccessibleRole();
+          AccessibleContext parent_ac = parent.getAccessibleContext();
+         if (parent_ac != null) {
+           parent_role = parent_ac.getAccessibleRole();
+         }
         }
         if (role != null) {
           if (newValue == javax.accessibility.AccessibleState.FOCUSED ||


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]