From ff2278a98eabc46aeabde82be2d2163fa7117e7a Mon Sep 17 00:00:00 2001 From: jmillman Date: Mon, 2 Nov 2015 17:20:33 -0500 Subject: [PATCH] set correct text on treecell for event type nodes --- .../ui/detailview/tree/EventsTree.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/EventsTree.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/EventsTree.java index d212e49a5f..fe8bd81568 100644 --- a/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/EventsTree.java +++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/EventsTree.java @@ -63,7 +63,6 @@ final public class EventsTree extends BorderPane { private final TimeLineController controller; - private DetailViewPane detailViewPane; @FXML @@ -77,7 +76,7 @@ final public class EventsTree extends BorderPane { public EventsTree(TimeLineController controller) { this.controller = controller; - + FXMLConstructor.construct(this, "EventsTree.fxml"); // NON-NLS } @@ -96,7 +95,7 @@ final public class EventsTree extends BorderPane { } getRoot().resort(sortByBox.getSelectionModel().getSelectedItem()); }); - + setRoot(); detailViewPane.getSelectedNodes().addListener((Observable observable) -> { @@ -177,10 +176,15 @@ final public class EventsTree extends BorderPane { updateHiddenState(item); }); registerListeners(controller.getQuickHideFilters(), item); - String text = item.getDescription() + " (" + item.getCount() + ")"; // NON-NLS - TreeItem> parent = getTreeItem().getParent(); - if (parent != null && parent.getValue() != null && (parent instanceof EventDescriptionTreeItem)) { - text = StringUtils.substringAfter(text, parent.getValue().getDescription()); + String text; + if (getTreeItem() instanceof EventTypeTreeItem) { + text = item.getEventType().getDisplayName(); + } else { + text = item.getDescription() + " (" + item.getCount() + ")"; // NON-NLS + TreeItem> parent = getTreeItem().getParent(); + if (parent != null && parent.getValue() != null && (parent instanceof EventDescriptionTreeItem)) { + text = StringUtils.substringAfter(text, parent.getValue().getDescription()); + } } setText(text); setTooltip(new Tooltip(text));