remove known_status from events table / UI. Not used for queries/filters

This commit is contained in:
Brian Carrier
2018-09-19 21:02:35 -04:00
parent 6400a72f3a
commit cef075fda8
4 changed files with 6 additions and 30 deletions
@@ -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;
}
@@ -68,11 +68,6 @@ public class SingleDetailsViewEvent implements DetailViewEvent {
*/
private final ImmutableMap<DescriptionLoD, String> 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.<DescriptionLoD, String>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).
@@ -77,8 +77,7 @@
<TableColumn fx:id="dateTimeColumn" editable="false" maxWidth="200.0" minWidth="150.0" prefWidth="150.0" resizable="false" sortable="false" text="Date/Time" />
<TableColumn fx:id="typeColumn" editable="false" maxWidth="100.0" minWidth="100.0" prefWidth="100.0" sortable="false" text="Event Type" />
<TableColumn fx:id="descriptionColumn" editable="false" maxWidth="3000.0" minWidth="100.0" prefWidth="300.0" sortable="false" text="Description" />
<TableColumn fx:id="knownColumn" editable="false" maxWidth="75.0" minWidth="75.0" prefWidth="75.0" resizable="false" sortable="false" text="Known" />
<TableColumn fx:id="idColumn" editable="false" maxWidth="50.0" minWidth="50.0" prefWidth="50.0" resizable="false" sortable="false" text="ID" />
<TableColumn fx:id="idColumn" editable="false" maxWidth="50.0" minWidth="50.0" prefWidth="50.0" resizable="false" sortable="false" text="ID" />
<TableColumn fx:id="taggedColumn" maxWidth="75.0" minWidth="75.0" prefWidth="75.0" resizable="false" text="Tagged" />
<TableColumn fx:id="hashHitColumn" maxWidth="75.0" minWidth="75.0" prefWidth="75.0" resizable="false" text="Hash Hit" />
</columns>
@@ -156,8 +156,6 @@ class ListTimeline extends BorderPane {
@FXML
private TableColumn<CombinedEvent, CombinedEvent> typeColumn;
@FXML
private TableColumn<CombinedEvent, CombinedEvent> knownColumn;
@FXML
private TableColumn<CombinedEvent, CombinedEvent> taggedColumn;
@FXML
private TableColumn<CombinedEvent, CombinedEvent> 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());