From f60760478ec7c78446be0e0c6bc5502d1557974c Mon Sep 17 00:00:00 2001 From: nicolasroard Date: Tue, 12 Feb 2013 12:19:19 -0800 Subject: Refactor FiltersManager Change-Id: I4c42ddb90e65e90af873eb8dbe065f4fa3de69ef --- .../filtershow/filters/FiltersManager.java | 98 +--------------------- 1 file changed, 1 insertion(+), 97 deletions(-) (limited to 'src_pd') diff --git a/src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java b/src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java index 2a1a6da6a..988cf2d81 100644 --- a/src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java +++ b/src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java @@ -16,39 +16,8 @@ package com.android.gallery3d.filtershow.filters; -import com.android.gallery3d.filtershow.cache.ImageLoader; - -import java.util.HashMap; -import java.util.Vector; - -public class FiltersManager { - - private static final String LOGTAG = "FiltersManager"; +public class FiltersManager extends BaseFiltersManager { private static FiltersManager gInstance = null; - private static HashMap mFilters = new HashMap(); - - private FiltersManager() { - Vector filters = new Vector(); - FiltersManager.addFilters(filters); - filters.add(new ImageFilterFx()); - filters.add(new ImageFilterBorder()); - filters.add(new ImageFilterParametricBorder()); - for (ImageFilter filter : filters) { - mFilters.put(filter.getClass(), filter); - } - } - - public ImageFilter getFilter(Class c) { - return mFilters.get(c); - } - - public ImageFilter getFilterForRepresentation(FilterRepresentation representation) { - return mFilters.get(representation.getFilterClass()); - } - - public void addFilter(Class filterClass, ImageFilter filter) { - mFilters.put(filterClass, filter); - } public static FiltersManager getManager() { if (gInstance == null) { @@ -56,69 +25,4 @@ public class FiltersManager { } return gInstance; } - - public static FilterRepresentation getRepresentation(Class c) { - ImageFilter filter = mFilters.get(c); - if (filter != null) { - return filter.getDefaultRepresentation(); - } - return null; - } - - public static void addFilterRepresentations(Vector representations) { - representations.add(getRepresentation(ImageFilterTinyPlanet.class)); - representations.add(getRepresentation(ImageFilterRedEye.class)); - representations.add(getRepresentation(ImageFilterWBalance.class)); - representations.add(getRepresentation(ImageFilterExposure.class)); - representations.add(getRepresentation(ImageFilterVignette.class)); - representations.add(getRepresentation(ImageFilterContrast.class)); - representations.add(getRepresentation(ImageFilterShadows.class)); - representations.add(getRepresentation(ImageFilterVibrance.class)); - representations.add(getRepresentation(ImageFilterSharpen.class)); - representations.add(getRepresentation(ImageFilterCurves.class)); - representations.add(getRepresentation(ImageFilterDraw.class)); - representations.add(getRepresentation(ImageFilterHue.class)); - representations.add(getRepresentation(ImageFilterSaturated.class)); - representations.add(getRepresentation(ImageFilterBwFilter.class)); - representations.add(getRepresentation(ImageFilterNegative.class)); - representations.add(getRepresentation(ImageFilterEdge.class)); - representations.add(getRepresentation(ImageFilterKMeans.class)); - } - - public static void addFilters(Vector filters) { - filters.add(new ImageFilterTinyPlanet()); - filters.add(new ImageFilterRedEye()); - filters.add(new ImageFilterWBalance()); - filters.add(new ImageFilterExposure()); - filters.add(new ImageFilterVignette()); - filters.add(new ImageFilterContrast()); - filters.add(new ImageFilterShadows()); - filters.add(new ImageFilterVibrance()); - filters.add(new ImageFilterSharpen()); - filters.add(new ImageFilterCurves()); - filters.add(new ImageFilterDraw()); - filters.add(new ImageFilterHue()); - filters.add(new ImageFilterSaturated()); - filters.add(new ImageFilterBwFilter()); - filters.add(new ImageFilterNegative()); - filters.add(new ImageFilterEdge()); - filters.add(new ImageFilterKMeans()); - } - - public static void addFilters(Vector filters, ImageLoader imageLoader) { - FiltersManager.addFilters(filters); - filters.add(new ImageFilterDownsample(imageLoader)); - FiltersManager.getManager().addFilter(ImageFilterDownsample.class, - new ImageFilterDownsample(imageLoader)); - } - - public void resetBitmapsRS() { - for (Class c : mFilters.keySet()) { - ImageFilter filter = mFilters.get(c); - if (filter instanceof ImageFilterRS) { - ImageFilterRS filterRS = (ImageFilterRS) filter; - filterRS.resetBitmap(); - } - } - } } -- cgit v1.2.3