X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e0188e2a2598ce57a4d21a3d7eb5f303aecaf0dd..a6c64d74cc84ef31accb835f570f990f5c45ecf8:/src/bindings/java/jxbt_utilities.h

diff --git a/src/bindings/java/jxbt_utilities.h b/src/bindings/java/jxbt_utilities.h
index 4752c7cb61..067a654cd2 100644
--- a/src/bindings/java/jxbt_utilities.h
+++ b/src/bindings/java/jxbt_utilities.h
@@ -1,56 +1,39 @@
 /* Various JNI helper functions                                             */
 
-/* Copyright (c) 2007-2012. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
-  * under the terms of the license (GNU LGPL) which comes with this package. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #ifndef JXBT_UTILITY_H
 #define JXBT_UTILITY_H
 
 #include <jni.h>
+#include <stdint.h>
+#include <string>
 
-/* *********** */
-/* JNI GETTERS */
-/* *********** */
+SG_BEGIN_DECL()
 
 /* Search a class and throw an exception if not found */
 jclass jxbt_get_class(JNIEnv * env, const char *name);
 
-/* Search a method in a class and throw an exception if not found
-   (it's ok to to pass a NULL class: it's a noop) */
-jmethodID jxbt_get_jmethod(JNIEnv * env, jclass class,
-                           const char *name, const char *signature);
+/* Search a method in a class and throw an exception if not found(it's ok to to pass a NULL class: it's a noop) */
+jmethodID jxbt_get_jmethod(JNIEnv * env, jclass cls, const char *name, const char *signature);
 
 /* Like the jxbt_get_class() but get a static method */
-jmethodID jxbt_get_static_jmethod(JNIEnv * env, jclass cls,
-                                  const char *name, const char *signature);
+jmethodID jxbt_get_static_jmethod(JNIEnv * env, jclass cls, const char *name, const char *signature);
 
-/* Search a field in a class and throw an exception if not found
-   (it's ok to to pass a NULL class: it's a noop) */
-jfieldID jxbt_get_jfield(JNIEnv * env, jclass class,
-                         const char *name, const char *signature);
+/* Search a field in a class and throw an exception if not found (it's ok to to pass a NULL class: it's a noop) */
+jfieldID jxbt_get_jfield(JNIEnv * env, jclass cls, const char *name, const char *signature);
 
-
-/* Search a method in a class and throw an exception if not found
-   (it's ok to to pass a NULL class: it's a noop) */
-jmethodID jxbt_get_smethod(JNIEnv * env, const char *classname,
-                           const char *name, const char *signature);
+/* Search a method in a class and throw an exception if not found (it's ok to to pass a NULL class: it's a noop) */
+jmethodID jxbt_get_smethod(JNIEnv * env, const char *classname, const char *name, const char *signature);
 
 /* Like the jxbt_get_smethod() but get a static method */
-jmethodID jxbt_get_static_smethod(JNIEnv * env, const char *classname,
-                                  const char *name, const char *signature);
-
-/* Search a field in a class and throw an exception if not found
-   (it's ok to to pass a NULL class: it's a noop) */
-jfieldID jxbt_get_sfield(JNIEnv * env, const char *classname,
-                         const char *name, const char *signature);
-
+jmethodID jxbt_get_static_smethod(JNIEnv * env, const char *classname, const char *name, const char *signature);
 
-/* ***************** */
-/* EXCEPTION RAISING */
-/* ***************** */
+/* Search a field in a class and throw an exception if not found (it's ok to to pass a NULL class: it's a noop) */
+jfieldID jxbt_get_sfield(JNIEnv * env, const char *classname, const char *name, const char *signature);
 
 #define jxbt_check_res(fun, res, allowed_exceptions, detail) do {\
     if (res != MSG_OK && (res | allowed_exceptions)) { \
@@ -66,31 +49,30 @@ jfieldID jxbt_get_sfield(JNIEnv * env, const char *classname,
    } } while (0)
 
 /* Throws an exception according to its name */
-void jxbt_throw_by_name(JNIEnv * env, const char *name, char *msg);
+void jxbt_throw_by_name(JNIEnv* env, const char* name, std::string msg);
 /** Thrown on internal error of this layer, or on problem with JNI */
-void jxbt_throw_jni(JNIEnv * env, const char *msg);
+void jxbt_throw_jni(JNIEnv* env, std::string msg);
 /** Thrown when using an object not bound to a native one where it should, or reverse (kinda JNI issue) */
-void jxbt_throw_notbound(JNIEnv * env, const char *kind, void *pointer);
-
-/** Thrown on error in native MSG code */
-void jxbt_throw_native(JNIEnv * env, char *msg);
-
+void jxbt_throw_notbound(JNIEnv* env, std::string kind, void* pointer);
 /** Thrown if NULL gets used */
-void jxbt_throw_null(JNIEnv * env, char *msg);
+void jxbt_throw_null(JNIEnv* env, std::string msg);
 
 /** Thrown on illegal arguments */
-void jxbt_throw_illegal(JNIEnv * env, char *msg);
+void jxbt_throw_illegal(JNIEnv* env, std::string msg);
 /** Thrown when looking for an host from name does not lead to anything */
-void jxbt_throw_host_not_found(JNIEnv * env, const char *invalid_name);
+void jxbt_throw_host_not_found(JNIEnv* env, std::string invalid_name);
 /** Thrown when looking for an host from name does not lead to anything */
-void jxbt_throw_process_not_found(JNIEnv * env, const char *invalid_name);
+void jxbt_throw_process_not_found(JNIEnv* env, std::string invalid_name);
 /** Thrown when a transfer failure accure while Sending task */
-void jxbt_throw_transfer_failure(JNIEnv * env, char *detail);
-/** Thrown when a host failure accures while Sending task*/
-void jxbt_throw_host_failure(JNIEnv * env, char *details);
-/** Thrown when a time out accures While Sending task */
-void jxbt_throw_time_out_failure(JNIEnv * env, char *details);
+void jxbt_throw_transfer_failure(JNIEnv* env, std::string detail);
+/** Thrown when a host failure occurs while Sending a task*/
+void jxbt_throw_host_failure(JNIEnv* env, std::string details);
+/** Thrown when a timeout occurs while Sending a task */
+void jxbt_throw_time_out_failure(JNIEnv* env, std::string details);
 /**Thrown when a task is canceled */
-void jxbt_throw_task_cancelled(JNIEnv * env, char *details);
+void jxbt_throw_task_cancelled(JNIEnv* env, std::string details);
+/** Thrown when looking for a storage from name does not lead to anything */
+void jxbt_throw_storage_not_found(JNIEnv* env, std::string invalid_name);
 
-#endif                          /* ! JXBT_UTILITY_H */
+SG_END_DECL()
+#endif