From ce2b6f25a29459fb6a52b8eb1522c2c83fc954ec Mon Sep 17 00:00:00 2001 From: tobrun Date: Tue, 26 Jun 2018 11:00:59 +0200 Subject: [android] - remove reflection lookup for MarkerViewAdapter intialisation --- .../java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java | 2 +- .../src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java | 6 ++---- .../mapboxsdk/testapp/activity/annotation/MarkerViewActivity.java | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java index 8304d0e6ed..8baec7879c 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java @@ -637,7 +637,7 @@ public class MarkerViewManager implements MapView.OnMapChangedListener { private LayoutInflater inflater; ImageMarkerViewAdapter(Context context) { - super(context); + super(context, MarkerView.class); inflater = LayoutInflater.from(context); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java index f5b9735603..45357b8064 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java @@ -45,7 +45,6 @@ import com.mapbox.mapboxsdk.style.layers.Layer; import com.mapbox.mapboxsdk.style.light.Light; import com.mapbox.mapboxsdk.style.sources.Source; -import java.lang.reflect.ParameterizedType; import java.util.HashMap; import java.util.List; @@ -2525,10 +2524,9 @@ public final class MapboxMap { * * @param context the context associated to a MapView */ - @SuppressWarnings("unchecked") - public MarkerViewAdapter(Context context) { + public MarkerViewAdapter(Context context, Class persistentClass) { this.context = context; - persistentClass = (Class) ((ParameterizedType) getClass().getGenericSuperclass()).getActualTypeArguments()[0]; + this.persistentClass = persistentClass; viewReusePool = new Pools.SimplePool<>(10000); } diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewActivity.java index 8c0dd69a0c..4b21dea076 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewActivity.java @@ -260,7 +260,7 @@ public class MarkerViewActivity extends AppCompatActivity { private MapboxMap mapboxMap; CountryAdapter(@NonNull Context context, @NonNull MapboxMap mapboxMap) { - super(context); + super(context, CountryMarkerView.class); this.inflater = LayoutInflater.from(context); this.mapboxMap = mapboxMap; } @@ -333,7 +333,7 @@ public class MarkerViewActivity extends AppCompatActivity { private MapboxMap mapboxMap; public TextAdapter(@NonNull Context context, @NonNull MapboxMap mapboxMap) { - super(context); + super(context, TextMarkerView.class); this.inflater = LayoutInflater.from(context); this.mapboxMap = mapboxMap; } -- cgit v1.2.1