get/setAppliedStyleClasses -> get/setClasses

2 files changed, 34 insertions, 17 deletions

diff --git a/android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/MapView.java b/android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/MapView.java
index bd37d38062..9a3a646138 100644
--- a/android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/MapView.java
+++ b/android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/MapView.java
@@ -33,7 +33,6 @@ import org.apache.commons.validator.routines.UrlValidator;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.UnknownFormatConversionException;
 
 // Custom view that shows a Map
 // Based on SurfaceView as we use OpenGL ES to render
@@ -57,7 +56,7 @@ public class MapView extends SurfaceView {
     private static final String STATE_DEBUG_ACTIVE = "debugActive";
     private static final String STATE_STYLE_URL = "styleUrl";
     private static final String STATE_ACCESS_TOKEN = "accessToken";
-    private static final String STATE_APPLIED_CLASSES = "appliedClasses";
+    private static final String STATE_CLASSES = "classes";
     private static final String STATE_DEFAULT_TRANSITION_DURATION = "defaultTransitionDuration";
 
     //
@@ -346,17 +345,17 @@ public class MapView extends SurfaceView {
     // Style methods
     //
 
-    public List<String> getAppliedStyleClasses() {
-        return mNativeMapView.getAppliedClasses();
+    public List<String> getClasses() {
+        return mNativeMapView.getClasses();
     }
 
-    public void setAppliedStyleClasses(List<String> styleClasses) {
-        setAppliedStyleClasses(styleClasses, 0);
+    public void setClasses(List<String> classes) {
+        setClasses(classes, 0);
     }
 
-    public void setAppliedStyleClasses(List<String> styleClasses, long transitionDuration) {
+    public void setClasses(List<String> classes, long transitionDuration) {
         mNativeMapView.setDefaultTransitionDuration(transitionDuration);
-        mNativeMapView.setAppliedClasses(styleClasses);
+        mNativeMapView.setClasses(classes);
     }
 
     //
@@ -378,9 +377,9 @@ public class MapView extends SurfaceView {
             setDebugActive(savedInstanceState.getBoolean(STATE_DEBUG_ACTIVE));
             setStyleUrl(savedInstanceState.getString(STATE_STYLE_URL));
             setAccessToken(savedInstanceState.getString(STATE_ACCESS_TOKEN));
-            List<String> appliedClasses = savedInstanceState.getStringArrayList(STATE_APPLIED_CLASSES);
+            List<String> appliedClasses = savedInstanceState.getStringArrayList(STATE_CLASSES);
             if (!appliedClasses.isEmpty()) {
-                setAppliedStyleClasses(appliedClasses);
+                setClasses(appliedClasses);
             }
             mNativeMapView.setDefaultTransitionDuration(savedInstanceState.getLong(STATE_DEFAULT_TRANSITION_DURATION));
         }
@@ -405,7 +404,7 @@ public class MapView extends SurfaceView {
         outState.putBoolean(STATE_DEBUG_ACTIVE, isDebugActive());
         outState.putString(STATE_STYLE_URL, getStyleUrl());
         outState.putString(STATE_ACCESS_TOKEN, getAccessToken());
-        //outState.putStringArrayList(STATE_APPLIED_CLASSES, new ArrayList<String>(getAppliedStyleClasses()));
+        outState.putStringArrayList(STATE_CLASSES, new ArrayList<String>(getClasses()));
         outState.putLong(STATE_DEFAULT_TRANSITION_DURATION, mNativeMapView.getDefaultTransitionDuration());
     }
 
diff --git a/android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/NativeMapView.java b/android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/NativeMapView.java
index 7663d25237..845decbe8d 100644
--- a/android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/NativeMapView.java
+++ b/android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/NativeMapView.java
@@ -167,12 +167,24 @@ class NativeMapView {
         nativeResize(mNativeMapViewPtr, width, height, ratio, fbWidth, fbHeight);
     }
 
-    public void setAppliedClasses(List<String> classes) {
-        nativeSetAppliedClasses(mNativeMapViewPtr, classes);
+    public void addClass(String clazz) {
+        nativeAddClass(mNativeMapViewPtr, clazz);
     }
 
-    public List<String> getAppliedClasses() {
-        return nativeGetAppliedClasses(mNativeMapViewPtr);
+    public void removeClass(String clazz) {
+        nativeRemoveClass(mNativeMapViewPtr, clazz);
+    }
+
+    public boolean hasClass(String clazz) {
+        return nativeHasClass(mNativeMapViewPtr, clazz);
+    }
+
+    public void setClasses(List<String> classes) {
+        nativeSetClasses(mNativeMapViewPtr, classes);
+    }
+
+    public List<String> getClasses() {
+        return nativeGetClasses(mNativeMapViewPtr);
     }
 
     public void setDefaultTransitionDuration() {
@@ -444,10 +456,16 @@ class NativeMapView {
     private native void nativeResize(long nativeMapViewPtr, int width,
             int height, float ratio, int fbWidth, int fbHeight);
 
-    private native void nativeSetAppliedClasses(long nativeMapViewPtr,
+    private native void nativeAddClass(long nativeMapViewPtr, String clazz);
+
+    private native void nativeRemoveClass(long nativeMapViewPtr, String clazz);
+
+    private native boolean nativeHasClass(long nativeMapViewPtr, String clazz);
+
+    private native void nativeSetClasses(long nativeMapViewPtr,
             List<String> classes);
 
-    private native List<String> nativeGetAppliedClasses(long nativeMapViewPtr);
+    private native List<String> nativeGetClasses(long nativeMapViewPtr);
 
     private native void nativeSetDefaultTransitionDuration(
             long nativeMapViewPtr, long milliseconds);