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

`fix RootFilterState intersection

Browse Source
This commit is contained in:
millmanorama 2018-11-01 14:13:03 +01:00
parent 02ce6ee62c
commit 16c73d45b0
5 changed files with 40 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Core/src/org/sleuthkit/autopsy/timeline/FilteredEventsModel.java
View File

@ -23,6 +23,7 @@ import com.google.common.cache.LoadingCache;
import com.google.common.collect.ImmutableList;
import com.google.common.eventbus.EventBus;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
@ -89,7 +90,6 @@ import org.sleuthkit.datamodel.timeline.TimelineFilter.TagsFilter;
import org.sleuthkit.datamodel.timeline.TimelineFilter.TextFilter;
import org.sleuthkit.datamodel.timeline.TimelineFilter.TypeFilter;
/**
* This class acts as the model for a TimelineView
*
@ -192,7 +192,7 @@ public final class FilteredEventsModel {
* the EvenType of the level specified in the zoomState
*
* @param zoomState The params that control what events to count and how to
* organize the returned map
* organize the returned map
*
* @return a map from event type( of the requested level) to event counts
*
@ -285,7 +285,6 @@ public final class FilteredEventsModel {
filterState.setDisabled(tagNames.contains(filterState.getFilter().getTagName()) == false);
}
}
/**
* Get a read only view of the time range currently in view.
@ -407,13 +406,13 @@ public final class FilteredEventsModel {
public List<Long> getEventIDs(Interval timeRange, TimelineFilter filter) throws TskCoreException {
final Interval overlap;
final RootFilterState intersect;
RootFilterState intersection;
synchronized (this) {
overlap = getSpanningInterval().overlap(timeRange);
intersect = getFilterState().copyOf();
intersection = getFilterState().intersect(filter);
}
intersect.getFilter().getSubFilters().add(filter);
return eventManager.getEventIDs(overlap, intersect.getActiveFilter());
return eventManager.getEventIDs(overlap, intersection.getActiveFilter());
}
/**

3
Core/src/org/sleuthkit/autopsy/timeline/ui/countsview/EventCountsChart.java
View File

@ -286,8 +286,7 @@ final class EventCountsChart extends StackedBarChart<String, Number> implements
* stacked bar chart.
*
* Concurrency Policy: This only accesses immutable state or javafx nodes
* (from the jfx thread) and the internally synchronized
* {@link TimeLineController}
* (from the jfx thread) and the internally synchronized TimeLineController
*
* TODO: review for thread safety -jm
*/

4
Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/CompoundFilterState.java
View File

@ -33,9 +33,9 @@ import org.sleuthkit.datamodel.timeline.TimelineFilter.CompoundFilter;
*/
public interface CompoundFilterState<SubFilterType extends TimelineFilter, C extends CompoundFilter<SubFilterType>> extends FilterState<C> {
ObservableList<? extends FilterState< ? extends SubFilterType>> getSubFilterStates();
ObservableList<? extends FilterState<? extends SubFilterType>> getSubFilterStates();
@Override
public CompoundFilterState<SubFilterType, C> copyOf();
}
}

2
Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/CompoundFilterStateImpl.java
View File

@ -108,7 +108,7 @@ class CompoundFilterStateImpl<SubFilterType extends TimelineFilter, C extends Co
}
private void addSubFilterState(FilterState<SubFilterType> newFilterModel) {
subFilterStates.add(newFilterModel);
getSubFilterStates().add(newFilterModel);
newFilterModel.selectedProperty().addListener(selectedProperty -> {
//set this compound filter model selected af any of the subfilters are selected.
setSelected(getSubFilterStates().stream().anyMatch(FilterState::isSelected));

31
Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/RootFilterState.java
View File

@ -22,7 +22,9 @@ import java.util.Collections;
import javafx.beans.property.ReadOnlyBooleanProperty;
import javafx.beans.property.ReadOnlyBooleanWrapper;
import javafx.collections.FXCollections;
import javafx.collections.ListChangeListener;
import javafx.collections.ObservableList;
import org.python.google.common.collect.Lists;
import org.sleuthkit.datamodel.TimelineManager;
import org.sleuthkit.datamodel.timeline.TimelineFilter;
import org.sleuthkit.datamodel.timeline.TimelineFilter.DataSourceFilter;
@ -83,6 +85,33 @@ public class RootFilterState implements FilterState<RootFilter>, CompoundFilterS
dataSourcesFilterState, typeFilterState);
}
/**
* Get a new root filter that intersects the given filter with this one.
*
* @param otherFilter
*
* @return A new RootFilter model that intersects the given filter with this
* one.
*/
public RootFilterState intersect(TimelineFilter otherFilter) {
RootFilterState copyOf = copyOf();
copyOf.addSubFilterState(otherFilter);
return copyOf;
}
private void addSubFilterState(TimelineFilter subFilter) {
if (subFilter instanceof TimelineFilter.CompoundFilter<?>) {
CompoundFilterStateImpl<? extends TimelineFilter, ? extends TimelineFilter.CompoundFilter<? extends TimelineFilter>> compoundFilterStateImpl = new CompoundFilterStateImpl<>((TimelineFilter.CompoundFilter<?>) subFilter);
getSubFilterStates().add(compoundFilterStateImpl);
compoundFilterStateImpl.setSelected(Boolean.TRUE);
} else {
DefaultFilterState<TimelineFilter> defaultFilterState = new DefaultFilterState<>(subFilter);
getSubFilterStates().add(defaultFilterState);
defaultFilterState.setSelected(Boolean.TRUE);
}
}
@Override
public RootFilterState copyOf() {
return new RootFilterState(getFilter().copyOf(),
@ -126,7 +155,7 @@ public class RootFilterState implements FilterState<RootFilter>, CompoundFilterS
textFilterState.getActiveFilter(),
typeFilterState.getActiveFilter(),
dataSourcesFilterState.getActiveFilter(),
Collections.emptySet());
Lists.transform(subFilterStates, FilterState::getActiveFilter));
}
@SuppressWarnings("rawtypes")