From 670d6d668f176dba90c825bccd488c0fda4c8eda Mon Sep 17 00:00:00 2001
From: William Schaefer <wschaefer@basistech.net>
Date: Tue, 10 Oct 2017 12:09:57 -0400
Subject: [PATCH] 2774 added organization choosing to new case wizards

---
 .../casemodule/NewCaseVisualPanel2.java       | 66 ++++++++++++-------
 .../casemodule/NewCaseWizardPanel2.java       |  7 +-
 2 files changed, 45 insertions(+), 28 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.java b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.java
index 5d39c6921a..c2c79f7e7a 100755
--- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.java
@@ -48,20 +48,6 @@ class NewCaseVisualPanel2 extends javax.swing.JPanel {
      */
     public NewCaseVisualPanel2() {
         initComponents();
-        try {
-            this.dbManager = EamDb.getInstance();
-        } catch (EamDbException ex) {
-            dbManager = null;
-        }
-        if (dbManager == null) {
-            comboBoxOrgName.setEnabled(false);
-            bnNewOrganization.setEnabled(false);
-            lbPointOfContactNameText.setEnabled(false);
-            lbPointOfContactEmailText.setEnabled(false);
-            lbPointOfContactPhoneText.setEnabled(false);
-        } else {
-            loadOrganizationData();
-        }
     }
 
     /**
@@ -75,6 +61,26 @@ class NewCaseVisualPanel2 extends javax.swing.JPanel {
         return NbBundle.getMessage(this.getClass(), "NewCaseVisualPanel2.getName.text");
     }
 
+    void setUpOrganization() {
+        try {
+            this.dbManager = EamDb.getInstance();
+        } catch (EamDbException ex) {
+            dbManager = null;
+        }
+        boolean cREnabled = (dbManager != null);
+        comboBoxOrgName.setEnabled(cREnabled);
+        bnNewOrganization.setEnabled(cREnabled);
+        lbPointOfContactNameText.setEnabled(cREnabled);
+        lbPointOfContactEmailText.setEnabled(cREnabled);
+        lbPointOfContactPhoneText.setEnabled(cREnabled);
+        if (cREnabled) {
+            loadOrganizationData();
+        } else {
+            selectedOrg = null;
+            clearOrganization();
+        }
+    }
+
     /**
      * This method is called from within the constructor to initialize the form.
      * WARNING: Do NOT modify this code. The content of this method is always
@@ -213,10 +219,7 @@ class NewCaseVisualPanel2 extends javax.swing.JPanel {
         }
 
         if ("".equals(orgName)) {
-            selectedOrg = null;
-            lbPointOfContactNameText.setText("");
-            lbPointOfContactEmailText.setText("");
-            lbPointOfContactPhoneText.setText("");
+            clearOrganization();
             return;
         }
 
@@ -251,19 +254,16 @@ class NewCaseVisualPanel2 extends javax.swing.JPanel {
                 comboBoxOrgName.addItem(org.getName());
             });
         } catch (EamDbException ex) {
-
+            selectedOrg = null;
         }
-        
-        if (!orgs.isEmpty() && null != selectedOrg) {
+
+        if (null != selectedOrg) {
             comboBoxOrgName.setSelectedItem(selectedOrg.getName());
             lbPointOfContactNameText.setText(selectedOrg.getPocName());
             lbPointOfContactEmailText.setText(selectedOrg.getPocEmail());
             lbPointOfContactPhoneText.setText(selectedOrg.getPocPhone());
         } else {
-            comboBoxOrgName.setSelectedItem("");
-            lbPointOfContactNameText.setText("");
-            lbPointOfContactEmailText.setText("");
-            lbPointOfContactPhoneText.setText("");
+            clearOrganization();
         }
     }
     // Variables declaration - do not modify//GEN-BEGIN:variables
@@ -283,6 +283,13 @@ class NewCaseVisualPanel2 extends javax.swing.JPanel {
     private javax.swing.JLabel optionalLabel;
     // End of variables declaration//GEN-END:variables
 
+    private void clearOrganization() {
+        comboBoxOrgName.setSelectedItem("");
+        lbPointOfContactNameText.setText("");
+        lbPointOfContactEmailText.setText("");
+        lbPointOfContactPhoneText.setText("");
+    }
+
     String getCaseNumber() {
         return caseNumberTextField.getText();
     }
@@ -290,5 +297,14 @@ class NewCaseVisualPanel2 extends javax.swing.JPanel {
     String getExaminer() {
         return examinerTextField.getText();
     }
+    
+    String getOrganization() {
+        if (selectedOrg != null) {
+            return selectedOrg.getName();
+        }
+        else {
+            return "";
+        }
+    }
 
 }
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel2.java b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel2.java
index d8888a8865..6490c9e20e 100755
--- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel2.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel2.java
@@ -47,6 +47,7 @@ class NewCaseWizardPanel2 implements WizardDescriptor.ValidatingPanel<WizardDesc
         if (component == null) {
             component = new NewCaseVisualPanel2();
         }
+        component.setUpOrganization();
         return component;
     }
 
@@ -137,9 +138,9 @@ class NewCaseWizardPanel2 implements WizardDescriptor.ValidatingPanel<WizardDesc
      */
     @Override
     public void storeSettings(WizardDescriptor settings) {
-        NewCaseVisualPanel2 currentComponent = getComponent();
-        settings.putProperty("caseNumber", currentComponent.getCaseNumber()); //NON-NLS
-        settings.putProperty("caseExaminer", currentComponent.getExaminer()); //NON-NLS
+        settings.putProperty("caseNumber", component.getCaseNumber()); //NON-NLS
+        settings.putProperty("caseExaminer", component.getExaminer()); //NON-NLS
+        settings.putProperty("caseOrganization", component.getOrganization()); //NON-NLS
     }
 
     @Override