diff --git a/src/de/deadlocker8/budgetmaster/logic/FilterSettings.java b/src/de/deadlocker8/budgetmaster/logic/FilterSettings.java index c016f5a2cf7cdda2b3a52642acc774b576739181..82818e4c97dc74d42d00f862e135f3079e76c1f2 100644 --- a/src/de/deadlocker8/budgetmaster/logic/FilterSettings.java +++ b/src/de/deadlocker8/budgetmaster/logic/FilterSettings.java @@ -164,7 +164,7 @@ public class FilterSettings } else { - return true; + return isEqualTagIDs(otherSettings); } } else @@ -177,38 +177,43 @@ public class FilterSettings { if(allowedCategoryIDs.equals(otherSettings.getAllowedCategoryIDs())) { - return true; + return isEqualTagIDs(otherSettings); } } - } + } + } - if(allowedTagIDs == null) + return false; + } + + private boolean isEqualTagIDs(FilterSettings otherSettings) + { + if(allowedTagIDs == null) + { + if(otherSettings.getAllowedTagIDs() != null) { - if(otherSettings.getAllowedTagIDs() != null) - { - return false; - } - else - { - return true; - } + return false; } - else + else + { + return true; + } + } + else + { + if(otherSettings.getAllowedTagIDs() == null) { - if(otherSettings.getAllowedTagIDs() == null) + return false; + } + else + { + if(allowedTagIDs.equals(otherSettings.getAllowedTagIDs())) { - return false; - } - else - { - if(allowedTagIDs.equals(otherSettings.getAllowedTagIDs())) - { - return true; - } + return true; } } - } - + } + return false; } } \ No newline at end of file