diff options
author | tobrun <tobrun.van.nuland@gmail.com> | 2018-10-22 14:02:44 +0200 |
---|---|---|
committer | Tobrun <tobrun@mapbox.com> | 2018-10-23 13:19:26 +0200 |
commit | 83ac1152757dfda0964383ac0fed6d87cd188b6d (patch) | |
tree | ba1a71e914898c95b8423a6198070f4401c9bb9d /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java | |
parent | 3ef5bc604b29a5e3c1050bff66f78c49ffd898cc (diff) | |
download | qtlocation-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/MapboxMapOptions.java')
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java | 39 |
1 files changed, 3 insertions, 36 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java index f1d1c1715d..3fac981fe5 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java @@ -143,7 +143,6 @@ public class MapboxMapOptions implements Parcelable { * @param attrs Attributeset containing configuration * @return the MapboxMapOptions created from attributes */ - @NonNull public static MapboxMapOptions createFromAttributes(@NonNull Context context, @Nullable AttributeSet attrs) { MapboxMapOptions mapboxMapOptions = new MapboxMapOptions(); float pxlRatio = context.getResources().getDisplayMetrics().density; @@ -251,7 +250,6 @@ public class MapboxMapOptions implements Parcelable { * @param apiBaseUrl The base of our API endpoint * @return This */ - @NonNull public MapboxMapOptions apiBaseUrl(String apiBaseUrl) { this.apiBaseUrl = apiBaseUrl; return this; @@ -263,7 +261,6 @@ public class MapboxMapOptions implements Parcelable { * @param cameraPosition Inital camera position * @return This */ - @NonNull public MapboxMapOptions camera(CameraPosition cameraPosition) { this.cameraPosition = cameraPosition; return this; @@ -275,7 +272,6 @@ public class MapboxMapOptions implements Parcelable { * @param styleUrl Url to be used to load a styleUrl * @return This */ - @NonNull public MapboxMapOptions styleUrl(String styleUrl) { this.styleUrl = styleUrl; return this; @@ -287,7 +283,6 @@ public class MapboxMapOptions implements Parcelable { * @param styleJson json to used as style * @return This */ - @NonNull public MapboxMapOptions styleJson(String styleJson) { this.styleJson = styleJson; return this; @@ -299,7 +294,6 @@ public class MapboxMapOptions implements Parcelable { * @param enabled True is debug is enabled * @return This */ - @NonNull public MapboxMapOptions debugActive(boolean enabled) { debugActive = enabled; return this; @@ -311,7 +305,6 @@ public class MapboxMapOptions implements Parcelable { * @param minZoom Zoom level to be used * @return This */ - @NonNull public MapboxMapOptions minZoomPreference(double minZoom) { this.minZoom = minZoom; return this; @@ -323,7 +316,6 @@ public class MapboxMapOptions implements Parcelable { * @param maxZoom Zoom level to be used * @return This */ - @NonNull public MapboxMapOptions maxZoomPreference(double maxZoom) { this.maxZoom = maxZoom; return this; @@ -335,7 +327,6 @@ public class MapboxMapOptions implements Parcelable { * @param enabled True and mapbox_compass_icon is shown * @return This */ - @NonNull public MapboxMapOptions compassEnabled(boolean enabled) { compassEnabled = enabled; return this; @@ -347,7 +338,6 @@ public class MapboxMapOptions implements Parcelable { * @param gravity Android SDK Gravity. * @return This */ - @NonNull public MapboxMapOptions compassGravity(int gravity) { compassGravity = gravity; return this; @@ -359,7 +349,6 @@ public class MapboxMapOptions implements Parcelable { * @param margins 4 long array for LTRB margins * @return This */ - @NonNull public MapboxMapOptions compassMargins(int[] margins) { compassMargins = margins; return this; @@ -374,7 +363,6 @@ public class MapboxMapOptions implements Parcelable { * @param compassFadeWhenFacingNorth true is mapbox_compass_icon fades to invisble * @return This */ - @NonNull public MapboxMapOptions compassFadesWhenFacingNorth(boolean compassFadeWhenFacingNorth) { this.fadeCompassFacingNorth = compassFadeWhenFacingNorth; return this; @@ -389,7 +377,6 @@ public class MapboxMapOptions implements Parcelable { * @param compass the drawable to show as image compass * @return This */ - @NonNull public MapboxMapOptions compassImage(Drawable compass) { this.compassImage = compass; return this; @@ -401,7 +388,6 @@ public class MapboxMapOptions implements Parcelable { * @param enabled True and logo is shown * @return This */ - @NonNull public MapboxMapOptions logoEnabled(boolean enabled) { logoEnabled = enabled; return this; @@ -413,7 +399,6 @@ public class MapboxMapOptions implements Parcelable { * @param gravity Android SDK Gravity. * @return This */ - @NonNull public MapboxMapOptions logoGravity(int gravity) { logoGravity = gravity; return this; @@ -425,7 +410,6 @@ public class MapboxMapOptions implements Parcelable { * @param margins 4 long array for LTRB margins * @return This */ - @NonNull public MapboxMapOptions logoMargins(int[] margins) { logoMargins = margins; return this; @@ -437,7 +421,6 @@ public class MapboxMapOptions implements Parcelable { * @param enabled True and attribution is shown * @return This */ - @NonNull public MapboxMapOptions attributionEnabled(boolean enabled) { attributionEnabled = enabled; return this; @@ -449,7 +432,6 @@ public class MapboxMapOptions implements Parcelable { * @param gravity Android SDK Gravity. * @return This */ - @NonNull public MapboxMapOptions attributionGravity(int gravity) { attributionGravity = gravity; return this; @@ -461,7 +443,6 @@ public class MapboxMapOptions implements Parcelable { * @param margins 4 long array for LTRB margins * @return This */ - @NonNull public MapboxMapOptions attributionMargins(int[] margins) { attributionMargins = margins; return this; @@ -473,7 +454,6 @@ public class MapboxMapOptions implements Parcelable { * @param color integer resembling a color * @return This */ - @NonNull public MapboxMapOptions attributionTintColor(@ColorInt int color) { attributionTintColor = color; return this; @@ -485,7 +465,6 @@ public class MapboxMapOptions implements Parcelable { * @param enabled True and gesture will be enabled * @return This */ - @NonNull public MapboxMapOptions rotateGesturesEnabled(boolean enabled) { rotateGesturesEnabled = enabled; return this; @@ -497,7 +476,6 @@ public class MapboxMapOptions implements Parcelable { * @param enabled True and gesture will be enabled * @return This */ - @NonNull public MapboxMapOptions scrollGesturesEnabled(boolean enabled) { scrollGesturesEnabled = enabled; return this; @@ -509,7 +487,6 @@ public class MapboxMapOptions implements Parcelable { * @param enabled True and gesture will be enabled * @return This */ - @NonNull public MapboxMapOptions tiltGesturesEnabled(boolean enabled) { tiltGesturesEnabled = enabled; return this; @@ -521,7 +498,6 @@ public class MapboxMapOptions implements Parcelable { * @param enabled True and gesture will be enabled * @return This */ - @NonNull public MapboxMapOptions zoomControlsEnabled(boolean enabled) { zoomControlsEnabled = enabled; return this; @@ -533,7 +509,6 @@ public class MapboxMapOptions implements Parcelable { * @param enabled True and gesture will be enabled * @return This */ - @NonNull public MapboxMapOptions zoomGesturesEnabled(boolean enabled) { zoomGesturesEnabled = enabled; return this; @@ -545,7 +520,6 @@ public class MapboxMapOptions implements Parcelable { * @param enabled True and gesture will be enabled * @return This */ - @NonNull public MapboxMapOptions doubleTapGesturesEnabled(boolean enabled) { doubleTapGesturesEnabled = enabled; return this; @@ -564,13 +538,11 @@ public class MapboxMapOptions implements Parcelable { * @param textureMode True to enable texture mode * @return This */ - @NonNull public MapboxMapOptions textureMode(boolean textureMode) { this.textureMode = textureMode; return this; } - @NonNull public MapboxMapOptions translucentTextureSurface(boolean translucentTextureSurface) { this.translucentTextureSurface = translucentTextureSurface; return this; @@ -582,7 +554,6 @@ public class MapboxMapOptions implements Parcelable { * @param loadColor the color to show during map creation * @return This */ - @NonNull public MapboxMapOptions foregroundLoadColor(@ColorInt int loadColor) { this.foregroundLoadColor = loadColor; return this; @@ -596,7 +567,6 @@ public class MapboxMapOptions implements Parcelable { * @param enable true to enable * @return This */ - @NonNull public MapboxMapOptions setPrefetchesTiles(boolean enable) { this.prefetchesTiles = enable; return this; @@ -612,7 +582,6 @@ public class MapboxMapOptions implements Parcelable { * @param crossSourceCollisions true to enable, false to disable * @return This */ - @NonNull public MapboxMapOptions crossSourceCollisions(boolean crossSourceCollisions) { this.crossSourceCollisions = crossSourceCollisions; return this; @@ -628,7 +597,6 @@ public class MapboxMapOptions implements Parcelable { * @param fontFamily font family for local ideograph generation. * @return This */ - @NonNull public MapboxMapOptions localIdeographFontFamily(String fontFamily) { this.localIdeographFontFamily = fontFamily; return this; @@ -641,7 +609,6 @@ public class MapboxMapOptions implements Parcelable { * @param pixelRatio the custom pixel ratio of the map under construction * @return This */ - @NonNull public MapboxMapOptions pixelRatio(float pixelRatio) { this.pixelRatio = pixelRatio; return this; @@ -952,7 +919,7 @@ public class MapboxMapOptions implements Parcelable { } public static final Parcelable.Creator<MapboxMapOptions> CREATOR = new Parcelable.Creator<MapboxMapOptions>() { - public MapboxMapOptions createFromParcel(@NonNull Parcel in) { + public MapboxMapOptions createFromParcel(Parcel in) { return new MapboxMapOptions(in); } @@ -967,7 +934,7 @@ public class MapboxMapOptions implements Parcelable { } @Override - public void writeToParcel(@NonNull Parcel dest, int flags) { + public void writeToParcel(Parcel dest, int flags) { dest.writeParcelable(cameraPosition, flags); dest.writeByte((byte) (debugActive ? 1 : 0)); @@ -1011,7 +978,7 @@ public class MapboxMapOptions implements Parcelable { } @Override - public boolean equals(@Nullable Object o) { + public boolean equals(Object o) { if (this == o) { return true; } |