diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light')
3 files changed, 5 insertions, 28 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Light.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Light.java index 0c8ce01a49..f3886d6cce 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Light.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Light.java @@ -49,7 +49,6 @@ public class Light { * * @return anchor as String */ - @NonNull @Property.ANCHOR public String getAnchor() { checkThread(); return nativeGetAnchor(); @@ -70,7 +69,6 @@ public class Light { * * @return position as Position */ - @NonNull public Position getPosition() { checkThread(); return nativeGetPosition(); @@ -81,7 +79,6 @@ public class Light { * * @return transition options for position */ - @NonNull public TransitionOptions getPositionTransition() { checkThread(); return nativeGetPositionTransition(); @@ -92,7 +89,7 @@ public class Light { * * @param options transition options for position */ - public void setPositionTransition(@NonNull TransitionOptions options) { + public void setPositionTransition(TransitionOptions options) { checkThread(); nativeSetPositionTransition(options.getDuration(), options.getDelay()); } @@ -122,7 +119,6 @@ public class Light { * * @return color as String */ - @NonNull public String getColor() { checkThread(); return nativeGetColor(); @@ -133,7 +129,6 @@ public class Light { * * @return transition options for color */ - @NonNull public TransitionOptions getColorTransition() { checkThread(); return nativeGetColorTransition(); @@ -144,7 +139,7 @@ public class Light { * * @param options transition options for color */ - public void setColorTransition(@NonNull TransitionOptions options) { + public void setColorTransition(TransitionOptions options) { checkThread(); nativeSetColorTransition(options.getDuration(), options.getDelay()); } @@ -164,7 +159,6 @@ public class Light { * * @return intensity as Float */ - @NonNull public float getIntensity() { checkThread(); return nativeGetIntensity(); @@ -175,7 +169,6 @@ public class Light { * * @return transition options for intensity */ - @NonNull public TransitionOptions getIntensityTransition() { checkThread(); return nativeGetIntensityTransition(); @@ -186,7 +179,7 @@ public class Light { * * @param options transition options for intensity */ - public void setIntensityTransition(@NonNull TransitionOptions options) { + public void setIntensityTransition(TransitionOptions options) { checkThread(); nativeSetIntensityTransition(options.getDuration(), options.getDelay()); } @@ -198,16 +191,13 @@ public class Light { @Keep private native void nativeSetAnchor(String anchor); - @NonNull @Keep private native String nativeGetAnchor(); @Keep private native void nativeSetPosition(Position position); - @NonNull @Keep private native Position nativeGetPosition(); - @NonNull @Keep private native TransitionOptions nativeGetPositionTransition(); @@ -216,10 +206,8 @@ public class Light { @Keep private native void nativeSetColor(String color); - @NonNull @Keep private native String nativeGetColor(); - @NonNull @Keep private native TransitionOptions nativeGetColorTransition(); @@ -228,10 +216,8 @@ public class Light { @Keep private native void nativeSetIntensity(float intensity); - @NonNull @Keep private native float nativeGetIntensity(); - @NonNull @Keep private native TransitionOptions nativeGetIntensityTransition(); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Position.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Position.java index 5678b64470..efd92f65a4 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Position.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Position.java @@ -1,8 +1,6 @@ package com.mapbox.mapboxsdk.style.light; import android.support.annotation.Keep; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; /** * Position of the light source relative to lit (extruded) geometries. @@ -51,7 +49,7 @@ public class Position { } @Override - public boolean equals(@Nullable Object o) { + public boolean equals(Object o) { if (this == o) { return true; } @@ -78,7 +76,6 @@ public class Position { return result; } - @NonNull @Override public String toString() { return "Position{" diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/light.java.ejs b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/light.java.ejs index 2a2734f7e1..7c9893a3a4 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/light.java.ejs +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/light.java.ejs @@ -55,7 +55,6 @@ public class Light { * * @return <%- property.name %> as Position */ - @NonNull public Position get<%- camelize(property.name) %>() { checkThread(); return nativeGet<%- camelize(property.name) %>(); @@ -89,7 +88,6 @@ public class Light { * * @return <%- property.name %> as <%- propertyType(property) %> */ - @NonNull <%- propertyTypeAnnotation(property) %> public <%- propertyJavaType(property) %> get<%- camelize(property.name) %>() { checkThread(); return nativeGet<%- camelize(property.name) %>(); @@ -102,7 +100,6 @@ public class Light { * * @return transition options for <%- property.name %> */ - @NonNull public TransitionOptions get<%- camelize(property.name) %>Transition() { checkThread(); return nativeGet<%- camelize(property.name) %>Transition(); @@ -113,7 +110,7 @@ public class Light { * * @param options transition options for <%- property.name %> */ - public void set<%- camelize(property.name) %>Transition(@NonNull TransitionOptions options) { + public void set<%- camelize(property.name) %>Transition(TransitionOptions options) { checkThread(); nativeSet<%- camelize(property.name) %>Transition(options.getDuration(), options.getDelay()); } @@ -129,19 +126,16 @@ public class Light { @Keep private native void nativeSet<%- camelize(property.name) %>(Position position); - @NonNull @Keep private native Position nativeGet<%- camelize(property.name) %>(); <% } else { -%> @Keep private native void nativeSet<%- camelize(property.name) %>(<%- propertyJavaType(property) -%> <%- property.name %>); - @NonNull @Keep private native <%- propertyJavaType(property) -%> nativeGet<%- camelize(property.name) %>(); <% } -%> <% if (property.transition) { -%> - @NonNull @Keep private native TransitionOptions nativeGet<%- camelize(property.name) %>Transition(); |