diff --git a/Core/src/org/sleuthkit/autopsy/filequery/FileSearchFiltering.java b/Core/src/org/sleuthkit/autopsy/filequery/FileSearchFiltering.java index abfd57b9bd..920f7983c1 100644 --- a/Core/src/org/sleuthkit/autopsy/filequery/FileSearchFiltering.java +++ b/Core/src/org/sleuthkit/autopsy/filequery/FileSearchFiltering.java @@ -235,8 +235,8 @@ class FileSearchFiltering { static class ParentSearchTerm { private final String searchStr; - private final boolean isFullPath; - private final boolean isIncluded; + private final boolean fullPath; + private final boolean included; /** * Create the ParentSearchTerm object @@ -249,8 +249,8 @@ class FileSearchFiltering { */ ParentSearchTerm(String searchStr, boolean isFullPath, boolean isIncluded) { this.searchStr = searchStr; - this.isFullPath = isFullPath; - this.isIncluded = isIncluded; + this.fullPath = isFullPath; + this.included = isIncluded; } /** @@ -297,17 +297,17 @@ class FileSearchFiltering { } /** - * @return the isFullPath + * @return the fullPath */ boolean isFullPath() { - return isFullPath; + return fullPath; } /** - * @return the isIncluded + * @return the included */ boolean isIncluded() { - return isIncluded; + return included; } /** diff --git a/Core/src/org/sleuthkit/autopsy/filequery/FileSearchPanel.form b/Core/src/org/sleuthkit/autopsy/filequery/FileSearchPanel.form index 0d60758f2e..787979b242 100644 --- a/Core/src/org/sleuthkit/autopsy/filequery/FileSearchPanel.form +++ b/Core/src/org/sleuthkit/autopsy/filequery/FileSearchPanel.form @@ -7,6 +7,10 @@ + + + + diff --git a/Core/src/org/sleuthkit/autopsy/filequery/FileSearchPanel.java b/Core/src/org/sleuthkit/autopsy/filequery/FileSearchPanel.java index 94c4679de2..bafe6696c8 100644 --- a/Core/src/org/sleuthkit/autopsy/filequery/FileSearchPanel.java +++ b/Core/src/org/sleuthkit/autopsy/filequery/FileSearchPanel.java @@ -727,11 +727,10 @@ final class FileSearchPanel extends javax.swing.JPanel implements ActionListener // //GEN-BEGIN:initComponents private void initComponents() { java.awt.GridBagConstraints gridBagConstraints; - parentPathButtonGroup = new javax.swing.ButtonGroup(); orderGroupsByButtonGroup = new javax.swing.ButtonGroup(); - parentIncludeButtonGroup = new javax.swing.ButtonGroup(); typeButtonGroup = new javax.swing.ButtonGroup(); + javax.swing.ButtonGroup parentIncludeButtonGroup = new javax.swing.ButtonGroup(); filtersScrollPane = new javax.swing.JScrollPane(); filtersPanel = new javax.swing.JPanel(); sizeCheckbox = new javax.swing.JCheckBox(); @@ -1581,7 +1580,6 @@ final class FileSearchPanel extends javax.swing.JPanel implements ActionListener private javax.swing.ButtonGroup orderGroupsByButtonGroup; private javax.swing.JLabel orderGroupsByLabel; private javax.swing.JCheckBox parentCheckbox; - private javax.swing.ButtonGroup parentIncludeButtonGroup; private javax.swing.JLabel parentLabel; private javax.swing.JList parentList; private javax.swing.ButtonGroup parentPathButtonGroup;