From 69db30368a3d270c8cb8e0d648651fb7286263aa Mon Sep 17 00:00:00 2001 From: ztenghui Date: Wed, 26 Jun 2013 13:54:17 -0700 Subject: Fix ambiguous naming and typo bug:9468909 Change-Id: Ic52f3b6f6b5d0c874e8291ce7b3a76cb6c22f60f --- .../gallery3d/filtershow/filters/FilterColorBorderRepresentation.java | 2 +- .../android/gallery3d/filtershow/filters/FilterFxRepresentation.java | 2 +- .../gallery3d/filtershow/filters/FilterImageBorderRepresentation.java | 2 +- .../android/gallery3d/filtershow/filters/FilterRepresentation.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/com/android/gallery3d') diff --git a/src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java index 99e1edf9a..d9e211723 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java @@ -76,7 +76,7 @@ public class FilterColorBorderRepresentation extends FilterRepresentation { return false; } - public boolean allowsMultipleInstances() { + public boolean allowsSingleInstanceOnly() { return true; } diff --git a/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java index abe69d110..a7efbca20 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java @@ -86,7 +86,7 @@ public class FilterFxRepresentation extends FilterRepresentation { } @Override - public boolean allowsMultipleInstances() { + public boolean allowsSingleInstanceOnly() { return true; } diff --git a/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java index d790d3ef7..c32f7ccdc 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java @@ -71,7 +71,7 @@ public class FilterImageBorderRepresentation extends FilterRepresentation { return R.string.none; } - public boolean allowsMultipleInstances() { + public boolean allowsSingleInstanceOnly() { return true; } diff --git a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java index 9d103d590..b192b5aaa 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java @@ -73,7 +73,7 @@ public class FilterRepresentation implements Cloneable { if (representation == null) { return false; } - if (representation.mFilterClass == representation.mFilterClass + if (representation.mFilterClass == mFilterClass && representation.mName.equalsIgnoreCase(mName) && representation.mPriority == mPriority && representation.mSupportsPartialRendering == mSupportsPartialRendering @@ -154,7 +154,7 @@ public class FilterRepresentation implements Cloneable { } } - public boolean allowsMultipleInstances() { + public boolean allowsSingleInstanceOnly() { return false; } -- cgit v1.2.3