Merge pull request #89 from grandcentrix/bugfix/clear_but_uses_abstra…

…ct_class_instead_of_implementation Weaken Parameter type for clearBut Methods
GCX-HCI · Feb 7, 2017 · 347a97f · 347a97f
2 parents 192b10d + caccae5
commit 347a97f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/library/src/main/java/net/grandcentrix/tray/Tray.java b/library/src/main/java/net/grandcentrix/tray/Tray.java
@@ -16,6 +16,7 @@
 
 package net.grandcentrix.tray;
 
+import net.grandcentrix.tray.core.AbstractTrayPreference;
 import net.grandcentrix.tray.core.Preferences;
 import net.grandcentrix.tray.core.TrayItem;
 import net.grandcentrix.tray.provider.TrayProviderHelper;
@@ -79,7 +80,7 @@ public boolean clear() {
      * @param modules modules excluded when deleting preferences
      * @return true when successfully cleared the not stated modules
      */
-    public boolean clearBut(TrayPreferences... modules) {
+    public boolean clearBut(AbstractTrayPreference... modules) {
         return mProviderHelper.clearBut(modules);
     }
 

diff --git a/library/src/main/java/net/grandcentrix/tray/provider/TrayProviderHelper.java b/library/src/main/java/net/grandcentrix/tray/provider/TrayProviderHelper.java
@@ -17,6 +17,7 @@
 package net.grandcentrix.tray.provider;
 
 import net.grandcentrix.tray.TrayPreferences;
+import net.grandcentrix.tray.core.AbstractTrayPreference;
 import net.grandcentrix.tray.core.TrayException;
 import net.grandcentrix.tray.core.TrayItem;
 
@@ -70,11 +71,11 @@ public boolean clear() {
      * @return true when successful, false otherwise. true doesn't indicate that something got
      * cleared, it just means no error occurred
      */
-    public boolean clearBut(TrayPreferences... modules) {
+    public boolean clearBut(AbstractTrayPreference... modules) {
         String selection = null;
         String[] selectionArgs = new String[]{};
 
-        for (final TrayPreferences module : modules) {
+        for (final AbstractTrayPreference module : modules) {
             if (module == null) {
                 continue;
             }