From 6691f7249e8aa4df4aa65712dc768e8b6a5e8dc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Thu, 16 Apr 2015 16:24:39 +0200 Subject: [PATCH] remove nativeRun() method as that is now private --- android/cpp/jni.cpp | 10 +--------- .../java/com/mapbox/mapboxgl/views/NativeMapView.java | 6 ------ 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/android/cpp/jni.cpp b/android/cpp/jni.cpp index b6e46ed5a..628f24a15 100644 --- a/android/cpp/jni.cpp +++ b/android/cpp/jni.cpp @@ -283,13 +283,6 @@ void JNICALL nativeResume(JNIEnv *env, jobject obj, jlong nativeMapViewPtr) { nativeMapView->resume(); } -void JNICALL nativeRun(JNIEnv *env, jobject obj, jlong nativeMapViewPtr) { - mbgl::Log::Debug(mbgl::Event::JNI, "nativeRun"); - assert(nativeMapViewPtr != 0); - NativeMapView *nativeMapView = reinterpret_cast(nativeMapViewPtr); - nativeMapView->getMap().run(); -} - void JNICALL nativeUpdate(JNIEnv *env, jobject obj, jlong nativeMapViewPtr) { mbgl::Log::Debug(mbgl::Event::JNI, "nativeUpdate"); assert(nativeMapViewPtr != 0); @@ -936,7 +929,7 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { // NOTE: if you get java.lang.UnsatisfiedLinkError you likely forgot to set the size of the // array correctly (too large) - std::array methods = {{ // Can remove the extra brace in C++14 + std::array methods = {{ // Can remove the extra brace in C++14 {"nativeCreate", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)J", reinterpret_cast(&nativeCreate)}, {"nativeDestroy", "(J)V", reinterpret_cast(&nativeDestroy)}, @@ -951,7 +944,6 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { {"nativeStop", "(J)V", reinterpret_cast(&nativeStop)}, {"nativePause", "(J)V", reinterpret_cast(&nativePause)}, {"nativeResume", "(J)V", reinterpret_cast(&nativeResume)}, - {"nativeRun", "(J)V", reinterpret_cast(&nativeRun)}, {"nativeUpdate", "(J)V", reinterpret_cast(&nativeUpdate)}, {"nativeTerminate", "(J)V", reinterpret_cast(&nativeTerminate)}, {"nativeResize", "(JIIFII)V", diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/NativeMapView.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/NativeMapView.java index d7ca950fb..4dcd5ef8e 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/NativeMapView.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/NativeMapView.java @@ -89,10 +89,6 @@ class NativeMapView { nativeResume(mNativeMapViewPtr); } - public void run() { - nativeRun(mNativeMapViewPtr); - } - public void update() { nativeUpdate(mNativeMapViewPtr); } @@ -398,8 +394,6 @@ class NativeMapView { private native void nativeResume(long nativeMapViewPtr); - private native void nativeRun(long nativeMapViewPtr); - private native void nativeUpdate(long nativeMapViewPtr); private native void nativeTerminate(long nativeMapViewPtr);