From ec9e91c09e47c27c267c783234ca7665ec1726e7 Mon Sep 17 00:00:00 2001 From: Kelly Kelly Date: Tue, 16 Jul 2019 14:12:26 -0400 Subject: [PATCH] Added comment to function --- .../timeline/ui/listvew/datamodel/ListViewModel.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/listvew/datamodel/ListViewModel.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/listvew/datamodel/ListViewModel.java index 0726d80081..6500184331 100755 --- a/Core/src/org/sleuthkit/autopsy/timeline/ui/listvew/datamodel/ListViewModel.java +++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/listvew/datamodel/ListViewModel.java @@ -107,9 +107,11 @@ public class ListViewModel { List eventTypes = unGroupConcat(resultSet.getString("eventTypes"), typesString -> eventManager.getEventType(Integer.valueOf(typesString)).orElseThrow(() -> new TskCoreException("Error mapping event type id " + typesString + ".S"))); + // We want to merge together file sub-type events that are at + //the same time, but create individual events for other sub Map eventMap = new HashMap<>(); - - if(hasFileTypeEvents(eventTypes)) { + if (hasFileTypeEvents(eventTypes)) { + for (int i = 0; i < eventIDs.size(); i++) { eventMap.put(eventTypes.get(i), eventIDs.get(i)); } @@ -118,7 +120,7 @@ public class ListViewModel { for (int i = 0; i < eventIDs.size(); i++) { eventMap.put(eventTypes.get(i), eventIDs.get(i)); combinedEvents.add(new CombinedEvent(resultSet.getLong("time") * 1000, eventMap)); - eventMap = new HashMap<>(); + eventMap.clear(); } } } @@ -132,8 +134,8 @@ public class ListViewModel { private boolean hasFileTypeEvents(List eventTypes) { - for(EventType type: eventTypes) { - if(type.getBaseType() != EventType.FILE_SYSTEM) { + for (EventType type: eventTypes) { + if (type.getBaseType() != EventType.FILE_SYSTEM) { return false; } }