diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java')
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java | 63 |
1 files changed, 10 insertions, 53 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java index 76f7b2f9fa..4718adc5c1 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java @@ -62,7 +62,6 @@ public class CircleLayer extends Layer { * @param sourceLayer the source layer to set * @return This */ - @NonNull public CircleLayer withSourceLayer(String sourceLayer) { setSourceLayer(sourceLayer); return this; @@ -73,7 +72,6 @@ public class CircleLayer extends Layer { * * @return id of the source */ - @NonNull public String getSourceId() { checkThread(); return nativeGetSourceId(); @@ -84,7 +82,6 @@ public class CircleLayer extends Layer { * * @return sourceLayer the source layer to get */ - @NonNull public String getSourceLayer() { checkThread(); return nativeGetSourceLayer(); @@ -95,7 +92,7 @@ public class CircleLayer extends Layer { * * @param filter the expression filter to set */ - public void setFilter(@NonNull Expression filter) { + public void setFilter(Expression filter) { checkThread(); nativeSetFilter(filter.toArray()); } @@ -106,8 +103,7 @@ public class CircleLayer extends Layer { * @param filter the expression filter to set * @return This */ - @NonNull - public CircleLayer withFilter(@NonNull Expression filter) { + public CircleLayer withFilter(Expression filter) { setFilter(filter); return this; } @@ -134,7 +130,6 @@ public class CircleLayer extends Layer { * @param properties the var-args properties * @return This */ - @NonNull public CircleLayer withProperties(@NonNull PropertyValue<?>... properties) { setProperties(properties); return this; @@ -147,7 +142,6 @@ public class CircleLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getCircleRadius() { checkThread(); @@ -159,7 +153,6 @@ public class CircleLayer extends Layer { * * @return transition options for Float */ - @NonNull public TransitionOptions getCircleRadiusTransition() { checkThread(); return nativeGetCircleRadiusTransition(); @@ -170,7 +163,7 @@ public class CircleLayer extends Layer { * * @param options transition options for Float */ - public void setCircleRadiusTransition(@NonNull TransitionOptions options) { + public void setCircleRadiusTransition(TransitionOptions options) { checkThread(); nativeSetCircleRadiusTransition(options.getDuration(), options.getDelay()); } @@ -180,7 +173,6 @@ public class CircleLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getCircleColor() { checkThread(); @@ -209,7 +201,6 @@ public class CircleLayer extends Layer { * * @return transition options for String */ - @NonNull public TransitionOptions getCircleColorTransition() { checkThread(); return nativeGetCircleColorTransition(); @@ -220,7 +211,7 @@ public class CircleLayer extends Layer { * * @param options transition options for String */ - public void setCircleColorTransition(@NonNull TransitionOptions options) { + public void setCircleColorTransition(TransitionOptions options) { checkThread(); nativeSetCircleColorTransition(options.getDuration(), options.getDelay()); } @@ -230,7 +221,6 @@ public class CircleLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getCircleBlur() { checkThread(); @@ -242,7 +232,6 @@ public class CircleLayer extends Layer { * * @return transition options for Float */ - @NonNull public TransitionOptions getCircleBlurTransition() { checkThread(); return nativeGetCircleBlurTransition(); @@ -253,7 +242,7 @@ public class CircleLayer extends Layer { * * @param options transition options for Float */ - public void setCircleBlurTransition(@NonNull TransitionOptions options) { + public void setCircleBlurTransition(TransitionOptions options) { checkThread(); nativeSetCircleBlurTransition(options.getDuration(), options.getDelay()); } @@ -263,7 +252,6 @@ public class CircleLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getCircleOpacity() { checkThread(); @@ -275,7 +263,6 @@ public class CircleLayer extends Layer { * * @return transition options for Float */ - @NonNull public TransitionOptions getCircleOpacityTransition() { checkThread(); return nativeGetCircleOpacityTransition(); @@ -286,7 +273,7 @@ public class CircleLayer extends Layer { * * @param options transition options for Float */ - public void setCircleOpacityTransition(@NonNull TransitionOptions options) { + public void setCircleOpacityTransition(TransitionOptions options) { checkThread(); nativeSetCircleOpacityTransition(options.getDuration(), options.getDelay()); } @@ -296,7 +283,6 @@ public class CircleLayer extends Layer { * * @return property wrapper value around Float[] */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float[]> getCircleTranslate() { checkThread(); @@ -308,7 +294,6 @@ public class CircleLayer extends Layer { * * @return transition options for Float[] */ - @NonNull public TransitionOptions getCircleTranslateTransition() { checkThread(); return nativeGetCircleTranslateTransition(); @@ -319,7 +304,7 @@ public class CircleLayer extends Layer { * * @param options transition options for Float[] */ - public void setCircleTranslateTransition(@NonNull TransitionOptions options) { + public void setCircleTranslateTransition(TransitionOptions options) { checkThread(); nativeSetCircleTranslateTransition(options.getDuration(), options.getDelay()); } @@ -329,7 +314,6 @@ public class CircleLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getCircleTranslateAnchor() { checkThread(); @@ -341,7 +325,6 @@ public class CircleLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getCirclePitchScale() { checkThread(); @@ -353,7 +336,6 @@ public class CircleLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getCirclePitchAlignment() { checkThread(); @@ -365,7 +347,6 @@ public class CircleLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getCircleStrokeWidth() { checkThread(); @@ -377,7 +358,6 @@ public class CircleLayer extends Layer { * * @return transition options for Float */ - @NonNull public TransitionOptions getCircleStrokeWidthTransition() { checkThread(); return nativeGetCircleStrokeWidthTransition(); @@ -388,7 +368,7 @@ public class CircleLayer extends Layer { * * @param options transition options for Float */ - public void setCircleStrokeWidthTransition(@NonNull TransitionOptions options) { + public void setCircleStrokeWidthTransition(TransitionOptions options) { checkThread(); nativeSetCircleStrokeWidthTransition(options.getDuration(), options.getDelay()); } @@ -398,7 +378,6 @@ public class CircleLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getCircleStrokeColor() { checkThread(); @@ -427,7 +406,6 @@ public class CircleLayer extends Layer { * * @return transition options for String */ - @NonNull public TransitionOptions getCircleStrokeColorTransition() { checkThread(); return nativeGetCircleStrokeColorTransition(); @@ -438,7 +416,7 @@ public class CircleLayer extends Layer { * * @param options transition options for String */ - public void setCircleStrokeColorTransition(@NonNull TransitionOptions options) { + public void setCircleStrokeColorTransition(TransitionOptions options) { checkThread(); nativeSetCircleStrokeColorTransition(options.getDuration(), options.getDelay()); } @@ -448,7 +426,6 @@ public class CircleLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getCircleStrokeOpacity() { checkThread(); @@ -460,7 +437,6 @@ public class CircleLayer extends Layer { * * @return transition options for Float */ - @NonNull public TransitionOptions getCircleStrokeOpacityTransition() { checkThread(); return nativeGetCircleStrokeOpacityTransition(); @@ -471,105 +447,86 @@ public class CircleLayer extends Layer { * * @param options transition options for Float */ - public void setCircleStrokeOpacityTransition(@NonNull TransitionOptions options) { + public void setCircleStrokeOpacityTransition(TransitionOptions options) { checkThread(); nativeSetCircleStrokeOpacityTransition(options.getDuration(), options.getDelay()); } - @NonNull @Keep private native Object nativeGetCircleRadius(); - @NonNull @Keep private native TransitionOptions nativeGetCircleRadiusTransition(); @Keep private native void nativeSetCircleRadiusTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetCircleColor(); - @NonNull @Keep private native TransitionOptions nativeGetCircleColorTransition(); @Keep private native void nativeSetCircleColorTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetCircleBlur(); - @NonNull @Keep private native TransitionOptions nativeGetCircleBlurTransition(); @Keep private native void nativeSetCircleBlurTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetCircleOpacity(); - @NonNull @Keep private native TransitionOptions nativeGetCircleOpacityTransition(); @Keep private native void nativeSetCircleOpacityTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetCircleTranslate(); - @NonNull @Keep private native TransitionOptions nativeGetCircleTranslateTransition(); @Keep private native void nativeSetCircleTranslateTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetCircleTranslateAnchor(); - @NonNull @Keep private native Object nativeGetCirclePitchScale(); - @NonNull @Keep private native Object nativeGetCirclePitchAlignment(); - @NonNull @Keep private native Object nativeGetCircleStrokeWidth(); - @NonNull @Keep private native TransitionOptions nativeGetCircleStrokeWidthTransition(); @Keep private native void nativeSetCircleStrokeWidthTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetCircleStrokeColor(); - @NonNull @Keep private native TransitionOptions nativeGetCircleStrokeColorTransition(); @Keep private native void nativeSetCircleStrokeColorTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetCircleStrokeOpacity(); - @NonNull @Keep private native TransitionOptions nativeGetCircleStrokeOpacityTransition(); |