diff --git a/contrib/mobile/Android/src/org/geuz/onelab/Gmsh.java b/contrib/mobile/Android/src/org/geuz/onelab/Gmsh.java index 1499df3fb7f51a0a72894aadc8ae4312dc143253..9433fda62f5c92fdb3e2cccc984e7b0b0b0c4e88 100644 --- a/contrib/mobile/Android/src/org/geuz/onelab/Gmsh.java +++ b/contrib/mobile/Android/src/org/geuz/onelab/Gmsh.java @@ -14,7 +14,7 @@ public class Gmsh implements Parcelable { System.loadLibrary("GetDP"); System.loadLibrary("Onelab"); } - private native long init(String name); // Init Gmsh + private native long init(); // Init Gmsh private native void loadFile(long ptr, String name); // load a file(OpenProjet) private native void initView(long ptr, int w, int h); // Called each time the GLView change private native void drawView(long ptr); // Called each time the GLView request a render @@ -41,8 +41,8 @@ public class Gmsh implements Parcelable { private long ptr; private Handler handler; - public Gmsh(String name, Handler handler) { - ptr = this.init(name); + public Gmsh(Handler handler) { + ptr = this.init(); this.handler = handler; } diff --git a/contrib/mobile/Android/src/org/geuz/onelab/MainActivity.java b/contrib/mobile/Android/src/org/geuz/onelab/MainActivity.java index 24013b948e5f19e0768b7e641b9fa9fd41db1e3b..e835b8bc55152285c88c3269221b1e24ab3aa926 100644 --- a/contrib/mobile/Android/src/org/geuz/onelab/MainActivity.java +++ b/contrib/mobile/Android/src/org/geuz/onelab/MainActivity.java @@ -48,7 +48,7 @@ public class MainActivity extends Activity{ getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN); getWindow().requestFeature(Window.FEATURE_ACTION_BAR_OVERLAY); setContentView(R.layout.main_activity_layout); - _gmsh = new Gmsh("", mainHandler); + _gmsh = new Gmsh(mainHandler); _notify = false; ActionBar actionBar = getActionBar(); actionBar.setDisplayHomeAsUpEnabled(true); diff --git a/contrib/mobile/androidGModel.cpp b/contrib/mobile/androidGModel.cpp index 3382d599b8bea8866f4f044fdaf00fedabb5cb64..bf336d0f5151f237883ac131dcfc44f4a3bb7ae3 100644 --- a/contrib/mobile/androidGModel.cpp +++ b/contrib/mobile/androidGModel.cpp @@ -118,14 +118,12 @@ JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *reserved) { return JNI_VERSION_1_6; } JNIEXPORT jlong JNICALL Java_org_geuz_onelab_Gmsh_init - (JNIEnv *env, jobject obj, jstring jname) + (JNIEnv *env, jobject obj) { if(gCallbackObject != NULL) env->DeleteGlobalRef(gCallbackObject); gCallbackObject = env->NewGlobalRef(obj); gJavaVM->GetEnv((void**)&env, JNI_VERSION_1_6); Msg::SetCallback(new MobileMessage()); - - const char* name = env->GetStringUTFChars(jname, NULL); return reinterpret_cast<jlong>(new drawContext()); } JNIEXPORT void JNICALL Java_org_geuz_onelab_Gmsh_loadFile diff --git a/contrib/mobile/androidGModel.h b/contrib/mobile/androidGModel.h index 4fc0462cfd5ea83be3a88ebab5f0a21d9639d5ea..013cd64457cf720857917f8cb17ae0005e4d0b11 100644 --- a/contrib/mobile/androidGModel.h +++ b/contrib/mobile/androidGModel.h @@ -15,7 +15,7 @@ extern "C" { * Signature: (Ljava/lang/String;)J */ JNIEXPORT jlong JNICALL Java_org_geuz_onelab_Gmsh_init - (JNIEnv *, jobject, jstring); + (JNIEnv *, jobject); /* * Class: org_geuz_onelab_Gmsh