From caccae561f4a2be3c100bc9e44a481c57a256b39 Mon Sep 17 00:00:00 2001 From: Jannis Veerkamp Date: Tue, 7 Feb 2017 13:23:45 +0100 Subject: [PATCH] Parameters of clearBut only need an instance of AbstractTrayPreference --- library/src/main/java/net/grandcentrix/tray/Tray.java | 3 ++- .../net/grandcentrix/tray/provider/TrayProviderHelper.java | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/library/src/main/java/net/grandcentrix/tray/Tray.java b/library/src/main/java/net/grandcentrix/tray/Tray.java index ff1d331..30204cb 100644 --- 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 index 61f3932..00f8ab7 100644 --- 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; }