1 files changed, 16 insertions, 43 deletions

diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterFx.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
index 345202fe6..820ec3e51 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
@@ -18,67 +18,40 @@ package com.android.gallery3d.filtershow.filters;
 
 import android.graphics.Bitmap;
 
+import com.android.gallery3d.filtershow.editors.BasicEditor;
+import com.android.gallery3d.filtershow.editors.ImageOnlyEditor;
+
 public class ImageFilterFx extends ImageFilter {
     private static final String TAG = "ImageFilterFx";
-    Bitmap fxBitmap;
-    int mNameResource = 0;
+    private FilterFxRepresentation mParameters = null;
 
-    public ImageFilterFx(Bitmap fxBitmap, String name, int nameResource) {
-        setFilterType(TYPE_FX);
-        mName = name;
-        this.fxBitmap = fxBitmap;
-        mNameResource = nameResource;
+    public ImageFilterFx() {
     }
 
-    @Override
-    public int getTextId() {
-        return mNameResource;
+    public void useRepresentation(FilterRepresentation representation) {
+        FilterFxRepresentation parameters = (FilterFxRepresentation) representation;
+        mParameters = parameters;
     }
 
-    @Override
-    public ImageFilter clone() throws CloneNotSupportedException {
-        ImageFilterFx filter = (ImageFilterFx) super.clone();
-        filter.fxBitmap = this.fxBitmap;
-        return filter;
-    }
-
-    @Override
-    public boolean isNil() {
-        if (fxBitmap != null) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public boolean showParameterValue() {
-        return false;
-    }
-
-    @Override
-    public boolean showEditingControls() {
-        return false;
-    }
-
-    @Override
-    public boolean showUtilityPanel() {
-        return false;
+    public FilterFxRepresentation getParameters() {
+        return mParameters;
     }
 
     native protected void nativeApplyFilter(Bitmap bitmap, int w, int h,Bitmap  fxBitmap, int fxw, int fxh);
 
     @Override
-    public Bitmap apply(Bitmap bitmap, float scaleFactor, boolean highQuality) {
-        if (fxBitmap==null)
+    public Bitmap apply(Bitmap bitmap, float scaleFactor, int quality) {
+        if (getParameters() == null || getParameters().getFxBitmap() ==null) {
             return bitmap;
+        }
 
         int w = bitmap.getWidth();
         int h = bitmap.getHeight();
 
-        int fxw = fxBitmap.getWidth();
-        int fxh = fxBitmap.getHeight();
+        int fxw = getParameters().getFxBitmap().getWidth();
+        int fxh = getParameters().getFxBitmap().getHeight();
 
-        nativeApplyFilter(bitmap, w, h,   fxBitmap,  fxw,  fxh);
+        nativeApplyFilter(bitmap, w, h,   getParameters().getFxBitmap(),  fxw,  fxh);
         return bitmap;
     }
 }