From b1c4fa6a6c940cd3c3fc58ce9dfa28d6387d6e70 Mon Sep 17 00:00:00 2001 From: tobrun Date: Tue, 11 Sep 2018 18:48:37 +0200 Subject: cleanup --- .../mapboxsdk/annotations/annotation.java.ejs | 8 +-- .../annotations/annotationManager.java.ejs | 1 - .../mapboxsdk/annotations/circle/Circle.java | 21 +++---- .../annotations/circle/CircleManager.java | 4 -- .../mapbox/mapboxsdk/annotations/fill/Fill.java | 12 ++-- .../mapboxsdk/annotations/fill/FillManager.java | 3 - .../mapbox/mapboxsdk/annotations/line/Line.java | 22 +++---- .../mapboxsdk/annotations/line/LineManager.java | 6 -- .../mapboxsdk/annotations/symbol/Symbol.java | 67 +++++++--------------- .../annotations/symbol/SymbolManager.java | 25 -------- platform/android/gradle/gradle-checkstyle.gradle | 8 +++ 11 files changed, 50 insertions(+), 127 deletions(-) diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/annotation.java.ejs b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/annotation.java.ejs index 60bdd1ffa1..7843bbdd82 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/annotation.java.ejs +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/annotation.java.ejs @@ -154,7 +154,6 @@ public class <%- camelize(type) %> { * * @return property wrapper value around <%- propertyType(property) %> */ - <%- propertyTypeAnnotation(property) %><%- iff(() => propertyTypeAnnotation(property), "") %> public <%- propertyType(property) %> get<%- camelize(property.name) %>() { JsonArray jsonArray = jsonObject.getAsJsonArray("<%-property.name %>"); <%- propertyType(property) %> value = new <%- propertyType(property).substring(0, propertyType(property).length-1) %>jsonArray.size()]; @@ -167,9 +166,9 @@ public class <%- camelize(type) %> { /** * Set the <%- camelize(property.name) %> property * - * @return property wrapper value around <%- propertyType(property) %> + * @param value constant property value for <%- propertyType(property) %> */ - public void set<%- camelize(property.name) %>(<%- propertyTypeAnnotation(property) %><%- iff(() => propertyTypeAnnotation(property), "") %><%- propertyType(property) %> value) { + public void set<%- camelize(property.name) %>(<%- propertyTypeAnnotation(property) %><%- iff(() => propertyTypeAnnotation(property), " ") %><%- propertyType(property) %> value) { JsonArray jsonArray = new JsonArray(); for (<%- propertyType(property).substring(0, propertyType(property).length-2) %> element : value) { jsonArray.add(element); @@ -184,7 +183,6 @@ public class <%- camelize(type) %> { * * @return property wrapper value around <%- propertyType(property) %> */ - <%- propertyTypeAnnotation(property) %><%- iff(() => propertyTypeAnnotation(property), "") %> public <%- propertyType(property) %> get<%- camelize(property.name) %>() { return jsonObject.get("<%- property.name %>").getAs<%- propertyType(property) %>(); } @@ -194,7 +192,7 @@ public class <%- camelize(type) %> { * * @param value constant property value for <%- propertyType(property) %> */ - public void set<%- camelize(property.name) %>(<%- propertyTypeAnnotation(property) %><%- iff(() => propertyTypeAnnotation(property), "") %> <%- propertyType(property) %> value) { + public void set<%- camelize(property.name) %>(<%- propertyTypeAnnotation(property) %><%- iff(() => propertyTypeAnnotation(property), " ") %><%- propertyType(property) %> value) { jsonObject.addProperty("<%- property.name %>", value); <%- type %>Manager.updateSource(); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/annotationManager.java.ejs b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/annotationManager.java.ejs index 6aa8ddd771..7a4657552e 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/annotationManager.java.ejs +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/annotationManager.java.ejs @@ -226,7 +226,6 @@ public class <%- camelize(type) %>Manager { * * @return property wrapper value around <%- propertyType(property) %> */ - <%- propertyTypeAnnotation(property) %><%- iff(() => propertyTypeAnnotation(property), "") %> public <%- propertyType(property) %> get<%- camelize(property.name) %>() { return layer.get<%- camelize(property.name) %>().value; } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/circle/Circle.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/circle/Circle.java index 19d97b714a..f9c0e378a0 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/circle/Circle.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/circle/Circle.java @@ -77,7 +77,6 @@ public class Circle { * * @return property wrapper value around Float */ - public Float getCircleRadius() { return jsonObject.get("circle-radius").getAsFloat(); } @@ -87,7 +86,7 @@ public class Circle { * * @param value constant property value for Float */ - public void setCircleRadius( Float value) { + public void setCircleRadius(Float value) { jsonObject.addProperty("circle-radius", value); circleManager.updateSource(); } @@ -97,7 +96,6 @@ public class Circle { * * @return property wrapper value around String */ - public String getCircleColor() { return jsonObject.get("circle-color").getAsString(); } @@ -107,7 +105,7 @@ public class Circle { * * @param value constant property value for String */ - public void setCircleColor( String value) { + public void setCircleColor(String value) { jsonObject.addProperty("circle-color", value); circleManager.updateSource(); } @@ -117,7 +115,6 @@ public class Circle { * * @return property wrapper value around Float */ - public Float getCircleBlur() { return jsonObject.get("circle-blur").getAsFloat(); } @@ -127,7 +124,7 @@ public class Circle { * * @param value constant property value for Float */ - public void setCircleBlur( Float value) { + public void setCircleBlur(Float value) { jsonObject.addProperty("circle-blur", value); circleManager.updateSource(); } @@ -137,7 +134,6 @@ public class Circle { * * @return property wrapper value around Float */ - public Float getCircleOpacity() { return jsonObject.get("circle-opacity").getAsFloat(); } @@ -147,7 +143,7 @@ public class Circle { * * @param value constant property value for Float */ - public void setCircleOpacity( Float value) { + public void setCircleOpacity(Float value) { jsonObject.addProperty("circle-opacity", value); circleManager.updateSource(); } @@ -157,7 +153,6 @@ public class Circle { * * @return property wrapper value around Float */ - public Float getCircleStrokeWidth() { return jsonObject.get("circle-stroke-width").getAsFloat(); } @@ -167,7 +162,7 @@ public class Circle { * * @param value constant property value for Float */ - public void setCircleStrokeWidth( Float value) { + public void setCircleStrokeWidth(Float value) { jsonObject.addProperty("circle-stroke-width", value); circleManager.updateSource(); } @@ -177,7 +172,6 @@ public class Circle { * * @return property wrapper value around String */ - public String getCircleStrokeColor() { return jsonObject.get("circle-stroke-color").getAsString(); } @@ -187,7 +181,7 @@ public class Circle { * * @param value constant property value for String */ - public void setCircleStrokeColor( String value) { + public void setCircleStrokeColor(String value) { jsonObject.addProperty("circle-stroke-color", value); circleManager.updateSource(); } @@ -197,7 +191,6 @@ public class Circle { * * @return property wrapper value around Float */ - public Float getCircleStrokeOpacity() { return jsonObject.get("circle-stroke-opacity").getAsFloat(); } @@ -207,7 +200,7 @@ public class Circle { * * @param value constant property value for Float */ - public void setCircleStrokeOpacity( Float value) { + public void setCircleStrokeOpacity(Float value) { jsonObject.addProperty("circle-stroke-opacity", value); circleManager.updateSource(); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/circle/CircleManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/circle/CircleManager.java index e780fd7062..bd86310f90 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/circle/CircleManager.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/circle/CircleManager.java @@ -178,7 +178,6 @@ public class CircleManager { * * @return property wrapper value around Float[] */ - public Float[] getCircleTranslate() { return layer.getCircleTranslate().value; } @@ -197,7 +196,6 @@ public class CircleManager { * * @return property wrapper value around String */ - @Property.CIRCLE_TRANSLATE_ANCHOR public String getCircleTranslateAnchor() { return layer.getCircleTranslateAnchor().value; } @@ -216,7 +214,6 @@ public class CircleManager { * * @return property wrapper value around String */ - @Property.CIRCLE_PITCH_SCALE public String getCirclePitchScale() { return layer.getCirclePitchScale().value; } @@ -235,7 +232,6 @@ public class CircleManager { * * @return property wrapper value around String */ - @Property.CIRCLE_PITCH_ALIGNMENT public String getCirclePitchAlignment() { return layer.getCirclePitchAlignment().value; } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/fill/Fill.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/fill/Fill.java index 1686deb180..5c6329d2ad 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/fill/Fill.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/fill/Fill.java @@ -85,7 +85,6 @@ public class Fill { * * @return property wrapper value around Float */ - public Float getFillOpacity() { return jsonObject.get("fill-opacity").getAsFloat(); } @@ -95,7 +94,7 @@ public class Fill { * * @param value constant property value for Float */ - public void setFillOpacity( Float value) { + public void setFillOpacity(Float value) { jsonObject.addProperty("fill-opacity", value); fillManager.updateSource(); } @@ -105,7 +104,6 @@ public class Fill { * * @return property wrapper value around String */ - public String getFillColor() { return jsonObject.get("fill-color").getAsString(); } @@ -115,7 +113,7 @@ public class Fill { * * @param value constant property value for String */ - public void setFillColor( String value) { + public void setFillColor(String value) { jsonObject.addProperty("fill-color", value); fillManager.updateSource(); } @@ -125,7 +123,6 @@ public class Fill { * * @return property wrapper value around String */ - public String getFillOutlineColor() { return jsonObject.get("fill-outline-color").getAsString(); } @@ -135,7 +132,7 @@ public class Fill { * * @param value constant property value for String */ - public void setFillOutlineColor( String value) { + public void setFillOutlineColor(String value) { jsonObject.addProperty("fill-outline-color", value); fillManager.updateSource(); } @@ -145,7 +142,6 @@ public class Fill { * * @return property wrapper value around String */ - public String getFillPattern() { return jsonObject.get("fill-pattern").getAsString(); } @@ -155,7 +151,7 @@ public class Fill { * * @param value constant property value for String */ - public void setFillPattern( String value) { + public void setFillPattern(String value) { jsonObject.addProperty("fill-pattern", value); fillManager.updateSource(); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/fill/FillManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/fill/FillManager.java index ffcaefb7e6..a2f3c2129a 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/fill/FillManager.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/fill/FillManager.java @@ -174,7 +174,6 @@ public class FillManager { * * @return property wrapper value around Boolean */ - public Boolean getFillAntialias() { return layer.getFillAntialias().value; } @@ -193,7 +192,6 @@ public class FillManager { * * @return property wrapper value around Float[] */ - public Float[] getFillTranslate() { return layer.getFillTranslate().value; } @@ -212,7 +210,6 @@ public class FillManager { * * @return property wrapper value around String */ - @Property.FILL_TRANSLATE_ANCHOR public String getFillTranslateAnchor() { return layer.getFillTranslateAnchor().value; } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/line/Line.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/line/Line.java index d7c62dfe92..9d86947030 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/line/Line.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/line/Line.java @@ -81,7 +81,6 @@ public class Line { * * @return property wrapper value around String */ - @Property.LINE_JOIN public String getLineJoin() { return jsonObject.get("line-join").getAsString(); } @@ -101,7 +100,6 @@ public class Line { * * @return property wrapper value around Float */ - public Float getLineOpacity() { return jsonObject.get("line-opacity").getAsFloat(); } @@ -111,7 +109,7 @@ public class Line { * * @param value constant property value for Float */ - public void setLineOpacity( Float value) { + public void setLineOpacity(Float value) { jsonObject.addProperty("line-opacity", value); lineManager.updateSource(); } @@ -121,7 +119,6 @@ public class Line { * * @return property wrapper value around String */ - public String getLineColor() { return jsonObject.get("line-color").getAsString(); } @@ -131,7 +128,7 @@ public class Line { * * @param value constant property value for String */ - public void setLineColor( String value) { + public void setLineColor(String value) { jsonObject.addProperty("line-color", value); lineManager.updateSource(); } @@ -141,7 +138,6 @@ public class Line { * * @return property wrapper value around Float */ - public Float getLineWidth() { return jsonObject.get("line-width").getAsFloat(); } @@ -151,7 +147,7 @@ public class Line { * * @param value constant property value for Float */ - public void setLineWidth( Float value) { + public void setLineWidth(Float value) { jsonObject.addProperty("line-width", value); lineManager.updateSource(); } @@ -161,7 +157,6 @@ public class Line { * * @return property wrapper value around Float */ - public Float getLineGapWidth() { return jsonObject.get("line-gap-width").getAsFloat(); } @@ -171,7 +166,7 @@ public class Line { * * @param value constant property value for Float */ - public void setLineGapWidth( Float value) { + public void setLineGapWidth(Float value) { jsonObject.addProperty("line-gap-width", value); lineManager.updateSource(); } @@ -181,7 +176,6 @@ public class Line { * * @return property wrapper value around Float */ - public Float getLineOffset() { return jsonObject.get("line-offset").getAsFloat(); } @@ -191,7 +185,7 @@ public class Line { * * @param value constant property value for Float */ - public void setLineOffset( Float value) { + public void setLineOffset(Float value) { jsonObject.addProperty("line-offset", value); lineManager.updateSource(); } @@ -201,7 +195,6 @@ public class Line { * * @return property wrapper value around Float */ - public Float getLineBlur() { return jsonObject.get("line-blur").getAsFloat(); } @@ -211,7 +204,7 @@ public class Line { * * @param value constant property value for Float */ - public void setLineBlur( Float value) { + public void setLineBlur(Float value) { jsonObject.addProperty("line-blur", value); lineManager.updateSource(); } @@ -221,7 +214,6 @@ public class Line { * * @return property wrapper value around String */ - public String getLinePattern() { return jsonObject.get("line-pattern").getAsString(); } @@ -231,7 +223,7 @@ public class Line { * * @param value constant property value for String */ - public void setLinePattern( String value) { + public void setLinePattern(String value) { jsonObject.addProperty("line-pattern", value); lineManager.updateSource(); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/line/LineManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/line/LineManager.java index c326fd95dd..47dc3bb664 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/line/LineManager.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/line/LineManager.java @@ -178,7 +178,6 @@ public class LineManager { * * @return property wrapper value around String */ - @Property.LINE_CAP public String getLineCap() { return layer.getLineCap().value; } @@ -197,7 +196,6 @@ public class LineManager { * * @return property wrapper value around Float */ - public Float getLineMiterLimit() { return layer.getLineMiterLimit().value; } @@ -216,7 +214,6 @@ public class LineManager { * * @return property wrapper value around Float */ - public Float getLineRoundLimit() { return layer.getLineRoundLimit().value; } @@ -235,7 +232,6 @@ public class LineManager { * * @return property wrapper value around Float[] */ - public Float[] getLineTranslate() { return layer.getLineTranslate().value; } @@ -254,7 +250,6 @@ public class LineManager { * * @return property wrapper value around String */ - @Property.LINE_TRANSLATE_ANCHOR public String getLineTranslateAnchor() { return layer.getLineTranslateAnchor().value; } @@ -273,7 +268,6 @@ public class LineManager { * * @return property wrapper value around Float[] */ - public Float[] getLineDasharray() { return layer.getLineDasharray().value; } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/symbol/Symbol.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/symbol/Symbol.java index a2e17defdc..c7f77d6d1b 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/symbol/Symbol.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/symbol/Symbol.java @@ -104,7 +104,6 @@ public class Symbol { * * @return property wrapper value around Float */ - public Float getIconSize() { return jsonObject.get("icon-size").getAsFloat(); } @@ -114,7 +113,7 @@ public class Symbol { * * @param value constant property value for Float */ - public void setIconSize( Float value) { + public void setIconSize(Float value) { jsonObject.addProperty("icon-size", value); symbolManager.updateSource(); } @@ -124,7 +123,6 @@ public class Symbol { * * @return property wrapper value around String */ - public String getIconImage() { return jsonObject.get("icon-image").getAsString(); } @@ -134,7 +132,7 @@ public class Symbol { * * @param value constant property value for String */ - public void setIconImage( String value) { + public void setIconImage(String value) { jsonObject.addProperty("icon-image", value); symbolManager.updateSource(); } @@ -144,7 +142,6 @@ public class Symbol { * * @return property wrapper value around Float */ - public Float getIconRotate() { return jsonObject.get("icon-rotate").getAsFloat(); } @@ -154,7 +151,7 @@ public class Symbol { * * @param value constant property value for Float */ - public void setIconRotate( Float value) { + public void setIconRotate(Float value) { jsonObject.addProperty("icon-rotate", value); symbolManager.updateSource(); } @@ -164,7 +161,6 @@ public class Symbol { * * @return property wrapper value around Float[] */ - public Float[] getIconOffset() { JsonArray jsonArray = jsonObject.getAsJsonArray("icon-offset"); Float[] value = new Float[jsonArray.size()]; @@ -177,7 +173,7 @@ public class Symbol { /** * Set the IconOffset property * - * @return property wrapper value around Float[] + * @param value constant property value for Float[] */ public void setIconOffset(Float[] value) { JsonArray jsonArray = new JsonArray(); @@ -193,7 +189,6 @@ public class Symbol { * * @return property wrapper value around String */ - @Property.ICON_ANCHOR public String getIconAnchor() { return jsonObject.get("icon-anchor").getAsString(); } @@ -213,7 +208,6 @@ public class Symbol { * * @return property wrapper value around String */ - public String getTextField() { return jsonObject.get("text-field").getAsString(); } @@ -223,7 +217,7 @@ public class Symbol { * * @param value constant property value for String */ - public void setTextField( String value) { + public void setTextField(String value) { jsonObject.addProperty("text-field", value); symbolManager.updateSource(); } @@ -233,7 +227,6 @@ public class Symbol { * * @return property wrapper value around String[] */ - public String[] getTextFont() { JsonArray jsonArray = jsonObject.getAsJsonArray("text-font"); String[] value = new String[jsonArray.size()]; @@ -246,7 +239,7 @@ public class Symbol { /** * Set the TextFont property * - * @return property wrapper value around String[] + * @param value constant property value for String[] */ public void setTextFont(String[] value) { JsonArray jsonArray = new JsonArray(); @@ -262,7 +255,6 @@ public class Symbol { * * @return property wrapper value around Float */ - public Float getTextSize() { return jsonObject.get("text-size").getAsFloat(); } @@ -272,7 +264,7 @@ public class Symbol { * * @param value constant property value for Float */ - public void setTextSize( Float value) { + public void setTextSize(Float value) { jsonObject.addProperty("text-size", value); symbolManager.updateSource(); } @@ -282,7 +274,6 @@ public class Symbol { * * @return property wrapper value around Float */ - public Float getTextMaxWidth() { return jsonObject.get("text-max-width").getAsFloat(); } @@ -292,7 +283,7 @@ public class Symbol { * * @param value constant property value for Float */ - public void setTextMaxWidth( Float value) { + public void setTextMaxWidth(Float value) { jsonObject.addProperty("text-max-width", value); symbolManager.updateSource(); } @@ -302,7 +293,6 @@ public class Symbol { * * @return property wrapper value around Float */ - public Float getTextLetterSpacing() { return jsonObject.get("text-letter-spacing").getAsFloat(); } @@ -312,7 +302,7 @@ public class Symbol { * * @param value constant property value for Float */ - public void setTextLetterSpacing( Float value) { + public void setTextLetterSpacing(Float value) { jsonObject.addProperty("text-letter-spacing", value); symbolManager.updateSource(); } @@ -322,7 +312,6 @@ public class Symbol { * * @return property wrapper value around String */ - @Property.TEXT_JUSTIFY public String getTextJustify() { return jsonObject.get("text-justify").getAsString(); } @@ -342,7 +331,6 @@ public class Symbol { * * @return property wrapper value around String */ - @Property.TEXT_ANCHOR public String getTextAnchor() { return jsonObject.get("text-anchor").getAsString(); } @@ -362,7 +350,6 @@ public class Symbol { * * @return property wrapper value around Float */ - public Float getTextRotate() { return jsonObject.get("text-rotate").getAsFloat(); } @@ -372,7 +359,7 @@ public class Symbol { * * @param value constant property value for Float */ - public void setTextRotate( Float value) { + public void setTextRotate(Float value) { jsonObject.addProperty("text-rotate", value); symbolManager.updateSource(); } @@ -382,7 +369,6 @@ public class Symbol { * * @return property wrapper value around String */ - @Property.TEXT_TRANSFORM public String getTextTransform() { return jsonObject.get("text-transform").getAsString(); } @@ -402,7 +388,6 @@ public class Symbol { * * @return property wrapper value around Float[] */ - public Float[] getTextOffset() { JsonArray jsonArray = jsonObject.getAsJsonArray("text-offset"); Float[] value = new Float[jsonArray.size()]; @@ -415,7 +400,7 @@ public class Symbol { /** * Set the TextOffset property * - * @return property wrapper value around Float[] + * @param value constant property value for Float[] */ public void setTextOffset(Float[] value) { JsonArray jsonArray = new JsonArray(); @@ -431,7 +416,6 @@ public class Symbol { * * @return property wrapper value around Float */ - public Float getIconOpacity() { return jsonObject.get("icon-opacity").getAsFloat(); } @@ -441,7 +425,7 @@ public class Symbol { * * @param value constant property value for Float */ - public void setIconOpacity( Float value) { + public void setIconOpacity(Float value) { jsonObject.addProperty("icon-opacity", value); symbolManager.updateSource(); } @@ -451,7 +435,6 @@ public class Symbol { * * @return property wrapper value around String */ - public String getIconColor() { return jsonObject.get("icon-color").getAsString(); } @@ -461,7 +444,7 @@ public class Symbol { * * @param value constant property value for String */ - public void setIconColor( String value) { + public void setIconColor(String value) { jsonObject.addProperty("icon-color", value); symbolManager.updateSource(); } @@ -471,7 +454,6 @@ public class Symbol { * * @return property wrapper value around String */ - public String getIconHaloColor() { return jsonObject.get("icon-halo-color").getAsString(); } @@ -481,7 +463,7 @@ public class Symbol { * * @param value constant property value for String */ - public void setIconHaloColor( String value) { + public void setIconHaloColor(String value) { jsonObject.addProperty("icon-halo-color", value); symbolManager.updateSource(); } @@ -491,7 +473,6 @@ public class Symbol { * * @return property wrapper value around Float */ - public Float getIconHaloWidth() { return jsonObject.get("icon-halo-width").getAsFloat(); } @@ -501,7 +482,7 @@ public class Symbol { * * @param value constant property value for Float */ - public void setIconHaloWidth( Float value) { + public void setIconHaloWidth(Float value) { jsonObject.addProperty("icon-halo-width", value); symbolManager.updateSource(); } @@ -511,7 +492,6 @@ public class Symbol { * * @return property wrapper value around Float */ - public Float getIconHaloBlur() { return jsonObject.get("icon-halo-blur").getAsFloat(); } @@ -521,7 +501,7 @@ public class Symbol { * * @param value constant property value for Float */ - public void setIconHaloBlur( Float value) { + public void setIconHaloBlur(Float value) { jsonObject.addProperty("icon-halo-blur", value); symbolManager.updateSource(); } @@ -531,7 +511,6 @@ public class Symbol { * * @return property wrapper value around Float */ - public Float getTextOpacity() { return jsonObject.get("text-opacity").getAsFloat(); } @@ -541,7 +520,7 @@ public class Symbol { * * @param value constant property value for Float */ - public void setTextOpacity( Float value) { + public void setTextOpacity(Float value) { jsonObject.addProperty("text-opacity", value); symbolManager.updateSource(); } @@ -551,7 +530,6 @@ public class Symbol { * * @return property wrapper value around String */ - public String getTextColor() { return jsonObject.get("text-color").getAsString(); } @@ -561,7 +539,7 @@ public class Symbol { * * @param value constant property value for String */ - public void setTextColor( String value) { + public void setTextColor(String value) { jsonObject.addProperty("text-color", value); symbolManager.updateSource(); } @@ -571,7 +549,6 @@ public class Symbol { * * @return property wrapper value around String */ - public String getTextHaloColor() { return jsonObject.get("text-halo-color").getAsString(); } @@ -581,7 +558,7 @@ public class Symbol { * * @param value constant property value for String */ - public void setTextHaloColor( String value) { + public void setTextHaloColor(String value) { jsonObject.addProperty("text-halo-color", value); symbolManager.updateSource(); } @@ -591,7 +568,6 @@ public class Symbol { * * @return property wrapper value around Float */ - public Float getTextHaloWidth() { return jsonObject.get("text-halo-width").getAsFloat(); } @@ -601,7 +577,7 @@ public class Symbol { * * @param value constant property value for Float */ - public void setTextHaloWidth( Float value) { + public void setTextHaloWidth(Float value) { jsonObject.addProperty("text-halo-width", value); symbolManager.updateSource(); } @@ -611,7 +587,6 @@ public class Symbol { * * @return property wrapper value around Float */ - public Float getTextHaloBlur() { return jsonObject.get("text-halo-blur").getAsFloat(); } @@ -621,7 +596,7 @@ public class Symbol { * * @param value constant property value for Float */ - public void setTextHaloBlur( Float value) { + public void setTextHaloBlur(Float value) { jsonObject.addProperty("text-halo-blur", value); symbolManager.updateSource(); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/symbol/SymbolManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/symbol/SymbolManager.java index bbe89e847a..952938e501 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/symbol/SymbolManager.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/symbol/SymbolManager.java @@ -200,7 +200,6 @@ public class SymbolManager { * * @return property wrapper value around String */ - @Property.SYMBOL_PLACEMENT public String getSymbolPlacement() { return layer.getSymbolPlacement().value; } @@ -219,7 +218,6 @@ public class SymbolManager { * * @return property wrapper value around Float */ - public Float getSymbolSpacing() { return layer.getSymbolSpacing().value; } @@ -238,7 +236,6 @@ public class SymbolManager { * * @return property wrapper value around Boolean */ - public Boolean getSymbolAvoidEdges() { return layer.getSymbolAvoidEdges().value; } @@ -257,7 +254,6 @@ public class SymbolManager { * * @return property wrapper value around Boolean */ - public Boolean getIconAllowOverlap() { return layer.getIconAllowOverlap().value; } @@ -276,7 +272,6 @@ public class SymbolManager { * * @return property wrapper value around Boolean */ - public Boolean getIconIgnorePlacement() { return layer.getIconIgnorePlacement().value; } @@ -295,7 +290,6 @@ public class SymbolManager { * * @return property wrapper value around Boolean */ - public Boolean getIconOptional() { return layer.getIconOptional().value; } @@ -314,7 +308,6 @@ public class SymbolManager { * * @return property wrapper value around String */ - @Property.ICON_ROTATION_ALIGNMENT public String getIconRotationAlignment() { return layer.getIconRotationAlignment().value; } @@ -333,7 +326,6 @@ public class SymbolManager { * * @return property wrapper value around String */ - @Property.ICON_TEXT_FIT public String getIconTextFit() { return layer.getIconTextFit().value; } @@ -352,7 +344,6 @@ public class SymbolManager { * * @return property wrapper value around Float[] */ - public Float[] getIconTextFitPadding() { return layer.getIconTextFitPadding().value; } @@ -371,7 +362,6 @@ public class SymbolManager { * * @return property wrapper value around Float */ - public Float getIconPadding() { return layer.getIconPadding().value; } @@ -390,7 +380,6 @@ public class SymbolManager { * * @return property wrapper value around Boolean */ - public Boolean getIconKeepUpright() { return layer.getIconKeepUpright().value; } @@ -409,7 +398,6 @@ public class SymbolManager { * * @return property wrapper value around String */ - @Property.ICON_PITCH_ALIGNMENT public String getIconPitchAlignment() { return layer.getIconPitchAlignment().value; } @@ -428,7 +416,6 @@ public class SymbolManager { * * @return property wrapper value around String */ - @Property.TEXT_PITCH_ALIGNMENT public String getTextPitchAlignment() { return layer.getTextPitchAlignment().value; } @@ -447,7 +434,6 @@ public class SymbolManager { * * @return property wrapper value around String */ - @Property.TEXT_ROTATION_ALIGNMENT public String getTextRotationAlignment() { return layer.getTextRotationAlignment().value; } @@ -466,7 +452,6 @@ public class SymbolManager { * * @return property wrapper value around Float */ - public Float getTextLineHeight() { return layer.getTextLineHeight().value; } @@ -485,7 +470,6 @@ public class SymbolManager { * * @return property wrapper value around Float */ - public Float getTextMaxAngle() { return layer.getTextMaxAngle().value; } @@ -504,7 +488,6 @@ public class SymbolManager { * * @return property wrapper value around Float */ - public Float getTextPadding() { return layer.getTextPadding().value; } @@ -523,7 +506,6 @@ public class SymbolManager { * * @return property wrapper value around Boolean */ - public Boolean getTextKeepUpright() { return layer.getTextKeepUpright().value; } @@ -542,7 +524,6 @@ public class SymbolManager { * * @return property wrapper value around Boolean */ - public Boolean getTextAllowOverlap() { return layer.getTextAllowOverlap().value; } @@ -561,7 +542,6 @@ public class SymbolManager { * * @return property wrapper value around Boolean */ - public Boolean getTextIgnorePlacement() { return layer.getTextIgnorePlacement().value; } @@ -580,7 +560,6 @@ public class SymbolManager { * * @return property wrapper value around Boolean */ - public Boolean getTextOptional() { return layer.getTextOptional().value; } @@ -599,7 +578,6 @@ public class SymbolManager { * * @return property wrapper value around Float[] */ - public Float[] getIconTranslate() { return layer.getIconTranslate().value; } @@ -618,7 +596,6 @@ public class SymbolManager { * * @return property wrapper value around String */ - @Property.ICON_TRANSLATE_ANCHOR public String getIconTranslateAnchor() { return layer.getIconTranslateAnchor().value; } @@ -637,7 +614,6 @@ public class SymbolManager { * * @return property wrapper value around Float[] */ - public Float[] getTextTranslate() { return layer.getTextTranslate().value; } @@ -656,7 +632,6 @@ public class SymbolManager { * * @return property wrapper value around String */ - @Property.TEXT_TRANSLATE_ANCHOR public String getTextTranslateAnchor() { return layer.getTextTranslateAnchor().value; } diff --git a/platform/android/gradle/gradle-checkstyle.gradle b/platform/android/gradle/gradle-checkstyle.gradle index 8eb4baa858..d80e676773 100644 --- a/platform/android/gradle/gradle-checkstyle.gradle +++ b/platform/android/gradle/gradle-checkstyle.gradle @@ -12,6 +12,14 @@ task checkstyle(type: Checkstyle) { source 'src' include '**/*.java' exclude '**/gen/**' + exclude '**/annotations/*/Circle.java' + exclude '**/annotations/*/Fill.java' + exclude '**/annotations/*/Line.java' + exclude '**/annotations/*/Symbol.java' + exclude '**/annotations/*/*Manager.java' + exclude '**/annotations/*/Line.java' + exclude '**/annotations/*ManagerTest.java' + exclude '**/annotations/*Test.java' exclude '**/style/*LayerTest.java' exclude '**/style/LightTest.java' exclude '**/style/layers/Property.java' -- cgit v1.2.1