mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-12 16:06:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

comments and minor cleanup

Browse Source
This commit is contained in:
jmillman 2016-04-15 16:40:25 -04:00
parent 1076ef3d81
commit ff3810df09
7 changed files with 53 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Core/src/org/sleuthkit/autopsy/timeline/filters/CompoundFilter.java
View File

@ -20,7 +20,6 @@ package org.sleuthkit.autopsy.timeline.filters;
import java.util.List;
import java.util.Objects;
import javafx.beans.Observable;
import javafx.collections.FXCollections;
import javafx.collections.ListChangeListener;
import javafx.collections.ObservableList;
@ -31,12 +30,8 @@ import javafx.collections.ObservableList;
* implementations can decide how to combine the sub-filters.
*
* a {@link CompoundFilter} uses listeners to enforce the following
* relationships between it and its sub-filters:
* <ol>
* <le>if a compound filter becomes inactive disable all of its sub-filters</le>
* <le>if all of a compound filter's sub-filters become un-selected, un-select
* the compound filter.</le>
* </ol>
* relationships between it and its sub-filters: if all of a compound filter's
* sub-filters become un-selected, un-select the compound filter.
*/
public abstract class CompoundFilter<SubFilterType extends Filter> extends AbstractFilter {
@ -57,27 +52,23 @@ public abstract class CompoundFilter<SubFilterType extends Filter> extends Abstr
public CompoundFilter(List<SubFilterType> subFilters) {
super();
//listen to changes in list of subfilters and
this.subFilters.addListener((ListChangeListener.Change<? extends SubFilterType> c) -> {
while (c.next()) { //add active state listener to newly added filters
addSubFilterListeners(c.getAddedSubList());
//listen to changes in list of subfilters
this.subFilters.addListener((ListChangeListener.Change<? extends SubFilterType> change) -> {
while (change.next()) {
//add a listener to the selected property of each added subfilter
change.getAddedSubList().forEach(addedSubFilter -> {
//if a subfilter's selected property changes...
addedSubFilter.selectedProperty().addListener(selectedProperty -> {
//set this compound filter selected af any of the subfilters are selected.
setSelected(getSubFilters().parallelStream().anyMatch(Filter::isSelected));
});
});
}
setSelected(getSubFilters().parallelStream().anyMatch(Filter::isSelected));
});
this.subFilters.setAll(subFilters);
}
private void addSubFilterListeners(List<? extends SubFilterType> newSubfilters) {
for (SubFilterType sf : newSubfilters) {
//if a subfilter changes selected state
sf.selectedProperty().addListener((Observable observable) -> {
//set this filter selected af any of the subfilters are selected.
setSelected(getSubFilters().parallelStream().anyMatch(Filter::isSelected));
});
}
}
static <SubFilterType extends Filter> boolean areSubFiltersEqual(final CompoundFilter<SubFilterType> oneFilter, final CompoundFilter<SubFilterType> otherFilter) {
if (oneFilter.getSubFilters().size() != otherFilter.getSubFilters().size()) {
return false;

10
Core/src/org/sleuthkit/autopsy/timeline/filters/DataSourcesFilter.java
View File

@ -30,21 +30,21 @@ import org.openide.util.NbBundle;
*/
public class DataSourcesFilter extends UnionFilter<DataSourceFilter> {
//keep references to the overridden properties so they don't get GC'd
private final BooleanBinding activePropertyOverride;
private BooleanBinding disabledPropertyOverride;
private final BooleanBinding disabledPropertyOverride;
public DataSourcesFilter() {
disabledPropertyOverride = Bindings.or(super.disabledProperty(), Bindings.size(getSubFilters()).lessThanOrEqualTo(1));
activePropertyOverride = super.activeProperty().and(Bindings.not(disabledProperty()));
activePropertyOverride = super.activeProperty().and(Bindings.not(disabledPropertyOverride));
}
@Override
public DataSourcesFilter copyOf() {
final DataSourcesFilter filterCopy = new DataSourcesFilter();
//add a copy of each subfilter
getSubFilters().forEach(dataSourceFilter ->
filterCopy.addSubFilter(dataSourceFilter.copyOf())
);
getSubFilters().forEach(dataSourceFilter -> filterCopy.addSubFilter(dataSourceFilter.copyOf()));
//these need to happen after the listeners fired by adding the subfilters
filterCopy.setSelected(isSelected());
filterCopy.setDisabled(isDisabled());

5
Core/src/org/sleuthkit/autopsy/timeline/filters/HashHitsFilter.java
View File

@ -43,9 +43,8 @@ public class HashHitsFilter extends UnionFilter<HashSetFilter> {
public HashHitsFilter copyOf() {
HashHitsFilter filterCopy = new HashHitsFilter();
//add a copy of each subfilter
this.getSubFilters().forEach(hashSetFilter ->
filterCopy.addSubFilter(hashSetFilter.copyOf())
);
this.getSubFilters().forEach(hashSetFilter -> filterCopy.addSubFilter(hashSetFilter.copyOf()));
//these need to happen after the listeners fired by adding the subfilters
filterCopy.setSelected(isSelected());
filterCopy.setDisabled(isDisabled());

5
Core/src/org/sleuthkit/autopsy/timeline/filters/TagsFilter.java
View File

@ -45,9 +45,8 @@ public class TagsFilter extends UnionFilter<TagNameFilter> {
public TagsFilter copyOf() {
TagsFilter filterCopy = new TagsFilter();
//add a copy of each subfilter
getSubFilters().forEach(tagNameFilter ->
filterCopy.addSubFilter(tagNameFilter.copyOf())
);
getSubFilters().forEach(tagNameFilter -> filterCopy.addSubFilter(tagNameFilter.copyOf()));
//these need to happen after the listeners fired by adding the subfilters
filterCopy.setSelected(isSelected());
filterCopy.setDisabled(isDisabled());

6
Core/src/org/sleuthkit/autopsy/timeline/filters/TypeFilter.java
View File

@ -102,10 +102,8 @@ public class TypeFilter extends UnionFilter<TypeFilter> {
//make a nonrecursive copy of this filter
final TypeFilter filterCopy = new TypeFilter(eventType, false);
//add a copy of each subfilter
getSubFilters().forEach(typeFilter ->
filterCopy.addSubFilter(typeFilter.copyOf(), comparator)
);
getSubFilters().forEach(typeFilter -> filterCopy.addSubFilter(typeFilter.copyOf(), comparator));
//these need to happen after the listeners fired by adding the subfilters
filterCopy.setSelected(isSelected());
filterCopy.setDisabled(isDisabled());
return filterCopy;

5
Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/FilterSetPanel.java
View File

@ -84,6 +84,10 @@ final public class FilterSetPanel extends BorderPane {
private final FilteredEventsModel filteredEvents;
private final TimeLineController controller;
/**
* map from filter to its expansion state in the ui, used to restore the
* expansion state as we navigate back and forward in the history
*/
private final ObservableMap<Filter, Boolean> expansionMap = FXCollections.observableHashMap();
private double dividerPosition;
@ -112,6 +116,7 @@ final public class FilterSetPanel extends BorderPane {
legendColumn.setCellValueFactory(cellDataFeatures -> cellDataFeatures.getValue().valueProperty());
legendColumn.setCellFactory(col -> new LegendCell(this.controller));
//type is the only filter expanded initialy
expansionMap.put(controller.getEventsModel().getFilter().getTypeFilter(), true);
this.filteredEvents.eventTypeZoomProperty().addListener((Observable observable) -> applyFilters());

42
Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/FilterTreeItem.java
View File

@ -31,50 +31,56 @@ import org.sleuthkit.autopsy.timeline.filters.Filter;
final public class FilterTreeItem extends TreeItem<Filter> {
/**
* recursively construct a tree of treeitems to parallel the filter tree of
* recursively construct a tree of TreeItems to parallel the filter tree of
* the given filter
*
*
* @param f the filter for this item. if f has sub-filters, tree items will
* be made for them added added to the children of this
* FilterTreeItem
* @param filter the filter for this item. if f has sub-filters, tree items
* will be made for them added added to the children of this
* FilterTreeItem
*/
public FilterTreeItem(Filter f, ObservableMap<Filter, Boolean> expansionMap) {
super(f);
public FilterTreeItem(Filter filter, ObservableMap<Filter, Boolean> expansionMap) {
super(filter);
//listen to changes in the expansion map, and update expansion state of filter object
expansionMap.addListener((MapChangeListener.Change<? extends Filter, ? extends Boolean> change) -> {
if (change.getKey().equals(f)) {
if (change.getKey().equals(filter)) {
setExpanded(expansionMap.get(change.getKey()));
}
});
if (expansionMap.containsKey(f)) {
setExpanded(expansionMap.get(f));
if (expansionMap.containsKey(filter)) {
setExpanded(expansionMap.get(filter));
}
expandedProperty().addListener(expandedProperty -> expansionMap.put(f, isExpanded()));
//keep expanion map upto date if user expands/collapses filter
expandedProperty().addListener(expandedProperty -> expansionMap.put(filter, isExpanded()));
if (f instanceof CompoundFilter<?>) {
final CompoundFilter<?> compoundFilter = (CompoundFilter<?>) f;
//if the filter is a compound filter, add its subfilters to the tree
if (filter instanceof CompoundFilter<?>) {
final CompoundFilter<?> compoundFilter = (CompoundFilter<?>) filter;
for (Filter subFilter : compoundFilter.getSubFilters()) {
getChildren().add(new FilterTreeItem(subFilter, expansionMap));
}
//add all sub filters
compoundFilter.getSubFilters().forEach(subFilter -> getChildren().add(new FilterTreeItem(subFilter, expansionMap)));
//listen to changes in sub filters and keep tree in sync
compoundFilter.getSubFilters().addListener((ListChangeListener.Change<? extends Filter> c) -> {
while (c.next()) {
for (Filter subfFilter : c.getAddedSubList()) {
setExpanded(true);
setExpanded(true); //emphasize new filters by expanding parent to make sure they are visible
getChildren().add(new FilterTreeItem(subfFilter, expansionMap));
}
}
});
/*
* enforce the following relationship between a compound filter and
* its subfilters: if a compound filter's active property changes,
* disable the subfilters if the compound filter is not active.
*/
compoundFilter.activeProperty().addListener(activeProperty -> {
compoundFilter.getSubFilters().forEach(subFilter -> subFilter.setDisabled(compoundFilter.isActive() == false));
});
}
}
}