summaryrefslogtreecommitdiff
path: root/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2017-01-26 18:52:44 +0100
committerKonstantin Käfer <mail@kkaefer.com>2017-01-27 11:44:16 +0100
commit62ea1f21858c69f6921c775ba7a3de201f0514d8 (patch)
tree7a4da88706e8a5513e1e13e993b2acc212cae3b1 /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style
parenta662508ddde4043ece36d8ea9b424368891d892c (diff)
downloadqtlocation-mapboxgl-62ea1f21858c69f6921c775ba7a3de201f0514d8.tar.gz
[core] remove trailing whitespace, add trailing newlines, add space after //
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style')
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Property.java36
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyValue.java4
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/property.java.ejs6
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java4
4 files changed, 25 insertions, 25 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Property.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Property.java
index bb060ddf15..d298b62392 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Property.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Property.java
@@ -11,7 +11,7 @@ import java.lang.annotation.RetentionPolicy;
*/
public abstract class Property<T> {
- //VISIBILITY: Whether this layer is displayed.
+ // VISIBILITY: Whether this layer is displayed.
/**
* The layer is shown.
@@ -30,7 +30,7 @@ public abstract class Property<T> {
public @interface VISIBILITY {
}
- //LINE_CAP: The display of line endings.
+ // LINE_CAP: The display of line endings.
/**
* A cap with a squared-off end which is drawn to the exact endpoint of the line.
@@ -59,7 +59,7 @@ public abstract class Property<T> {
public @interface LINE_CAP {
}
- //LINE_JOIN: The display of lines when joining.
+ // LINE_JOIN: The display of lines when joining.
/**
* A join with a squared-off end which is drawn beyond the endpoint of the line at a distance of one-half of the
@@ -89,7 +89,7 @@ public abstract class Property<T> {
public @interface LINE_JOIN {
}
- //SYMBOL_PLACEMENT: Label placement relative to its geometry.
+ // SYMBOL_PLACEMENT: Label placement relative to its geometry.
/**
* The label is placed at the point where the geometry is located.
@@ -111,7 +111,7 @@ public abstract class Property<T> {
public @interface SYMBOL_PLACEMENT {
}
- //ICON_ROTATION_ALIGNMENT: In combination with `symbol-placement`, determines the rotation behavior of icons.
+ // ICON_ROTATION_ALIGNMENT: In combination with `symbol-placement`, determines the rotation behavior of icons.
/**
* When {@link SYMBOL_PLACEMENT} is set to {@link Property#SYMBOL_PLACEMENT_POINT}, aligns icons east-west. When
@@ -142,7 +142,7 @@ public abstract class Property<T> {
public @interface ICON_ROTATION_ALIGNMENT {
}
- //ICON_TEXT_FIT: Scales the icon to fit around the associated text.
+ // ICON_TEXT_FIT: Scales the icon to fit around the associated text.
/**
* The icon is displayed at its intrinsic aspect ratio.
@@ -174,7 +174,7 @@ public abstract class Property<T> {
public @interface ICON_TEXT_FIT {
}
- //TEXT_PITCH_ALIGNMENT: Orientation of text when map is pitched.
+ // TEXT_PITCH_ALIGNMENT: Orientation of text when map is pitched.
/**
* The text is aligned to the plane of the map.
@@ -201,7 +201,7 @@ public abstract class Property<T> {
public @interface TEXT_PITCH_ALIGNMENT {
}
- //TEXT_ROTATION_ALIGNMENT: In combination with `symbol-placement`, determines the rotation behavior of the individual
+ // TEXT_ROTATION_ALIGNMENT: In combination with `symbol-placement`, determines the rotation behavior of the individual
// glyphs forming the text.
/**
@@ -233,7 +233,7 @@ public abstract class Property<T> {
public @interface TEXT_ROTATION_ALIGNMENT {
}
- //TEXT_JUSTIFY: Text justification options.
+ // TEXT_JUSTIFY: Text justification options.
/**
* The text is aligned to the left.
@@ -260,7 +260,7 @@ public abstract class Property<T> {
public @interface TEXT_JUSTIFY {
}
- //TEXT_ANCHOR: Part of the text placed closest to the anchor.
+ // TEXT_ANCHOR: Part of the text placed closest to the anchor.
/**
* The center of the text is placed closest to the anchor.
@@ -317,7 +317,7 @@ public abstract class Property<T> {
public @interface TEXT_ANCHOR {
}
- //TEXT_TRANSFORM: Specifies how to capitalize text, similar to the CSS `text-transform` property.
+ // TEXT_TRANSFORM: Specifies how to capitalize text, similar to the CSS `text-transform` property.
/**
* The text is not altered.
@@ -344,7 +344,7 @@ public abstract class Property<T> {
public @interface TEXT_TRANSFORM {
}
- //FILL_TRANSLATE_ANCHOR: Controls the translation reference point.
+ // FILL_TRANSLATE_ANCHOR: Controls the translation reference point.
/**
* The fill is translated relative to the map.
@@ -366,7 +366,7 @@ public abstract class Property<T> {
public @interface FILL_TRANSLATE_ANCHOR {
}
- //LINE_TRANSLATE_ANCHOR: Controls the translation reference point.
+ // LINE_TRANSLATE_ANCHOR: Controls the translation reference point.
/**
* The line is translated relative to the map.
@@ -388,7 +388,7 @@ public abstract class Property<T> {
public @interface LINE_TRANSLATE_ANCHOR {
}
- //ICON_TRANSLATE_ANCHOR: Controls the translation reference point.
+ // ICON_TRANSLATE_ANCHOR: Controls the translation reference point.
/**
* Icons are translated relative to the map.
@@ -410,7 +410,7 @@ public abstract class Property<T> {
public @interface ICON_TRANSLATE_ANCHOR {
}
- //TEXT_TRANSLATE_ANCHOR: Controls the translation reference point.
+ // TEXT_TRANSLATE_ANCHOR: Controls the translation reference point.
/**
* The text is translated relative to the map.
@@ -432,7 +432,7 @@ public abstract class Property<T> {
public @interface TEXT_TRANSLATE_ANCHOR {
}
- //CIRCLE_TRANSLATE_ANCHOR: Controls the translation reference point.
+ // CIRCLE_TRANSLATE_ANCHOR: Controls the translation reference point.
/**
* The circle is translated relative to the map.
@@ -454,7 +454,7 @@ public abstract class Property<T> {
public @interface CIRCLE_TRANSLATE_ANCHOR {
}
- //CIRCLE_PITCH_SCALE: Controls the scaling behavior of the circle when the map is pitched.
+ // CIRCLE_PITCH_SCALE: Controls the scaling behavior of the circle when the map is pitched.
/**
* Circles are scaled according to their apparent distance to the camera.
@@ -476,7 +476,7 @@ public abstract class Property<T> {
public @interface CIRCLE_PITCH_SCALE {
}
- //Class definition
+ // Class definition
public final String name;
public final T value;
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyValue.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyValue.java
index c404f07c76..582a0bc74f 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyValue.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyValue.java
@@ -30,7 +30,7 @@ public class PropertyValue<T> {
@Nullable
public Function<T> getFunction() {
if (isFunction()) {
- //noinspection unchecked
+ // noinspection unchecked
return (Function<T>) value;
} else {
Timber.w("not a function, try value");
@@ -41,7 +41,7 @@ public class PropertyValue<T> {
@Nullable
public T getValue() {
if (isValue()) {
- //noinspection unchecked
+ // noinspection unchecked
return (T) value;
} else {
Timber.w("not a value, try function");
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/property.java.ejs b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/property.java.ejs
index 3ce691775c..eb6a0a6938 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/property.java.ejs
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/property.java.ejs
@@ -14,7 +14,7 @@ import java.lang.annotation.RetentionPolicy;
*/
public abstract class Property<T> {
- //VISIBILITY: Whether this layer is displayed.
+ // VISIBILITY: Whether this layer is displayed.
/**
* The layer is shown.
@@ -33,7 +33,7 @@ public abstract class Property<T> {
public @interface VISIBILITY {}
<% for (const property of properties) { -%>
- //<%- snakeCaseUpper(property.name) %>: <%- property.doc %>
+ // <%- snakeCaseUpper(property.name) %>: <%- property.doc %>
<% for (const value in property.values) { -%>
/**
@@ -55,7 +55,7 @@ public abstract class Property<T> {
<% } -%>
- //Class definition
+ // Class definition
public final String name;
public final T value;
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java
index 0c2ee42ea0..f9875c7242 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java
@@ -160,8 +160,8 @@ public class GeoJsonSource extends Source {
}
protected void setRawJson(String geoJson) {
- //Wrap the String in a map as an Object is expected by the
- //style conversion template
+ // Wrap the String in a map as an Object is expected by the
+ // style conversion template
HashMap<String, String> wrapper = new HashMap<>();
wrapper.put("data", geoJson);
nativeSetGeoJson(wrapper);