From 8c15029a08e529f11c8cdd1cc774667930c598db Mon Sep 17 00:00:00 2001
From: Karl Mortensen <kmortensen@basistech.com>
Date: Mon, 13 Apr 2015 16:58:50 -0400
Subject: [PATCH] Update dbtype, remove comments, add bad credential warning

---
 .../org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java  | 3 ++-
 Core/src/org/sleuthkit/autopsy/core/UserPreferences.java       | 3 ++-
 .../autopsy/corecomponents/MultiUserSettingsPanel.java         | 2 +-
 Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java       | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java
index ee91f9b0b4..f24958fcf8 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java
@@ -30,6 +30,7 @@ import javax.swing.event.DocumentListener;
 import org.sleuthkit.autopsy.casemodule.Case.CaseType;
 import org.sleuthkit.autopsy.core.UserPreferences;
 import org.sleuthkit.datamodel.CaseDbConnectionInfo;
+import org.sleuthkit.datamodel.TskData.DbType;
 
 /**
  * The wizard panel for the new case creation.
@@ -48,7 +49,7 @@ final class NewCaseVisualPanel1 extends JPanel implements DocumentListener {
         caseNameTextField.getDocument().addDocumentListener(this);
         caseParentDirTextField.getDocument().addDocumentListener(this);
         CaseDbConnectionInfo info = UserPreferences.getDatabaseConnectionInfo();
-        if (info.getDbType() == CaseDbConnectionInfo.DbType.UNKNOWN) {
+        if (info.getDbType() == DbType.UNKNOWN) {
             rbSingleUserCase.setSelected(true);
             rbSingleUserCase.setEnabled(false);
             rbSingleUserCase.setVisible(false);
diff --git a/Core/src/org/sleuthkit/autopsy/core/UserPreferences.java b/Core/src/org/sleuthkit/autopsy/core/UserPreferences.java
index 2d92ac6814..1e3b1cf237 100755
--- a/Core/src/org/sleuthkit/autopsy/core/UserPreferences.java
+++ b/Core/src/org/sleuthkit/autopsy/core/UserPreferences.java
@@ -22,7 +22,8 @@ import java.util.prefs.PreferenceChangeListener;
 import java.util.prefs.Preferences;
 import org.openide.util.NbPreferences;
 import org.sleuthkit.datamodel.CaseDbConnectionInfo;
-import org.sleuthkit.datamodel.CaseDbConnectionInfo.DbType;
+import org.sleuthkit.datamodel.TskData.DbType;
+
 
 /**
  * Provides convenient access to a Preferences node for user preferences with
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.java
index 663785e516..e8182e17e1 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.java
@@ -9,7 +9,7 @@ import java.awt.Color;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 import org.sleuthkit.datamodel.CaseDbConnectionInfo;
-import org.sleuthkit.datamodel.CaseDbConnectionInfo.DbType;
+import org.sleuthkit.datamodel.TskData.DbType;
 import org.sleuthkit.autopsy.core.UserPreferences;
 
 public class MultiUserSettingsPanel extends javax.swing.JPanel {
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
index cac5131bc3..b1a379838e 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
@@ -498,7 +498,7 @@ public class IngestManager {
 
         // Cancel all the jobs already created. Force a stack trace for the log
         // message.
-   // KDM     logger.log(Level.INFO, String.format("Cancelling all ingest jobs called with %d jobs in jobsById map", this.jobsById.size()), new Exception("Cancelling all ingest jobs"));
+        logger.log(Level.INFO, String.format("Cancelling all ingest jobs called with %d jobs in jobsById map", this.jobsById.size()), new Exception("Cancelling all ingest jobs"));
         for (IngestJob job : this.jobsById.values()) {
             logger.log(Level.INFO, "Cancelling ingest job {0}, already cancelled is {1}", new Object[]{job.getId(), job.isCancelled()});
             job.cancel();