summaryrefslogtreecommitdiff
path: root/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk
diff options
context:
space:
mode:
authortobrun <tobrun.van.nuland@gmail.com>2018-10-22 14:02:31 +0200
committerTobrun <tobrun.van.nuland@gmail.com>2018-10-23 12:36:39 +0200
commit79fda661690cfd80371a22dc6327c027badb9303 (patch)
tree2ecbe1de46f5bb2d18b13656cf5d458eaf63c4d4 /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk
parent9afe75aa76c02db21209e8f92b09be4b596a3983 (diff)
downloadqtlocation-mapboxgl-79fda661690cfd80371a22dc6327c027badb9303.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/mapboxsdk')
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java2
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/OnMapReadyCallback.java4
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java2
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);