tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "[android] - add NonNull to MapboxMap parameter for onMapReady callback, removes necessity to add question mark to all mapboxMap invocations"

Browse Source 
This reverts commit a436fd233f.
This commit is contained in:
tobrun
2018-10-22 14:02:31 +02:00
committed by Tobrun
parent fa78bcadfd
commit 3ef5bc604b
27 changed files with 28 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java
View File

@@ -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);

4
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/OnMapReadyCallback.java
View File

@@ -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);
}

2
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java
View File

@@ -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);

3
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/OnMapReadyIdlingResource.java
View File

@@ -3,7 +3,6 @@ package com.mapbox.mapboxsdk.testapp.utils;
import android.app.Activity;
import android.os.Handler;
import android.os.Looper;
import android.support.annotation.NonNull;
import android.support.annotation.WorkerThread;
import android.support.test.espresso.IdlingResource;
@@ -51,7 +50,7 @@ public class OnMapReadyIdlingResource implements IdlingResource, OnMapReadyCallb
}
@Override
public void onMapReady(@NonNull MapboxMap mapboxMap) {
public void onMapReady(MapboxMap mapboxMap) {
this.mapboxMap = mapboxMap;
if (resourceCallback != null) {
resourceCallback.onTransitionToIdle();

3
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewsInRectangleActivity.java
View File

@@ -2,7 +2,6 @@ package com.mapbox.mapboxsdk.testapp.activity.annotation;
import android.graphics.RectF;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v7.app.AppCompatActivity;
import android.view.View;
import android.widget.Toast;
@@ -44,7 +43,7 @@ public class MarkerViewsInRectangleActivity extends AppCompatActivity implements
}
@Override
public void onMapReady(@NonNull MapboxMap mapboxMap) {
public void onMapReady(MapboxMap mapboxMap) {
MarkerViewsInRectangleActivity.this.mapboxMap = mapboxMap;
selectionBox.setOnClickListener(this);
mapboxMap.moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(52.0907, 5.1214), 16));

3
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolygonActivity.java
View File

@@ -2,7 +2,6 @@ package com.mapbox.mapboxsdk.testapp.activity.annotation;
import android.graphics.Color;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v7.app.AppCompatActivity;
import android.view.Menu;
import android.view.MenuItem;
@@ -75,7 +74,7 @@ public class PolygonActivity extends AppCompatActivity implements OnMapReadyCall
}
@Override
public void onMapReady(@NonNull MapboxMap map) {
public void onMapReady(MapboxMap map) {
mapboxMap = map;
map.setOnPolygonClickListener(polygon -> Toast.makeText(

3
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimationTypeActivity.java
View File

@@ -1,7 +1,6 @@
package com.mapbox.mapboxsdk.testapp.activity.camera;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v7.app.AppCompatActivity;
import android.view.View;
import android.widget.Toast;
@@ -63,7 +62,7 @@ public class CameraAnimationTypeActivity extends AppCompatActivity implements On
}
@Override
public void onMapReady(@NonNull MapboxMap map) {
public void onMapReady(MapboxMap map) {
mapboxMap = map;
mapboxMap.getUiSettings().setAttributionEnabled(false);
mapboxMap.getUiSettings().setLogoEnabled(false);

3
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimatorActivity.java
View File

@@ -5,7 +5,6 @@ import android.animation.AnimatorSet;
import android.animation.TypeEvaluator;
import android.animation.ValueAnimator;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.util.LongSparseArray;
import android.support.v4.view.animation.FastOutLinearInInterpolator;
import android.support.v4.view.animation.FastOutSlowInInterpolator;
@@ -79,7 +78,7 @@ public class CameraAnimatorActivity extends AppCompatActivity implements OnMapRe
}
@Override
public void onMapReady(@NonNull final MapboxMap map) {
public void onMapReady(final MapboxMap map) {
mapboxMap = map;
initFab();
}

3
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/GestureDetectorActivity.java
View File

@@ -5,7 +5,6 @@ import android.os.Bundle;
import android.os.Handler;
import android.support.annotation.ColorInt;
import android.support.annotation.IntDef;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.AppCompatActivity;
@@ -69,7 +68,7 @@ public class GestureDetectorActivity extends AppCompatActivity {
mapView.onCreate(savedInstanceState);
mapView.getMapAsync(new OnMapReadyCallback() {
@Override
public void onMapReady(@NonNull MapboxMap mapboxMap) {
public void onMapReady(MapboxMap mapboxMap) {
GestureDetectorActivity.this.mapboxMap = mapboxMap;
initializeMap();
}

3
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/MaxMinZoomActivity.java
View File

@@ -1,7 +1,6 @@
package com.mapbox.mapboxsdk.testapp.activity.camera;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v7.app.AppCompatActivity;
import com.mapbox.mapboxsdk.constants.Style;
@@ -32,7 +31,7 @@ public class MaxMinZoomActivity extends AppCompatActivity implements OnMapReadyC
}
@Override
public void onMapReady(@NonNull final MapboxMap map) {
public void onMapReady(final MapboxMap map) {
mapboxMap = map;
mapboxMap.setMinZoomPreference(3);
mapboxMap.setMaxZoomPreference(5);

2
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ScrollByActivity.java
View File

@@ -60,7 +60,7 @@ public class ScrollByActivity extends AppCompatActivity implements OnMapReadyCal
}
@Override
public void onMapReady(@NonNull MapboxMap map) {
public void onMapReady(MapboxMap map) {
mapboxMap = map;
UiSettings uiSettings = mapboxMap.getUiSettings();
uiSettings.setLogoEnabled(false);

3
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/espresso/DeviceIndependentTestActivity.java
View File

@@ -1,7 +1,6 @@
package com.mapbox.mapboxsdk.testapp.activity.espresso;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v7.app.AppCompatActivity;
import com.mapbox.mapboxsdk.maps.MapView;
import com.mapbox.mapboxsdk.maps.MapboxMap;
@@ -25,7 +24,7 @@ public class DeviceIndependentTestActivity extends AppCompatActivity implements
}
@Override
public void onMapReady(@NonNull MapboxMap map) {
public void onMapReady(MapboxMap map) {
mapboxMap = map;
}

3
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/espresso/EspressoTestActivity.java
View File

@@ -1,7 +1,6 @@
package com.mapbox.mapboxsdk.testapp.activity.espresso;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v7.app.AppCompatActivity;
import com.mapbox.mapboxsdk.maps.MapView;
@@ -29,7 +28,7 @@ public class EspressoTestActivity extends AppCompatActivity implements OnMapRead
}
@Override
public void onMapReady(@NonNull MapboxMap map) {
public void onMapReady(MapboxMap map) {
mapboxMap = map;
}

3
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/MapFragmentActivity.java
View File

@@ -1,7 +1,6 @@
package com.mapbox.mapboxsdk.testapp.activity.fragment;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v7.app.AppCompatActivity;
import com.mapbox.mapboxsdk.camera.CameraPosition;
import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
@@ -69,7 +68,7 @@ public class MapFragmentActivity extends AppCompatActivity implements MapFragmen
}
@Override
public void onMapReady(@NonNull MapboxMap map) {
public void onMapReady(MapboxMap map) {
mapboxMap = map;
}

3
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/SupportMapFragmentActivity.java
View File

@@ -1,7 +1,6 @@
package com.mapbox.mapboxsdk.testapp.activity.fragment;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v7.app.AppCompatActivity;
import com.mapbox.mapboxsdk.camera.CameraPosition;
import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
@@ -70,7 +69,7 @@ public class SupportMapFragmentActivity extends AppCompatActivity implements Map
}
@Override
public void onMapReady(@NonNull MapboxMap map) {
public void onMapReady(MapboxMap map) {
mapboxMap = map;
}

3
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/imagegenerator/SnapshotActivity.java
View File

@@ -2,7 +2,6 @@ package com.mapbox.mapboxsdk.testapp.activity.imagegenerator;
import android.graphics.Bitmap;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.design.widget.FloatingActionButton;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.AppCompatActivity;
@@ -39,7 +38,7 @@ public class SnapshotActivity extends AppCompatActivity implements OnMapReadyCal
}
@Override
public void onMapReady(@NonNull MapboxMap map) {
public void onMapReady(MapboxMap map) {
mapboxMap = map;
mapboxMap.setStyleUrl(Style.OUTDOORS);
FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);

3
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/DynamicInfoWindowAdapterActivity.java
View File

@@ -2,7 +2,6 @@ package com.mapbox.mapboxsdk.testapp.activity.infowindow;
import android.graphics.Color;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.content.res.ResourcesCompat;
import android.support.v7.app.AppCompatActivity;
import android.widget.TextView;
@@ -41,7 +40,7 @@ public class DynamicInfoWindowAdapterActivity extends AppCompatActivity implemen
}
@Override
public void onMapReady(@NonNull MapboxMap map) {
public void onMapReady(MapboxMap map) {
mapboxMap = map;
// Add info window adapter

2
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationMapChangeActivity.java
View File

@@ -75,7 +75,7 @@ public class LocationMapChangeActivity extends AppCompatActivity implements OnMa
}
@Override
public void onMapReady(@NonNull MapboxMap mapboxMap) {
public void onMapReady(MapboxMap mapboxMap) {
this.mapboxMap = mapboxMap;
activateLocationComponent();
}

2
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationModesActivity.java
View File

@@ -131,7 +131,7 @@ public class LocationModesActivity extends AppCompatActivity implements OnMapRea
@SuppressLint("MissingPermission")
@Override
public void onMapReady(@NonNull MapboxMap mapboxMap) {
public void onMapReady(MapboxMap mapboxMap) {
this.mapboxMap = mapboxMap;
locationEngine = new LocationEngineProvider(this).obtainBestLocationEngineAvailable();

2
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/ManualLocationUpdatesActivity.java
View File

@@ -115,7 +115,7 @@ public class ManualLocationUpdatesActivity extends AppCompatActivity implements
}
@Override
public void onMapReady(@NonNull MapboxMap mapboxMap) {
public void onMapReady(MapboxMap mapboxMap) {
locationEngine = new LocationEngineProvider(this).obtainBestLocationEngineAvailable();
locationEngine.addLocationEngineListener(this);
locationEngine.setPriority(LocationEnginePriority.HIGH_ACCURACY);

4
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/BottomSheetActivity.java
View File

@@ -152,7 +152,7 @@ public class BottomSheetActivity extends AppCompatActivity {
}
@Override
public void onMapReady(@NonNull MapboxMap mapboxMap) {
public void onMapReady(MapboxMap mapboxMap) {
mapboxMap.moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(37.760545, -122.436055), 15));
}
@@ -227,7 +227,7 @@ public class BottomSheetActivity extends AppCompatActivity {
}
@Override
public void onMapReady(@NonNull MapboxMap mapboxMap) {
public void onMapReady(MapboxMap mapboxMap) {
mapboxMap.moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(37.760545, -122.436055), 15));
}

3
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java
View File

@@ -2,7 +2,6 @@ package com.mapbox.mapboxsdk.testapp.activity.maplayout;
import android.content.Context;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.design.widget.FloatingActionButton;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBar;
@@ -95,7 +94,7 @@ public class DebugModeActivity extends AppCompatActivity implements OnMapReadyCa
}
@Override
public void onMapReady(@NonNull MapboxMap map) {
public void onMapReady(MapboxMap map) {
mapboxMap = map;
mapboxMap.getUiSettings().setZoomControlsEnabled(true);

3
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/LatLngBoundsForCameraActivity.java
View File

@@ -2,7 +2,6 @@ package com.mapbox.mapboxsdk.testapp.activity.maplayout;
import android.graphics.Color;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v7.app.AppCompatActivity;
import android.view.Gravity;
import android.view.View;
@@ -40,7 +39,7 @@ public class LatLngBoundsForCameraActivity extends AppCompatActivity implements
}
@Override
public void onMapReady(@NonNull MapboxMap mapboxMap) {
public void onMapReady(MapboxMap mapboxMap) {
this.mapboxMap = mapboxMap;
mapboxMap.setLatLngBoundsForCameraTarget(ICELAND_BOUNDS);
mapboxMap.setMinZoomPreference(2);

3
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/GradientLineActivity.java
View File

@@ -2,7 +2,6 @@ package com.mapbox.mapboxsdk.testapp.activity.style;
import android.graphics.Color;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v7.app.AppCompatActivity;
import com.mapbox.mapboxsdk.maps.MapView;
import com.mapbox.mapboxsdk.maps.MapboxMap;
@@ -49,7 +48,7 @@ public class GradientLineActivity extends AppCompatActivity implements OnMapRead
}
@Override
public void onMapReady(@NonNull MapboxMap map) {
public void onMapReady(MapboxMap map) {
this.mapboxMap = map;
try {

2
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/SymbolGeneratorActivity.java
View File

@@ -87,7 +87,7 @@ public class SymbolGeneratorActivity extends AppCompatActivity implements OnMapR
}
@Override
public void onMapReady(@NonNull final MapboxMap map) {
public void onMapReady(final MapboxMap map) {
mapboxMap = map;
addSymbolClickListener();
new LoadDataTask(this).execute();

2
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/SymbolLayerActivity.java
View File

@@ -89,7 +89,7 @@ public class SymbolLayerActivity extends AppCompatActivity implements MapboxMap.
}
@Override
public void onMapReady(@NonNull MapboxMap mapboxMap) {
public void onMapReady(MapboxMap mapboxMap) {
this.mapboxMap = mapboxMap;
// Add a sdf image for the makers

3
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewDebugModeActivity.java
View File

@@ -2,7 +2,6 @@ package com.mapbox.mapboxsdk.testapp.activity.textureview;
import android.content.Context;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.design.widget.FloatingActionButton;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBar;
@@ -95,7 +94,7 @@ public class TextureViewDebugModeActivity extends AppCompatActivity implements O
}
@Override
public void onMapReady(@NonNull MapboxMap map) {
public void onMapReady(MapboxMap map) {
mapboxMap = map;
mapboxMap.getUiSettings().setZoomControlsEnabled(true);