[android] Remove UnknownLayer

This commit is contained in:
Mikhail Pozdnyakov
2018-11-06 11:45:51 +02:00
parent 6f34e69b2e
commit 1ba1ead3ea
4 changed files with 0 additions and 105 deletions

View File

@@ -1,27 +0,0 @@
package com.mapbox.mapboxsdk.style.layers;
import android.support.annotation.Keep;
import android.support.annotation.UiThread;
/**
* An unknown type of layer
*/
@UiThread
@Keep
public class UnknownLayer extends Layer {
/**
* Creates a UnknownLayer.
*
* @param nativePtr pointer used by core
*/
UnknownLayer(long nativePtr) {
super(nativePtr);
}
protected native void initialize();
@Override
protected native void finalize() throws Throwable;
}

View File

@@ -103,8 +103,6 @@ platform/android/src/style/layers/raster_layer.cpp
platform/android/src/style/layers/raster_layer.hpp
platform/android/src/style/layers/symbol_layer.cpp
platform/android/src/style/layers/symbol_layer.hpp
platform/android/src/style/layers/unknown_layer.cpp
platform/android/src/style/layers/unknown_layer.hpp
platform/android/src/style/sources/geojson_source.cpp
platform/android/src/style/sources/geojson_source.hpp
platform/android/src/style/sources/custom_geometry_source.cpp

View File

@@ -1,48 +0,0 @@
#include "unknown_layer.hpp"
#include <string>
namespace {
// Dummy initializer (We don't support initializing this from the JVM)
std::unique_ptr<mbgl::android::UnknownLayer> init(jni::JNIEnv&) {
throw std::runtime_error("UnknownLayer should not be initialized from the JVM");
}
} // namespace
namespace mbgl {
namespace android {
UnknownLayer::UnknownLayer(mbgl::Map& map, mbgl::style::Layer& coreLayer)
: Layer(map, coreLayer) {
}
UnknownLayer::UnknownLayer(mbgl::Map& map, std::unique_ptr<mbgl::style::Layer> coreLayer)
: Layer(map, std::move(coreLayer)) {
}
jni::Local<jni::Object<Layer>> UnknownLayer::createJavaPeer(jni::JNIEnv& env, Layer* layer) {
static auto& javaClass = jni::Class<UnknownLayer>::Singleton(env);
static auto constructor = javaClass.GetConstructor<jni::jlong>(env);
return javaClass.New(env, constructor, reinterpret_cast<jni::jlong>(layer));
}
void UnknownLayer::registerNative(jni::JNIEnv& env) {
// Lookup the class
static auto& javaClass = jni::Class<UnknownLayer>::Singleton(env);
#define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name)
std::function<std::unique_ptr<UnknownLayer>(JNIEnv&)> initializer = nullptr;
// Register the peer
jni::RegisterNativePeer<UnknownLayer>(
env, javaClass, "nativePtr",
init,
"initialize",
"finalize");
}
} // namespace android
} // namespace mbgl

View File

@@ -1,28 +0,0 @@
#pragma once
#include "layer.hpp"
#include <mbgl/style/layer.hpp>
#include <jni/jni.hpp>
namespace mbgl {
namespace android {
class UnknownLayer : public Layer {
public:
using SuperTag = Layer;
static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/layers/UnknownLayer"; };
static void registerNative(jni::JNIEnv&);
UnknownLayer(mbgl::Map&, mbgl::style::Layer&);
UnknownLayer(mbgl::Map&, std::unique_ptr<mbgl::style::Layer>);
~UnknownLayer() = default;
static jni::Local<jni::Object<Layer>> createJavaPeer(jni::JNIEnv&, Layer*);
}; // class UnknownLayer
} // namespace android
} // namespace mbgl