Merge "Add equality check into FilterCurveRep" into gb-ub-photos-carlsbad

1 files changed, 23 insertions, 0 deletions

diff --git a/src/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
index a71aa8863..569ead957 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
@@ -58,6 +58,7 @@ public class FilterCurvesRepresentation extends FilterRepresentation {
         mSplines = spline;
     }
 
+    @Override
     public boolean isNil() {
         for (int i = 0; i < MAX_SPLINE_NUMBER; i++) {
             if (getSpline(i) != null && !getSpline(i).isOriginal()) {
@@ -67,6 +68,27 @@ public class FilterCurvesRepresentation extends FilterRepresentation {
         return true;
     }
 
+    @Override
+    public boolean equals(FilterRepresentation representation) {
+        if (!super.equals(representation)) {
+            return false;
+        }
+
+        if (!(representation instanceof FilterCurvesRepresentation)) {
+            return false;
+        } else {
+            FilterCurvesRepresentation curve =
+                    (FilterCurvesRepresentation) representation;
+            for (int i = 0; i < MAX_SPLINE_NUMBER; i++) {
+                if (!getSpline(i).sameValues(curve.getSpline(i))) {
+                    return false;
+                }
+            }
+        }
+        // Every spline matches, therefore they are the same.
+        return true;
+    }
+
     public void reset() {
         Spline spline = new Spline();
 
@@ -81,6 +103,7 @@ public class FilterCurvesRepresentation extends FilterRepresentation {
     public void setSpline(int splineIndex, Spline s) {
         mSplines[splineIndex] = s;
     }
+
     public Spline getSpline(int splineIndex) {
         return mSplines[splineIndex];
     }