From e12260c8fe4f2b0e17ea2878a012f85fa745d2e6 Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Tue, 13 May 2014 14:30:53 -0400 Subject: [PATCH] Split IngestEvent enum into two enums --- .../autopsy/datamodel/EmailExtracted.java | 12 ++- .../autopsy/datamodel/ExtractedContent.java | 24 +++-- .../autopsy/datamodel/HashsetHits.java | 12 ++- .../autopsy/datamodel/InterestingHits.java | 12 ++- .../autopsy/datamodel/KeywordHits.java | 12 ++- .../org/sleuthkit/autopsy/datamodel/Tags.java | 10 +- .../DirectoryTreeTopComponent.java | 11 +-- .../autopsy/ingest/IngestManager.java | 92 +++++++++---------- .../hashdatabase/HashLookupSettingsPanel.java | 6 +- .../KeywordSearchEditListPanel.java | 8 +- .../KeywordSearchListsViewerPanel.java | 8 +- 11 files changed, 108 insertions(+), 99 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/EmailExtracted.java b/Core/src/org/sleuthkit/autopsy/datamodel/EmailExtracted.java index e3f018425f..f7e83c4935 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/EmailExtracted.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/EmailExtracted.java @@ -282,13 +282,13 @@ public class EmailExtracted implements AutopsyVisitableItem { public void propertyChange(PropertyChangeEvent evt) { String eventType = evt.getPropertyName(); - if (eventType.equals(IngestManager.IngestEvent.DATA.toString())) { + if (eventType.equals(IngestManager.IngestModuleEvent.DATA.toString())) { if (((ModuleDataEvent) evt.getOldValue()).getArtifactType() == BlackboardArtifact.ARTIFACT_TYPE.TSK_EMAIL_MSG) { emailResults.update(); } } - else if (eventType.equals(IngestManager.IngestEvent.INGEST_JOB_COMPLETED.toString()) - || eventType.equals(IngestManager.IngestEvent.INGEST_JOB_CANCELLED.toString())) { + else if (eventType.equals(IngestManager.IngestJobEvent.COMPLETED.toString()) + || eventType.equals(IngestManager.IngestJobEvent.CANCELLED.toString())) { emailResults.update(); } } @@ -296,14 +296,16 @@ public class EmailExtracted implements AutopsyVisitableItem { @Override protected void addNotify() { - IngestManager.addPropertyChangeListener(pcl); + IngestManager.getInstance().addIngestJobEventListener(pcl); + IngestManager.getInstance().addIngestModuleEventListener(pcl); emailResults.update(); emailResults.addObserver(this); } @Override protected void removeNotify() { - IngestManager.removePropertyChangeListener(pcl); + IngestManager.getInstance().removeIngestJobEventListener(pcl); + IngestManager.getInstance().removeIngestModuleEventListener(pcl); emailResults.deleteObserver(this); } diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java index 2be34d8cae..d64413ca95 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java @@ -152,13 +152,13 @@ public class ExtractedContent implements AutopsyVisitableItem { public void propertyChange(PropertyChangeEvent evt) { String eventType = evt.getPropertyName(); - if (eventType.equals(IngestManager.IngestEvent.DATA.toString())) { + if (eventType.equals(IngestManager.IngestModuleEvent.DATA.toString())) { final ModuleDataEvent event = (ModuleDataEvent) evt.getOldValue(); if (doNotShow.contains(event.getArtifactType()) == false) { refresh(true); } - } else if (eventType.equals(IngestManager.IngestEvent.INGEST_JOB_COMPLETED.toString()) - || eventType.equals(IngestManager.IngestEvent.INGEST_JOB_CANCELLED.toString())) { + } else if (eventType.equals(IngestManager.IngestJobEvent.COMPLETED.toString()) + || eventType.equals(IngestManager.IngestJobEvent.CANCELLED.toString())) { refresh(true); } } @@ -166,12 +166,14 @@ public class ExtractedContent implements AutopsyVisitableItem { @Override protected void addNotify() { - IngestManager.addPropertyChangeListener(pcl); + IngestManager.getInstance().addIngestJobEventListener(pcl); + IngestManager.getInstance().addIngestModuleEventListener(pcl); } @Override protected void removeNotify() { - IngestManager.removePropertyChangeListener(pcl); + IngestManager.getInstance().removeIngestJobEventListener(pcl); + IngestManager.getInstance().removeIngestModuleEventListener(pcl); typeNodeList.clear(); } @@ -347,13 +349,13 @@ public class ExtractedContent implements AutopsyVisitableItem { public void propertyChange(PropertyChangeEvent evt) { String eventType = evt.getPropertyName(); - if (eventType.equals(IngestManager.IngestEvent.DATA.toString())) { + if (eventType.equals(IngestManager.IngestModuleEvent.DATA.toString())) { final ModuleDataEvent event = (ModuleDataEvent) evt.getOldValue(); if (event.getArtifactType() == type) { refresh(true); } - } else if (eventType.equals(IngestManager.IngestEvent.INGEST_JOB_COMPLETED.toString()) - || eventType.equals(IngestManager.IngestEvent.INGEST_JOB_CANCELLED.toString())) { + } else if (eventType.equals(IngestManager.IngestJobEvent.COMPLETED.toString()) + || eventType.equals(IngestManager.IngestJobEvent.CANCELLED.toString())) { refresh(true); } } @@ -361,12 +363,14 @@ public class ExtractedContent implements AutopsyVisitableItem { @Override protected void addNotify() { - IngestManager.addPropertyChangeListener(pcl); + IngestManager.getInstance().addIngestJobEventListener(pcl); + IngestManager.getInstance().addIngestModuleEventListener(pcl); } @Override protected void removeNotify() { - IngestManager.removePropertyChangeListener(pcl); + IngestManager.getInstance().removeIngestJobEventListener(pcl); + IngestManager.getInstance().removeIngestModuleEventListener(pcl); } @Override diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/HashsetHits.java b/Core/src/org/sleuthkit/autopsy/datamodel/HashsetHits.java index fe23fb47cf..afc67620f8 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/HashsetHits.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/HashsetHits.java @@ -183,13 +183,13 @@ public class HashsetHits implements AutopsyVisitableItem { public void propertyChange(PropertyChangeEvent evt) { String eventType = evt.getPropertyName(); - if (eventType.equals(IngestManager.IngestEvent.DATA.toString())) { + if (eventType.equals(IngestManager.IngestModuleEvent.DATA.toString())) { if (((ModuleDataEvent) evt.getOldValue()).getArtifactType() == ARTIFACT_TYPE.TSK_HASHSET_HIT) { hashsetResults.update(); } } - else if (eventType.equals(IngestManager.IngestEvent.INGEST_JOB_COMPLETED.toString()) - || eventType.equals(IngestManager.IngestEvent.INGEST_JOB_CANCELLED.toString())) { + else if (eventType.equals(IngestManager.IngestJobEvent.COMPLETED.toString()) + || eventType.equals(IngestManager.IngestJobEvent.CANCELLED.toString())) { hashsetResults.update(); } } @@ -197,14 +197,16 @@ public class HashsetHits implements AutopsyVisitableItem { @Override protected void addNotify() { - IngestManager.addPropertyChangeListener(pcl); + IngestManager.getInstance().addIngestJobEventListener(pcl); + IngestManager.getInstance().addIngestModuleEventListener(pcl); hashsetResults.update(); hashsetResults.addObserver(this); } @Override protected void removeNotify() { - IngestManager.removePropertyChangeListener(pcl); + IngestManager.getInstance().removeIngestJobEventListener(pcl); + IngestManager.getInstance().removeIngestModuleEventListener(pcl); hashsetResults.deleteObserver(this); } diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/InterestingHits.java b/Core/src/org/sleuthkit/autopsy/datamodel/InterestingHits.java index ec30d0ce80..30bd242bf4 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/InterestingHits.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/InterestingHits.java @@ -178,14 +178,14 @@ public class InterestingHits implements AutopsyVisitableItem { public void propertyChange(PropertyChangeEvent evt) { String eventType = evt.getPropertyName(); - if (eventType.equals(IngestManager.IngestEvent.DATA.toString())) { + if (eventType.equals(IngestManager.IngestModuleEvent.DATA.toString())) { if ((((ModuleDataEvent) evt.getOldValue()).getArtifactType() == BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT) || (((ModuleDataEvent) evt.getOldValue()).getArtifactType() == BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT)) { interestingResults.update(); } } - else if (eventType.equals(IngestManager.IngestEvent.INGEST_JOB_COMPLETED.toString()) - || eventType.equals(IngestManager.IngestEvent.INGEST_JOB_CANCELLED.toString())) { + else if (eventType.equals(IngestManager.IngestJobEvent.COMPLETED.toString()) + || eventType.equals(IngestManager.IngestJobEvent.CANCELLED.toString())) { interestingResults.update(); } } @@ -193,14 +193,16 @@ public class InterestingHits implements AutopsyVisitableItem { @Override protected void addNotify() { - IngestManager.addPropertyChangeListener(pcl); + IngestManager.getInstance().addIngestJobEventListener(pcl); + IngestManager.getInstance().addIngestModuleEventListener(pcl); interestingResults.update(); interestingResults.addObserver(this); } @Override protected void removeNotify() { - IngestManager.removePropertyChangeListener(pcl); + IngestManager.getInstance().removeIngestJobEventListener(pcl); + IngestManager.getInstance().removeIngestModuleEventListener(pcl); interestingResults.deleteObserver(this); } diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/KeywordHits.java b/Core/src/org/sleuthkit/autopsy/datamodel/KeywordHits.java index bdec4cf4e2..716d3eee8d 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/KeywordHits.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/KeywordHits.java @@ -236,13 +236,13 @@ public class KeywordHits implements AutopsyVisitableItem { public void propertyChange(PropertyChangeEvent evt) { String eventType = evt.getPropertyName(); - if (eventType.equals(IngestManager.IngestEvent.DATA.toString())) { + if (eventType.equals(IngestManager.IngestModuleEvent.DATA.toString())) { if (((ModuleDataEvent) evt.getOldValue()).getArtifactType() == BlackboardArtifact.ARTIFACT_TYPE.TSK_KEYWORD_HIT) { keywordResults.update(); } } - else if (eventType.equals(IngestManager.IngestEvent.INGEST_JOB_COMPLETED.toString()) - || eventType.equals(IngestManager.IngestEvent.INGEST_JOB_CANCELLED.toString())) { + else if (eventType.equals(IngestManager.IngestJobEvent.COMPLETED.toString()) + || eventType.equals(IngestManager.IngestJobEvent.CANCELLED.toString())) { keywordResults.update(); } } @@ -250,14 +250,16 @@ public class KeywordHits implements AutopsyVisitableItem { @Override protected void addNotify() { - IngestManager.addPropertyChangeListener(pcl); + IngestManager.getInstance().addIngestJobEventListener(pcl); + IngestManager.getInstance().addIngestModuleEventListener(pcl); keywordResults.update(); keywordResults.addObserver(this); } @Override protected void removeNotify() { - IngestManager.removePropertyChangeListener(pcl); + IngestManager.getInstance().removeIngestJobEventListener(pcl); + IngestManager.getInstance().removeIngestModuleEventListener(pcl); keywordResults.deleteObserver(this); } diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/Tags.java b/Core/src/org/sleuthkit/autopsy/datamodel/Tags.java index c44166b939..d77d7e902f 100755 --- a/Core/src/org/sleuthkit/autopsy/datamodel/Tags.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/Tags.java @@ -121,12 +121,12 @@ public class Tags implements AutopsyVisitableItem { @Override public void propertyChange(PropertyChangeEvent evt) { String eventType = evt.getPropertyName(); - if (eventType.equals(IngestManager.IngestEvent.DATA.toString())) { + if (eventType.equals(IngestManager.IngestModuleEvent.DATA.toString())) { if ((((ModuleDataEvent) evt.getOldValue()).getArtifactType() == BlackboardArtifact.ARTIFACT_TYPE.TSK_TAG_ARTIFACT) || ((ModuleDataEvent) evt.getOldValue()).getArtifactType() == BlackboardArtifact.ARTIFACT_TYPE.TSK_TAG_FILE) { refresh(true); tagResults.update(); } - } else if (eventType.equals(IngestManager.IngestEvent.INGEST_JOB_COMPLETED.toString()) || eventType.equals(IngestManager.IngestEvent.INGEST_JOB_CANCELLED.toString())) { + } else if (eventType.equals(IngestManager.IngestJobEvent.COMPLETED.toString()) || eventType.equals(IngestManager.IngestJobEvent.CANCELLED.toString())) { refresh(true); tagResults.update(); } @@ -135,14 +135,16 @@ public class Tags implements AutopsyVisitableItem { @Override protected void addNotify() { - IngestManager.addPropertyChangeListener(pcl); + IngestManager.getInstance().addIngestJobEventListener(pcl); + IngestManager.getInstance().addIngestModuleEventListener(pcl); tagResults.update(); tagResults.addObserver(this); } @Override protected void removeNotify() { - IngestManager.removePropertyChangeListener(pcl); + IngestManager.getInstance().removeIngestJobEventListener(pcl); + IngestManager.getInstance().removeIngestModuleEventListener(pcl); tagResults.deleteObserver(this); } diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java index cb4efb4a74..a1d83c4768 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java @@ -56,7 +56,6 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.BlackboardResultViewer; import org.sleuthkit.autopsy.corecomponents.DataResultTopComponent; import org.sleuthkit.autopsy.corecomponents.TableFilterNode; import org.sleuthkit.autopsy.datamodel.BlackboardArtifactNode; -import org.sleuthkit.autopsy.datamodel.ExtractedContent.RootNode; import org.sleuthkit.autopsy.datamodel.DataSources; import org.sleuthkit.autopsy.datamodel.DataSourcesNode; import org.sleuthkit.autopsy.datamodel.KeywordHits; @@ -67,8 +66,6 @@ import org.sleuthkit.autopsy.datamodel.RootContentChildren; import org.sleuthkit.autopsy.datamodel.Views; import org.sleuthkit.autopsy.datamodel.ViewsNode; import org.sleuthkit.autopsy.ingest.IngestManager; -import org.sleuthkit.autopsy.ingest.IngestManager.IngestEvent; -import org.sleuthkit.autopsy.ingest.ModuleDataEvent; import org.sleuthkit.datamodel.BlackboardArtifact; import org.sleuthkit.datamodel.BlackboardAttribute; import org.sleuthkit.datamodel.Content; @@ -578,18 +575,18 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat else if (changed.equals(ExplorerManager.PROP_SELECTED_NODES)) { respondSelection((Node[]) oldValue, (Node[]) newValue); } - else if (changed.equals(IngestEvent.DATA.toString())) { + else if (changed.equals(IngestManager.IngestModuleEvent.DATA.toString())) { // nothing to do here. // all nodes should be listening for these events and update accordingly. - } else if (changed.equals(IngestEvent.INGEST_JOB_COMPLETED.toString()) - || changed.equals(IngestEvent.INGEST_JOB_CANCELLED.toString())) { + } else if (changed.equals(IngestManager.IngestJobEvent.COMPLETED.toString()) + || changed.equals(IngestManager.IngestJobEvent.CANCELLED.toString())) { SwingUtilities.invokeLater(new Runnable() { @Override public void run() { refreshDataSourceTree(); } }); - } else if (changed.equals(IngestEvent.CONTENT_CHANGED.toString())) { + } else if (changed.equals(IngestManager.IngestModuleEvent.CONTENT_CHANGED.toString())) { SwingUtilities.invokeLater(new Runnable() { @Override public void run() { diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java index cd772728fb..afff6121b8 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java @@ -230,45 +230,55 @@ public class IngestManager { } /** - * Ingest events. + * Ingest job events. */ - public enum IngestEvent { + public enum IngestJobEvent { /** * Property change event fired when an ingest job is started. The old * value of the PropertyChangeEvent object is set to the ingest job id, * and the new value is set to null. */ - INGEST_JOB_STARTED, + STARTED, /** * Property change event fired when an ingest job is completed. The old * value of the PropertyChangeEvent object is set to the ingest job id, * and the new value is set to null. */ - INGEST_JOB_COMPLETED, + COMPLETED, /** * Property change event fired when an ingest job is canceled. The old * value of the PropertyChangeEvent object is set to the ingest job id, * and the new value is set to null. */ - INGEST_JOB_CANCELLED, + CANCELLED, + }; + + /** + * Ingest module events. + */ + public enum IngestModuleEvent { + /** - * Event sent when an ingest module posts new data to blackboard or - * somewhere else. Second argument of the property change fired contains - * ModuleDataEvent object and third argument is null. The object can - * contain encapsulated new data created by the module. Listener can - * also query new data as needed. + * Property change event fired when an ingest module adds new data to a + * case, usually by posting to the blackboard. The old value of the + * PropertyChangeEvent is a ModuleDataEvent object, and the new value is + * set to null. */ DATA, /** - * Event send when content changed, either its attributes changed, or - * new content children have been added. I.e. from ZIP files or Carved - * files + * Property change event fired when an ingest module adds new content to + * a case or changes a recorded attribute of existing content. For + * example, if a module adds an extracted or carved file to a case, the + * module should fire this event. The old value of the + * PropertyChangeEvent is a ModuleContentEvent object, and the new value + * is set to null. */ CONTENT_CHANGED, /** - * Event sent when a file has finished going through a pipeline of - * modules. Second argument is the object ID. Third argument is null + * Property change event fired when the ingest of a file is completed. + * The old value of the PropertyChangeEvent is the Autopsy object ID of + * the file, and the new value is set to null. */ FILE_DONE, }; @@ -309,35 +319,13 @@ public class IngestManager { ingestModuleEventPublisher.removePropertyChangeListener(listener); } - /** - * Add an ingest module event property change listener. - * - * @deprecated - * @param listener The PropertyChangeListener to register. - */ - public static void addPropertyChangeListener(final PropertyChangeListener listener) { - instance.ingestJobEventPublisher.addPropertyChangeListener(listener); - instance.ingestModuleEventPublisher.addPropertyChangeListener(listener); - } - - /** - * Remove an ingest module event property change listener. - * - * @deprecated - * @param listener The PropertyChangeListener to unregister. - */ - public static void removePropertyChangeListener(final PropertyChangeListener listener) { - instance.ingestJobEventPublisher.removePropertyChangeListener(listener); - instance.ingestModuleEventPublisher.removePropertyChangeListener(listener); - } - /** * Fire an ingest event signifying an ingest job started. * * @param ingestJobId The ingest job id. */ void fireIngestJobStarted(long ingestJobId) { - fireIngestEventsThreadPool.submit(new FireIngestEventThread(ingestJobEventPublisher, IngestEvent.INGEST_JOB_STARTED, ingestJobId, null)); + fireIngestEventsThreadPool.submit(new FireIngestEventThread(ingestJobEventPublisher, IngestJobEvent.STARTED, ingestJobId, null)); } /** @@ -346,7 +334,7 @@ public class IngestManager { * @param ingestJobId The ingest job id. */ void fireIngestJobCompleted(long ingestJobId) { - fireIngestEventsThreadPool.submit(new FireIngestEventThread(ingestJobEventPublisher, IngestEvent.INGEST_JOB_COMPLETED, ingestJobId, null)); + fireIngestEventsThreadPool.submit(new FireIngestEventThread(ingestJobEventPublisher, IngestJobEvent.COMPLETED, ingestJobId, null)); } /** @@ -355,7 +343,7 @@ public class IngestManager { * @param ingestJobId The ingest job id. */ void fireIngestJobCancelled(long ingestJobId) { - fireIngestEventsThreadPool.submit(new FireIngestEventThread(ingestJobEventPublisher, IngestEvent.INGEST_JOB_CANCELLED, ingestJobId, null)); + fireIngestEventsThreadPool.submit(new FireIngestEventThread(ingestJobEventPublisher, IngestJobEvent.CANCELLED, ingestJobId, null)); } /** @@ -364,7 +352,7 @@ public class IngestManager { * @param fileId The object id of file. */ void fireFileIngestDone(long fileId) { - fireIngestEventsThreadPool.submit(new FireIngestEventThread(ingestModuleEventPublisher, IngestEvent.FILE_DONE, fileId, null)); + fireIngestEventsThreadPool.submit(new FireIngestEventThread(ingestModuleEventPublisher, IngestModuleEvent.FILE_DONE, fileId, null)); } /** @@ -373,7 +361,7 @@ public class IngestManager { * @param moduleDataEvent A ModuleDataEvent with the details of the posting. */ void fireIngestModuleDataEvent(ModuleDataEvent moduleDataEvent) { - fireIngestEventsThreadPool.submit(new FireIngestEventThread(ingestModuleEventPublisher, IngestEvent.DATA, moduleDataEvent, null)); + fireIngestEventsThreadPool.submit(new FireIngestEventThread(ingestModuleEventPublisher, IngestModuleEvent.DATA, moduleDataEvent, null)); } /** @@ -384,7 +372,7 @@ public class IngestManager { * content. */ void fireIngestModuleContentEvent(ModuleContentEvent moduleContentEvent) { - fireIngestEventsThreadPool.submit(new FireIngestEventThread(ingestModuleEventPublisher, IngestEvent.CONTENT_CHANGED, moduleContentEvent, null)); + fireIngestEventsThreadPool.submit(new FireIngestEventThread(ingestModuleEventPublisher, IngestModuleEvent.CONTENT_CHANGED, moduleContentEvent, null)); } /** @@ -534,13 +522,23 @@ public class IngestManager { private static class FireIngestEventThread implements Runnable { private final PropertyChangeSupport publisher; - private final IngestEvent event; + private final IngestJobEvent jobEvent; + private final IngestModuleEvent moduleEvent; private final Object oldValue; private final Object newValue; - FireIngestEventThread(PropertyChangeSupport publisher, IngestEvent event, Object oldValue, Object newValue) { + FireIngestEventThread(PropertyChangeSupport publisher, IngestJobEvent event, Object oldValue, Object newValue) { this.publisher = publisher; - this.event = event; + this.jobEvent = event; + this.moduleEvent = null; + this.oldValue = oldValue; + this.newValue = newValue; + } + + FireIngestEventThread(PropertyChangeSupport publisher, IngestModuleEvent event, Object oldValue, Object newValue) { + this.publisher = publisher; + this.jobEvent = null; + this.moduleEvent = event; this.oldValue = oldValue; this.newValue = newValue; } @@ -548,7 +546,7 @@ public class IngestManager { @Override public void run() { try { - publisher.firePropertyChange(event.toString(), oldValue, newValue); + publisher.firePropertyChange((jobEvent != null ? jobEvent.toString() : moduleEvent.toString()), oldValue, newValue); } catch (Exception e) { logger.log(Level.SEVERE, "Ingest manager listener threw exception", e); //NON-NLS MessageNotifyUtil.Notify.show(NbBundle.getMessage(IngestManager.class, "IngestManager.moduleErr"), diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashLookupSettingsPanel.java b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashLookupSettingsPanel.java index c414731036..bdc77069d2 100644 --- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashLookupSettingsPanel.java +++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashLookupSettingsPanel.java @@ -231,9 +231,9 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan } private boolean isIngestJobEvent(PropertyChangeEvent evt) { - return evt.getPropertyName().equals(IngestManager.IngestEvent.INGEST_JOB_STARTED.toString()) - || evt.getPropertyName().equals(IngestManager.IngestEvent.INGEST_JOB_COMPLETED.toString()) - || evt.getPropertyName().equals(IngestManager.IngestEvent.INGEST_JOB_CANCELLED.toString()); + return evt.getPropertyName().equals(IngestManager.IngestJobEvent.STARTED.toString()) + || evt.getPropertyName().equals(IngestManager.IngestJobEvent.COMPLETED.toString()) + || evt.getPropertyName().equals(IngestManager.IngestJobEvent.CANCELLED.toString()); } @Override diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java index 4ba2d39eb6..65e2de24ea 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java @@ -43,7 +43,7 @@ import javax.swing.table.AbstractTableModel; import javax.swing.table.TableColumn; import org.sleuthkit.autopsy.corecomponents.OptionsPanel; import org.sleuthkit.autopsy.ingest.IngestManager; -import org.sleuthkit.autopsy.ingest.IngestManager.IngestEvent; +import org.sleuthkit.autopsy.ingest.IngestManager.IngestJobEvent; /** * KeywordSearchEditListPanel widget to manage keywords in lists @@ -130,9 +130,9 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec @Override public void propertyChange(PropertyChangeEvent evt) { String changed = evt.getPropertyName(); - if (changed.equals(IngestEvent.INGEST_JOB_STARTED.toString()) - || changed.equals(IngestEvent.INGEST_JOB_COMPLETED.toString()) - || changed.equals(IngestEvent.INGEST_JOB_CANCELLED.toString())) { + if (changed.equals(IngestJobEvent.STARTED.toString()) + || changed.equals(IngestJobEvent.COMPLETED.toString()) + || changed.equals(IngestJobEvent.CANCELLED.toString())) { EventQueue.invokeLater(new Runnable() { @Override public void run() { diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsViewerPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsViewerPanel.java index 0e8c099aac..4cefc3ca87 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsViewerPanel.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsViewerPanel.java @@ -42,7 +42,7 @@ import org.openide.util.NbBundle; import org.openide.util.actions.SystemAction; import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.ingest.IngestManager; -import org.sleuthkit.autopsy.ingest.IngestManager.IngestEvent; +import org.sleuthkit.autopsy.ingest.IngestManager.IngestJobEvent; /** * Viewer panel widget for keyword lists that is used in the ingest config and options area. @@ -122,9 +122,9 @@ class KeywordSearchListsViewerPanel extends AbstractKeywordSearchPerformer { @Override public void propertyChange(PropertyChangeEvent evt) { String changed = evt.getPropertyName(); - if (changed.equals(IngestEvent.INGEST_JOB_STARTED.toString()) - || changed.equals(IngestEvent.INGEST_JOB_COMPLETED.toString()) - || changed.equals(IngestEvent.INGEST_JOB_CANCELLED.toString())) { + if (changed.equals(IngestJobEvent.STARTED.toString()) + || changed.equals(IngestJobEvent.COMPLETED.toString()) + || changed.equals(IngestJobEvent.CANCELLED.toString())) { EventQueue.invokeLater(new Runnable() { @Override public void run() {