Cleanup

Change-Id: I30ccd935876a8cbf580d06c037b4bc7f86dafa42

diff --git a/src/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
index d90f558..5234023 100644 (file)
--- 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 84e04c7..1cb2645 100644 (file)
--- 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 06987d2..5aff39d 100644 (file)
--- 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 d92b323..7d9d7f9 100644 (file)
--- 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;
     }

diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilter.java b/src/com/android/gallery3d/filtershow/filters/ImageFilter.java
index abf65c4..5039da7 100644 (file)
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilter.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilter.java
@@ -97,23 +97,6 @@ public class ImageFilter implements Cloneable {
         return mImagePreset;
     }
 
-    public boolean equals(ImageFilter filter) {
-        if (!same(filter)) {
-            return false;
-        }
-        return true;
-    }
-
-    public boolean same(ImageFilter filter) {
-        if (filter == null) {
-            return false;
-        }
-        if (!filter.getName().equalsIgnoreCase(getName())) {
-            return false;
-        }
-        return true;
-    }
-
     public void useRepresentation(FilterRepresentation representation) {
     }
 

diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
index 646a6b4..6362124 100644 (file)
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
@@ -26,24 +26,10 @@ import com.android.gallery3d.R;
 public class ImageFilterBorder extends ImageFilter {
     private static final float NINEPATCH_ICON_SCALING = 10;
     private static final float BITMAP_ICON_SCALING = 1 / 3.0f;
-    Drawable mNinePatch = null;
     private FilterImageBorderRepresentation mParameters = null;
 
-    @Override
-    public ImageFilter clone() throws CloneNotSupportedException {
-        ImageFilterBorder filter = (ImageFilterBorder) super.clone();
-        filter.setDrawable(mNinePatch);
-        return filter;
-    }
-
     public ImageFilterBorder() {
-
-    }
-
-    public ImageFilterBorder(Drawable ninePatch) {
-        setFilterType(TYPE_BORDER);
         mName = "Border";
-        mNinePatch = ninePatch;
     }
 
     public void useRepresentation(FilterRepresentation representation) {
@@ -55,13 +41,6 @@ public class ImageFilterBorder extends ImageFilter {
         return mParameters;
     }
 
-    public boolean isNil() {
-        if (mNinePatch == null) {
-            return true;
-        }
-        return false;
-    }
-
     @Override
     public int getTextId() {
         return R.string.borders;
@@ -82,27 +61,6 @@ public class ImageFilterBorder extends ImageFilter {
         return false;
     }
 
-    @Override
-    public boolean same(ImageFilter filter) {
-        boolean isBorderFilter = super.same(filter);
-        if (!isBorderFilter) {
-            return false;
-        }
-        if (!(filter instanceof ImageFilterBorder)) {
-            return false;
-        }
-        ImageFilterBorder borderFilter = (ImageFilterBorder) filter;
-        if (mNinePatch != borderFilter.mNinePatch) {
-            return false;
-        }
-        return true;
-    }
-
-    public void setDrawable(Drawable ninePatch) {
-        // TODO: for now we only use nine patch
-        mNinePatch = ninePatch;
-    }
-
     public Bitmap applyHelper(Bitmap bitmap, float scale1, float scale2 ) {
         int w = bitmap.getWidth();
         int h = bitmap.getHeight();

diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterBwFilter.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterBwFilter.java
index 1c06323..6a0d4c7 100644 (file)
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterBwFilter.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterBwFilter.java
@@ -47,12 +47,6 @@ public class ImageFilterBwFilter extends SimpleImageFilter {
         return R.string.bwfilter;
     }
 
-    @Override
-    public ImageFilter clone() throws CloneNotSupportedException {
-        ImageFilterBwFilter filter = (ImageFilterBwFilter) super.clone();
-        return filter;
-    }
-
     native protected void nativeApplyFilter(Bitmap bitmap, int w, int h, int r, int g, int b);
 
     @Override

diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java
index 7919052..7c160b3 100644 (file)
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java
@@ -76,43 +76,6 @@ public class ImageFilterCurves extends ImageFilter {
         return false;
     }
 
-    @Override
-    public boolean equals(ImageFilter filter) {
-        return same(filter);
-    }
-
-    @Override
-    public ImageFilter clone() throws CloneNotSupportedException {
-        ImageFilterCurves filter = (ImageFilterCurves) super.clone();
-        filter.mParameters = (FilterCurvesRepresentation) mParameters.clone();
-
-        return filter;
-    }
-
-    public boolean isNil() {
-        for (int i = 0; i < 4; i++) {
-            if (mParameters.getSpline(i) != null && !mParameters.getSpline(i).isOriginal()) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    @Override
-    public boolean same(ImageFilter filter) {
-        boolean isCurveFilter = super.same(filter);
-        if (!isCurveFilter) {
-            return false;
-        }
-        ImageFilterCurves curve = (ImageFilterCurves) filter;
-        for (int i = 0; i < 4; i++) {
-            if (mParameters.getSpline(i) != curve.mParameters.getSpline(i)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
     public void populateArray(int[] array, int curveIndex) {
         Spline spline = mParameters.getSpline(curveIndex);
         if (spline == null) {

diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
index f1ed90c..05efd4a 100644 (file)
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
@@ -260,29 +260,10 @@ public class ImageFilterDraw extends ImageFilter {
         return EditorDraw.ID;
     }
 
-    @Override
-    public ImageFilter clone() throws CloneNotSupportedException {
-        ImageFilterDraw filter = (ImageFilterDraw) super.clone();
-
-        filter.mDrawingsTypes = mDrawingsTypes.clone();
-        return filter;
-    }
-
     public boolean isNil() {
         return mParameters.getDrawing().isEmpty();
     }
 
-    @Override
-    public boolean same(ImageFilter filter) {
-        boolean isSuperSame = super.same(filter);
-        if (!isSuperSame || !(filter instanceof ImageFilterDraw)) {
-            return false;
-        }
-
-        ImageFilterDraw dfilter = (ImageFilterDraw) filter;
-        return mParameters.getDrawing().equals(dfilter.mParameters.getDrawing());
-    }
-
     public void draw(Canvas canvas, Matrix originalRotateToScreen) {
         for (FilterDrawRepresentation.StrokeData strokeData : mParameters.getDrawing()) {
             paint(strokeData, canvas, originalRotateToScreen, false);

diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterFx.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
index 8a50ca9..2fa4cfb 100644 (file)
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
@@ -49,13 +49,6 @@ public class ImageFilterFx extends ImageFilter {
         return mNameResource;
     }
 
-    @Override
-    public ImageFilter clone() throws CloneNotSupportedException {
-        ImageFilterFx filter = (ImageFilterFx) super.clone();
-        filter.fxBitmap = this.fxBitmap;
-        return filter;
-    }
-
     public boolean isNil() {
         if (fxBitmap != null) {
             return false;

diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
index 33ecc8a..a778bee 100644 (file)
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
@@ -45,6 +45,7 @@ public class ImageFilterGeometry extends ImageFilter {
 
     @Override
     public ImageFilter clone() throws CloneNotSupportedException {
+        // FIXME: clone() should not be needed. Remove when we fix geometry.
         ImageFilterGeometry filter = (ImageFilterGeometry) super.clone();
         return filter;
     }

diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterGradient.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterGradient.java
index be4ba87..a0b733a 100644 (file)
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterGradient.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterGradient.java
@@ -37,6 +37,7 @@ public class ImageFilterGradient extends ImageFilter {
 
     @Override
     public ImageFilter clone() throws CloneNotSupportedException {
+        // FIXME: clone() should not be needed. Remove?.
         ImageFilterGradient filter = (ImageFilterGradient) super.clone();
         System.arraycopy(mColors, 0, filter.mColors, 0, mColors.length);
         System.arraycopy(mPositions, 0, filter.mPositions, 0, mPositions.length);

diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterHue.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterHue.java
index 51c476d..f6cd220 100644 (file)
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterHue.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterHue.java
@@ -53,13 +53,6 @@ public class ImageFilterHue extends SimpleImageFilter {
         return BasicEditor.ID;
     }
 
-    @Override
-    public ImageFilter clone() throws CloneNotSupportedException {
-        ImageFilterHue filter = (ImageFilterHue) super.clone();
-        filter.cmatrix = new ColorSpaceMatrix(cmatrix);
-        return filter;
-    }
-
     native protected void nativeApplyFilter(Bitmap bitmap, int w, int h, float []matrix);
 
     @Override

diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
index ca98069..f0fbc31 100644 (file)
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
@@ -26,9 +26,6 @@ import android.graphics.RectF;
 import com.android.gallery3d.R;
 
 public class ImageFilterParametricBorder extends ImageFilter {
-    private int mBorderColor = Color.WHITE;
-    private int mBorderSize = 10;
-    private int mBorderCornerRadius = 10;
     private FilterColorBorderRepresentation mParameters = null;
 
     public ImageFilterParametricBorder() {
@@ -65,50 +62,6 @@ public class ImageFilterParametricBorder extends ImageFilter {
         return false;
     }
 
-    public ImageFilterParametricBorder(int color, int size, int radius) {
-        setBorder(color, size, radius);
-        setFilterType(TYPE_BORDER);
-    }
-
-    @Override
-    public ImageFilter clone() throws CloneNotSupportedException {
-        ImageFilterParametricBorder filter = (ImageFilterParametricBorder) super.clone();
-        filter.setBorder(mBorderColor, mBorderSize, mBorderCornerRadius);
-        return filter;
-    }
-
-    public boolean isNil() {
-        return false;
-    }
-
-    @Override
-    public boolean same(ImageFilter filter) {
-        boolean isBorderFilter = super.same(filter);
-        if (!isBorderFilter) {
-            return false;
-        }
-        if (!(filter instanceof ImageFilterParametricBorder)) {
-            return false;
-        }
-        ImageFilterParametricBorder borderFilter = (ImageFilterParametricBorder) filter;
-        if (borderFilter.mBorderColor != mBorderColor) {
-            return false;
-        }
-        if (borderFilter.mBorderSize != mBorderSize) {
-            return false;
-        }
-        if (borderFilter.mBorderCornerRadius != mBorderCornerRadius) {
-            return false;
-        }
-        return true;
-    }
-
-    public void setBorder(int color, int size, int radius) {
-        mBorderColor = color;
-        mBorderSize = size;
-        mBorderCornerRadius = radius;
-    }
-
     private void applyHelper(Canvas canvas, int w, int h) {
         if (getParameters() == null) {
             return;

diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java
index 0378090..ee3a19c 100644 (file)
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java
@@ -50,6 +50,7 @@ public class ImageFilterRedEye extends ImageFilter {
 
     @Override
     public ImageFilter clone() throws CloneNotSupportedException {
+        // FIXME: clone() should not be needed. Remove when we fix red eyes.
         ImageFilterRedEye filter = (ImageFilterRedEye) super.clone();
         if (mCandidates != null) {
             int size = mCandidates.size();
@@ -68,33 +69,6 @@ public class ImageFilterRedEye extends ImageFilter {
         return true;
     }
 
-    @Override
-    public boolean same(ImageFilter filter) {
-        boolean isRedEyeFilter = super.same(filter);
-        if (!isRedEyeFilter) {
-            return false;
-        }
-        ImageFilterRedEye redEyeFilter = (ImageFilterRedEye) filter;
-        if (redEyeFilter.mCandidates == null && mCandidates == null) {
-            return true;
-        }
-        if (redEyeFilter.mCandidates == null || mCandidates == null) {
-            return false;
-        }
-        if (redEyeFilter.mCandidates.size() != mCandidates.size()) {
-            return false;
-        }
-        int size = mCandidates.size();
-        for (int i = 0; i < size; i++) {
-            RedEyeCandidate c1 = mCandidates.elementAt(i);
-            RedEyeCandidate c2 = redEyeFilter.mCandidates.elementAt(i);
-            if (!c1.equals(c2)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
     public Vector<RedEyeCandidate> getCandidates() {
         if (mCandidates == null) {
             mCandidates = new Vector<RedEyeCandidate>();

diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java
index 27e5342..c39580f 100644 (file)
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java
@@ -44,12 +44,6 @@ public class ImageFilterShadows extends SimpleImageFilter {
         return R.string.shadow_recovery;
     }
 
-    @Override
-    public ImageFilter clone() throws CloneNotSupportedException {
-        ImageFilterShadows filter = (ImageFilterShadows) super.clone();
-        return filter;
-    }
-
     native protected void nativeApplyFilter(Bitmap bitmap, int w, int h, float  factor);
 
     @Override

diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterStraighten.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterStraighten.java
index 85fcf27..3feec7b 100644 (file)
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterStraighten.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterStraighten.java
@@ -32,6 +32,7 @@ public class ImageFilterStraighten extends ImageFilter {
 
     @Override
     public ImageFilter clone() throws CloneNotSupportedException {
+        // FIXME: clone() should not be needed. Remove when we fix geometry.
         ImageFilterStraighten filter = (ImageFilterStraighten) super.clone();
         filter.mRotation = mRotation;
         filter.mZoomFactor = mZoomFactor;