Refactor FiltersManager

Change-Id: I4c42ddb90e65e90af873eb8dbe065f4fa3de69ef

6 files changed, 6 insertions, 14 deletions

diff --git a/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
index b2e1ed39b..89ea5ccc5 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
@@ -50,7 +50,7 @@ public class FilterDrawRepresentation extends FilterRepresentation {
     public FilterDrawRepresentation() {
         super("Draw");
         setFilterClass(ImageFilterDraw.class);
-        setFilterType(FilterRepresentation.TYPE_VIGNETTE);
+        setPriority(FilterRepresentation.TYPE_VIGNETTE);
         setTextId(R.string.imageDraw);
         setButtonId(R.id.drawOnImageButton);
         setEditorId(EditorDraw.ID);
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
index fa3fe720b..859bf327c 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
@@ -31,7 +31,7 @@ public class FilterFxRepresentation extends FilterRepresentation {
         mBitmapResource = bitmapResource;
         mNameResource = nameResource;
         setFilterClass(ImageFilterFx.class);
-        setFilterType(FilterRepresentation.TYPE_FX);
+        setPriority(FilterRepresentation.TYPE_FX);
         setTextId(nameResource);
         setEditorId(ImageOnlyEditor.ID);
         setShowEditingControls(false);
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
index 38d3a696f..2667cc8e9 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
@@ -31,7 +31,7 @@ public class FilterRedEyeRepresentation extends FilterRepresentation {
     public FilterRedEyeRepresentation() {
         super("RedEye");
         setFilterClass(ImageFilterRedEye.class);
-        setFilterType(FilterRepresentation.TYPE_NORMAL);
+        setPriority(FilterRepresentation.TYPE_NORMAL);
         setButtonId(R.id.redEyeButton);
         setTextId(R.string.redeye);
         setEditorId(EditorRedEye.ID);
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
index f282d2966..2b6c3fe7d 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
@@ -23,7 +23,7 @@ import com.android.gallery3d.filtershow.presets.ImagePreset;
 public class FilterRepresentation implements Cloneable {
     private static final String LOGTAG = "FilterRepresentation";
     private String mName;
-    private int mPriority;
+    private int mPriority = TYPE_NORMAL;
     private ImagePreset mPreset;
     private Class mFilterClass;
     private int mTextId = 0;
@@ -40,7 +40,6 @@ public class FilterRepresentation implements Cloneable {
     public static final byte TYPE_VIGNETTE = 4;
     public static final byte TYPE_NORMAL = 5;
     public static final byte TYPE_TINYPLANET = 6;
-    private byte filterType = TYPE_NORMAL;
 
     public FilterRepresentation(String name) {
         mName = name;
@@ -86,14 +85,6 @@ public class FilterRepresentation implements Cloneable {
         return mName;
     }
 
-    public byte getFilterType() {
-        return filterType;
-    }
-
-    protected void setFilterType(byte type) {
-        filterType = type;
-    }
-
     public void setName(String name) {
         mName = name;
     }
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
index 9bf2f0bf3..7b69ce9e0 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
@@ -27,7 +27,7 @@ public class FilterTinyPlanetRepresentation extends FilterBasicRepresentation {
         super("TinyPlanet", 0, 50, 100);
         setShowParameterValue(true);
         setFilterClass(ImageFilterTinyPlanet.class);
-        setFilterType(FilterRepresentation.TYPE_TINYPLANET);
+        setPriority(FilterRepresentation.TYPE_TINYPLANET);
         setTextId(R.string.tinyplanet);
         setButtonId(R.id.tinyplanetButton);
         setEditorId(EditorTinyPlanet.ID);
diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
index adea9deb3..b81659a1a 100644
--- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
+++ b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
@@ -21,6 +21,7 @@ import android.util.Log;
 
 import com.android.gallery3d.filtershow.ImageStateAdapter;
 import com.android.gallery3d.filtershow.cache.ImageLoader;
+import com.android.gallery3d.filtershow.filters.BaseFiltersManager;
 import com.android.gallery3d.filtershow.filters.FilterRepresentation;
 import com.android.gallery3d.filtershow.filters.FiltersManager;
 import com.android.gallery3d.filtershow.filters.ImageFilter;