From fc4a2d5bbf8c2e449780eeae24efb5482f9c1bae Mon Sep 17 00:00:00 2001
From: William Schaefer <wschaefer@basistech.net>
Date: Tue, 12 Sep 2017 14:30:14 -0400
Subject: [PATCH] 2945 switching between standalone and review mode bug fixed
 2968 duplicate

---
 .../configuration/AutoIngestSettingsPanel.form  |  3 ---
 .../configuration/AutoIngestSettingsPanel.java  | 17 ++---------------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/AutoIngestSettingsPanel.form b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/AutoIngestSettingsPanel.form
index dd372c93a0..3430d45e56 100755
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/AutoIngestSettingsPanel.form
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/AutoIngestSettingsPanel.form
@@ -665,9 +665,6 @@
                   <Border info="null"/>
                 </Property>
               </Properties>
-              <Events>
-                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="tbOopsActionPerformed"/>
-              </Events>
             </Component>
           </SubComponents>
         </Container>
diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/AutoIngestSettingsPanel.java b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/AutoIngestSettingsPanel.java
index be6e8e006b..d64b9954ab 100755
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/AutoIngestSettingsPanel.java
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/AutoIngestSettingsPanel.java
@@ -602,8 +602,8 @@ public class AutoIngestSettingsPanel extends javax.swing.JPanel {
     private void enableOptionsBasedOnMode(OptionsUiMode mode) {
         if (mode != OptionsUiMode.DOWNLOADING_CONFIGURATION) {
             boolean nonMasterSharedConfig = !masterNodeCheckBox.isSelected() && sharedConfigCheckbox.isSelected();
-            jRadioButtonAutomated.setEnabled(cbJoinAutoIngestCluster.isSelected() && !sharedConfigCheckbox.isSelected());
-            jRadioButtonReview.setEnabled(cbJoinAutoIngestCluster.isSelected() && !sharedConfigCheckbox.isSelected());
+            jRadioButtonAutomated.setEnabled(cbJoinAutoIngestCluster.isSelected());
+            jRadioButtonReview.setEnabled(cbJoinAutoIngestCluster.isSelected());
 
             jLabelSelectInputFolder.setEnabled(mode == OptionsUiMode.AIM && !nonMasterSharedConfig);
             inputPathTextField.setEnabled(mode == OptionsUiMode.AIM && !nonMasterSharedConfig);
@@ -1021,11 +1021,6 @@ public class AutoIngestSettingsPanel extends javax.swing.JPanel {
         tbOops.setForeground(new java.awt.Color(255, 0, 0));
         tbOops.setText(org.openide.util.NbBundle.getMessage(AutoIngestSettingsPanel.class, "AutoIngestSettingsPanel.tbOops.text")); // NOI18N
         tbOops.setBorder(null);
-        tbOops.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                tbOopsActionPerformed(evt);
-            }
-        });
 
         javax.swing.GroupLayout nodePanelLayout = new javax.swing.GroupLayout(nodePanel);
         nodePanel.setLayout(nodePanelLayout);
@@ -1172,10 +1167,6 @@ public class AutoIngestSettingsPanel extends javax.swing.JPanel {
         } else {
             uploadButton.setEnabled(false);
         }
-        if (sharedConfigCheckbox.isEnabled()) {
-            jRadioButtonAutomated.setEnabled(false);
-            jRadioButtonReview.setEnabled(false);
-        }
     }//GEN-LAST:event_masterNodeCheckBoxItemStateChanged
 
     private void cbJoinAutoIngestClusterActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cbJoinAutoIngestClusterActionPerformed
@@ -1183,10 +1174,6 @@ public class AutoIngestSettingsPanel extends javax.swing.JPanel {
         controller.changed();
     }//GEN-LAST:event_cbJoinAutoIngestClusterActionPerformed
 
-    private void tbOopsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_tbOopsActionPerformed
-        // TODO add your handling code here:
-    }//GEN-LAST:event_tbOopsActionPerformed
-
     private void browseOutputFolderButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_browseOutputFolderButtonActionPerformed
         String oldText = outputPathTextField.getText().trim();
         // set the current directory of the FileChooser if the oldText is valid