From 9ac444a08d9701dc7b0da41859842a77d7be8e00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Paczos?= Date: Wed, 7 Nov 2018 17:17:26 +0100 Subject: [android] removing plain text getter for "text-field" --- .../mapbox/mapboxsdk/style/layers/layer.java.ejs | 36 ---------------------- 1 file changed, 36 deletions(-) (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs') diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs index 60bbe941a6..e62c82e3b6 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs @@ -182,44 +182,8 @@ public class <%- camelize(type) %>Layer extends Layer { @SuppressWarnings("unchecked") public PropertyValue<<%- propertyType(property) %>> get<%- camelize(property.name) %>() { checkThread(); -<% if (property.name === 'text-field' && property.type === 'formatted') { -%> - - PropertyValue propertyValue = new PropertyValue<>("text-field", nativeGetTextField()); - if (propertyValue.isExpression()) { - return (PropertyValue) propertyValue; - } else { - String text = null; - - Formatted formatted = (Formatted) nativeGetTextField(); - if (formatted != null) { - StringBuilder builder = new StringBuilder(); - for (FormattedSection section : formatted.getFormattedSections()) { - builder.append(section.getText()); - } - text = builder.toString(); - } - - return (PropertyValue) new PropertyValue("text-field", text); - } -<% } else { -%> return (PropertyValue<<%- propertyType(property) %>>) new PropertyValue("<%- property.name %>", nativeGet<%- camelize(property.name) %>()); -<% } -%> } -<% if (property.name === 'text-field' && property.type === 'formatted') { -%> - - /** - * Get the <%- camelize(property.name) %> property as {@link Formatted} object - * - * @return property wrapper value around <%- propertyType(property) %> - * @see Expression#format(Expression.FormatEntry...) - */ - @NonNull - @SuppressWarnings("unchecked") - public PropertyValue getFormatted<%- camelize(property.name) %>() { - checkThread(); - return (PropertyValue) new PropertyValue("<%- property.name %>", nativeGet<%- camelize(property.name) %>()); - } -<% } -%> <% if (property.type == 'color') { -%> /** -- cgit v1.2.1