From 412c0b4ce3509ed4f65220f12fa87ddb96ca0ebb Mon Sep 17 00:00:00 2001 From: "Samuel H. Kenyon" Date: Tue, 25 Feb 2014 18:04:13 -0500 Subject: [PATCH 1/4] Added comment about EDT to DataResultViewerTable.setNode(). --- .../autopsy/corecomponents/DataResultViewerTable.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java index 6cde1ad2a2..eac9dd763a 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java @@ -236,6 +236,10 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DataResultViewer; return true; } + /** + * Thread note: Make sure to run this in the EDT as it causes GUI operations. + * @param selectedNode + */ @Override public void setNode(Node selectedNode) { // change the cursor to "waiting cursor" for this operation From 885a0c0b7ccb9a7ff71e7e8fed3e72ae4c4f6262 Mon Sep 17 00:00:00 2001 From: Brian Carrier Date: Tue, 25 Feb 2014 22:28:06 -0500 Subject: [PATCH 2/4] Throw exectpions in init, make connection to detect 404 error, renamed method --- .../autopsy/keywordsearch/Installer.java | 10 +++++----- .../keywordsearch/KeywordSearchIngestModule.java | 16 +++++++++++----- .../sleuthkit/autopsy/keywordsearch/Server.java | 5 +++-- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Installer.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Installer.java index 44689e819e..f38b9fdd81 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Installer.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Installer.java @@ -66,9 +66,9 @@ class Installer extends ModuleInstall { int serverStopPort = server.getCurrentSolrStopPort(); logger.log(Level.SEVERE, "There's already a server running on " + serverPort + " port that can't be shutdown."); - if (!Server.available(serverPort)) { + if (!Server.isPortAvailable(serverPort)) { reportPortError(serverPort); - } else if (!Server.available(serverStopPort)) { + } else if (!Server.isPortAvailable(serverStopPort)) { reportStopPortError(serverStopPort); } else { //some other reason @@ -95,7 +95,7 @@ class Installer extends ModuleInstall { //TODO move some of this logic to Server class for (int i = 0; i <= 3; i++) { logger.log(Level.INFO, "Checking if port available."); - if (Server.available(server.getCurrentSolrServerPort())) { + if (Server.isPortAvailable(server.getCurrentSolrServerPort())) { logger.log(Level.INFO, "Port available, trying to start server."); server.start(); break; @@ -165,9 +165,9 @@ class Installer extends ModuleInstall { //check if port is taken or some other reason int serverPort = server.getCurrentSolrServerPort(); int serverStopPort = server.getCurrentSolrStopPort(); - if (!Server.available(serverPort)) { + if (!Server.isPortAvailable(serverPort)) { reportPortError(serverPort); - } else if (!Server.available(serverStopPort)) { + } else if (!Server.isPortAvailable(serverStopPort)) { reportStopPortError(serverStopPort); } else { //some other reason diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java index 821999419c..22857fc597 100755 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java @@ -44,6 +44,7 @@ import org.netbeans.api.progress.aggregate.AggregateProgressFactory; import org.netbeans.api.progress.aggregate.AggregateProgressHandle; import org.netbeans.api.progress.aggregate.ProgressContributor; import org.openide.util.Cancellable; +import org.openide.util.Exceptions; import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.coreutils.EscapeUtil; import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil; @@ -361,8 +362,7 @@ public final class KeywordSearchIngestModule extends IngestModuleAbstractFile { logger.log(Level.SEVERE, msg); String details = NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.tryStopSolrMsg", msg); services.postMessage(IngestMessage.createErrorMessage(++messageID, instance, msg, details)); - return; - + throw new IngestModuleException(msg); } } catch (KeywordSearchModuleException ex) { logger.log(Level.WARNING, "Error checking if Solr server is running while initializing ingest", ex); @@ -370,9 +370,15 @@ public final class KeywordSearchIngestModule extends IngestModuleAbstractFile { String msg = NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.badInitMsg"); String details = NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.tryStopSolrMsg", msg); services.postMessage(IngestMessage.createErrorMessage(++messageID, instance, msg, details)); - return; + throw new IngestModuleException(msg); + } + try { + // make an actual query to verify that server is responding + // we had cases where getStatus was OK, but the connection resulted in a 404 + server.queryNumIndexedDocuments(); + } catch (KeywordSearchModuleException | NoOpenCoreException ex) { + throw new IngestModuleException("Error connecting to SOLR server"); } - //initialize extractors stringExtractor = new AbstractFileStringExtract(); @@ -415,7 +421,7 @@ public final class KeywordSearchIngestModule extends IngestModuleAbstractFile { curDataSourceIds = new HashSet(); indexer = new Indexer(); - + final int updateIntervalMs = KeywordSearchSettings.getUpdateFrequency().getTime() * 60 * 1000; logger.log(Level.INFO, "Using commit interval (ms): " + updateIntervalMs); logger.log(Level.INFO, "Using searcher interval (ms): " + updateIntervalMs); diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java index d78a630112..998d25f24c 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java @@ -350,7 +350,7 @@ public class Server { */ void start() throws KeywordSearchModuleException, SolrServerNoPortException { logger.log(Level.INFO, "Starting Solr server from: " + solrFolder.getAbsolutePath()); - if (available(currentSolrServerPort)) { + if (isPortAvailable(currentSolrServerPort)) { logger.log(Level.INFO, "Port [" + currentSolrServerPort + "] available, starting Solr"); try { final String MAX_SOLR_MEM_MB_PAR = "-Xmx" + Integer.toString(MAX_SOLR_MEM_MB) + "m"; @@ -419,7 +419,7 @@ public class Server { * * @param port the port to check for availability */ - static boolean available(int port) { + static boolean isPortAvailable(int port) { ServerSocket ss = null; try { @@ -524,6 +524,7 @@ public class Server { //TODO handle timeout in cases when some other type of server on that port CoreAdminRequest.getStatus(null, solrServer); + logger.log(Level.INFO, "Solr server is running"); } catch (SolrServerException ex) { From 7cc3e8f1f90146169a60ca8a56d2a29b26f34a5c Mon Sep 17 00:00:00 2001 From: Brian Carrier Date: Tue, 25 Feb 2014 22:31:54 -0500 Subject: [PATCH 3/4] Added exception message to init exception --- .../autopsy/keywordsearch/KeywordSearchIngestModule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java index 22857fc597..7220d4d485 100755 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java @@ -377,7 +377,7 @@ public final class KeywordSearchIngestModule extends IngestModuleAbstractFile { // we had cases where getStatus was OK, but the connection resulted in a 404 server.queryNumIndexedDocuments(); } catch (KeywordSearchModuleException | NoOpenCoreException ex) { - throw new IngestModuleException("Error connecting to SOLR server"); + throw new IngestModuleException("Error connecting to SOLR server: " + ex.getMessage()); } //initialize extractors From cbaa64dc5dec7e9901c2c57d139ce6a2765e5c65 Mon Sep 17 00:00:00 2001 From: Brian Carrier Date: Tue, 25 Feb 2014 23:23:56 -0500 Subject: [PATCH 4/4] Added enum to case to store all event names. Shortened names a bit --- .../sleuthkit/autopsy/casemodule/Case.java | 162 ++++++------------ .../DirectoryTreeTopComponent.java | 6 +- .../autopsy/filesearch/DateSearchFilter.java | 6 +- .../autopsy/filesearch/FileSearchAction.java | 2 +- .../ingest/IngestMessageTopComponent.java | 2 +- .../autopsy/ingest/IngestMessagesToolbar.java | 2 +- .../autopsy/ingest/IngestMonitor.java | 2 +- .../autopsy/menuactions/DataResultMenu.java | 2 +- .../autopsy/report/ReportWizardAction.java | 2 +- .../hashdatabase/HashDbPanelSearchAction.java | 2 +- .../autopsy/keywordsearch/KeywordSearch.java | 2 +- .../keywordsearch/KeywordSearchPanel.java | 2 +- .../sleuthkit/autopsy/timeline/Timeline.java | 4 +- 13 files changed, 70 insertions(+), 126 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java index 2dc6861360..29c5a2bae1 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java @@ -61,47 +61,7 @@ public class Case implements SleuthkitCase.ErrorObserver { private static final String autopsyVer = Version.getVersion(); // current version of autopsy. Change it when the version is changed private static String appName = null; - /** - * Property name that indicates the name of the current case has changed. - * When a case is opened, "old name" is empty string and "new name" is the name. - * When a case is closed, "old name" is the case name and "new name" is empty string. - * When a case is renamed, "old name" has the original name and "new name" has the new name. - */ - public static final String CASE_NAME = "caseName"; - /** - * Property name that indicates the number of the current case has changed. - * Fired with the case number is changed. The value is an int: the number of - * the case. -1 is used for no case number set. - */ - public static final String CASE_NUMBER = "caseNumber"; - /** - * Property name that indicates the examiner of the current case has - * changed. Fired with the case examiner is changed. The value is a String: - * the name of the examiner. The empty string ("") is used for no examiner - * set. - */ - public static final String CASE_EXAMINER = "caseExaminer"; - /** - * Property name that indicates a new data source (image, disk or local - * file) has been added to the current case. The new value is the - * newly-added instance of the new data source, and the old value is always - * null. - */ - public static final String CASE_ADD_DATA_SOURCE = "addDataSource"; - /** - * Property name that indicates a data source has been removed from the - * current case. The "old value" is the (int) content ID of the data source - * that was removed, the new value is the instance of the data source. - */ - public static final String CASE_DEL_DATA_SOURCE = "removeDataSource"; - /** - * Property name that indicates the currently open case has changed. - * When a case is opened, the "new value" will be an instance of the opened - * Case object and the "old value" will be null. - * When a case is closed, the "new value" will be null and the "old value" - * will be the instance of the Case object being closed. - */ - public static final String CASE_CURRENT_CASE = "currentCase"; + /** * Name for the property that determines whether to show the dialog at * startup @@ -114,69 +74,53 @@ public class Case implements SleuthkitCase.ErrorObserver { * Events that the case module will fire. Event listeners can get the event * name by using String returned by toString() method on a specific event. */ - /* @@@ BC: I added this as a place holder for what I want this to be, but - * this is not the time to change it. We'll start using this at a major release - * version. - */ - private enum CaseModuleEvent_DoNotUse { - /** - * Property name that indicates the name of the current case has changed. - * Fired with the case is renamed, and when the current case is - * opened/closed/changed. The value is a String: the name of the case. The - * empty string ("") is used for no open case. - */ - // @@@ BC: I propose that this is no longer called for case open/close. - CASE_NAME("caseName"), - - /** - * Property name that indicates the number of the current case has changed. - * Fired with the case number is changed. The value is an int: the number of - * the case. -1 is used for no case number set. - */ - CASE_NUMBER("caseNumber"), - - /** - * Property name that indicates the examiner of the current case has - * changed. Fired with the case examiner is changed. The value is a String: - * the name of the examiner. The empty string ("") is used for no examiner - * set. - */ - CASE_EXAMINER("caseExaminer"), - - /** - * Property name that indicates a new data source (image, disk or local - * file) has been added to the current case. The new value is the - * newly-added instance of the new data source, and the old value is always - * null. - */ - CASE_ADD_DATA_SOURCE("addDataSource"), - - /** - * Property name that indicates a data source has been removed from the - * current case. The "old value" is the (int) content ID of the data source - * that was removed, the new value is the instance of the data source. - */ - CASE_DEL_DATA_SOURCE("removeDataSource"), - + public enum Events { /** - * Property name that indicates the currently open case has changed. The new - * value is the instance of the opened Case, or null if there is no open - * case. The old value is the instance of the closed Case, or null if there - * was no open case. + * Property name that indicates the name of the current case has + * changed. When a case is opened, "old name" is empty string and "new + * name" is the name. When a case is closed, "old name" is the case name + * and "new name" is empty string. When a case is renamed, "old name" + * has the original name and "new name" has the new name. */ - CASE_CURRENT_CASE("currentCase"); - - private String name; - CaseModuleEvent_DoNotUse(String name) { - this.name = name; - } - - public String getName() { - return this.name; - } + // @@@ BC: I propose that this is no longer called for case open/close. + NAME, + /** + * Property name that indicates the number of the current case has + * changed. Fired with the case number is changed. The value is an int: + * the number of the case. -1 is used for no case number set. + */ + NUMBER, + /** + * Property name that indicates the examiner of the current case has + * changed. Fired with the case examiner is changed. The value is a + * String: the name of the examiner. The empty string ("") is used for + * no examiner set. + */ + EXAMINER, + /** + * Property name that indicates a new data source (image, disk or local + * file) has been added to the current case. The new value is the + * newly-added instance of the new data source, and the old value is + * always null. + */ + DATA_SOURCE_ADDED, + /** + * Property name that indicates a data source has been removed from the + * current case. The "old value" is the (int) content ID of the data + * source that was removed, the new value is the instance of the data + * source. + */ + DATA_SOURCE_DELETED, + /** + * Property name that indicates the currently open case has changed. + * When a case is opened, the "new value" will be an instance of the + * opened Case object and the "old value" will be null. When a case is + * closed, the "new value" will be null and the "old value" will be the + * instance of the Case object being closed. + */ + CURRENT_CASE; }; - private String name; private String number; private String examiner; @@ -244,7 +188,7 @@ public class Case implements SleuthkitCase.ErrorObserver { doCaseChange(null); //closes windows, etc try { - pcs.firePropertyChange(CASE_CURRENT_CASE, oldCase, null); + pcs.firePropertyChange(Events.CURRENT_CASE.toString(), oldCase, null); } catch (Exception e) { logger.log(Level.SEVERE, "Case listener threw exception", e); @@ -253,7 +197,7 @@ public class Case implements SleuthkitCase.ErrorObserver { doCaseNameChange(""); try { - pcs.firePropertyChange(CASE_NAME, oldCase.name, ""); + pcs.firePropertyChange(Events.NAME.toString(), oldCase.name, ""); } catch (Exception e) { logger.log(Level.SEVERE, "Case listener threw exception", e); @@ -266,7 +210,7 @@ public class Case implements SleuthkitCase.ErrorObserver { try { - pcs.firePropertyChange(CASE_CURRENT_CASE, null, currentCase); + pcs.firePropertyChange(Events.CURRENT_CASE.toString(), null, currentCase); } catch (Exception e) { logger.log(Level.SEVERE, "Case listener threw exception", e); @@ -276,7 +220,7 @@ public class Case implements SleuthkitCase.ErrorObserver { try { - pcs.firePropertyChange(CASE_NAME, "", currentCase.name); + pcs.firePropertyChange(Events.NAME.toString(), "", currentCase.name); } catch (Exception e) { logger.log(Level.SEVERE, "Case threw exception", e); @@ -441,7 +385,7 @@ public class Case implements SleuthkitCase.ErrorObserver { Image newImage = db.getImageById(imgId); try { - pcs.firePropertyChange(CASE_ADD_DATA_SOURCE, null, newImage); // the new value is the instance of the image + pcs.firePropertyChange(Events.DATA_SOURCE_ADDED.toString(), null, newImage); // the new value is the instance of the image } catch (Exception e) { logger.log(Level.SEVERE, "Case listener threw exception", e); @@ -475,7 +419,7 @@ public class Case implements SleuthkitCase.ErrorObserver { void notifyNewDataSource(Content newDataSource) { try { - pcs.firePropertyChange(CASE_ADD_DATA_SOURCE, null, newDataSource); + pcs.firePropertyChange(Events.DATA_SOURCE_ADDED.toString(), null, newDataSource); } catch (Exception e) { logger.log(Level.SEVERE, "Case threw exception", e); @@ -556,7 +500,7 @@ public class Case implements SleuthkitCase.ErrorObserver { name = newCaseName; // change the local value RecentCases.getInstance().updateRecentCase(oldCaseName, oldPath, newCaseName, newPath); // update the recent case try { - pcs.firePropertyChange(CASE_NAME, oldCaseName, newCaseName); + pcs.firePropertyChange(Events.NAME.toString(), oldCaseName, newCaseName); } catch (Exception e) { logger.log(Level.SEVERE, "Case listener threw exception", e); @@ -580,7 +524,7 @@ public class Case implements SleuthkitCase.ErrorObserver { xmlcm.setCaseExaminer(newExaminer); // set the examiner examiner = newExaminer; try { - pcs.firePropertyChange(CASE_EXAMINER, oldExaminer, newExaminer); + pcs.firePropertyChange(Events.EXAMINER.toString(), oldExaminer, newExaminer); } catch (Exception e) { logger.log(Level.SEVERE, "Case listener threw exception", e); @@ -603,7 +547,7 @@ public class Case implements SleuthkitCase.ErrorObserver { number = newCaseNumber; try { - pcs.firePropertyChange(CASE_NUMBER, oldCaseNumber, newCaseNumber); + pcs.firePropertyChange(Events.NUMBER.toString(), oldCaseNumber, newCaseNumber); } catch (Exception e) { logger.log(Level.SEVERE, "Case listener threw exception", e); diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java index 2f6fc03f22..ae09e6cffa 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java @@ -516,7 +516,7 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat Object newValue = evt.getNewValue(); // change in the case name - if (changed.equals(Case.CASE_NAME)) { + if (changed.equals(Case.Events.NAME.toString())) { // set the main title of the window String oldCaseName = oldValue.toString(); String newCaseName = newValue.toString(); @@ -529,7 +529,7 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat em.getRootContext().setDisplayName(newCaseName); } } // changed current case - else if (changed.equals(Case.CASE_CURRENT_CASE)) { + else if (changed.equals(Case.Events.CURRENT_CASE.toString())) { // When a case is closed, the old value of this property is the // closed Case object and the new value is null. When a case is // opened, the old value is null and the new value is the new Case @@ -553,7 +553,7 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat resetHistory(); } } // if the image is added to the case - else if (changed.equals(Case.CASE_ADD_DATA_SOURCE)) { + else if (changed.equals(Case.Events.DATA_SOURCE_ADDED.toString())) { componentOpened(); // Image img = (Image)newValue; // diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/DateSearchFilter.java b/Core/src/org/sleuthkit/autopsy/filesearch/DateSearchFilter.java index d945207ba8..d61c174358 100644 --- a/Core/src/org/sleuthkit/autopsy/filesearch/DateSearchFilter.java +++ b/Core/src/org/sleuthkit/autopsy/filesearch/DateSearchFilter.java @@ -239,7 +239,7 @@ class DateSearchFilter extends AbstractFileSearchFilter { Object oldValue = evt.getOldValue(); Object newValue = evt.getNewValue(); - if (changed.equals(Case.CASE_CURRENT_CASE)) { + if (changed.equals(Case.Events.CURRENT_CASE.toString().toString())) { // create or open a case if (newValue != null) { DateSearchFilter.this.updateTimeZoneList(); @@ -247,12 +247,12 @@ class DateSearchFilter extends AbstractFileSearchFilter { } // if the image is added to the case - if (changed.equals(Case.CASE_ADD_DATA_SOURCE)) { + if (changed.equals(Case.Events.DATA_SOURCE_ADDED.toString())) { DateSearchFilter.this.updateTimeZoneList(); } // if the image is removed from the case - if (changed.equals(Case.CASE_DEL_DATA_SOURCE)) { + if (changed.equals(Case.Events.DATA_SOURCE_DELETED.toString())) { DateSearchFilter.this.updateTimeZoneList(); } } diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchAction.java b/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchAction.java index 52b7f69991..c6b2e28697 100644 --- a/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchAction.java +++ b/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchAction.java @@ -38,7 +38,7 @@ import org.sleuthkit.autopsy.directorytree.FileSearchProvider; @Override public void propertyChange(PropertyChangeEvent evt) { - if(evt.getPropertyName().equals(Case.CASE_CURRENT_CASE)){ + if(evt.getPropertyName().equals(Case.Events.CURRENT_CASE.toString())){ setEnabled(evt.getNewValue() != null); } } diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java index d4a9ab9cce..c37ef96c28 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java @@ -213,7 +213,7 @@ import org.sleuthkit.datamodel.Content; Case.addPropertyChangeListener(new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - if (evt.getPropertyName().equals(Case.CASE_CURRENT_CASE)) { + if (evt.getPropertyName().equals(Case.Events.CURRENT_CASE.toString())) { Case oldCase = (Case) evt.getOldValue(); if (oldCase == null) //nothing to do, new case had been opened { diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java index f817383595..fcc9861f22 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java @@ -143,7 +143,7 @@ import org.sleuthkit.autopsy.casemodule.Case; Case.addPropertyChangeListener(new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - if (evt.getPropertyName().equals(Case.CASE_CURRENT_CASE)) { + if (evt.getPropertyName().equals(Case.Events.CURRENT_CASE.toString())) { setEnabled(evt.getNewValue() != null); } } diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMonitor.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMonitor.java index b483c3d35c..1eee1baf25 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMonitor.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMonitor.java @@ -123,7 +123,7 @@ import org.sleuthkit.autopsy.coreutils.PlatformUtil; String changed = evt.getPropertyName(); Object newValue = evt.getNewValue(); - if (changed.equals(Case.CASE_CURRENT_CASE)) { + if (changed.equals(Case.Events.CURRENT_CASE.toString())) { if (newValue != null) { setMonitorDir(); } diff --git a/Core/src/org/sleuthkit/autopsy/menuactions/DataResultMenu.java b/Core/src/org/sleuthkit/autopsy/menuactions/DataResultMenu.java index 098f6fd0b5..682d6f62f8 100644 --- a/Core/src/org/sleuthkit/autopsy/menuactions/DataResultMenu.java +++ b/Core/src/org/sleuthkit/autopsy/menuactions/DataResultMenu.java @@ -49,7 +49,7 @@ import org.sleuthkit.autopsy.casemodule.Case; Object oldValue = evt.getOldValue(); Object newValue = evt.getNewValue(); - if (changed.equals(Case.CASE_CURRENT_CASE)) { + if (changed.equals(Case.Events.CURRENT_CASE.toString())) { if (newValue != null) { // enable all menus when a case is created / opened int totalMenus = menu.getItemCount(); diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java index 23d9020de1..9a3942b225 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java @@ -83,7 +83,7 @@ public final class ReportWizardAction extends CallableSystemAction implements P Case.addPropertyChangeListener(new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - if (evt.getPropertyName().equals(Case.CASE_CURRENT_CASE)) { + if (evt.getPropertyName().equals(Case.Events.CURRENT_CASE.toString())) { Case newCase = (Case) evt.getNewValue(); setEnabled(newCase != null); diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbPanelSearchAction.java b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbPanelSearchAction.java index 732ad2908d..e9989e715f 100644 --- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbPanelSearchAction.java +++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbPanelSearchAction.java @@ -47,7 +47,7 @@ class HashDbPanelSearchAction extends CallableSystemAction { @Override public void propertyChange(PropertyChangeEvent evt) { - if(evt.getPropertyName().equals(Case.CASE_CURRENT_CASE)){ + if(evt.getPropertyName().equals(Case.Events.CURRENT_CASE.toString())){ setEnabled(evt.getNewValue() != null); } } diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearch.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearch.java index afbec2d84c..59f218fc09 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearch.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearch.java @@ -126,7 +126,7 @@ public class KeywordSearch { Object newValue = evt.getNewValue(); final Logger logger = Logger.getLogger(CaseChangeListener.class.getName()); - if (changed.equals(Case.CASE_CURRENT_CASE)) { + if (changed.equals(Case.Events.CURRENT_CASE.toString())) { if (newValue != null) { // new case is open try { diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchPanel.java index 65de59f22d..3dd2b3f14f 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchPanel.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchPanel.java @@ -395,7 +395,7 @@ class KeywordSearchPanel extends AbstractKeywordSearchPerformer { Object oldValue = evt.getOldValue(); Object newValue = evt.getNewValue(); - if (changed.equals(Case.CASE_CURRENT_CASE)) { + if (changed.equals(Case.Events.CURRENT_CASE.toString())) { resetSearchBox(); if (newValue == null) { setFields(false); diff --git a/Timeline/src/org/sleuthkit/autopsy/timeline/Timeline.java b/Timeline/src/org/sleuthkit/autopsy/timeline/Timeline.java index af031d8439..479b98cfe0 100644 --- a/Timeline/src/org/sleuthkit/autopsy/timeline/Timeline.java +++ b/Timeline/src/org/sleuthkit/autopsy/timeline/Timeline.java @@ -613,7 +613,7 @@ public class Timeline extends CallableSystemAction implements Presenter.Toolbar, @Override public void propertyChange(PropertyChangeEvent evt) { String prop = evt.getPropertyName(); - if (prop.equals(Case.CASE_ADD_DATA_SOURCE)) { + if (prop.equals(Case.Events.DATA_SOURCE_ADDED.toString())) { if (mainFrame != null && !mainFrame.isVisible()) { // change the lastObjectId to trigger a reparse of mactime barData ++lastObjectId; @@ -629,7 +629,7 @@ public class Timeline extends CallableSystemAction implements Presenter.Toolbar, // call performAction as if the user selected 'Make Timeline' from the menu performAction(); - } else if (prop.equals(Case.CASE_CURRENT_CASE)) { + } else if (prop.equals(Case.Events.CURRENT_CASE.toString())) { if (mainFrame != null && mainFrame.isVisible()) { mainFrame.dispose(); mainFrame = null;