From b356d93dacf4648e39bef808c488deb9c3ff6ee4 Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Thu, 4 Jun 2020 08:14:50 -0400 Subject: [PATCH] 6305 reset filters when case opened or closed --- .../sleuthkit/autopsy/discovery/DiscoveryDialog.java | 11 +++++++---- .../autopsy/discovery/ImageThumbnailPanel.java | 2 +- .../autopsy/discovery/OpenDiscoveryAction.java | 3 ++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.java b/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.java index a70df71418..e270e83486 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.java +++ b/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.java @@ -36,9 +36,9 @@ final class DiscoveryDialog extends javax.swing.JDialog { private static final long serialVersionUID = 1L; private final static Logger logger = Logger.getLogger(DiscoveryDialog.class.getName()); - private final ImageFilterPanel imageFilterPanel = new ImageFilterPanel(); - private final VideoFilterPanel videoFilterPanel = new VideoFilterPanel(); - private final DocumentFilterPanel documentFilterPanel = new DocumentFilterPanel(); + private ImageFilterPanel imageFilterPanel = new ImageFilterPanel(); + private VideoFilterPanel videoFilterPanel = new VideoFilterPanel(); + private DocumentFilterPanel documentFilterPanel = new DocumentFilterPanel(); private static final Color SELECTED_COLOR = new Color(216, 230, 242); private static final Color UNSELECTED_COLOR = new Color(240, 240, 240); private SearchWorker searchWorker = null; @@ -88,7 +88,10 @@ final class DiscoveryDialog extends javax.swing.JDialog { /** * Update the search settings to a default state. */ - private void updateSearchSettings() { + void updateSearchSettings() { + imageFilterPanel = new ImageFilterPanel(); + videoFilterPanel = new VideoFilterPanel(); + documentFilterPanel = new DocumentFilterPanel(); imagesButton.setSelected(true); imagesButton.setEnabled(false); imagesButton.setBackground(SELECTED_COLOR); diff --git a/Core/src/org/sleuthkit/autopsy/discovery/ImageThumbnailPanel.java b/Core/src/org/sleuthkit/autopsy/discovery/ImageThumbnailPanel.java index 6d861d06e9..8f7b90ad08 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/ImageThumbnailPanel.java +++ b/Core/src/org/sleuthkit/autopsy/discovery/ImageThumbnailPanel.java @@ -41,7 +41,7 @@ final class ImageThumbnailPanel extends javax.swing.JPanel implements ListCellRe /** * Creates new form ImageThumbnailPanel */ - ImageThumbnailPanel() { + ImageThumbnailPanel() { initComponents(); } diff --git a/Core/src/org/sleuthkit/autopsy/discovery/OpenDiscoveryAction.java b/Core/src/org/sleuthkit/autopsy/discovery/OpenDiscoveryAction.java index f72d25e22e..545fca578f 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/OpenDiscoveryAction.java +++ b/Core/src/org/sleuthkit/autopsy/discovery/OpenDiscoveryAction.java @@ -64,7 +64,7 @@ public final class OpenDiscoveryAction extends CallableSystemAction implements P toolbarButton.addActionListener(OpenDiscoveryAction.this::actionPerformed); this.setEnabled(false); } - + @Override public boolean isEnabled() { return Case.isCaseOpen(); @@ -132,6 +132,7 @@ public final class OpenDiscoveryAction extends CallableSystemAction implements P @Override public void setEnabled(boolean value) { super.setEnabled(value); + DiscoveryDialog.getDiscoveryDialogInstance().updateSearchSettings(); toolbarButton.setEnabled(value); }