Skip to content
Snippets Groups Projects
Commit 6d2584cc authored by Maxime Graulich's avatar Maxime Graulich
Browse files

Android: remove unused parameter

parent e4371fac
No related branches found
No related tags found
No related merge requests found
...@@ -14,7 +14,7 @@ public class Gmsh implements Parcelable { ...@@ -14,7 +14,7 @@ public class Gmsh implements Parcelable {
System.loadLibrary("GetDP"); System.loadLibrary("GetDP");
System.loadLibrary("Onelab"); 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 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 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 private native void drawView(long ptr); // Called each time the GLView request a render
...@@ -41,8 +41,8 @@ public class Gmsh implements Parcelable { ...@@ -41,8 +41,8 @@ public class Gmsh implements Parcelable {
private long ptr; private long ptr;
private Handler handler; private Handler handler;
public Gmsh(String name, Handler handler) { public Gmsh(Handler handler) {
ptr = this.init(name); ptr = this.init();
this.handler = handler; this.handler = handler;
} }
......
...@@ -48,7 +48,7 @@ public class MainActivity extends Activity{ ...@@ -48,7 +48,7 @@ public class MainActivity extends Activity{
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN); getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
getWindow().requestFeature(Window.FEATURE_ACTION_BAR_OVERLAY); getWindow().requestFeature(Window.FEATURE_ACTION_BAR_OVERLAY);
setContentView(R.layout.main_activity_layout); setContentView(R.layout.main_activity_layout);
_gmsh = new Gmsh("", mainHandler); _gmsh = new Gmsh(mainHandler);
_notify = false; _notify = false;
ActionBar actionBar = getActionBar(); ActionBar actionBar = getActionBar();
actionBar.setDisplayHomeAsUpEnabled(true); actionBar.setDisplayHomeAsUpEnabled(true);
......
...@@ -118,14 +118,12 @@ JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *reserved) { ...@@ -118,14 +118,12 @@ JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *reserved) {
return JNI_VERSION_1_6; return JNI_VERSION_1_6;
} }
JNIEXPORT jlong JNICALL Java_org_geuz_onelab_Gmsh_init 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); if(gCallbackObject != NULL) env->DeleteGlobalRef(gCallbackObject);
gCallbackObject = env->NewGlobalRef(obj); gCallbackObject = env->NewGlobalRef(obj);
gJavaVM->GetEnv((void**)&env, JNI_VERSION_1_6); gJavaVM->GetEnv((void**)&env, JNI_VERSION_1_6);
Msg::SetCallback(new MobileMessage()); Msg::SetCallback(new MobileMessage());
const char* name = env->GetStringUTFChars(jname, NULL);
return reinterpret_cast<jlong>(new drawContext()); return reinterpret_cast<jlong>(new drawContext());
} }
JNIEXPORT void JNICALL Java_org_geuz_onelab_Gmsh_loadFile JNIEXPORT void JNICALL Java_org_geuz_onelab_Gmsh_loadFile
......
...@@ -15,7 +15,7 @@ extern "C" { ...@@ -15,7 +15,7 @@ extern "C" {
* Signature: (Ljava/lang/String;)J * Signature: (Ljava/lang/String;)J
*/ */
JNIEXPORT jlong JNICALL Java_org_geuz_onelab_Gmsh_init JNIEXPORT jlong JNICALL Java_org_geuz_onelab_Gmsh_init
(JNIEnv *, jobject, jstring); (JNIEnv *, jobject);
/* /*
* Class: org_geuz_onelab_Gmsh * Class: org_geuz_onelab_Gmsh
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment