From 326cc9a7939046476d8fa44c9f31c6e0c388a233 Mon Sep 17 00:00:00 2001
From: nicolasroard <nicolasroard@google.com>
Date: Wed, 10 Apr 2013 08:20:26 -0700
Subject: Small cleanup in setting resources

Change-Id: Icd275aaddcee59a578f916c57903012ce35469ad
---
 .../android/gallery3d/filtershow/FilterShowActivity.java   | 14 +-------------
 .../gallery3d/filtershow/cache/FilteringPipeline.java      |  9 ++++++---
 .../gallery3d/filtershow/filters/BaseFiltersManager.java   |  7 +++++++
 .../gallery3d/filtershow/filters/FiltersManager.java       |  7 +++++++
 4 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index 92ce2309e..1a7d200f1 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -360,19 +360,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
         ImageFilter.setActivityForMemoryToasts(this);
 
         Resources res = getResources();
-        // TODO: add a mechanism to set the resources in FiltersManagmer
-        ImageFilterBorder filterBorder = (ImageFilterBorder) FiltersManager.getManager().getFilter(ImageFilterBorder.class);
-        filterBorder.setResources(res);
-        filterBorder = (ImageFilterBorder) FiltersManager.getPreviewManager().getFilter(ImageFilterBorder.class);
-        filterBorder.setResources(res);
-        filterBorder = (ImageFilterBorder) FiltersManager.getHighresManager().getFilter(ImageFilterBorder.class);
-        filterBorder.setResources(res);
-        ImageFilterFx filterFx = (ImageFilterFx) FiltersManager.getManager().getFilter(ImageFilterFx.class);
-        filterFx.setResources(res);
-        filterFx = (ImageFilterFx) FiltersManager.getPreviewManager().getFilter(ImageFilterFx.class);
-        filterFx.setResources(res);
-        filterFx = (ImageFilterFx) FiltersManager.getHighresManager().getFilter(ImageFilterFx.class);
-        filterFx.setResources(res);
+        FiltersManager.setResources(res);
 
         ImageShow.setDefaultBackgroundColor(res.getColor(R.color.background_screen));
         // TODO: get those values from XML.
diff --git a/src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java b/src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
index a295647b5..e63323b92 100644
--- a/src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
+++ b/src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
@@ -131,9 +131,12 @@ public class FilteringPipeline implements Handler.Callback {
                 Process.THREAD_PRIORITY_FOREGROUND);
         mHandlerThread.start();
         mProcessingHandler = new Handler(mHandlerThread.getLooper(), this);
-        mAccessoryPipeline = new CachingPipeline(FiltersManager.getManager(), "Accessory");
-        mPreviewPipeline = new CachingPipeline(FiltersManager.getPreviewManager(), "Preview");
-        mHighresPreviewPipeline = new CachingPipeline(FiltersManager.getHighresManager(), "Highres");
+        mAccessoryPipeline = new CachingPipeline(
+                FiltersManager.getManager(), "Accessory");
+        mPreviewPipeline = new CachingPipeline(
+                FiltersManager.getPreviewManager(), "Preview");
+        mHighresPreviewPipeline = new CachingPipeline(
+                FiltersManager.getHighresManager(), "Highres");
     }
 
     public synchronized static FilteringPipeline getPipeline() {
diff --git a/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java b/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
index 232de6460..66ad10640 100644
--- a/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
+++ b/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
@@ -15,6 +15,7 @@
  */
 package com.android.gallery3d.filtershow.filters;
 
+import android.content.res.Resources;
 import com.android.gallery3d.filtershow.presets.ImagePreset;
 
 import java.util.HashMap;
@@ -140,4 +141,10 @@ public abstract class BaseFiltersManager {
         representations.add(getRepresentation(ImageFilterDraw.class));
     }
 
+    public void setFilterResources(Resources resources) {
+        ImageFilterBorder filterBorder = (ImageFilterBorder) getFilter(ImageFilterBorder.class);
+        filterBorder.setResources(resources);
+        ImageFilterFx filterFx = (ImageFilterFx) getFilter(ImageFilterFx.class);
+        filterFx.setResources(resources);
+    }
 }
diff --git a/src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java b/src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
index 910627aeb..9de9b7b91 100644
--- a/src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
+++ b/src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
@@ -16,6 +16,8 @@
 
 package com.android.gallery3d.filtershow.filters;
 
+import android.content.res.Resources;
+
 import java.util.HashMap;
 import java.util.Vector;
 
@@ -55,4 +57,9 @@ public class FiltersManager extends BaseFiltersManager {
         sHighresInstance = null;
     }
 
+    public static void setResources(Resources resources) {
+        FiltersManager.getManager().setFilterResources(resources);
+        FiltersManager.getPreviewManager().setFilterResources(resources);
+        FiltersManager.getHighresManager().setFilterResources(resources);
+    }
 }
-- 
cgit v1.2.3