diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/SqlFilterState.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/SqlFilterState.java index 9bf2c16c4d..5180dd3425 100755 --- a/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/SqlFilterState.java +++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/SqlFilterState.java @@ -18,9 +18,6 @@ */ package org.sleuthkit.autopsy.timeline.ui.filtering.datamodel; -import javafx.beans.binding.Bindings; -import javafx.beans.binding.BooleanBinding; -import javafx.beans.property.SimpleBooleanProperty; import org.sleuthkit.datamodel.TimelineFilter; /** @@ -29,11 +26,6 @@ import org.sleuthkit.datamodel.TimelineFilter; * @param */ public class SqlFilterState extends AbstractFilterState { - - private final SimpleBooleanProperty selected = new SimpleBooleanProperty(false); - private final SimpleBooleanProperty disabled = new SimpleBooleanProperty(false); - private final BooleanBinding activeProp = Bindings.and(selected, disabled.not()); - /** * Selected = false, Disabled = false * @@ -41,25 +33,21 @@ public class SqlFilterState extends AbstractF */ public SqlFilterState(FilterType filter) { // Setting the intial state to all filters to "selected" except - // the "Hide Known Filters". - this(filter, !(filter instanceof TimelineFilter.HideKnownFilter)); + // the "Hide Known Filters", "Tags", "Hashsets" and "Text". + // There are better ways to do this, but this works in a pinch + this(filter, !(filter instanceof TimelineFilter.HideKnownFilter || filter instanceof TimelineFilter.TagsFilter || filter instanceof TimelineFilter.HashHitsFilter || filter instanceof TimelineFilter.TextFilter)); } /** * Disabled = false * * @param filter - * @param selected True to select this filter initialy. + * @param selected True to select this filter initially. */ public SqlFilterState(FilterType filter, boolean selected) { super(filter, selected); } -// protected SqlFilterState(FilterType filter, boolean selected, boolean disabled) { -// super(filter, selected); -// setDisabled(disabled); -// } - @Override public String getDisplayName() { return getFilter().getDisplayName(); @@ -76,7 +64,6 @@ public class SqlFilterState extends AbstractF @Override public String toString() { - activeProp.get(); return "TimelineFilterState{" + " filter=" + getFilter().toString() + ", selected=" + isSelected()