Set the default state for the filters

This commit is contained in:
Kelly Kelly 2019-07-31 10:42:39 -04:00
parent eab5788c70
commit 561dbeab0e

View File

@ -18,9 +18,6 @@
*/ */
package org.sleuthkit.autopsy.timeline.ui.filtering.datamodel; 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; import org.sleuthkit.datamodel.TimelineFilter;
/** /**
@ -29,11 +26,6 @@ import org.sleuthkit.datamodel.TimelineFilter;
* @param <FilterType> * @param <FilterType>
*/ */
public class SqlFilterState<FilterType extends TimelineFilter> extends AbstractFilterState<FilterType> { public class SqlFilterState<FilterType extends TimelineFilter> extends AbstractFilterState<FilterType> {
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 * Selected = false, Disabled = false
* *
@ -41,25 +33,21 @@ public class SqlFilterState<FilterType extends TimelineFilter> extends AbstractF
*/ */
public SqlFilterState(FilterType filter) { public SqlFilterState(FilterType filter) {
// Setting the intial state to all filters to "selected" except // Setting the intial state to all filters to "selected" except
// the "Hide Known Filters". // the "Hide Known Filters", "Tags", "Hashsets" and "Text".
this(filter, !(filter instanceof TimelineFilter.HideKnownFilter)); // 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 * Disabled = false
* *
* @param filter * @param filter
* @param selected True to select this filter initialy. * @param selected True to select this filter initially.
*/ */
public SqlFilterState(FilterType filter, boolean selected) { public SqlFilterState(FilterType filter, boolean selected) {
super(filter, selected); super(filter, selected);
} }
// protected SqlFilterState(FilterType filter, boolean selected, boolean disabled) {
// super(filter, selected);
// setDisabled(disabled);
// }
@Override @Override
public String getDisplayName() { public String getDisplayName() {
return getFilter().getDisplayName(); return getFilter().getDisplayName();
@ -76,7 +64,6 @@ public class SqlFilterState<FilterType extends TimelineFilter> extends AbstractF
@Override @Override
public String toString() { public String toString() {
activeProp.get();
return "TimelineFilterState{" return "TimelineFilterState{"
+ " filter=" + getFilter().toString() + " filter=" + getFilter().toString()
+ ", selected=" + isSelected() + ", selected=" + isSelected()