Refactoring ImageLoader.

- Moves state (history, loadlisteners, bitmaps, etc.)
  from ImageLoader to MasterImage.
- Makes ImageLoader into a utility class.

Change-Id: I7a8a988c61848694a86a4b2919bf8f30bfd2be8c

1 files changed, 1 insertions, 12 deletions

diff --git a/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java b/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
index c78bc1ef4..78a4d211d 100644
--- a/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
+++ b/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
@@ -46,8 +46,6 @@ public class ImagePreset {
 
     private static final String LOGTAG = "ImagePreset";
 
-    private ImageLoader mImageLoader = null;
-
     private Vector<FilterRepresentation> mFilters = new Vector<FilterRepresentation>();
 
     protected boolean mIsFxPreset = false;
@@ -81,7 +79,6 @@ public class ImagePreset {
         } catch (java.lang.CloneNotSupportedException e) {
             Log.v(LOGTAG, "Exception trying to clone: " + e);
         }
-        mImageLoader = source.getImageLoader();
     }
 
     public FilterRepresentation getFilterRepresentation(int position) {
@@ -226,14 +223,6 @@ public class ImagePreset {
         }
     }
 
-    public ImageLoader getImageLoader() {
-        return mImageLoader;
-    }
-
-    public void setImageLoader(ImageLoader mImageLoader) {
-        this.mImageLoader = mImageLoader;
-    }
-
     public boolean equals(ImagePreset preset) {
         if (!same(preset)) {
             return false;
@@ -525,7 +514,7 @@ public class ImagePreset {
     }
 
     public boolean canDoPartialRendering() {
-        if (ImageLoader.getZoomOrientation() != ImageLoader.ORI_NORMAL) {
+        if (MasterImage.getImage().getZoomOrientation() != ImageLoader.ORI_NORMAL) {
             return false;
         }
         for (int i = 0; i < mFilters.size(); i++) {