From 773203f5c032ed29de1ed067b480e15e26ca08d6 Mon Sep 17 00:00:00 2001
From: "U-BASIS\\dgrove" <dgrove@WIN-DGROV-4999.basistech.net>
Date: Thu, 13 Sep 2018 10:19:36 -0400
Subject: [PATCH] Fixed a minor bug with the properties file.

---
 .../autopsy/casemodule/CasePreferences.java   | 20 ++++++++++++++-----
 .../DirectoryTreeTopComponent.java            |  7 +++----
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CasePreferences.java b/Core/src/org/sleuthkit/autopsy/casemodule/CasePreferences.java
index 4b53331e8f..1c853c7951 100755
--- a/Core/src/org/sleuthkit/autopsy/casemodule/CasePreferences.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/CasePreferences.java
@@ -37,6 +37,9 @@ import org.sleuthkit.autopsy.directorytree.DirectoryTreeTopComponent;
 public final class CasePreferences {
     
     private static final String SETTINGS_FILE = "CasePreferences.properties"; //NON-NLS
+    private static final String KEY_GROUP_BY_DATA_SOURCE = "groupByDataSource"; //NON-NLS
+    private static final String VALUE_TRUE = "true"; //NON-NLS
+    private static final String VALUE_FALSE = "false"; //NON-NLS
     
     private static final Logger logger = Logger.getLogger(CasePreferences.class.getName());
     
@@ -94,10 +97,17 @@ public final class CasePreferences {
             try (InputStream inputStream = Files.newInputStream(settingsFile)) {
                 Properties props = new Properties();
                 props.load(inputStream);
-                if (props.getProperty("groupByDataSource", "false").equals("true")) {
-                    groupItemsInTreeByDataSource = true;
-                } else {
-                    groupItemsInTreeByDataSource = false;
+                String groupByDataSourceValue = props.getProperty(KEY_GROUP_BY_DATA_SOURCE);
+                switch (groupByDataSourceValue) {
+                    case VALUE_TRUE:
+                        groupItemsInTreeByDataSource = true;
+                        break;
+                    case VALUE_FALSE:
+                        groupItemsInTreeByDataSource = false;
+                        break;
+                    default:
+                        groupItemsInTreeByDataSource = null;
+                        break;
                 }
             } catch (IOException ex) {
                 logger.log(Level.SEVERE, "Error reading settings file", ex);
@@ -119,7 +129,7 @@ public final class CasePreferences {
         Path settingsFile = Paths.get(currentCase.getConfigDirectory(), SETTINGS_FILE); //NON-NLS
         Properties props = new Properties();
         if (groupItemsInTreeByDataSource != null) {
-            props.setProperty("groupByDataSource", (groupItemsInTreeByDataSource ? "true" : "false"));
+            props.setProperty(KEY_GROUP_BY_DATA_SOURCE, (groupItemsInTreeByDataSource ? VALUE_TRUE : VALUE_FALSE));
         }
 
         try (OutputStream fos = Files.newOutputStream(settingsFile)) {
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java
index c11844fc2e..9c577cba59 100644
--- a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java
@@ -427,10 +427,9 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
      * Ask the user if they want to group by data source when opening a large
      * case.
      *
-     * @param currentCase
-     * @param dataSourceCount
+     * @param dataSourceCount The number of data sources in the case.
      */
-    private void promptForDataSourceGrouping(Case currentCase, int dataSourceCount) {
+    private void promptForDataSourceGrouping(int dataSourceCount) {
         if (CasePreferences.getGroupItemsInTreeByDataSource() == null) {
             GroupDataSourcesDialog dialog = new GroupDataSourcesDialog(dataSourceCount);
             dialog.display();
@@ -486,7 +485,7 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
                     int dataSourceCount = currentCase.getDataSources().size();
                     if (!Objects.equals(CasePreferences.getGroupItemsInTreeByDataSource(), true)
                             && dataSourceCount > threshold) {
-                        promptForDataSourceGrouping(currentCase, dataSourceCount);
+                        promptForDataSourceGrouping(dataSourceCount);
                     }
                 } catch (TskCoreException ex) {
                     LOGGER.log(Level.SEVERE, "Error loading data sources", ex);