From 7cce588bf36e458364eb56c6538668841ebf71c6 Mon Sep 17 00:00:00 2001
From: William Schaefer <wschaefer@basistech.net>
Date: Wed, 6 Nov 2019 18:06:22 -0500
Subject: [PATCH] 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 @@
     <Component class="javax.swing.ButtonGroup" name="orderGroupsByButtonGroup">
     </Component>
     <Component class="javax.swing.ButtonGroup" name="parentIncludeButtonGroup">
+      <AuxValues>
+        <AuxValue name="JavaCodeGenerator_VariableLocal" type="java.lang.Boolean" value="true"/>
+        <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/>
+      </AuxValues>
     </Component>
   </NonVisualComponents>
   <Properties>
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<ParentSearchTerm> parentList;
     private javax.swing.ButtonGroup parentPathButtonGroup;