From de360793f9979b17e4719717d4bfa66357f47bfc Mon Sep 17 00:00:00 2001 From: rcordovano Date: Fri, 24 Apr 2015 10:08:51 -0400 Subject: [PATCH] Error-proof HashLookupSettingsPanel.isLocalIngestJobEvent() --- .../hashdatabase/HashLookupSettingsPanel.java | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java index e587f951b6..0386ac873e 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java @@ -76,7 +76,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan public void run() { updateComponents(); } - }); + }); } } }); @@ -229,7 +229,16 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan } private boolean isLocalIngestJobEvent(PropertyChangeEvent evt) { - return evt instanceof AutopsyEvent && ((AutopsyEvent)evt).getSourceType() == AutopsyEvent.SourceType.LOCAL; + if (evt instanceof AutopsyEvent) { + AutopsyEvent event = (AutopsyEvent) evt; + if (event.getSourceType() == AutopsyEvent.SourceType.LOCAL) { + String eventType = event.getPropertyName(); + return (eventType.equals(IngestManager.IngestJobEvent.STARTED.toString()) + || eventType.equals(IngestManager.IngestJobEvent.CANCELLED.toString()) + || eventType.equals(IngestManager.IngestJobEvent.COMPLETED.toString())); + } + } + return false; } @Override @@ -276,7 +285,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan HashDbManager.getInstance().loadLastSavedConfiguration(); } } - + void removeThese(List toRemove) { for (HashDb hashDb : toRemove) { hashSetManager.removeHashDatabaseInternal(hashDb); @@ -305,7 +314,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan } int res = JOptionPane.showConfirmDialog(this, message, NbBundle.getMessage(this.getClass(), - "HashDbConfigPanel.unindexedDbsMsg"), + "HashDbConfigPanel.unindexedDbsMsg"), JOptionPane.YES_NO_OPTION); if (res == JOptionPane.YES_OPTION) { ModalNoButtons indexingDialog = new ModalNoButtons(this, new Frame(), unindexed); @@ -753,7 +762,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan private void deleteDatabaseButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_deleteDatabaseButtonActionPerformed if (JOptionPane.showConfirmDialog(null, NbBundle.getMessage(this.getClass(), - "HashDbConfigPanel.deleteDbActionConfirmMsg"), + "HashDbConfigPanel.deleteDbActionConfirmMsg"), NbBundle.getMessage(this.getClass(), "HashDbConfigPanel.deleteDbActionMsg"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE) == JOptionPane.YES_OPTION) { @@ -828,4 +837,4 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan private javax.swing.JCheckBox sendIngestMessagesCheckBox; private javax.swing.JLabel typeLabel; // End of variables declaration//GEN-END:variables -} \ No newline at end of file +}