From 290ef43bdffcd14863ea326c2704ae017dd2d643 Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Mon, 28 Nov 2016 12:27:51 -0500 Subject: [PATCH] Data Sources Tree now refreshes on module and ingest completion --- .../sleuthkit/autopsy/datamodel/DataSourcesNode.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/DataSourcesNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/DataSourcesNode.java index 73f4d95cd0..f696c98e40 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/DataSourcesNode.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/DataSourcesNode.java @@ -28,6 +28,7 @@ import org.openide.util.NbBundle; import org.openide.util.lookup.Lookups; import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.coreutils.Logger; +import org.sleuthkit.autopsy.ingest.IngestManager; import org.sleuthkit.datamodel.Content; import org.sleuthkit.datamodel.TskCoreException; @@ -79,7 +80,10 @@ public class DataSourcesNode extends DisplayableItemNode { @Override public void propertyChange(PropertyChangeEvent evt) { String eventType = evt.getPropertyName(); - if (eventType.equals(Case.Events.DATA_SOURCE_ADDED.toString())) { + if (eventType.equals(IngestManager.IngestModuleEvent.CONTENT_CHANGED.toString()) + || eventType.equals(IngestManager.IngestJobEvent.COMPLETED.toString()) + || eventType.equals(IngestManager.IngestJobEvent.CANCELLED.toString()) + || eventType.equals(Case.Events.DATA_SOURCE_ADDED.toString())) { reloadKeys(); } } @@ -88,12 +92,16 @@ public class DataSourcesNode extends DisplayableItemNode { @Override protected void addNotify() { Case.addPropertyChangeListener(pcl); + IngestManager.getInstance().addIngestJobEventListener(pcl); + IngestManager.getInstance().addIngestModuleEventListener(pcl); reloadKeys(); } @Override protected void removeNotify() { Case.removePropertyChangeListener(pcl); + IngestManager.getInstance().removeIngestJobEventListener(pcl); + IngestManager.getInstance().removeIngestModuleEventListener(pcl); currentKeys.clear(); setKeys(Collections.emptySet()); }