1 files changed, 10 insertions, 88 deletions

diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilter.java b/src/com/android/gallery3d/filtershow/filters/ImageFilter.java
index a261031c3..abf65c4b0 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilter.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilter.java
@@ -24,15 +24,6 @@ import com.android.gallery3d.filtershow.presets.ImagePreset;
 
 public class ImageFilter implements Cloneable {
 
-    public static int DEFAULT_MAX_PARAMETER = 100;
-    public static int DEFAULT_MIN_PARAMETER = -100;
-    public static int DEFAULT_INITIAL_PARAMETER = 0;
-
-    protected int mMaxParameter = DEFAULT_MAX_PARAMETER;
-    protected int mMinParameter = DEFAULT_MIN_PARAMETER;
-    protected int mPreviewParameter = mMaxParameter;
-    protected int mDefaultParameter = DEFAULT_INITIAL_PARAMETER;
-    protected int mParameter = DEFAULT_INITIAL_PARAMETER;
     private ImagePreset mImagePreset;
 
     protected String mName = "Original";
@@ -81,31 +72,6 @@ public class ImageFilter implements Cloneable {
         return true;
     }
 
-    @Override
-    public ImageFilter clone() throws CloneNotSupportedException {
-        ImageFilter filter = (ImageFilter) super.clone();
-        filter.setName(getName());
-        filter.setParameter(getParameter());
-        filter.setFilterType(filterType);
-        filter.mMaxParameter = mMaxParameter;
-        filter.mMinParameter = mMinParameter;
-        filter.mImagePreset = mImagePreset;
-        filter.mDefaultParameter = mDefaultParameter;
-        filter.mPreviewParameter = mPreviewParameter;
-        return filter;
-    }
-
-    public void reset() {
-        setParameter(mDefaultParameter);
-    }
-
-    public boolean isNil() {
-        if (mParameter == mDefaultParameter) {
-            return true;
-        }
-        return false;
-    }
-
     public void setName(String name) {
         mName = name;
     }
@@ -124,68 +90,17 @@ public class ImageFilter implements Cloneable {
      * Override this to provide filter-specific button icons.
      */
     public Bitmap iconApply(Bitmap bitmap, float scaleFactor, boolean highQuality) {
-        int param = getParameter();
-        setParameter(getPreviewParameter());
-        bitmap = apply(bitmap, scaleFactor, highQuality);
-        setParameter(param);
-        return bitmap;
-    }
-
-    public int getParameter() {
-        return mParameter;
-    }
-
-    public void setParameter(int value) {
-        mParameter = value;
-    }
-
-    /**
-     * The maximum allowed value (inclusive)
-     * @return maximum value allowed as input to this filter
-     */
-    public int getMaxParameter() {
-        return mMaxParameter;
-    }
-
-    /**
-     * The parameter value to be used in previews.
-     * @return parameter value to be used to preview the filter
-     */
-    public int getPreviewParameter() {
-        return mPreviewParameter;
-    }
-
-    /**
-     * The minimum allowed value (inclusive)
-     * @return minimum value allowed as input to this filter
-     */
-    public int getMinParameter() {
-        return mMinParameter;
-    }
-
-    /**
-     * Returns the default value returned by this filter.
-     * @return default value
-     */
-    public int getDefaultParameter() {
-        return mDefaultParameter;
+        return apply(bitmap, scaleFactor, highQuality);
     }
 
     public ImagePreset getImagePreset() {
         return mImagePreset;
     }
 
-    public void setImagePreset(ImagePreset mPreset) {
-        this.mImagePreset = mPreset;
-    }
-
     public boolean equals(ImageFilter filter) {
         if (!same(filter)) {
             return false;
         }
-        if (mParameter != filter.mParameter) {
-            return false;
-        }
         return true;
     }
 
@@ -199,10 +114,17 @@ public class ImageFilter implements Cloneable {
         return true;
     }
 
+    public void useRepresentation(FilterRepresentation representation) {
+    }
+
     native protected void nativeApplyGradientFilter(Bitmap bitmap, int w, int h,
             int[] redGradient, int[] greenGradient, int[] blueGradient);
 
-    public void useFilter(ImageFilter a) {
-        setParameter(a.getParameter());
+    public FilterRepresentation getDefaultRepresentation() {
+        return null;
+    }
+
+    public boolean hasDefaultRepresentation() {
+        return false;
     }
 }