Refactoring ImageLoader.

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

Change-Id: I7a8a988c61848694a86a4b2919bf8f30bfd2be8c

5 files changed, 4 insertions, 12 deletions

diff --git a/src/com/android/gallery3d/filtershow/editors/Editor.java b/src/com/android/gallery3d/filtershow/editors/Editor.java
index 7d395ef37..9539d651b 100644
--- a/src/com/android/gallery3d/filtershow/editors/Editor.java
+++ b/src/com/android/gallery3d/filtershow/editors/Editor.java
@@ -188,10 +188,6 @@ public class Editor implements OnSeekBarChangeListener, SwapButton.SwapButtonLis
         return mImageShow;
     }
 
-    public void setImageLoader(ImageLoader imageLoader) {
-        mImageShow.setImageLoader(imageLoader);
-    }
-
     public void setVisibility(int visible) {
         mView.setVisibility(visible);
     }
diff --git a/src/com/android/gallery3d/filtershow/editors/EditorCrop.java b/src/com/android/gallery3d/filtershow/editors/EditorCrop.java
index 24a83cd46..ec6e30b7e 100644
--- a/src/com/android/gallery3d/filtershow/editors/EditorCrop.java
+++ b/src/com/android/gallery3d/filtershow/editors/EditorCrop.java
@@ -28,7 +28,6 @@ import android.widget.PopupMenu;
 import com.android.gallery3d.R;
 import com.android.gallery3d.filtershow.crop.CropExtras;
 import com.android.gallery3d.filtershow.imageshow.ImageCrop;
-import com.android.gallery3d.filtershow.imageshow.MasterImage;
 
 public class EditorCrop extends Editor implements EditorInfo {
     public static final int ID = R.id.editorCrop;
@@ -53,7 +52,7 @@ public class EditorCrop extends Editor implements EditorInfo {
             mImageCrop = new ImageCrop(context);
         }
         mView = mImageShow = mImageCrop;
-        mImageCrop.setImageLoader(MasterImage.getImage().getImageLoader());
+        mImageCrop.bindAsImageLoadListener();
         mImageCrop.setEditor(this);
         mImageCrop.syncLocalToMasterGeometry();
         mImageCrop.setCropActionFlag(mCropActionFlag);
diff --git a/src/com/android/gallery3d/filtershow/editors/EditorFlip.java b/src/com/android/gallery3d/filtershow/editors/EditorFlip.java
index de6240c7a..67070045b 100644
--- a/src/com/android/gallery3d/filtershow/editors/EditorFlip.java
+++ b/src/com/android/gallery3d/filtershow/editors/EditorFlip.java
@@ -25,7 +25,6 @@ import android.widget.LinearLayout;
 
 import com.android.gallery3d.R;
 import com.android.gallery3d.filtershow.imageshow.ImageFlip;
-import com.android.gallery3d.filtershow.imageshow.MasterImage;
 
 public class EditorFlip extends Editor implements EditorInfo {
     public static final String LOGTAG = "EditorFlip";
@@ -43,7 +42,7 @@ public class EditorFlip extends Editor implements EditorInfo {
             mImageFlip = new ImageFlip(context);
         }
         mView = mImageShow = mImageFlip;
-        mImageFlip.setImageLoader(MasterImage.getImage().getImageLoader());
+        mImageFlip.bindAsImageLoadListener();
         mImageFlip.setEditor(this);
         mImageFlip.syncLocalToMasterGeometry();
     }
diff --git a/src/com/android/gallery3d/filtershow/editors/EditorRotate.java b/src/com/android/gallery3d/filtershow/editors/EditorRotate.java
index a637c08ff..e66be2cc1 100644
--- a/src/com/android/gallery3d/filtershow/editors/EditorRotate.java
+++ b/src/com/android/gallery3d/filtershow/editors/EditorRotate.java
@@ -25,7 +25,6 @@ import android.widget.LinearLayout;
 
 import com.android.gallery3d.R;
 import com.android.gallery3d.filtershow.imageshow.ImageRotate;
-import com.android.gallery3d.filtershow.imageshow.MasterImage;
 
 public class EditorRotate extends Editor implements EditorInfo {
     public static final String LOGTAG = "EditorRotate";
@@ -43,7 +42,7 @@ public class EditorRotate extends Editor implements EditorInfo {
             mImageRotate = new ImageRotate(context);
         }
         mView = mImageShow = mImageRotate;
-        mImageRotate.setImageLoader(MasterImage.getImage().getImageLoader());
+        mImageRotate.bindAsImageLoadListener();
         mImageRotate.setEditor(this);
         mImageRotate.syncLocalToMasterGeometry();
     }
diff --git a/src/com/android/gallery3d/filtershow/editors/EditorStraighten.java b/src/com/android/gallery3d/filtershow/editors/EditorStraighten.java
index dbc6ca05d..40333aa00 100644
--- a/src/com/android/gallery3d/filtershow/editors/EditorStraighten.java
+++ b/src/com/android/gallery3d/filtershow/editors/EditorStraighten.java
@@ -23,7 +23,6 @@ import android.widget.FrameLayout;
 import com.android.gallery3d.R;
 import com.android.gallery3d.filtershow.imageshow.GeometryMetadata;
 import com.android.gallery3d.filtershow.imageshow.ImageStraighten;
-import com.android.gallery3d.filtershow.imageshow.MasterImage;
 
 public class EditorStraighten extends Editor implements EditorInfo {
     public static final int ID = R.id.editorStraighten;
@@ -50,7 +49,7 @@ public class EditorStraighten extends Editor implements EditorInfo {
             mImageStraighten = new ImageStraighten(context);
         }
         mView = mImageShow = mImageStraighten;
-        mImageStraighten.setImageLoader(MasterImage.getImage().getImageLoader());
+        mImageStraighten.bindAsImageLoadListener();
         mImageStraighten.setEditor(this);
         mImageStraighten.syncLocalToMasterGeometry();
     }