[java-atk-wrapper] JNI: Format jawaction
- From: Magdalen Berns <mberns src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [java-atk-wrapper] JNI: Format jawaction
- Date: Sun, 8 Mar 2015 22:47:49 +0000 (UTC)
commit f65ebb72ddb87c4b5b866848eaf51691ab577852
Author: Magdalen Berns <m berns thismagpie com>
Date: Sun Mar 8 22:47:20 2015 +0000
JNI: Format jawaction
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=745862
jni/src/jawaction.c | 320 +++++++++++++++++++++++++++++----------------------
1 files changed, 184 insertions(+), 136 deletions(-)
---
diff --git a/jni/src/jawaction.c b/jni/src/jawaction.c
index a596b8f..9af38d4 100644
--- a/jni/src/jawaction.c
+++ b/jni/src/jawaction.c
@@ -35,177 +35,225 @@ static const gchar* jaw_action_get_keybinding (AtkAction *action, gint i);
gint i);*/
typedef struct _ActionData {
- jobject atk_action;
- gchar* action_name;
- jstring jstrActionName;
- gchar* action_description;
- jstring jstrActionDescription;
- gchar* action_keybinding;
- jstring jstrActionKeybinding;
+ jobject atk_action;
+ gchar* action_name;
+ jstring jstrActionName;
+ gchar* action_description;
+ jstring jstrActionDescription;
+ gchar* action_keybinding;
+ jstring jstrActionKeybinding;
} ActionData;
void
jaw_action_interface_init (AtkActionIface *iface)
{
- iface->do_action = jaw_action_do_action;
- iface->get_n_actions = jaw_action_get_n_actions;
- iface->get_description = jaw_action_get_description;
- iface->get_name = jaw_action_get_name;
- iface->get_keybinding = jaw_action_get_keybinding;
- iface->get_localized_name = NULL; /*jaw_get_localized_name;*/
- iface->set_description = NULL;
+ iface->do_action = jaw_action_do_action;
+ iface->get_n_actions = jaw_action_get_n_actions;
+ iface->get_description = jaw_action_get_description;
+ iface->get_name = jaw_action_get_name;
+ iface->get_keybinding = jaw_action_get_keybinding;
+ iface->get_localized_name = NULL; /*jaw_get_localized_name;*/
+ iface->set_description = NULL;
}
gpointer
jaw_action_data_init (jobject ac)
{
- ActionData *data = g_new0(ActionData, 1);
-
- JNIEnv *jniEnv = jaw_util_get_jni_env();
- jclass classAction = (*jniEnv)->FindClass(jniEnv, "org/GNOME/Accessibility/AtkAction");
- jmethodID jmid = (*jniEnv)->GetMethodID(jniEnv, classAction, "<init>",
"(Ljavax/accessibility/AccessibleContext;)V");
- jobject jatk_action = (*jniEnv)->NewObject(jniEnv, classAction, jmid, ac);
- data->atk_action = (*jniEnv)->NewGlobalRef(jniEnv, jatk_action);
-
- return data;
+ ActionData *data = g_new0(ActionData, 1);
+
+ JNIEnv *jniEnv = jaw_util_get_jni_env();
+ jclass classAction = (*jniEnv)->FindClass(jniEnv,
+ "org/GNOME/Accessibility/AtkAction");
+ jmethodID jmid = (*jniEnv)->GetMethodID(jniEnv,
+ classAction,
+ "<init>",
+ "(Ljavax/accessibility/AccessibleContext;)V");
+ jobject jatk_action = (*jniEnv)->NewObject(jniEnv, classAction, jmid, ac);
+ data->atk_action = (*jniEnv)->NewGlobalRef(jniEnv, jatk_action);
+
+ return data;
}
void
jaw_action_data_finalize (gpointer p)
{
- ActionData *data = (ActionData*)p;
- JNIEnv *jniEnv = jaw_util_get_jni_env();
-
- if (data && data->atk_action) {
- if (data->action_name != NULL) {
- (*jniEnv)->ReleaseStringUTFChars(jniEnv, data->jstrActionName, data->action_name);
- (*jniEnv)->DeleteGlobalRef(jniEnv, data->jstrActionName);
- data->jstrActionName = NULL;
- data->action_name = NULL;
- }
-
- if (data->action_description != NULL) {
- (*jniEnv)->ReleaseStringUTFChars(jniEnv, data->jstrActionDescription,
data->action_description);
- (*jniEnv)->DeleteGlobalRef(jniEnv, data->jstrActionDescription);
- data->jstrActionDescription = NULL;
- data->action_description = NULL;
- }
-
- if (data->action_keybinding != NULL) {
- (*jniEnv)->ReleaseStringUTFChars(jniEnv, data->jstrActionKeybinding,
data->action_keybinding);
- (*jniEnv)->DeleteGlobalRef(jniEnv, data->jstrActionKeybinding);
- data->jstrActionKeybinding = NULL;
- data->action_keybinding = NULL;
- }
-
- (*jniEnv)->DeleteGlobalRef(jniEnv, data->atk_action);
- data->atk_action = NULL;
- }
+ ActionData *data = (ActionData*)p;
+ JNIEnv *jniEnv = jaw_util_get_jni_env();
+
+ if (data && data->atk_action) {
+ if (data->action_name != NULL) {
+ (*jniEnv)->ReleaseStringUTFChars(jniEnv,
+ data->jstrActionName,
+ data->action_name);
+ (*jniEnv)->DeleteGlobalRef(jniEnv, data->jstrActionName);
+ data->jstrActionName = NULL;
+ data->action_name = NULL;
+ }
+
+ if (data->action_description != NULL) {
+ (*jniEnv)->ReleaseStringUTFChars(jniEnv,
+ data->jstrActionDescription,
+ data->action_description);
+ (*jniEnv)->DeleteGlobalRef(jniEnv, data->jstrActionDescription);
+ data->jstrActionDescription = NULL;
+ data->action_description = NULL;
+ }
+
+ if (data->action_keybinding != NULL) {
+ (*jniEnv)->ReleaseStringUTFChars(jniEnv,
+ data->jstrActionKeybinding,
+ data->action_keybinding);
+ (*jniEnv)->DeleteGlobalRef(jniEnv, data->jstrActionKeybinding);
+ data->jstrActionKeybinding = NULL;
+ data->action_keybinding = NULL;
+ }
+
+ (*jniEnv)->DeleteGlobalRef(jniEnv, data->atk_action);
+ data->atk_action = NULL;
+ }
}
static gboolean
-jaw_action_do_action (AtkAction *action,
- gint i)
+jaw_action_do_action (AtkAction *action, gint i)
{
- JawObject *jaw_obj = JAW_OBJECT(action);
- ActionData *data = jaw_object_get_interface_data(jaw_obj, INTERFACE_ACTION);
- jobject atk_action = data->atk_action;
-
- JNIEnv *jniEnv = jaw_util_get_jni_env();
- jclass classAtkAction = (*jniEnv)->FindClass(jniEnv, "org/GNOME/Accessibility/AtkAction");
- jmethodID jmid = (*jniEnv)->GetMethodID(jniEnv, classAtkAction, "do_action", "(I)Z");
- jboolean jresult = (*jniEnv)->CallBooleanMethod(jniEnv, atk_action, jmid, (jint)i);
-
- if (jresult == JNI_TRUE) {
- return TRUE;
- }
-
- return FALSE;
+ JawObject *jaw_obj = JAW_OBJECT(action);
+ ActionData *data = jaw_object_get_interface_data(jaw_obj, INTERFACE_ACTION);
+ jobject atk_action = data->atk_action;
+
+ JNIEnv *jniEnv = jaw_util_get_jni_env();
+ jclass classAtkAction = (*jniEnv)->FindClass(jniEnv,
+ "org/GNOME/Accessibility/AtkAction");
+ jmethodID jmid = (*jniEnv)->GetMethodID(jniEnv,
+ classAtkAction,
+ "do_action",
+ "(I)Z");
+ jboolean jresult = (*jniEnv)->CallBooleanMethod(jniEnv,
+ atk_action,
+ jmid,
+ (jint)i);
+
+ if (jresult == JNI_TRUE)
+ return TRUE;
+
+ return FALSE;
}
static gint
jaw_action_get_n_actions (AtkAction *action)
{
- JawObject *jaw_obj = JAW_OBJECT(action);
- ActionData *data = jaw_object_get_interface_data(jaw_obj, INTERFACE_ACTION);
- jobject atk_action = data->atk_action;
-
- JNIEnv *jniEnv = jaw_util_get_jni_env();
- jclass classAtkAction = (*jniEnv)->FindClass(jniEnv, "org/GNOME/Accessibility/AtkAction");
- jmethodID jmid = (*jniEnv)->GetMethodID(jniEnv, classAtkAction, "get_n_actions", "()I");
-
- return (gint)(*jniEnv)->CallIntMethod(jniEnv, atk_action, jmid);
+ JawObject *jaw_obj = JAW_OBJECT(action);
+ ActionData *data = jaw_object_get_interface_data(jaw_obj, INTERFACE_ACTION);
+ jobject atk_action = data->atk_action;
+
+ JNIEnv *jniEnv = jaw_util_get_jni_env();
+ jclass classAtkAction = (*jniEnv)->FindClass(jniEnv,
+ "org/GNOME/Accessibility/AtkAction");
+ jmethodID jmid = (*jniEnv)->GetMethodID(jniEnv,
+ classAtkAction,
+ "get_n_actions", "()I");
+
+ return (gint)(*jniEnv)->CallIntMethod(jniEnv, atk_action, jmid);
}
static const gchar*
-jaw_action_get_description (AtkAction *action,
- gint i)
+jaw_action_get_description (AtkAction *action, gint i)
{
- JawObject *jaw_obj = JAW_OBJECT(action);
- ActionData *data = jaw_object_get_interface_data(jaw_obj, INTERFACE_ACTION);
- jobject atk_action = data->atk_action;
-
- JNIEnv *jniEnv = jaw_util_get_jni_env();
- jclass classAtkAction = (*jniEnv)->FindClass(jniEnv, "org/GNOME/Accessibility/AtkAction");
- jmethodID jmid = (*jniEnv)->GetMethodID(jniEnv, classAtkAction, "get_description",
"(I)Ljava/lang/String;");
- jstring jstr = (*jniEnv)->CallObjectMethod(jniEnv, atk_action, jmid, (jint)i);
-
- if (data->action_description != NULL) {
- (*jniEnv)->ReleaseStringUTFChars(jniEnv, data->jstrActionDescription,
data->action_description);
- (*jniEnv)->DeleteGlobalRef(jniEnv, data->jstrActionDescription);
- }
-
- data->jstrActionDescription = (*jniEnv)->NewGlobalRef(jniEnv, jstr);
- data->action_description = (gchar*)(*jniEnv)->GetStringUTFChars(jniEnv, data->jstrActionDescription,
NULL);
-
- return data->action_description;
+ JawObject *jaw_obj = JAW_OBJECT(action);
+ ActionData *data = jaw_object_get_interface_data(jaw_obj, INTERFACE_ACTION);
+ jobject atk_action = data->atk_action;
+
+ JNIEnv *jniEnv = jaw_util_get_jni_env();
+ jclass classAtkAction = (*jniEnv)->FindClass(jniEnv,
+ "org/GNOME/Accessibility/AtkAction");
+ jmethodID jmid = (*jniEnv)->GetMethodID(jniEnv,
+ classAtkAction,
+ "get_description",
+ "(I)Ljava/lang/String;");
+ jstring jstr = (*jniEnv)->CallObjectMethod(jniEnv,
+ atk_action,
+ jmid,
+ (jint)i);
+
+ if (data->action_description != NULL)
+ {
+ (*jniEnv)->ReleaseStringUTFChars(jniEnv,
+ data->jstrActionDescription,
+ data->action_description);
+ (*jniEnv)->DeleteGlobalRef(jniEnv, data->jstrActionDescription);
+ }
+
+ data->jstrActionDescription = (*jniEnv)->NewGlobalRef(jniEnv, jstr);
+ data->action_description = (gchar*)(*jniEnv)->GetStringUTFChars(jniEnv,
+ data->jstrActionDescription,
+ NULL);
+
+ return data->action_description;
}
static const gchar*
-jaw_action_get_name (AtkAction *action,
- gint i)
+jaw_action_get_name (AtkAction *action, gint i)
{
- JawObject *jaw_obj = JAW_OBJECT(action);
- ActionData *data = jaw_object_get_interface_data(jaw_obj, INTERFACE_ACTION);
- jobject atk_action = data->atk_action;
-
- JNIEnv *jniEnv = jaw_util_get_jni_env();
- jclass classAtkAction = (*jniEnv)->FindClass(jniEnv, "org/GNOME/Accessibility/AtkAction");
- jmethodID jmid = (*jniEnv)->GetMethodID(jniEnv, classAtkAction, "get_name", "(I)Ljava/lang/String;");
- jstring jstr = (*jniEnv)->CallObjectMethod(jniEnv, atk_action, jmid, (jint)i);
-
- if (data->action_name != NULL) {
- (*jniEnv)->ReleaseStringUTFChars(jniEnv, data->jstrActionName, data->action_name);
- (*jniEnv)->DeleteGlobalRef(jniEnv, data->jstrActionName);
- }
-
- data->jstrActionName = (*jniEnv)->NewGlobalRef(jniEnv, jstr);
- data->action_name = (gchar*)(*jniEnv)->GetStringUTFChars(jniEnv, data->jstrActionName, NULL);
-
- return data->action_name;
+ JawObject *jaw_obj = JAW_OBJECT(action);
+ ActionData *data = jaw_object_get_interface_data(jaw_obj, INTERFACE_ACTION);
+ jobject atk_action = data->atk_action;
+
+ JNIEnv *jniEnv = jaw_util_get_jni_env();
+ jclass classAtkAction = (*jniEnv)->FindClass(jniEnv,
+ "org/GNOME/Accessibility/AtkAction");
+ jmethodID jmid = (*jniEnv)->GetMethodID(jniEnv,
+ classAtkAction,
+ "get_name",
+ "(I)Ljava/lang/String;");
+ jstring jstr = (*jniEnv)->CallObjectMethod(jniEnv, atk_action, jmid, (jint)i);
+
+ if (data->action_name != NULL)
+ {
+ (*jniEnv)->ReleaseStringUTFChars(jniEnv,
+ data->jstrActionName,
+ data->action_name);
+ (*jniEnv)->DeleteGlobalRef(jniEnv, data->jstrActionName);
+ }
+
+ data->jstrActionName = (*jniEnv)->NewGlobalRef(jniEnv, jstr);
+ data->action_name = (gchar*)(*jniEnv)->GetStringUTFChars(jniEnv,
+ data->jstrActionName,
+ NULL);
+
+ return data->action_name;
}
static const gchar*
-jaw_action_get_keybinding (AtkAction *action,
- gint i)
+jaw_action_get_keybinding (AtkAction *action, gint i)
{
- JawObject *jaw_obj = JAW_OBJECT(action);
- ActionData *data = jaw_object_get_interface_data(jaw_obj, INTERFACE_ACTION);
- jobject atk_action = data->atk_action;
-
- JNIEnv *jniEnv = jaw_util_get_jni_env();
- jclass classAtkAction = (*jniEnv)->FindClass(jniEnv, "org/GNOME/Accessibility/AtkAction");
- jmethodID jmid = (*jniEnv)->GetMethodID(jniEnv, classAtkAction, "get_keybinding",
"(I)Ljava/lang/String;");
- jstring jstr = (*jniEnv)->CallObjectMethod(jniEnv, atk_action, jmid, (jint)i);
-
- if (data->action_keybinding != NULL) {
- (*jniEnv)->ReleaseStringUTFChars(jniEnv, data->jstrActionKeybinding, data->action_keybinding);
- (*jniEnv)->DeleteGlobalRef(jniEnv, data->jstrActionKeybinding);
- }
-
- data->jstrActionKeybinding = (*jniEnv)->NewGlobalRef(jniEnv, jstr);
- data->action_keybinding = (gchar*)(*jniEnv)->GetStringUTFChars(jniEnv, data->jstrActionKeybinding,
NULL);
-
- return data->action_keybinding;
+ JawObject *jaw_obj = JAW_OBJECT(action);
+ if (jaw_obj == NULL)
+ return NULL;
+
+ ActionData *data = jaw_object_get_interface_data(jaw_obj, INTERFACE_ACTION);
+ jobject atk_action = data->atk_action;
+
+ JNIEnv *jniEnv = jaw_util_get_jni_env();
+ jclass classAtkAction = (*jniEnv)->FindClass(jniEnv,
+ "org/GNOME/Accessibility/AtkAction");
+ jmethodID jmid = (*jniEnv)->GetMethodID(jniEnv,
+ classAtkAction,
+ "get_keybinding",
+ "(I)Ljava/lang/String;");
+ jstring jstr = (*jniEnv)->CallObjectMethod(jniEnv, atk_action, jmid, (jint)i);
+
+ if (data->action_keybinding != NULL)
+ {
+ (*jniEnv)->ReleaseStringUTFChars(jniEnv,
+ data->jstrActionKeybinding,
+ data->action_keybinding);
+
+ (*jniEnv)->DeleteGlobalRef(jniEnv, data->jstrActionKeybinding);
+ }
+
+ data->jstrActionKeybinding = (*jniEnv)->NewGlobalRef(jniEnv, jstr);
+ data->action_keybinding = (gchar*)(*jniEnv)->GetStringUTFChars(jniEnv,
+ data->jstrActionKeybinding,
+ NULL);
+ return data->action_keybinding;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]