Merge "Fix ambiguous naming and typo" into gb-ub-photos-carlsbad

5 files changed, 6 insertions, 6 deletions

diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index 289a4c37b..2ac7e981b 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -447,7 +447,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
         if (representation == null) {
             copy.addFilter(filterRepresentation);
         } else {
-            if (filterRepresentation.allowsMultipleInstances()) {
+            if (filterRepresentation.allowsSingleInstanceOnly()) {
                 representation.updateTempParametersFrom(filterRepresentation);
                 copy.setHistoryName(filterRepresentation.getName());
                 representation.synchronizeRepresentation();
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;
     }