X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fc783dc02e4e1bf955b152713d1df4914ae3adb8..0062810c4d947182d063333a1e949f89a3647dd8:/src/jxbt_utilities.c

diff --git a/src/jxbt_utilities.c b/src/jxbt_utilities.c
index 6b11b8b0c2..1daf3700c5 100644
--- a/src/jxbt_utilities.c
+++ b/src/jxbt_utilities.c
@@ -1,6 +1,6 @@
 /* Various JNI helper functions                                             */
 
-/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2007-2012. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -201,11 +201,11 @@ jfieldID jxbt_get_sfield(JNIEnv * env, const char *classname,
 /* ***************** */
 /* EXCEPTION RAISING */
 /* ***************** */
-static void jxbt_throw_by_name(JNIEnv * env, const char *name, char *msg)
+void jxbt_throw_by_name(JNIEnv * env, const char *name, char *msg)
 {
   jclass cls = (*env)->FindClass(env, name);
 
-  xbt_assert2(cls, "%s (Plus severe error: class %s not found)\n", msg,
+  xbt_assert(cls, "%s (Plus severe error: class %s not found)\n", msg,
               name);
 
   (*env)->ThrowNew(env, cls, msg);
@@ -218,21 +218,21 @@ static void jxbt_throw_by_name(JNIEnv * env, const char *name, char *msg)
 void jxbt_throw_jni(JNIEnv * env, const char *msg)
 {
   jxbt_throw_by_name(env,
-                     "simgrid/msg/JniException",
+                     "org/simgrid/msg/JniException",
                      bprintf("Internal or JNI error: %s", msg));
 }
 
 void jxbt_throw_notbound(JNIEnv * env, const char *kind, void *pointer)
 {
   jxbt_throw_by_name(env,
-                     "simgrid/msg/JniException",
+                     "org/simgrid/msg/JniException",
                      bprintf("Internal error: %s %p not bound", kind,
                              pointer));
 }
 
 void jxbt_throw_native(JNIEnv * env, char *msg)
 {
-  jxbt_throw_by_name(env, "simgrid/msg/NativeException", msg);
+  jxbt_throw_by_name(env, "org/simgrid/msg/NativeException", msg);
 }
 
 /* *** */
@@ -250,14 +250,14 @@ void jxbt_throw_illegal(JNIEnv * env, char *msg)
 void jxbt_throw_host_not_found(JNIEnv * env, const char *invalid_name)
 {
   jxbt_throw_by_name(env,
-                     "simgrid/msg/HostNotFoundException",
+                     "org/simgrid/msg/HostNotFoundException",
                      bprintf("No such host: %s", invalid_name));
 }
 
 void jxbt_throw_process_not_found(JNIEnv * env, const char *invalid_name)
 {
   jxbt_throw_by_name(env,
-                     "simgrid/msg/ProcessNotFoundException",
+                     "org/simgrid/msg/ProcessNotFoundException",
                      bprintf("No such process: %s", invalid_name));
 }
 
@@ -265,7 +265,7 @@ void jxbt_throw_process_not_found(JNIEnv * env, const char *invalid_name)
 void jxbt_throw_transfer_failure(JNIEnv * env, char *details)
 {
 
-  jxbt_throw_by_name(env, "simgrid/msg/TransferFailureException", details);
+  jxbt_throw_by_name(env, "org/simgrid/msg/TransferFailureException", details);
 
 }
 
@@ -274,7 +274,7 @@ void jxbt_throw_host_failure(JNIEnv * env, char *details)
 {
 
   jxbt_throw_by_name(env,
-                     "simgrid/msg/HostFailureException",
+                     "org/simgrid/msg/HostFailureException",
                      bprintf("Host Failure %s", details));
 
 }
@@ -283,7 +283,7 @@ void jxbt_throw_host_failure(JNIEnv * env, char *details)
 void jxbt_throw_time_out_failure(JNIEnv * env, char *details)
 {
 
-  jxbt_throw_by_name(env, "simgrid/msg/TimeoutException", details);
+  jxbt_throw_by_name(env, "org/simgrid/msg/TimeoutException", details);
 
 }
 
@@ -291,6 +291,6 @@ void jxbt_throw_time_out_failure(JNIEnv * env, char *details)
 void jxbt_throw_task_cancelled(JNIEnv * env, char *details)
 {
 
-  jxbt_throw_by_name(env, "simgrid/msg/TaskCancelledException", details);
+  jxbt_throw_by_name(env, "org/simgrid/msg/TaskCancelledException", details);
 
 }