From 126c12d2d172feaced698ef87a75e688bfe3b7ed Mon Sep 17 00:00:00 2001 From: Oliver Spohngellert Date: Thu, 26 May 2016 16:06:20 -0400 Subject: [PATCH] Fixed semantics. --- .../autopsy/filesearch/DateSearchFilter.java | 12 +----------- .../autopsy/filesearch/DateSearchPanel.java | 2 +- .../autopsy/filesearch/FileSearchFilter.java | 16 +++++++++++++--- .../autopsy/filesearch/FileSearchPanel.java | 8 ++++---- .../filesearch/KnownStatusSearchFilter.java | 6 +----- .../filesearch/KnownStatusSearchPanel.java | 2 +- .../autopsy/filesearch/MimeTypeFilter.java | 6 +----- .../autopsy/filesearch/NameSearchFilter.java | 6 +----- 8 files changed, 23 insertions(+), 35 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/DateSearchFilter.java b/Core/src/org/sleuthkit/autopsy/filesearch/DateSearchFilter.java index d92d62e7e4..33e1ba6635 100644 --- a/Core/src/org/sleuthkit/autopsy/filesearch/DateSearchFilter.java +++ b/Core/src/org/sleuthkit/autopsy/filesearch/DateSearchFilter.java @@ -205,19 +205,9 @@ class DateSearchFilter extends AbstractFileSearchFilter { getComponent().addActionListener(l); } - @Override - public void addPropertyChangeListener(PropertyChangeListener listener) { - getComponent().addPropertyChangeListener(listener); - } - @Override public boolean isValid() { - if (!isEnabled()) { - return true; - } - else { - return this.getComponent().isSearchable(); - } + return this.getComponent().isValidSearch(); } /** diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/DateSearchPanel.java b/Core/src/org/sleuthkit/autopsy/filesearch/DateSearchPanel.java index 718eaa8b8f..9794e25700 100644 --- a/Core/src/org/sleuthkit/autopsy/filesearch/DateSearchPanel.java +++ b/Core/src/org/sleuthkit/autopsy/filesearch/DateSearchPanel.java @@ -430,7 +430,7 @@ class DateSearchPanel extends javax.swing.JPanel { dateToButtonCalendar.setTargetDate(date); } - boolean isSearchable() { + boolean isValidSearch() { return this.accessedCheckBox.isSelected() || this.changedCheckBox.isSelected() || this.createdCheckBox.isSelected() || diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchFilter.java b/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchFilter.java index bf1cb6fdcf..457db56570 100644 --- a/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchFilter.java +++ b/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchFilter.java @@ -25,7 +25,7 @@ import javax.swing.JComponent; /** * Provides a filter and the panel to display it to the FileSearchTopComponent */ - interface FileSearchFilter { +interface FileSearchFilter { /** * Gets the panel to put in the File Search pane. @@ -40,7 +40,12 @@ import javax.swing.JComponent; * @return true if it should be included in the search */ boolean isEnabled(); - + + /** + * Checks if the panel has valid input for search. + * + * @return Whether the panel has valid input for search. + */ boolean isValid(); /** @@ -58,7 +63,12 @@ import javax.swing.JComponent; * Add an action listener to the fields of this panel */ void addActionListener(ActionListener l); - + + /** + * Adds the property change listener to the panel + * + * @param listener the listener to add. + */ void addPropertyChangeListener(PropertyChangeListener listener); /** diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchPanel.java b/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchPanel.java index 569bb4ba32..656e22ef9e 100644 --- a/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchPanel.java +++ b/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchPanel.java @@ -105,7 +105,7 @@ class FileSearchPanel extends javax.swing.JPanel { filter.addPropertyChangeListener(new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - searchButton.setEnabled(isSearchable()); + searchButton.setEnabled(isValidSearch()); } }); } @@ -116,13 +116,13 @@ class FileSearchPanel extends javax.swing.JPanel { search(); } }); - searchButton.setEnabled(isSearchable()); + searchButton.setEnabled(isValidSearch()); } /** * @return true if any of the filters in the panel are enabled (checked) */ - private boolean isSearchable() { + private boolean isValidSearch() { boolean enabled = false; for (FileSearchFilter filter : this.getFilters()) { if (filter.isEnabled()) { @@ -144,7 +144,7 @@ class FileSearchPanel extends javax.swing.JPanel { // change the cursor to "waiting cursor" for this operation this.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); try { - if (this.isSearchable()) { + if (this.isValidSearch()) { String title = NbBundle.getMessage(this.getClass(), "FileSearchPanel.search.results.title", ++resultWindowCount); String pathText = NbBundle.getMessage(this.getClass(), "FileSearchPanel.search.results.pathText"); diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/KnownStatusSearchFilter.java b/Core/src/org/sleuthkit/autopsy/filesearch/KnownStatusSearchFilter.java index e11de57180..5f52afa035 100644 --- a/Core/src/org/sleuthkit/autopsy/filesearch/KnownStatusSearchFilter.java +++ b/Core/src/org/sleuthkit/autopsy/filesearch/KnownStatusSearchFilter.java @@ -86,10 +86,6 @@ class KnownStatusSearchFilter extends AbstractFileSearchFilter { @Override public boolean isValid() { - if (!isEnabled()) { - return true; - } else { - return !this.getComponent().getMimeTypesSelected().isEmpty(); - } + return !this.getComponent().getMimeTypesSelected().isEmpty(); } } diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/NameSearchFilter.java b/Core/src/org/sleuthkit/autopsy/filesearch/NameSearchFilter.java index 787d66784a..ee70ebd5e1 100644 --- a/Core/src/org/sleuthkit/autopsy/filesearch/NameSearchFilter.java +++ b/Core/src/org/sleuthkit/autopsy/filesearch/NameSearchFilter.java @@ -65,10 +65,6 @@ class NameSearchFilter extends AbstractFileSearchFilter { @Override public boolean isValid() { - if (!isEnabled()) { - return true; - } else { - return !this.getComponent().getSearchTextField().getText().isEmpty(); - } + return !this.getComponent().getSearchTextField().getText().isEmpty(); } }