From e706709eb7ea5b8442796131dc4baef3a0ef4ec4 Mon Sep 17 00:00:00 2001
From: "U-BASIS\\zhaohui" <zhaohui@win-zhaoh-3257.basistech.net>
Date: Mon, 18 Dec 2017 17:00:01 -0500
Subject: [PATCH 1/2] 3377: Not saving the notes to properties file

---
 .../org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel2.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel2.java b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel2.java
index 7752611202..249c1b30c3 100755
--- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel2.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel2.java
@@ -42,7 +42,6 @@ class NewCaseWizardPanel2 implements WizardDescriptor.ValidatingPanel<WizardDesc
     private static final String PROP_EXAMINER_NAME = "LBL_EXAMINER_NAME"; //NON-NLS
     private static final String PROP_EXAMINER_PHONE = "LBL_EXAMINER_PHONE"; //NON-NLS
     private static final String PROP_EXAMINER_EMAIL = "LBL_EXAMINER_EMAIL"; //NON-NLS
-    private static final String PROP_CASE_NOTES = "LBL_CASE_NOTES"; //NON-NLS
     private static final String PROP_ORGANIZATION_NAME = "LBL_ORGANIZATION_NAME"; //NON-NLS
     private NewCaseVisualPanel2 component;
     private final Set<ChangeListener> listeners = new HashSet<>(1);
@@ -142,12 +141,10 @@ class NewCaseWizardPanel2 implements WizardDescriptor.ValidatingPanel<WizardDesc
             String lastExaminerName = ModuleSettings.getConfigSetting(ModuleSettings.MAIN_SETTINGS, PROP_EXAMINER_NAME);
             String lastExaminerPhone = ModuleSettings.getConfigSetting(ModuleSettings.MAIN_SETTINGS, PROP_EXAMINER_PHONE);
             String lastExaminerEmail = ModuleSettings.getConfigSetting(ModuleSettings.MAIN_SETTINGS, PROP_EXAMINER_EMAIL);
-            String lastCaseNotes = ModuleSettings.getConfigSetting(ModuleSettings.MAIN_SETTINGS, PROP_CASE_NOTES);
             String lastOrganizationName = ModuleSettings.getConfigSetting(ModuleSettings.MAIN_SETTINGS, PROP_ORGANIZATION_NAME);
             panel.setExaminerName(lastExaminerName);
             panel.setExaminerPhone(lastExaminerPhone);
             panel.setExaminerEmail(lastExaminerEmail);
-            panel.setCaseNotes(lastCaseNotes);
             panel.setOrganization(EamDb.isEnabled() ? lastOrganizationName : "");
             panel.setCaseNumber("");  //clear the number field 
         } catch (Exception e) {
@@ -174,7 +171,6 @@ class NewCaseWizardPanel2 implements WizardDescriptor.ValidatingPanel<WizardDesc
         settings.putProperty("caseExaminerEmail", component.getExaminerEmail()); //NON-NLS
         ModuleSettings.setConfigSetting(ModuleSettings.MAIN_SETTINGS, PROP_EXAMINER_EMAIL, component.getExaminerEmail());
         settings.putProperty("caseNotes", component.getCaseNotes()); //NON-NLS
-        ModuleSettings.setConfigSetting(ModuleSettings.MAIN_SETTINGS, PROP_CASE_NOTES, component.getCaseNotes());
         settings.putProperty("caseOrganization", component.getOrganization()); //NON-NLS
         ModuleSettings.setConfigSetting(ModuleSettings.MAIN_SETTINGS, PROP_ORGANIZATION_NAME, component.getOrganization());
     }

From 8dce2fc71bb61cd120ddc44264f82e11af6b378e Mon Sep 17 00:00:00 2001
From: "U-BASIS\\zhaohui" <zhaohui@win-zhaoh-3257.basistech.net>
Date: Mon, 18 Dec 2017 17:53:01 -0500
Subject: [PATCH 2/2] 3377: new case should clear the notes field first

---
 .../org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel2.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel2.java b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel2.java
index 249c1b30c3..aa9b6643d8 100755
--- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel2.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel2.java
@@ -147,6 +147,7 @@ class NewCaseWizardPanel2 implements WizardDescriptor.ValidatingPanel<WizardDesc
             panel.setExaminerEmail(lastExaminerEmail);
             panel.setOrganization(EamDb.isEnabled() ? lastOrganizationName : "");
             panel.setCaseNumber("");  //clear the number field 
+            panel.setCaseNotes(""); //clear the notes field
         } catch (Exception e) {
             logger.log(Level.WARNING, "Could not read wizard settings in NewCaseWizardPanel2, ", e); //NON-NLS
         }