From cef075fda868caa414e253b9e5f2905db20006f7 Mon Sep 17 00:00:00 2001 From: Brian Carrier Date: Wed, 19 Sep 2018 21:02:35 -0400 Subject: [PATCH] remove known_status from events table / UI. Not used for queries/filters --- .../timeline/explorernodes/EventNode.java | 3 +-- .../datamodel/SingleDetailsViewEvent.java | 21 +++---------------- .../timeline/ui/listvew/ListTimeline.fxml | 3 +-- .../timeline/ui/listvew/ListTimeline.java | 9 +------- 4 files changed, 6 insertions(+), 30 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/timeline/explorernodes/EventNode.java b/Core/src/org/sleuthkit/autopsy/timeline/explorernodes/EventNode.java index b72b8a4101..8b8e6511cb 100644 --- a/Core/src/org/sleuthkit/autopsy/timeline/explorernodes/EventNode.java +++ b/Core/src/org/sleuthkit/autopsy/timeline/explorernodes/EventNode.java @@ -96,8 +96,7 @@ public class EventNode extends DisplayableItemNode { properties.put(new NodeProperty<>("description", Bundle.NodeProperty_displayName_description(), "description", event.getFullDescription())); // NON-NLS properties.put(new NodeProperty<>("eventBaseType", Bundle.NodeProperty_displayName_baseType(), "base type", event.getEventType().getSuperType().getDisplayName())); // NON-NLS properties.put(new NodeProperty<>("eventSubType", Bundle.NodeProperty_displayName_subType(), "sub type", event.getEventType().getDisplayName())); // NON-NLS - properties.put(new NodeProperty<>("Known", Bundle.NodeProperty_displayName_known(), "known", event.getKnown().toString())); // NON-NLS - + return sheet; } diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/datamodel/SingleDetailsViewEvent.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/datamodel/SingleDetailsViewEvent.java index 7a2df66a4d..7c7cf72b45 100644 --- a/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/datamodel/SingleDetailsViewEvent.java +++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/datamodel/SingleDetailsViewEvent.java @@ -68,11 +68,6 @@ public class SingleDetailsViewEvent implements DetailViewEvent { */ private final ImmutableMap descriptions; - /** - * The known value for the file this event is derived from. - */ - private final TskData.FileKnown known; - /** * True if the file this event is derived from hits any of the configured * hash sets. @@ -101,11 +96,10 @@ public class SingleDetailsViewEvent implements DetailViewEvent { * @param fullDescription * @param medDescription * @param shortDescription - * @param known * @param hashHit * @param tagged */ - public SingleDetailsViewEvent(long eventID, long dataSourceObjId, long fileObjId, Long artifactID, long time, EventType type, String fullDescription, String medDescription, String shortDescription, TskData.FileKnown known, boolean hashHit, boolean tagged) { + public SingleDetailsViewEvent(long eventID, long dataSourceObjId, long fileObjId, Long artifactID, long time, EventType type, String fullDescription, String medDescription, String shortDescription, boolean hashHit, boolean tagged) { this.eventID = eventID; this.dataSourceObjId = dataSourceObjId; this.fileObjId = fileObjId; @@ -115,7 +109,6 @@ public class SingleDetailsViewEvent implements DetailViewEvent { descriptions = ImmutableMap.of(DescriptionLoD.FULL, fullDescription, DescriptionLoD.MEDIUM, medDescription, DescriptionLoD.SHORT, shortDescription); - this.known = known; this.hashHit = hashHit; this.tagged = tagged; } @@ -130,7 +123,6 @@ public class SingleDetailsViewEvent implements DetailViewEvent { singleEvent.getFullDescription(), singleEvent.getMedDescription(), singleEvent.getShortDescription(), - singleEvent.getKnown(), singleEvent.isHashHit(), singleEvent.isTagged()); } @@ -145,7 +137,7 @@ public class SingleDetailsViewEvent implements DetailViewEvent { * with the given parent. */ public SingleDetailsViewEvent withParent(MultiEvent newParent) { - SingleDetailsViewEvent singleEvent = new SingleDetailsViewEvent(eventID, dataSourceObjId, fileObjId, artifactID, time, type, descriptions.get(DescriptionLoD.FULL), descriptions.get(DescriptionLoD.MEDIUM), descriptions.get(DescriptionLoD.SHORT), known, hashHit, tagged); + SingleDetailsViewEvent singleEvent = new SingleDetailsViewEvent(eventID, dataSourceObjId, fileObjId, artifactID, time, type, descriptions.get(DescriptionLoD.FULL), descriptions.get(DescriptionLoD.MEDIUM), descriptions.get(DescriptionLoD.SHORT), hashHit, tagged); singleEvent.parent = newParent; return singleEvent; } @@ -240,14 +232,7 @@ public class SingleDetailsViewEvent implements DetailViewEvent { return getDescription(DescriptionLoD.SHORT); } - /** - * Get the known value of the file this event is derived from. - * - * @return the known value - */ - public TskData.FileKnown getKnown() { - return known; - } + /** * Get the description of this event at the give level of detail(LoD). diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/listvew/ListTimeline.fxml b/Core/src/org/sleuthkit/autopsy/timeline/ui/listvew/ListTimeline.fxml index a0138c5c83..de86817f00 100644 --- a/Core/src/org/sleuthkit/autopsy/timeline/ui/listvew/ListTimeline.fxml +++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/listvew/ListTimeline.fxml @@ -77,8 +77,7 @@ - - + diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/listvew/ListTimeline.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/listvew/ListTimeline.java index 50acc565a9..1c37bac240 100644 --- a/Core/src/org/sleuthkit/autopsy/timeline/ui/listvew/ListTimeline.java +++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/listvew/ListTimeline.java @@ -156,8 +156,6 @@ class ListTimeline extends BorderPane { @FXML private TableColumn typeColumn; @FXML - private TableColumn knownColumn; - @FXML private TableColumn taggedColumn; @FXML private TableColumn hashHitColumn; @@ -217,8 +215,7 @@ class ListTimeline extends BorderPane { assert dateTimeColumn != null : "fx:id=\"dateTimeColumn\" was not injected: check your FXML file 'ListViewPane.fxml'."; //NON-NLS assert descriptionColumn != null : "fx:id=\"descriptionColumn\" was not injected: check your FXML file 'ListViewPane.fxml'."; //NON-NLS assert typeColumn != null : "fx:id=\"typeColumn\" was not injected: check your FXML file 'ListViewPane.fxml'."; //NON-NLS - assert knownColumn != null : "fx:id=\"knownColumn\" was not injected: check your FXML file 'ListViewPane.fxml'."; //NON-NLS - + //configure scroll controls scrollInrementComboBox.setButtonCell(new ChronoFieldListCell()); scrollInrementComboBox.setCellFactory(comboBox -> new ChronoFieldListCell()); @@ -247,10 +244,6 @@ class ListTimeline extends BorderPane { typeColumn.setCellValueFactory(CELL_VALUE_FACTORY); typeColumn.setCellFactory(col -> new EventTypeCell()); - knownColumn.setCellValueFactory(CELL_VALUE_FACTORY); - knownColumn.setCellFactory(col -> new TextEventTableCell(singleEvent - -> singleEvent.getKnown().getName())); - taggedColumn.setCellValueFactory(CELL_VALUE_FACTORY); taggedColumn.setCellFactory(col -> new TaggedCell());