[java-atk-wrapper] Call getAccessibleContext in EDT



commit 95b052dccbeb21ecac3655c2fb4be4516c3dcf86
Author: Samuel Thibault <samuel thibault ens-lyon org>
Date:   Fri Jun 14 09:41:44 2019 +0200

    Call getAccessibleContext in EDT

 jni/src/jawselection.c                            | 10 +++-------
 wrapper/org/GNOME/Accessibility/AtkSelection.java |  4 ++--
 2 files changed, 5 insertions(+), 9 deletions(-)
---
diff --git a/jni/src/jawselection.c b/jni/src/jawselection.c
index 571a4b2..01247f5 100644
--- a/jni/src/jawselection.c
+++ b/jni/src/jawselection.c
@@ -134,17 +134,13 @@ jaw_selection_ref_selection (AtkSelection *selection, gint i)
        }
 
        jclass classAtkSelection = (*jniEnv)->FindClass(jniEnv, "org/GNOME/Accessibility/AtkSelection");
-       jmethodID jmid = (*jniEnv)->GetMethodID(jniEnv, classAtkSelection, "ref_selection", 
"(I)Ljavax/accessibility/Accessible;");
-       jobject jchild = (*jniEnv)->CallObjectMethod(jniEnv, atk_selection, jmid, (jint)i);
+       jmethodID jmid = (*jniEnv)->GetMethodID(jniEnv, classAtkSelection, "ref_selection", 
"(I)Ljavax/accessibility/AccessibleContext;");
+       jobject child_ac = (*jniEnv)->CallObjectMethod(jniEnv, atk_selection, jmid, (jint)i);
        (*jniEnv)->DeleteGlobalRef(jniEnv, atk_selection);
-       if (!jchild) {
+       if (!child_ac) {
                return NULL;
        }
 
-       jclass classAccessible = (*jniEnv)->FindClass( jniEnv, "javax/accessibility/Accessible" );
-       jmid = (*jniEnv)->GetMethodID( jniEnv, classAccessible, "getAccessibleContext", 
"()Ljavax/accessibility/AccessibleContext;" );
-       jobject child_ac = (*jniEnv)->CallObjectMethod( jniEnv, jchild, jmid );
-
        AtkObject *obj = (AtkObject*) jaw_impl_get_instance_from_jaw( jniEnv, child_ac );
        g_object_ref (G_OBJECT(obj));
 
diff --git a/wrapper/org/GNOME/Accessibility/AtkSelection.java 
b/wrapper/org/GNOME/Accessibility/AtkSelection.java
index fd1e18b..7e62f4e 100644
--- a/wrapper/org/GNOME/Accessibility/AtkSelection.java
+++ b/wrapper/org/GNOME/Accessibility/AtkSelection.java
@@ -48,8 +48,8 @@ public class AtkSelection {
                return true;
        }
 
-       public Accessible ref_selection (int i) {
-               return AtkUtil.invokeInSwing ( () -> { return acc_selection.getAccessibleSelection(i); }, 
null);
+       public AccessibleContext ref_selection (int i) {
+               return AtkUtil.invokeInSwing ( () -> { return 
acc_selection.getAccessibleSelection(i).getAccessibleContext(); }, null);
        }
 
        public int get_selection_count () {


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