diff options
| author | tobrun <tobrun.van.nuland@gmail.com> | 2018-10-22 14:02:31 +0200 |
|---|---|---|
| committer | Tobrun <tobrun@mapbox.com> | 2018-10-23 13:19:26 +0200 |
| commit | 3ef5bc604b29a5e3c1050bff66f78c49ffd898cc (patch) | |
| tree | 5073abdcb69a14bbbd6ff5252f687c7192db0216 /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox | |
| parent | fa78bcadfddb2c1179d929e4a2abcc1b1dd758c6 (diff) | |
| download | qtlocation-mapboxgl-3ef5bc604b29a5e3c1050bff66f78c49ffd898cc.tar.gz | |
Revert "[android] - add NonNull to MapboxMap parameter for onMapReady callback, removes necessity to add question mark to all mapboxMap invocations"
This reverts commit a436fd233f325ddca571e3c61641588e8166a6b4.
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox')
3 files changed, 3 insertions, 5 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java index f89b280c4c..74becae4c5 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java @@ -124,7 +124,7 @@ public final class MapFragment extends Fragment implements OnMapReadyCallback { * @param mapboxMap The public api controller of the map */ @Override - public void onMapReady(@NonNull MapboxMap mapboxMap) { + public void onMapReady(MapboxMap mapboxMap) { this.mapboxMap = mapboxMap; for (OnMapReadyCallback onMapReadyCallback : mapReadyCallbackList) { onMapReadyCallback.onMapReady(mapboxMap); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/OnMapReadyCallback.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/OnMapReadyCallback.java index 31b459abbd..fc92e5028b 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/OnMapReadyCallback.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/OnMapReadyCallback.java @@ -1,7 +1,5 @@ package com.mapbox.mapboxsdk.maps; -import android.support.annotation.NonNull; - /** * Interface definition for a callback to be invoked when the map is ready to be used. * <p> @@ -18,5 +16,5 @@ public interface OnMapReadyCallback { * @param mapboxMap An instance of MapboxMap associated with the {@link MapFragment} or * {@link MapView} that defines the callback. */ - void onMapReady(@NonNull MapboxMap mapboxMap); + void onMapReady(MapboxMap mapboxMap); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java index cda59380a9..184153a241 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java @@ -119,7 +119,7 @@ public class SupportMapFragment extends Fragment implements OnMapReadyCallback { } @Override - public void onMapReady(@NonNull MapboxMap mapboxMap) { + public void onMapReady(MapboxMap mapboxMap) { this.mapboxMap = mapboxMap; for (OnMapReadyCallback onMapReadyCallback : mapReadyCallbackList) { onMapReadyCallback.onMapReady(mapboxMap); |