Cleanup

Change-Id: I30ccd935876a8cbf580d06c037b4bc7f86dafa42

4 files changed, 19 insertions, 5 deletions

diff --git a/src/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
index d90f55851..5234023d0 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
@@ -7,6 +7,7 @@ import com.android.gallery3d.filtershow.ui.Spline;
  */
 public class FilterCurvesRepresentation extends FilterRepresentation {
     private Spline[] mSplines = new Spline[4];
+
     public FilterCurvesRepresentation() {
         super("Curves");
         for (int i = 0; i < mSplines.length; i++) {
@@ -15,6 +16,15 @@ public class FilterCurvesRepresentation extends FilterRepresentation {
         }
     }
 
+    public boolean isNil() {
+        for (int i = 0; i < 4; i++) {
+            if (getSpline(i) != null && !getSpline(i).isOriginal()) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     public void reset() {
         Spline spline = new Spline();
 
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
index 84e04c7ee..1cb2645c7 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
@@ -68,6 +68,11 @@ public class FilterDrawRepresentation extends FilterRepresentation {
     }
 
     @Override
+    public boolean isNil() {
+        return getDrawing().isEmpty();
+    }
+
+    @Override
     public void useParametersFrom(FilterRepresentation a) {
         if (a instanceof FilterDrawRepresentation) {
             FilterDrawRepresentation representation = (FilterDrawRepresentation) a;
@@ -85,14 +90,15 @@ public class FilterDrawRepresentation extends FilterRepresentation {
             }
         }
     }
+
     @Override
     public boolean equals(FilterRepresentation representation) {
         if (!super.equals(representation)) {
             return false;
         }
         if (representation instanceof FilterDrawRepresentation) {
-            FilterDrawRepresentation grunge = (FilterDrawRepresentation) representation;
-                return true;
+            // FIXME!
+            return true;
         }
         return false;
     }
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
index 06987d2e6..5aff39df4 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
@@ -73,7 +73,7 @@ public class FilterFxRepresentation extends FilterRepresentation {
     }
 
     public boolean allowsMultipleInstances() {
-        return false;
+        return true;
     }
 
     public Bitmap getFxBitmap() {
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
index d92b323bb..7d9d7f923 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
@@ -29,8 +29,6 @@ public class FilterRepresentation implements Cloneable {
     private boolean mShowParameterValue;
     private Class mFilterClass;
 
-    public static String DEFAULT = "Default";
-
     public FilterRepresentation(String name) {
         mName = name;
     }