From 7cce588bf36e458364eb56c6538668841ebf71c6 Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Wed, 6 Nov 2019 18:06:22 -0500 Subject: [PATCH 1/2] 5674 fix codacy complaints --- .../autopsy/filequery/FileSearchFiltering.java | 16 ++++++++-------- .../autopsy/filequery/FileSearchPanel.form | 4 ++++ .../autopsy/filequery/FileSearchPanel.java | 3 +-- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/filequery/FileSearchFiltering.java b/Core/src/org/sleuthkit/autopsy/filequery/FileSearchFiltering.java index d0cef928f7..66676aa669 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 9c6bf63c21..5f148e7227 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 9e6008a750..c2875ca0aa 100644 --- a/Core/src/org/sleuthkit/autopsy/filequery/FileSearchPanel.java +++ b/Core/src/org/sleuthkit/autopsy/filequery/FileSearchPanel.java @@ -614,7 +614,7 @@ final class FileSearchPanel extends javax.swing.JPanel implements ActionListener parentPathButtonGroup = new javax.swing.ButtonGroup(); orderGroupsByButtonGroup = new javax.swing.ButtonGroup(); - parentIncludeButtonGroup = 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(); @@ -1470,7 +1470,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; From 5af8d710f1951dd8ea1f5d6abc9fa1b991f1ae4a Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Wed, 6 Nov 2019 18:26:32 -0500 Subject: [PATCH 2/2] 5673 fix codacy issues --- .../sleuthkit/autopsy/filequery/DiscoveryTopComponent.form | 4 ++++ .../sleuthkit/autopsy/filequery/DiscoveryTopComponent.java | 3 +-- Core/src/org/sleuthkit/autopsy/filequery/FileSearch.java | 6 ++---- .../org/sleuthkit/autopsy/filequery/FileSearchPanel.form | 6 ++++-- .../org/sleuthkit/autopsy/filequery/FileSearchPanel.java | 6 ++---- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/filequery/DiscoveryTopComponent.form b/Core/src/org/sleuthkit/autopsy/filequery/DiscoveryTopComponent.form index 38e9c012a0..5546e8eb9d 100644 --- a/Core/src/org/sleuthkit/autopsy/filequery/DiscoveryTopComponent.form +++ b/Core/src/org/sleuthkit/autopsy/filequery/DiscoveryTopComponent.form @@ -72,6 +72,10 @@ + + + + diff --git a/Core/src/org/sleuthkit/autopsy/filequery/DiscoveryTopComponent.java b/Core/src/org/sleuthkit/autopsy/filequery/DiscoveryTopComponent.java index cf94829d0d..3efc4c870f 100644 --- a/Core/src/org/sleuthkit/autopsy/filequery/DiscoveryTopComponent.java +++ b/Core/src/org/sleuthkit/autopsy/filequery/DiscoveryTopComponent.java @@ -167,7 +167,7 @@ public final class DiscoveryTopComponent extends TopComponent { javax.swing.JSplitPane mainSplitPane = new javax.swing.JSplitPane(); leftSplitPane = new javax.swing.JSplitPane(); rightSplitPane = new javax.swing.JSplitPane(); - toolBarPanel = new javax.swing.JPanel(); + javax.swing.JPanel toolBarPanel = new javax.swing.JPanel(); imagesButton = new javax.swing.JButton(); videosButton = new javax.swing.JButton(); @@ -291,7 +291,6 @@ public final class DiscoveryTopComponent extends TopComponent { private javax.swing.JButton imagesButton; private javax.swing.JSplitPane leftSplitPane; private javax.swing.JSplitPane rightSplitPane; - private javax.swing.JPanel toolBarPanel; private javax.swing.JButton videosButton; // End of variables declaration//GEN-END:variables diff --git a/Core/src/org/sleuthkit/autopsy/filequery/FileSearch.java b/Core/src/org/sleuthkit/autopsy/filequery/FileSearch.java index 4126f23c3f..c6b1cb3a16 100644 --- a/Core/src/org/sleuthkit/autopsy/filequery/FileSearch.java +++ b/Core/src/org/sleuthkit/autopsy/filequery/FileSearch.java @@ -1032,10 +1032,8 @@ class FileSearch { EamDb centralRepoDb) throws FileSearchException { if (centralRepoDb == null) { for (ResultFile file : files) { - if (file.getFrequency() == Frequency.UNKNOWN) { - if (file.getFirstInstance().getKnown() == TskData.FileKnown.KNOWN) { - file.setFrequency(Frequency.KNOWN); - } + if (file.getFrequency() == Frequency.UNKNOWN && file.getFirstInstance().getKnown() == TskData.FileKnown.KNOWN) { + file.setFrequency(Frequency.KNOWN); } } } else { diff --git a/Core/src/org/sleuthkit/autopsy/filequery/FileSearchPanel.form b/Core/src/org/sleuthkit/autopsy/filequery/FileSearchPanel.form index 787979b242..ccfb608cd6 100644 --- a/Core/src/org/sleuthkit/autopsy/filequery/FileSearchPanel.form +++ b/Core/src/org/sleuthkit/autopsy/filequery/FileSearchPanel.form @@ -3,6 +3,10 @@
+ + + + @@ -12,8 +16,6 @@ - - diff --git a/Core/src/org/sleuthkit/autopsy/filequery/FileSearchPanel.java b/Core/src/org/sleuthkit/autopsy/filequery/FileSearchPanel.java index bafe6696c8..0437bd71e0 100644 --- a/Core/src/org/sleuthkit/autopsy/filequery/FileSearchPanel.java +++ b/Core/src/org/sleuthkit/autopsy/filequery/FileSearchPanel.java @@ -727,9 +727,9 @@ final class FileSearchPanel extends javax.swing.JPanel implements ActionListener // //GEN-BEGIN:initComponents private void initComponents() { java.awt.GridBagConstraints gridBagConstraints; - parentPathButtonGroup = new javax.swing.ButtonGroup(); + + javax.swing.ButtonGroup parentPathButtonGroup = new javax.swing.ButtonGroup(); orderGroupsByButtonGroup = 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(); @@ -1582,7 +1582,6 @@ final class FileSearchPanel extends javax.swing.JPanel implements ActionListener private javax.swing.JCheckBox parentCheckbox; private javax.swing.JLabel parentLabel; private javax.swing.JList parentList; - private javax.swing.ButtonGroup parentPathButtonGroup; private javax.swing.JScrollPane parentScrollPane; private javax.swing.JTextField parentTextField; private javax.swing.JCheckBox scoreCheckbox; @@ -1597,7 +1596,6 @@ final class FileSearchPanel extends javax.swing.JPanel implements ActionListener private javax.swing.JCheckBox tagsCheckbox; private javax.swing.JList tagsList; private javax.swing.JScrollPane tagsScrollPane; - private javax.swing.ButtonGroup typeButtonGroup; // End of variables declaration//GEN-END:variables }