diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventClusterNode.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventClusterNode.java index 8874f1bac0..22914eb0eb 100755 --- a/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventClusterNode.java +++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventClusterNode.java @@ -191,25 +191,25 @@ final class EventClusterNode extends MultiEventNodeBase> loggedTask; loggedTask = new LoggedTask>(Bundle.EventClusterNode_loggedTask_name(), false) { - private volatile TimelineEvent.DescriptionLevel loadedDescription = withRelativeDetail(getDescriptionLevel(), relativeDetail); + private volatile TimelineEvent.DescriptionLevel loadedDescriptionLevel = withRelativeDetail(getDescriptionLevel(), relativeDetail); @Override protected List call() throws Exception { //newly loaded substripes List stripes; //next LoD in diraction of given relativeDetail - TimelineEvent.DescriptionLevel next = loadedDescription; + TimelineEvent.DescriptionLevel next = loadedDescriptionLevel; do { - loadedDescription = next; - if (loadedDescription == getEvent().getDescriptionLevel()) { + loadedDescriptionLevel = next; + if (loadedDescriptionLevel == getEvent().getDescriptionLevel()) { //if we are back at the level of detail of the original cluster, return empty list to inidicate. return Collections.emptyList(); } //query for stripes at the desired level of detail - stripes = chartLane.getParentChart().getDetailsViewModel().getEventStripes(descriptionFilter, zoom.withDescrLOD(loadedDescription)); + stripes = chartLane.getParentChart().getDetailsViewModel().getEventStripes(descriptionFilter, zoom.withDescrLOD(loadedDescriptionLevel)); //setup next for subsequent go through the "do" loop - next = withRelativeDetail(loadedDescription, relativeDetail); + next = withRelativeDetail(loadedDescriptionLevel, relativeDetail); } while (stripes.size() == 1 && nonNull(next)); //keep going while there was only on stripe and we havne't reached the end of the LoD continuum. // return list of EventStripes with parents set to this cluster @@ -227,7 +227,7 @@ final class EventClusterNode extends MultiEventNodeBase newSubStripes = get(); if (newSubStripes.isEmpty()) { //restore original display diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/datamodel/DetailsViewModel.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/datamodel/DetailsViewModel.java index b2c2fd0e9d..675999b40d 100755 --- a/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/datamodel/DetailsViewModel.java +++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/datamodel/DetailsViewModel.java @@ -153,7 +153,7 @@ final public class DetailsViewModel { * @throws org.sleuthkit.datamodel.TskCoreException If there is an error * querying the db. */ - List getEvents(ZoomState zoom, DateTimeZone timeZone) throws TskCoreException { + private List getEvents(ZoomState zoom, DateTimeZone timeZone) throws TskCoreException { //unpack params Interval timeRange = zoom.getTimeRange(); TimelineFilter.RootFilter activeFilter = zoom.getFilterState().getActiveFilter();