summaryrefslogtreecommitdiff
path: root/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
diff options
context:
space:
mode:
authortobrun <tobrun.van.nuland@gmail.com>2018-10-22 14:02:44 +0200
committerTobrun <tobrun@mapbox.com>2018-10-23 13:19:26 +0200
commit83ac1152757dfda0964383ac0fed6d87cd188b6d (patch)
treeba1a71e914898c95b8423a6198070f4401c9bb9d /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
parent3ef5bc604b29a5e3c1050bff66f78c49ffd898cc (diff)
downloadqtlocation-mapboxgl-83ac1152757dfda0964383ac0fed6d87cd188b6d.tar.gz
Revert "[android] - infer nullity"
This reverts commit 617742710852a5a958a13f2b659f8c307973e49d.
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java')
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java16
1 files changed, 5 insertions, 11 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
index 14f5495a5b..3c039d3de2 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
@@ -31,12 +31,9 @@ final class Transform implements MapView.OnMapChangedListener {
private final MarkerViewManager markerViewManager;
private final Handler handler = new Handler();
- @Nullable
private CameraPosition cameraPosition;
- @Nullable
private MapboxMap.CancelableCallback cameraCancelableCallback;
- @Nullable
private MapboxMap.OnCameraChangeListener onCameraChangeListener;
private CameraChangeDispatcher cameraChangeDispatcher;
@@ -61,7 +58,6 @@ final class Transform implements MapView.OnMapChangedListener {
// Camera API
//
- @Nullable
@UiThread
public final CameraPosition getCameraPosition() {
if (cameraPosition == null) {
@@ -96,8 +92,7 @@ final class Transform implements MapView.OnMapChangedListener {
}
@UiThread
- final void moveCamera(@NonNull MapboxMap mapboxMap, @NonNull CameraUpdate update,
- @Nullable final MapboxMap.CancelableCallback callback) {
+ final void moveCamera(MapboxMap mapboxMap, CameraUpdate update, final MapboxMap.CancelableCallback callback) {
CameraPosition cameraPosition = update.getCameraPosition(mapboxMap);
if (isValidCameraPosition(cameraPosition)) {
cancelTransitions();
@@ -117,9 +112,8 @@ final class Transform implements MapView.OnMapChangedListener {
}
@UiThread
- final void easeCamera(@NonNull MapboxMap mapboxMap, @NonNull CameraUpdate update, int durationMs,
- boolean easingInterpolator, @Nullable final MapboxMap.CancelableCallback callback,
- boolean isDismissable) {
+ final void easeCamera(MapboxMap mapboxMap, CameraUpdate update, int durationMs, boolean easingInterpolator,
+ final MapboxMap.CancelableCallback callback, boolean isDismissable) {
CameraPosition cameraPosition = update.getCameraPosition(mapboxMap);
if (isValidCameraPosition(cameraPosition)) {
cancelTransitions();
@@ -135,8 +129,8 @@ final class Transform implements MapView.OnMapChangedListener {
}
@UiThread
- final void animateCamera(@NonNull MapboxMap mapboxMap, @NonNull CameraUpdate update, int durationMs,
- @Nullable final MapboxMap.CancelableCallback callback) {
+ final void animateCamera(MapboxMap mapboxMap, CameraUpdate update, int durationMs,
+ final MapboxMap.CancelableCallback callback) {
CameraPosition cameraPosition = update.getCameraPosition(mapboxMap);
if (isValidCameraPosition(cameraPosition)) {
cancelTransitions();