cosmetics in java implem

[simgrid.git] / src / bindings / java / jxbt_utilities.cpp

diff --git a/src/bindings/java/jxbt_utilities.cpp b/src/bindings/java/jxbt_utilities.cpp
index d418b3f..771ad2a 100644 (file)
--- a/src/bindings/java/jxbt_utilities.cpp
+++ b/src/bindings/java/jxbt_utilities.cpp
@@ -9,12 +9,9 @@
 #include "xbt/string.hpp"
 #include "xbt/sysdep.h"
 
-#include <cstdlib> /* abort */
-
 jclass jxbt_get_class(JNIEnv * env, const char *name)
 {
   jclass cls = env->FindClass(name);
-
   if (not cls) {
     jxbt_throw_jni(env, std::string("Class ") + name + " not found");
     return nullptr;
@@ -25,20 +22,17 @@ jclass jxbt_get_class(JNIEnv * env, const char *name)
 
 jmethodID jxbt_get_jmethod(JNIEnv * env, jclass cls, const char *name, const char *signature)
 {
-  jmethodID id;
-
   if (not cls)
     return nullptr;
-  id = env->GetMethodID(cls, name, signature);
 
+  jmethodID id = env->GetMethodID(cls, name, signature);
   if (not id) {
     jmethodID tostr_id = env->GetMethodID(cls, "getName", "()Ljava/lang/String;");
-    auto jclassname       = (jstring)env->CallObjectMethod(cls, tostr_id, nullptr);
-    const char* classname = env->GetStringUTFChars(jclassname, nullptr);
-
-    env->ReleaseStringUTFChars(jclassname, classname);
+    auto jclassname    = (jstring)env->CallObjectMethod(cls, tostr_id, nullptr);
+    jstring_wrapper classname(env, jclassname);
+    auto msg = std::string("Cannot find method") + name + "(" + signature + ") in " + classname.value;
 
-    jxbt_throw_jni(env, std::string("Cannot find method") + name + "(" + signature + ") in " + classname);
+    jxbt_throw_jni(env, msg);
     return nullptr;
   }
 
@@ -47,20 +41,17 @@ jmethodID jxbt_get_jmethod(JNIEnv * env, jclass cls, const char *name, const cha
 
 jmethodID jxbt_get_static_jmethod(JNIEnv * env, jclass cls, const char *name, const char *signature)
 {
-  jmethodID id;
-
   if (not cls)
     return nullptr;
-  id = env->GetStaticMethodID(cls, name, signature);
 
+  jmethodID id = env->GetStaticMethodID(cls, name, signature);
   if (not id) {
     jmethodID tostr_id = env->GetMethodID(cls, "getName", "()Ljava/lang/String;");
     auto jclassname       = (jstring)env->CallObjectMethod(cls, tostr_id, nullptr);
-    const char* classname = env->GetStringUTFChars(jclassname, nullptr);
-
-    env->ReleaseStringUTFChars(jclassname, classname);
+    jstring_wrapper classname(env, jclassname);
+    auto msg = std::string("Cannot find static method") + name + "(" + signature + ") in " + classname.value;
 
-    jxbt_throw_jni(env, std::string("Cannot find static method") + name + "(" + signature + ") in " + classname);
+    jxbt_throw_jni(env, msg);
     return nullptr;
   }
 
@@ -69,15 +60,11 @@ jmethodID jxbt_get_static_jmethod(JNIEnv * env, jclass cls, const char *name, co
 
 jmethodID jxbt_get_static_smethod(JNIEnv * env, const char *classname, const char *name, const char *signature)
 {
-  jclass cls;
-  jmethodID id;
-  cls = jxbt_get_class(env, classname);
-
+  jclass cls = jxbt_get_class(env, classname);
   if (not cls)
     return nullptr;
 
-  id = env->GetStaticMethodID(cls, name, signature);
-
+  jmethodID id = env->GetStaticMethodID(cls, name, signature);
   if (not id) {
     jxbt_throw_jni(env, std::string("Cannot find static method") + name + "(" + signature + ") in " + classname);
     return nullptr;
@@ -87,15 +74,11 @@ jmethodID jxbt_get_static_smethod(JNIEnv * env, const char *classname, const cha
 
 jmethodID jxbt_get_smethod(JNIEnv * env, const char *classname, const char *name, const char *signature)
 {
-  jclass cls;
-  jmethodID id;
-  cls = jxbt_get_class(env, classname);
-
+  jclass cls = jxbt_get_class(env, classname);
   if (not cls)
     return nullptr;
 
-  id = env->GetMethodID(cls, name, signature);
-
+  jmethodID id = env->GetMethodID(cls, name, signature);
   if (not id) {
     jxbt_throw_jni(env, std::string("Cannot find method") + name + "(" + signature + ") in " + classname);
     return nullptr;
@@ -105,13 +88,10 @@ jmethodID jxbt_get_smethod(JNIEnv * env, const char *classname, const char *name
 
 jfieldID jxbt_get_jfield(JNIEnv * env, jclass cls, const char *name, const char *signature)
 {
-  jfieldID id;
-
   if (not cls)
     return nullptr;
 
-  id = env->GetFieldID(cls, name, signature);
-
+  jfieldID id = env->GetFieldID(cls, name, signature);
   if (not id) {
     jmethodID getname_id = env->GetMethodID(cls, "getName", "()Ljava/lang/String;");
     auto jclassname       = (jstring)env->CallObjectMethod(cls, getname_id, nullptr);
@@ -130,13 +110,10 @@ jfieldID jxbt_get_jfield(JNIEnv * env, jclass cls, const char *name, const char
 jfieldID jxbt_get_sfield(JNIEnv * env, const char *classname, const char *name, const char *signature)
 {
   jclass cls = jxbt_get_class(env, classname);
-  jfieldID id;
-
   if (not cls)
     return nullptr;
 
-  id = env->GetFieldID(cls, name, signature);
-
+  jfieldID id = env->GetFieldID(cls, name, signature);
   if (not id) {
     jxbt_throw_jni(env, std::string("Cannot find field") + signature + " " + name + " in " + classname);
     return nullptr;
@@ -192,7 +169,7 @@ void jxbt_throw_transfer_failure(JNIEnv* env, const std::string& details)
 
 void jxbt_throw_host_failure(JNIEnv* env, const std::string& details)
 {
-  jxbt_throw_by_name(env, "org/simgrid/msg/HostFailureException", "Host Failure " + details);
+  jxbt_throw_by_name(env, "org/simgrid/msg/HostFailureException", "Host Failure" + details);
 }
 
 void jxbt_throw_time_out_failure(JNIEnv* env, const std::string& details)