From f0512d0478bbcd081c9464a1c85cde9dbeb5494f Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Fri, 1 Nov 2019 15:33:59 -0400 Subject: [PATCH] 5673 fix default filter for frequency --- .../autopsy/filequery/FileSearchPanel.java | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/filequery/FileSearchPanel.java b/Core/src/org/sleuthkit/autopsy/filequery/FileSearchPanel.java index 94c622333f..41ec31f351 100644 --- a/Core/src/org/sleuthkit/autopsy/filequery/FileSearchPanel.java +++ b/Core/src/org/sleuthkit/autopsy/filequery/FileSearchPanel.java @@ -93,7 +93,17 @@ final class FileSearchPanel extends javax.swing.JPanel implements ActionListener sizeScrollPane.setEnabled(true); sizeScrollPane.setVisible(true); crFrequencyCheckbox.setVisible(true); + crFrequencyCheckbox.setSelected(true); + int[] selectedFrequencyIndices; + if (!EamDb.isEnabled()) { + selectedFrequencyIndices = new int[]{0}; + } else { + selectedFrequencyIndices = new int[]{1, 2, 3, 4, 5, 6, 7}; + } + crFrequencyList.setEnabled(true); crFrequencyList.setVisible(true); + crFrequencyList.setSelectedIndices(selectedFrequencyIndices); + crFrequencyScrollPane.setEnabled(true); crFrequencyScrollPane.setVisible(true); exifCheckbox.setVisible(true); objectsCheckbox.setVisible(true); @@ -141,7 +151,17 @@ final class FileSearchPanel extends javax.swing.JPanel implements ActionListener sizeScrollPane.setEnabled(true); sizeScrollPane.setVisible(true); crFrequencyCheckbox.setVisible(true); + crFrequencyCheckbox.setSelected(true); + int[] selectedFrequencyIndices; + if (!EamDb.isEnabled()) { + selectedFrequencyIndices = new int[]{0}; + } else { + selectedFrequencyIndices = new int[]{1, 2, 3, 4, 5, 6, 7}; + } + crFrequencyList.setEnabled(true); crFrequencyList.setVisible(true); + crFrequencyList.setSelectedIndices(selectedFrequencyIndices); + crFrequencyScrollPane.setEnabled(true); crFrequencyScrollPane.setVisible(true); exifCheckbox.setVisible(true); objectsCheckbox.setSelected(false); @@ -172,10 +192,10 @@ final class FileSearchPanel extends javax.swing.JPanel implements ActionListener notableCheckbox.setVisible(false); } - void resetPanel(){ + void resetPanel() { customizeComponents(); } - + /** * Set up all the UI components */ @@ -265,6 +285,7 @@ final class FileSearchPanel extends javax.swing.JPanel implements ActionListener for (FileSearchData.Frequency freq : FileSearchData.Frequency.getOptionsForFilteringWithoutCr()) { frequencyListModel.add(count, freq); } + } else { for (FileSearchData.Frequency freq : FileSearchData.Frequency.getOptionsForFilteringWithCr()) { frequencyListModel.add(count, freq);