From cbb8cc1a3fdc93a590611e65d912dca8d6a1e68b Mon Sep 17 00:00:00 2001
From: alexjacks92 <alexjacks@comcast.net>
Date: Mon, 28 Apr 2014 16:43:53 -0400
Subject: [PATCH 01/24] First pass at id/path swapping.

---
 test/script/tskdbdiff.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/test/script/tskdbdiff.py b/test/script/tskdbdiff.py
index 0220d757b9..abbf2e3aa4 100644
--- a/test/script/tskdbdiff.py
+++ b/test/script/tskdbdiff.py
@@ -268,6 +268,7 @@ class TskDbDiff(object):
 class TskDbDiffException(Exception):
     pass
 
+
 def replace_id(line, table):
     """Remove the object id from a line.
 
@@ -275,15 +276,19 @@ def replace_id(line, table):
         line: a String, the line to remove the object id from.
         table: a map from object ids to file paths.
     """
-    index = line.find('INSERT INTO "tsk_files"')
-    if (index != -1):
-        # take the portion of the string between the open parenthesis and the comma (ie, the object id)
-        obj_id = line[line.find('(') + 1 : line.find(',')]
+    files_index = line.find('INSERT INTO "tsk_files"')
+    path_index = line.find('INSERT INTO "tsk_files_path"')
+    # take the portion of the string between the open parenthesis and the comma (ie, the object id)
+    obj_id = line[line.find('(') + 1 : line.find(',')]
+    if files_index != -1:
         # takes everything from the beginning of the string up to the opening
         # parenthesis, the path associated with the object id, and everything after 
         # the first comma, and concactenate it
         newLine = (line[:line.find('('):] + '(' + table[int(obj_id)] + line[line.find(','):])
         return newLine
+    elif path_index != -1:
+        newLine = (line[:line.find('('):] + '(' + table[int(obj_id)] + line[line.find(','):])
+        return newLine
     else:
         return line
 

From a0b4a2d32f84e039a849f730cb4c83eb821163f0 Mon Sep 17 00:00:00 2001
From: alexjacks92 <alexjacks@comcast.net>
Date: Tue, 29 Apr 2014 16:53:15 -0400
Subject: [PATCH 02/24] Replacing more IDs with file paths - now tsk_files_path
 and tsk_objects tables as well.

---
 .../netbeans/core/startup/Bundle.properties   |  2 +-
 .../core/windows/view/ui/Bundle.properties    |  2 +-
 test/script/regression.py                     | 23 ++++++++++---------
 test/script/tskdbdiff.py                      | 20 +++++++++++++---
 4 files changed, 31 insertions(+), 16 deletions(-)
 mode change 100644 => 100755 test/script/tskdbdiff.py

diff --git a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
index 28783ec7c0..d22a89c799 100644
--- a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
+++ b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
@@ -1,5 +1,5 @@
 #Updated by build script
-#Tue, 22 Apr 2014 16:06:14 -0400
+#Tue, 29 Apr 2014 10:05:28 -0400
 LBL_splash_window_title=Starting Autopsy
 SPLASH_HEIGHT=288
 SPLASH_WIDTH=538
diff --git a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
index fe9124784d..fe8e0abbcc 100644
--- a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
+++ b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
@@ -1,5 +1,5 @@
 #Updated by build script
-#Tue, 22 Apr 2014 16:06:14 -0400
+#Tue, 29 Apr 2014 10:05:28 -0400
 
 CTL_MainWindow_Title=Autopsy 3.1.0_Beta
 CTL_MainWindow_Title_No_Project=Autopsy 3.1.0_Beta
diff --git a/test/script/regression.py b/test/script/regression.py
index 7c33e62d33..e689fdccff 100755
--- a/test/script/regression.py
+++ b/test/script/regression.py
@@ -818,7 +818,7 @@ class TestResultsDiffer(object):
             logging.critical(traceback.format_exc())
             return False
 
-    def _compare_report_files(a_path, b_path):
+    def _compare_report_files(gold_path, output_path):
         """Compares the two specified report html files.
 
         Args:
@@ -830,17 +830,18 @@ class TestResultsDiffer(object):
             unordered list in the html report files, or (0, 0) if the
             lenghts are the same.
         """
-        a_file = open(a_path)
-        b_file = open(b_path)
-        a = a_file.read()
-        b = b_file.read()
-        a = a[a.find("<ul>"):]
-        b = b[b.find("<ul>"):]
+        gold_file = open(gold_path)
+        output_file = open(output_path)
+        goldHtml = gold_file.read()
+        outputHtml = output_file.read()
+        goldHtml = goldHtml[goldHtml.find("<ul>"):]
+        outputHtml = outputHtml[outputHtml.find("<ul>"):]
 
-        a_list = TestResultsDiffer._split(a, 50)
-        b_list = TestResultsDiffer._split(b, 50)
-        if not len(a_list) == len(b_list):
-            ex = (len(a_list), len(b_list))
+        g_list = TestResultsDiffer._split(goldHtml, 50)
+        o_list = TestResultsDiffer._split(outputHtml, 50)
+        if not len(g_list) == len(o_list):
+            ex = (len(g_list), len(o_list))
+            print("846 ex is " + str(ex))
             return ex
         else:
             return (0, 0)
diff --git a/test/script/tskdbdiff.py b/test/script/tskdbdiff.py
old mode 100644
new mode 100755
index abbf2e3aa4..e175af50aa
--- a/test/script/tskdbdiff.py
+++ b/test/script/tskdbdiff.py
@@ -43,8 +43,8 @@ class TskDbDiff(object):
         self.output_dir = output_dir
         self.gold_bb_dump = gold_bb_dump
         self.gold_dump = gold_dump
-        self._generate_gold_dump = gold_dump is None
-        self._generate_gold_bb_dump = gold_bb_dump is None
+        self._generate_gold_dump = True
+        self._generate_gold_bb_dump = True
         self._bb_dump_diff = ""
         self._dump_diff = ""
         self._bb_dump = ""
@@ -278,6 +278,8 @@ def replace_id(line, table):
     """
     files_index = line.find('INSERT INTO "tsk_files"')
     path_index = line.find('INSERT INTO "tsk_files_path"')
+    object_index = line.find('INSERT INTO "tsk_objects"')
+    if (files_index != -1 or path_index != -1):
     # take the portion of the string between the open parenthesis and the comma (ie, the object id)
     obj_id = line[line.find('(') + 1 : line.find(',')]
     if files_index != -1:
@@ -289,6 +291,18 @@ def replace_id(line, table):
     elif path_index != -1:
         newLine = (line[:line.find('('):] + '(' + table[int(obj_id)] + line[line.find(','):])
         return newLine
+    elif (object_index != -1):
+        obj_id = line[line.find('(') + 1 : line.find(',')]
+        parent_id = line[line.find(',') + 2 : line.find(',', line.find(',') + 1)]
+        try:
+            path = table[int(obj_id)]
+            parent_path = table[int(parent_id)]
+            no_ID = (line[:line.find('('):] + '(' + path + line[line.find(','):])
+            newLine = (no_ID[:no_ID.find(',') + 1] + " " + parent_path + no_ID[no_ID.find(parent_id) + 1:])
+            return newLine
+        except Exception as e: 
+            # objects table has things that aren't files. if lookup fails, don't replace the object id.
+            return line
     else:
         return line
 
@@ -313,7 +327,7 @@ def main():
         print("usage: tskdbdiff [OUPUT DB PATH] [GOLD DB PATH]")
         sys.exit()
 
-    db_diff = TskDbDiff(output_db, gold_db, output_dir=".")
+    db_diff = TskDbDiff(output_db, gold_db, output_dir=".") 
     dump_passed, bb_dump_passed = db_diff.run_diff()
 
     if dump_passed and bb_dump_passed:

From ae1793bfd3a19e4a35c2731a91930f3a73804a3d Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Tue, 29 Apr 2014 17:49:12 -0400
Subject: [PATCH 03/24] Safekeep ingest framework improvements

---
 .../autopsy/ingest/Bundle.properties          |   6 -
 .../autopsy/ingest/Bundle_ja.properties       | 130 ++-
 .../ingest/DataSourceIngestPipeline.java      |   4 +-
 .../autopsy/ingest/DataSourceIngestTask.java  |  44 ++
 .../ingest/DataSourceIngestTaskScheduler.java |  57 ++
 .../autopsy/ingest/FileIngestTask.java        |  93 +++
 .../ingest/FileIngestTaskScheduler.java       | 418 ++++++++++
 .../autopsy/ingest/GetFilesCountVisitor.java  |  99 +++
 .../sleuthkit/autopsy/ingest/IngestJob.java   | 296 ++++---
 .../autopsy/ingest/IngestJobContext.java      |   4 +-
 .../autopsy/ingest/IngestManager.java         | 496 ++++++------
 .../ingest/IngestMessageTopComponent.java     |   2 +-
 .../autopsy/ingest/IngestMonitor.java         |   2 +-
 .../autopsy/ingest/IngestScheduler.java       | 744 ------------------
 .../autopsy/ingest/IngestServices.java        |   4 +-
 15 files changed, 1203 insertions(+), 1196 deletions(-)
 create mode 100755 Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestTask.java
 create mode 100755 Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestTaskScheduler.java
 create mode 100755 Core/src/org/sleuthkit/autopsy/ingest/FileIngestTask.java
 create mode 100755 Core/src/org/sleuthkit/autopsy/ingest/FileIngestTaskScheduler.java
 create mode 100755 Core/src/org/sleuthkit/autopsy/ingest/GetFilesCountVisitor.java
 delete mode 100644 Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java

diff --git a/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties b/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties
index fed46c8bac..144c7359fd 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties
@@ -52,12 +52,6 @@ Ensure the Case drive has at least 1GB free space and restart ingest.
 IngestJobConfigurationPanel.advancedButton.text=Advanced
 IngestJobConfigurationPanel.advancedButton.actionCommand=Advanced
 IngestScheduler.DataSourceScheduler.toString.size=DataSourceQueue, size\:
-IngestScheduler.FileSched.toString.curFiles.text=\
-CurFiles, size\:
-IngestScheduler.FileSched.toString.curDirs.text=\
-CurDirs(stack), size\:
-IngestScheduler.FileSched.toString.rootDirs.text=\
-RootDirs(sorted), size\:
 IngestManager.StartIngestJobsTask.run.displayName=Queueing ingest tasks
 IngestManager.StartIngestJobsTask.run.cancelling={0} (Cancelling...)
 IngestManager.StartIngestJobsTask.run.catchException.msg=An error occurred while starting ingest. Results may only be partial
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/ingest/Bundle_ja.properties
index 69eee4e67e..e3433daff3 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/ingest/Bundle_ja.properties
@@ -1,74 +1,68 @@
-CTL_IngestMessageTopComponent=\u30E1\u30C3\u30BB\u30FC\u30B8
-HINT_IngestMessageTopComponent=\u30E1\u30C3\u30BB\u30FC\u30B8\u30A6\u30A3\u30F3\u30C9\u30A6
-IngestDialog.closeButton.title=\u9589\u3058\u308B
-IngestDialog.startButton.title=\u30B9\u30BF\u30FC\u30C8
-IngestDialog.title.text=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB
-IngestJob.progress.cancelling={0}\uFF08\u30AD\u30E3\u30F3\u30BB\u30EB\u4E2D\u2026\uFF09
-IngestJob.progress.dataSourceIngest.displayName={0}\u306E\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u3092\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8
-IngestJob.progress.fileIngest.displayName={0}\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8
-IngestJobConfigurationPanel.advancedButton.actionCommand=\u30A2\u30C9\u30D0\u30F3\u30B9
-IngestJobConfigurationPanel.advancedButton.text=\u30A2\u30C9\u30D0\u30F3\u30B9
-IngestJobConfigurationPanel.processUnallocCheckbox.text=\u672A\u5272\u308A\u5F53\u3066\u9818\u57DF\u306E\u51E6\u7406
-IngestJobConfigurationPanel.processUnallocCheckbox.toolTipText=\u524A\u9664\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u7B49\u306E\u672A\u5272\u308A\u5F53\u3066\u9818\u57DF\u3092\u51E6\u7406\u3002\u3088\u308A\u5B8C\u5168\u306A\u7D50\u679C\u304C\u51FA\u307E\u3059\u304C\u3001\u5927\u304D\u3044\u30A4\u30E1\u30FC\u30B8\u3067\u306F\u51E6\u7406\u6642\u9593\u304C\u9577\u304F\u306A\u308B\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002
-IngestManager.moduleErr=\u30E2\u30B8\u30E5\u30FC\u30EB\u30A8\u30E9\u30FC
-IngestManager.moduleErr.errListenToUpdates.msg=Ingest Manager\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3092\u78BA\u8A8D\u4E2D\u306B\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u30A8\u30E9\u30FC\u3092\u8D77\u3053\u3057\u307E\u3057\u305F\u3002\u3069\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u304B\u30ED\u30B0\u3067\u78BA\u8A8D\u3057\u3066\u4E0B\u3055\u3044\u3002\u4E00\u90E8\u306E\u30C7\u30FC\u30BF\u304C\u4E0D\u5B8C\u5168\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002
-IngestManager.StartIngestJobsTask.run.cancelling={0}\uFF08\u30AD\u30E3\u30F3\u30BB\u30EB\u4E2D\u2026\uFF09
-IngestManager.StartIngestJobsTask.run.catchException.msg=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u306E\u958B\u59CB\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u7D50\u679C\u304C\u4E00\u90E8\u306E\u3082\u306E
-IngestManager.StartIngestJobsTask.run.displayName=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30BF\u30B9\u30AF\u3092\u30AD\u30E5\u30FC\u30A4\u30F3\u30B0
-IngestMessage.exception.srcSubjDetailsDataNotNull.msg=\u30BD\u30FC\u30B9\u3001\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8\u3001\u8A73\u7D30\u304A\u3088\u3073\u30C7\u30FC\u30BF\u306F\u30CC\u30EB\u3067\u3042\u3063\u3066\u306F\u3044\u3051\u307E\u305B\u3093
-IngestMessage.exception.srcSubjNotNull.msg=\u30BD\u30FC\u30B9\u304A\u3088\u3073\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8\u306F\u30CC\u30EB\u3067\u3042\u3063\u3066\u306F\u3044\u3051\u307E\u305B\u3093
-IngestMessage.exception.typeSrcSubjNotNull.msg=\u30E1\u30C3\u30BB\u30FC\u30B8\u30BF\u30A4\u30D7\u3001\u30BD\u30FC\u30B9\u304A\u3088\u3073\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8\u306F\u30CC\u30EB\u3067\u3042\u3063\u3066\u306F\u3044\u3051\u307E\u305B\u3093
-IngestMessage.toString.data.text=\ \u30C7\u30FC\u30BF\uFF1A{0}
-IngestMessage.toString.date.text=\ \u65E5\u4ED8\uFF1A{0}
-IngestMessage.toString.details.text=\ \u8A73\u7D30\uFF1A{0}
-IngestMessage.toString.subject.text=\ \u30B5\u30D6\u30B8\u30A7\u30AF\u30C8\uFF1A{0}
-IngestMessage.toString.type.text=\u30BF\u30A4\u30D7\uFF1A{0}
-IngestMessageDetailsPanel.copyMenuItem.text=\u30B3\u30D4\u30FC
-IngestMessageDetailsPanel.messageDetailsPane.contentType=\u30C6\u30AD\u30B9\u30C8\uFF0Fhtml
-IngestMessageDetailsPanel.selectAllMenuItem.text=\u3059\u3079\u3066\u9078\u629E
-IngestMessageDetailsPanel.viewArtifactButton.text=\u7D50\u679C\u3078\u79FB\u52D5
-IngestMessageDetailsPanel.viewContentButton.text=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3078\u79FB\u52D5
-IngestMessagePanel.BooleanRenderer.exception.nonBoolVal.msg=\u30D6\u30FC\u30EB\u5024\u3067\u306F\u306A\u3044\u3082\u306E\u306BBooleanRenderer\u3092\u4F7F\u7528\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F
-IngestMessagePanel.DateRenderer.exception.nonDateVal.text=\u65E5\u4ED8\u3067\u306F\u306A\u3044\u3082\u306E\u306BDateRenderer\u3092\u4F7F\u7528\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F\u3002
-IngestMessagePanel.moduleErr=\u30E2\u30B8\u30E5\u30FC\u30EB\u30A8\u30E9\u30FC
-IngestMessagePanel.moduleErr.errListenUpdates.text=IngestMessagePanel\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3092\u78BA\u8A8D\u4E2D\u306B\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u30A8\u30E9\u30FC\u3092\u8D77\u3053\u3057\u307E\u3057\u305F\u3002\u3069\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u304B\u30ED\u30B0\u3067\u78BA\u8A8D\u3057\u3066\u4E0B\u3055\u3044\u3002\u4E00\u90E8\u306E\u30C7\u30FC\u30BF\u304C\u4E0D\u5B8C\u5168\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002
-IngestMessagePanel.MsgTableMod.colNames.module=\u30E2\u30B8\u30E5\u30FC\u30EB
-IngestMessagePanel.MsgTableMod.colNames.new=\u65B0\u898F\uFF1F
-IngestMessagePanel.MsgTableMod.colNames.num=\u756A\u53F7
-IngestMessagePanel.MsgTableMod.colNames.subject=\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8
-IngestMessagePanel.MsgTableMod.colNames.timestamp=\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7
-IngestMessagePanel.sortByComboBox.model.priority=\u512A\u5148\u5EA6
+CTL_IngestMessageTopComponent=\u30e1\u30c3\u30bb\u30fc\u30b8
+HINT_IngestMessageTopComponent=\u30e1\u30c3\u30bb\u30fc\u30b8\u30a6\u30a3\u30f3\u30c9\u30a6
+IngestDialog.closeButton.title=\u9589\u3058\u308b
+IngestDialog.startButton.title=\u30b9\u30bf\u30fc\u30c8
+IngestDialog.title.text=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30e2\u30b8\u30e5\u30fc\u30eb
+IngestJob.progress.cancelling={0}\uff08\u30ad\u30e3\u30f3\u30bb\u30eb\u4e2d\u2026\uff09
+IngestJob.progress.dataSourceIngest.displayName={0}\u306e\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9\u3092\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8
+IngestJob.progress.fileIngest.displayName={0}\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8
+IngestJobConfigurationPanel.advancedButton.actionCommand=\u30a2\u30c9\u30d0\u30f3\u30b9
+IngestJobConfigurationPanel.advancedButton.text=\u30a2\u30c9\u30d0\u30f3\u30b9
+IngestJobConfigurationPanel.processUnallocCheckbox.text=\u672a\u5272\u308a\u5f53\u3066\u9818\u57df\u306e\u51e6\u7406
+IngestJobConfigurationPanel.processUnallocCheckbox.toolTipText=\u524a\u9664\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\u7b49\u306e\u672a\u5272\u308a\u5f53\u3066\u9818\u57df\u3092\u51e6\u7406\u3002\u3088\u308a\u5b8c\u5168\u306a\u7d50\u679c\u304c\u51fa\u307e\u3059\u304c\u3001\u5927\u304d\u3044\u30a4\u30e1\u30fc\u30b8\u3067\u306f\u51e6\u7406\u6642\u9593\u304c\u9577\u304f\u306a\u308b\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002
+IngestManager.moduleErr=\u30e2\u30b8\u30e5\u30fc\u30eb\u30a8\u30e9\u30fc
+IngestManager.moduleErr.errListenToUpdates.msg=Ingest Manager\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u3092\u78ba\u8a8d\u4e2d\u306b\u30e2\u30b8\u30e5\u30fc\u30eb\u304c\u30a8\u30e9\u30fc\u3092\u8d77\u3053\u3057\u307e\u3057\u305f\u3002\u3069\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u304b\u30ed\u30b0\u3067\u78ba\u8a8d\u3057\u3066\u4e0b\u3055\u3044\u3002\u4e00\u90e8\u306e\u30c7\u30fc\u30bf\u304c\u4e0d\u5b8c\u5168\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002
+IngestManager.StartIngestJobsTask.run.cancelling={0}\uff08\u30ad\u30e3\u30f3\u30bb\u30eb\u4e2d\u2026\uff09
+IngestManager.StartIngestJobsTask.run.catchException.msg=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u306e\u958b\u59cb\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u7d50\u679c\u304c\u4e00\u90e8\u306e\u3082\u306e
+IngestManager.StartIngestJobsTask.run.displayName=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30bf\u30b9\u30af\u3092\u30ad\u30e5\u30fc\u30a4\u30f3\u30b0
+IngestMessage.exception.srcSubjDetailsDataNotNull.msg=\u30bd\u30fc\u30b9\u3001\u30b5\u30d6\u30b8\u30a7\u30af\u30c8\u3001\u8a73\u7d30\u304a\u3088\u3073\u30c7\u30fc\u30bf\u306f\u30cc\u30eb\u3067\u3042\u3063\u3066\u306f\u3044\u3051\u307e\u305b\u3093
+IngestMessage.exception.srcSubjNotNull.msg=\u30bd\u30fc\u30b9\u304a\u3088\u3073\u30b5\u30d6\u30b8\u30a7\u30af\u30c8\u306f\u30cc\u30eb\u3067\u3042\u3063\u3066\u306f\u3044\u3051\u307e\u305b\u3093
+IngestMessage.exception.typeSrcSubjNotNull.msg=\u30e1\u30c3\u30bb\u30fc\u30b8\u30bf\u30a4\u30d7\u3001\u30bd\u30fc\u30b9\u304a\u3088\u3073\u30b5\u30d6\u30b8\u30a7\u30af\u30c8\u306f\u30cc\u30eb\u3067\u3042\u3063\u3066\u306f\u3044\u3051\u307e\u305b\u3093
+IngestMessage.toString.data.text=\ \u30c7\u30fc\u30bf\uff1a{0}
+IngestMessage.toString.date.text=\ \u65e5\u4ed8\uff1a{0}
+IngestMessage.toString.details.text=\ \u8a73\u7d30\uff1a{0}
+IngestMessage.toString.subject.text=\ \u30b5\u30d6\u30b8\u30a7\u30af\u30c8\uff1a{0}
+IngestMessage.toString.type.text=\u30bf\u30a4\u30d7\uff1a{0}
+IngestMessageDetailsPanel.copyMenuItem.text=\u30b3\u30d4\u30fc
+IngestMessageDetailsPanel.messageDetailsPane.contentType=\u30c6\u30ad\u30b9\u30c8\uff0fhtml
+IngestMessageDetailsPanel.selectAllMenuItem.text=\u3059\u3079\u3066\u9078\u629e
+IngestMessageDetailsPanel.viewArtifactButton.text=\u7d50\u679c\u3078\u79fb\u52d5
+IngestMessageDetailsPanel.viewContentButton.text=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3078\u79fb\u52d5
+IngestMessagePanel.BooleanRenderer.exception.nonBoolVal.msg=\u30d6\u30fc\u30eb\u5024\u3067\u306f\u306a\u3044\u3082\u306e\u306bBooleanRenderer\u3092\u4f7f\u7528\u3057\u3088\u3046\u3068\u3057\u307e\u3057\u305f
+IngestMessagePanel.DateRenderer.exception.nonDateVal.text=\u65e5\u4ed8\u3067\u306f\u306a\u3044\u3082\u306e\u306bDateRenderer\u3092\u4f7f\u7528\u3057\u3088\u3046\u3068\u3057\u307e\u3057\u305f\u3002
+IngestMessagePanel.moduleErr=\u30e2\u30b8\u30e5\u30fc\u30eb\u30a8\u30e9\u30fc
+IngestMessagePanel.moduleErr.errListenUpdates.text=IngestMessagePanel\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u3092\u78ba\u8a8d\u4e2d\u306b\u30e2\u30b8\u30e5\u30fc\u30eb\u304c\u30a8\u30e9\u30fc\u3092\u8d77\u3053\u3057\u307e\u3057\u305f\u3002\u3069\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u304b\u30ed\u30b0\u3067\u78ba\u8a8d\u3057\u3066\u4e0b\u3055\u3044\u3002\u4e00\u90e8\u306e\u30c7\u30fc\u30bf\u304c\u4e0d\u5b8c\u5168\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002
+IngestMessagePanel.MsgTableMod.colNames.module=\u30e2\u30b8\u30e5\u30fc\u30eb
+IngestMessagePanel.MsgTableMod.colNames.new=\u65b0\u898f\uff1f
+IngestMessagePanel.MsgTableMod.colNames.num=\u756a\u53f7
+IngestMessagePanel.MsgTableMod.colNames.subject=\u30b5\u30d6\u30b8\u30a7\u30af\u30c8
+IngestMessagePanel.MsgTableMod.colNames.timestamp=\u30bf\u30a4\u30e0\u30b9\u30bf\u30f3\u30d7
+IngestMessagePanel.sortByComboBox.model.priority=\u512a\u5148\u5ea6
 IngestMessagePanel.sortByComboBox.model.time=\u6642\u9593
-IngestMessagePanel.sortByComboBox.toolTipText=\u6642\u9593\u9806\uFF08\u6642\u7CFB\u5217\uFF09\u307E\u305F\u306F\u30E1\u30C3\u30BB\u30FC\u30B8\u306E\u512A\u5148\u5EA6\u3067\u30BD\u30FC\u30C8
-IngestMessagePanel.sortByLabel.text=\u4E0B\u8A18\u3067\u30BD\u30FC\u30C8\uFF1A
-IngestMessagePanel.totalMessagesNameLabel.text=\u5408\u8A08\uFF1A
+IngestMessagePanel.sortByComboBox.toolTipText=\u6642\u9593\u9806\uff08\u6642\u7cfb\u5217\uff09\u307e\u305f\u306f\u30e1\u30c3\u30bb\u30fc\u30b8\u306e\u512a\u5148\u5ea6\u3067\u30bd\u30fc\u30c8
+IngestMessagePanel.sortByLabel.text=\u4e0b\u8a18\u3067\u30bd\u30fc\u30c8\uff1a
+IngestMessagePanel.totalMessagesNameLabel.text=\u5408\u8a08\uff1a
 IngestMessagePanel.totalMessagesNameVal.text=-
-IngestMessagePanel.totalUniqueMessagesNameLabel.text=\u30E6\u30CB\u30FC\u30AF\uFF1A
+IngestMessagePanel.totalUniqueMessagesNameLabel.text=\u30e6\u30cb\u30fc\u30af\uff1a
 IngestMessagePanel.totalUniqueMessagesNameVal.text=-
-IngestMessagesToolbar.customizeButton.toolTipText=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E1\u30C3\u30BB\u30FC\u30B8
-IngestMessageTopComponent.displayName=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30A4\u30F3\u30DC\u30C3\u30AF\u30B9
-IngestMessageTopComponent.displayReport.option.GenRpt=\u30EC\u30DD\u30FC\u30C8\u751F\u6210
+IngestMessagesToolbar.customizeButton.toolTipText=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8
+IngestMessageTopComponent.displayName=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30a4\u30f3\u30dc\u30c3\u30af\u30b9
+IngestMessageTopComponent.displayReport.option.GenRpt=\u30ec\u30dd\u30fc\u30c8\u751f\u6210
 IngestMessageTopComponent.displayReport.option.OK=OK
-IngestMessageTopComponent.initComponents.name=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30A4\u30F3\u30DC\u30C3\u30AF\u30B9
-IngestMessageTopComponent.msgDlg.ingestRpt.text=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30EC\u30DD\u30FC\u30C8
-IngestMonitor.mgrErrMsg.lowDiskSpace.msg=\u30C7\u30A3\u30B9\u30AF{0}\u306E\u30C7\u30A3\u30B9\u30AF\u9818\u57DF\u4E0D\u8DB3\u306E\u305F\u3081\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u3092\u4E2D\u6B62\u3057\u307E\u3059\u3002\
-\u30B1\u30FC\u30B9\u30C9\u30E9\u30A4\u30D6\u306B\u6700\u4F4E1GB\u306E\u7A7A\u304D\u9818\u57DF\u304C\u3042\u308B\u306E\u3092\u78BA\u8A8D\u3057\u3001\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u3092\u518D\u30B9\u30BF\u30FC\u30C8\u3057\u3066\u4E0B\u3055\u3044\u3002
-IngestMonitor.mgrErrMsg.lowDiskSpace.title=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u304C\u4E2D\u6B62\u3055\u308C\u307E\u3057\u305F\u30FC{0}\u306E\u30C7\u30A3\u30B9\u30AF\u9818\u57DF\u4E0D\u8DB3
-IngestScheduler.DataSourceScheduler.toString.size=DataSourceQueue, \u30B5\u30A4\u30BA\uFF1A
-IngestScheduler.FileSched.toString.curDirs.text=\
-CurDirs(stack), \u30B5\u30A4\u30BA\uFF1A
-IngestScheduler.FileSched.toString.curFiles.text=\
-CurFiles, \u30B5\u30A4\u30BA\uFF1A
-IngestScheduler.FileSched.toString.rootDirs.text=\
-RootDirs(sorted), \u30B5\u30A4\u30BA\uFF1A
-OpenIDE-Module-Name=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8
-IngestManager.StartIngestJobsTask.run.progress.msg1={0}\u306E\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30BF\u30B9\u30AF
-IngestManager.StartIngestJobsTask.run.progress.msg2={0}\u306E\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30BF\u30B9\u30AF
-IngestManager.StartIngestJobsTask.run.progress.msg3={0}\u306E\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30BF\u30B9\u30AF
-IngestManager.StartIngestJobsTask.run.progress.msg4={0}\u306E\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30BF\u30B9\u30AF
-IngestManager.StartIngestJobsTask.run.startupErr.dlgErrorList=\u30A8\u30E9\u30FC\uFF1A\
+IngestMessageTopComponent.initComponents.name=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30a4\u30f3\u30dc\u30c3\u30af\u30b9
+IngestMessageTopComponent.msgDlg.ingestRpt.text=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30ec\u30dd\u30fc\u30c8
+IngestMonitor.mgrErrMsg.lowDiskSpace.msg=\u30c7\u30a3\u30b9\u30af{0}\u306e\u30c7\u30a3\u30b9\u30af\u9818\u57df\u4e0d\u8db3\u306e\u305f\u3081\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u3092\u4e2d\u6b62\u3057\u307e\u3059\u3002\
+\u30b1\u30fc\u30b9\u30c9\u30e9\u30a4\u30d6\u306b\u6700\u4f4e1GB\u306e\u7a7a\u304d\u9818\u57df\u304c\u3042\u308b\u306e\u3092\u78ba\u8a8d\u3057\u3001\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u3092\u518d\u30b9\u30bf\u30fc\u30c8\u3057\u3066\u4e0b\u3055\u3044\u3002
+IngestMonitor.mgrErrMsg.lowDiskSpace.title=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u304c\u4e2d\u6b62\u3055\u308c\u307e\u3057\u305f\u30fc{0}\u306e\u30c7\u30a3\u30b9\u30af\u9818\u57df\u4e0d\u8db3
+IngestScheduler.DataSourceScheduler.toString.size=DataSourceQueue, \u30b5\u30a4\u30ba\uff1a
+OpenIDE-Module-Name=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8
+IngestManager.StartIngestJobsTask.run.progress.msg1={0}\u306e\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30bf\u30b9\u30af
+IngestManager.StartIngestJobsTask.run.progress.msg2={0}\u306e\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30bf\u30b9\u30af
+IngestManager.StartIngestJobsTask.run.progress.msg3={0}\u306e\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30bf\u30b9\u30af
+IngestManager.StartIngestJobsTask.run.progress.msg4={0}\u306e\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30bf\u30b9\u30af
+IngestManager.StartIngestJobsTask.run.startupErr.dlgErrorList=\u30a8\u30e9\u30fc\uff1a\
 \
 {0}
-IngestManager.StartIngestJobsTask.run.startupErr.dlgMsg=\uFF11\u3064\u307E\u305F\u306F\u8907\u6570\u306E\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u30B9\u30BF\u30FC\u30C8\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30B8\u30E7\u30D6\u306F\u30AD\u30E3\u30F3\u30BB\u30EB\u3055\u308C\u307E\u3057\u305F\u3002
-IngestManager.StartIngestJobsTask.run.startupErr.dlgSolution=\u5931\u6557\u3057\u305F\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u7121\u52B9\u5316\u3059\u308B\u304B\u30A8\u30E9\u30FC\u3092\u89E3\u6C7A\u3057\u3001\u305D\u306E\u5F8C\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u3092\u53F3\u30AF\u30EA\u30C3\u30AF\u3057\u3001\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u5B9F\u884C\u3092\u9078\u629E\u3057\u3066\u3001\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u3092\u30EA\u30B9\u30BF\u30FC\u30C8\u3057\u3066\u4E0B\u3055\u3044\u3002
-IngestManager.StartIngestJobsTask.run.startupErr.dlgTitle=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u5931\u6557
\ No newline at end of file
+IngestManager.StartIngestJobsTask.run.startupErr.dlgMsg=\uff11\u3064\u307e\u305f\u306f\u8907\u6570\u306e\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30e2\u30b8\u30e5\u30fc\u30eb\u3092\u30b9\u30bf\u30fc\u30c8\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30b8\u30e7\u30d6\u306f\u30ad\u30e3\u30f3\u30bb\u30eb\u3055\u308c\u307e\u3057\u305f\u3002
+IngestManager.StartIngestJobsTask.run.startupErr.dlgSolution=\u5931\u6557\u3057\u305f\u30e2\u30b8\u30e5\u30fc\u30eb\u3092\u7121\u52b9\u5316\u3059\u308b\u304b\u30a8\u30e9\u30fc\u3092\u89e3\u6c7a\u3057\u3001\u305d\u306e\u5f8c\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9\u3092\u53f3\u30af\u30ea\u30c3\u30af\u3057\u3001\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30e2\u30b8\u30e5\u30fc\u30eb\u3092\u5b9f\u884c\u3092\u9078\u629e\u3057\u3066\u3001\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u3092\u30ea\u30b9\u30bf\u30fc\u30c8\u3057\u3066\u4e0b\u3055\u3044\u3002
+IngestManager.StartIngestJobsTask.run.startupErr.dlgTitle=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u5931\u6557
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestPipeline.java b/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestPipeline.java
index fb349f249c..b824ffe615 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestPipeline.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestPipeline.java
@@ -34,8 +34,8 @@ final class DataSourceIngestPipeline {
     private final List<IngestModuleTemplate> moduleTemplates;
     private List<DataSourceIngestModuleDecorator> modules = new ArrayList<>();
 
-    DataSourceIngestPipeline(IngestJob task, List<IngestModuleTemplate> moduleTemplates) {
-        this.job = task;
+    DataSourceIngestPipeline(IngestJob job, List<IngestModuleTemplate> moduleTemplates) {
+        this.job = job;
         this.moduleTemplates = moduleTemplates;
     }
 
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestTask.java b/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestTask.java
new file mode 100755
index 0000000000..af27d9b8c0
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestTask.java
@@ -0,0 +1,44 @@
+/*
+ * Autopsy Forensic Browser
+ * 
+ * Copyright 2014 Basis Technology Corp.
+ * Contact: carrier <at> sleuthkit <dot> org
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.autopsy.ingest;
+
+import org.sleuthkit.datamodel.Content;
+
+final class DataSourceIngestTask {
+    
+    private final IngestJob ingestJob;
+    private final Content dataSource;
+    
+    DataSourceIngestTask(IngestJob ingestJob, Content dataSource) {
+        this.ingestJob = ingestJob;
+        this.dataSource = dataSource;                        
+    }
+    
+    IngestJob getIngestJob() {
+        return ingestJob;
+    }
+    
+    Content getDataSource() {
+        return dataSource;
+    }    
+    
+    void execute() {
+        ingestJob.process();
+    }
+}
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestTaskScheduler.java b/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestTaskScheduler.java
new file mode 100755
index 0000000000..22a6124396
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestTaskScheduler.java
@@ -0,0 +1,57 @@
+/*
+ * Autopsy Forensic Browser
+ * 
+ * Copyright 2012-2014 Basis Technology Corp.
+ * Contact: carrier <at> sleuthkit <dot> org
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.autopsy.ingest;
+
+import java.util.concurrent.LinkedBlockingQueue;
+
+final class DataSourceIngestTaskScheduler {
+
+    private static DataSourceIngestTaskScheduler instance = new DataSourceIngestTaskScheduler();
+    private final LinkedBlockingQueue<DataSourceIngestTask> tasks = new LinkedBlockingQueue<>();
+
+    static DataSourceIngestTaskScheduler getInstance() {
+        return instance;
+    }
+
+    private DataSourceIngestTaskScheduler() {
+    }
+
+    synchronized void addTask(DataSourceIngestTask task) throws InterruptedException {
+        task.getIngestJob().notifyTaskPending();
+        try {
+            tasks.put(task);
+        }
+        catch (InterruptedException ex) {
+            // RJCTOD: Need a safety notification to undo above
+        }
+    }
+
+    DataSourceIngestTask getNextTask() throws InterruptedException {
+        return tasks.take();
+    }
+
+    boolean hasTasksForIngestJob(long jobId) {
+        for (DataSourceIngestTask task : tasks) {
+            if (task.getIngestJobId() == jobId) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/FileIngestTask.java b/Core/src/org/sleuthkit/autopsy/ingest/FileIngestTask.java
new file mode 100755
index 0000000000..db0edf9edf
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/ingest/FileIngestTask.java
@@ -0,0 +1,93 @@
+/*
+ * Autopsy Forensic Browser
+ * 
+ * Copyright 2012-2014 Basis Technology Corp.
+ * Contact: carrier <at> sleuthkit <dot> org
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.autopsy.ingest;
+
+import java.util.Objects;
+import java.util.logging.Level;
+import org.sleuthkit.datamodel.AbstractFile;
+import org.sleuthkit.datamodel.TskCoreException;
+
+final class FileIngestTask {
+    final AbstractFile file;
+    private final IngestJob ingestJob;
+
+    FileIngestTask(AbstractFile file, IngestJob task) {
+        this.file = file;
+        this.ingestJob = task;
+    }
+
+    public IngestJob getIngestJob() {
+        return ingestJob;
+    }
+
+    public AbstractFile getFile() {
+        return file;
+    }
+    
+    void execute(long threadId) {
+        ingestJob.process(file);
+    }
+
+    @Override
+    public String toString() { //RJCTODO: May not keep this
+        try {
+            return "ProcessTask{" + "file=" + file.getId() + ": " + file.getUniquePath() + "}"; // + ", dataSourceTask=" + dataSourceTask + '}';
+        } catch (TskCoreException ex) {
+            // RJCTODO
+//            FileIngestTaskScheduler.logger.log(Level.SEVERE, "Cound not get unique path of file in queue, ", ex); //NON-NLS
+        }
+        return "ProcessTask{" + "file=" + file.getId() + ": " + file.getName() + '}';
+    }
+
+    /**
+     * two process tasks are equal when the file/dir and modules are the
+     * same this enables are not to queue up the same file/dir, modules
+     * tuples into the root dir set
+     *
+     * @param obj
+     * @return
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final FileIngestTask other = (FileIngestTask) obj;
+        if (this.file != other.file && (this.file == null || !this.file.equals(other.file))) {
+            return false;
+        }
+        IngestJob thisTask = this.getIngestJob();
+        IngestJob otherTask = other.getIngestJob();
+        if (thisTask != otherTask && (thisTask == null || !thisTask.equals(otherTask))) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 5;
+        hash = 47 * hash + Objects.hashCode(this.file);
+        hash = 47 * hash + Objects.hashCode(this.ingestJob);
+        return hash;
+    }    
+}
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/FileIngestTaskScheduler.java b/Core/src/org/sleuthkit/autopsy/ingest/FileIngestTaskScheduler.java
new file mode 100755
index 0000000000..280012ebf8
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/ingest/FileIngestTaskScheduler.java
@@ -0,0 +1,418 @@
+/*
+ * Autopsy Forensic Browser
+ * 
+ * Copyright 2012-2014 Basis Technology Corp.
+ * Contact: carrier <at> sleuthkit <dot> org
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.autopsy.ingest;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.sleuthkit.datamodel.AbstractFile;
+import org.sleuthkit.datamodel.Content;
+import org.sleuthkit.datamodel.DerivedFile;
+import org.sleuthkit.datamodel.Directory;
+import org.sleuthkit.datamodel.File;
+import org.sleuthkit.datamodel.FileSystem;
+import org.sleuthkit.datamodel.LayoutFile;
+import org.sleuthkit.datamodel.LocalFile;
+import org.sleuthkit.datamodel.TskCoreException;
+import org.sleuthkit.datamodel.TskData;
+import org.sleuthkit.datamodel.VirtualDirectory;
+
+final class FileIngestTaskScheduler {
+
+    private static final Logger logger = Logger.getLogger(FileIngestTaskScheduler.class.getName());
+    private static FileIngestTaskScheduler instance;
+    private final TreeSet<FileIngestTask> rootDirectoryTasks = new TreeSet<>(new RootDirectoryTaskComparator());
+    private final List<FileIngestTask> directoryTasks = new ArrayList<>();
+    private final LinkedBlockingQueue<FileIngestTask> fileTasks = new LinkedBlockingQueue<>(); // Unlimited capacity
+    private static final int FAT_NTFS_FLAGS = TskData.TSK_FS_TYPE_ENUM.TSK_FS_TYPE_FAT12.getValue() | TskData.TSK_FS_TYPE_ENUM.TSK_FS_TYPE_FAT16.getValue() | TskData.TSK_FS_TYPE_ENUM.TSK_FS_TYPE_FAT32.getValue() | TskData.TSK_FS_TYPE_ENUM.TSK_FS_TYPE_NTFS.getValue();
+
+    static synchronized FileIngestTaskScheduler getInstance() {
+        if (instance == null) {
+            instance = new FileIngestTaskScheduler();
+        }
+        return instance;
+    }
+
+    private FileIngestTaskScheduler() {
+    }
+
+    synchronized void addTasks(IngestJob dataSourceTask, Content dataSource) {
+        Collection<AbstractFile> rootObjects = dataSource.accept(new GetRootDirectoryVisitor());
+        List<AbstractFile> firstLevelFiles = new ArrayList<>();
+        if (rootObjects.isEmpty() && dataSource instanceof AbstractFile) {
+            // The data source is file.
+            firstLevelFiles.add((AbstractFile) dataSource);
+        } else {
+            for (AbstractFile root : rootObjects) {
+                List<Content> children;
+                try {
+                    children = root.getChildren();
+                    if (children.isEmpty()) {
+                        //add the root itself, could be unalloc file, child of volume or image
+                        firstLevelFiles.add(root);
+                    } else {
+                        //root for fs root dir, schedule children dirs/files
+                        for (Content child : children) {
+                            if (child instanceof AbstractFile) {
+                                firstLevelFiles.add((AbstractFile) child);
+                            }
+                        }
+                    }
+                } catch (TskCoreException ex) {
+                    logger.log(Level.WARNING, "Could not get children of root to enqueue: " + root.getId() + ": " + root.getName(), ex); //NON-NLS
+                }
+            }
+        }
+        for (AbstractFile firstLevelFile : firstLevelFiles) {
+            FileIngestTask fileTask = new FileIngestTask(firstLevelFile, dataSourceTask);
+            if (shouldEnqueueTask(fileTask)) {
+                rootDirectoryTasks.add(fileTask);
+            }
+        }
+
+        // Reshuffle/update the dir and file level queues if needed
+        updateQueues();
+    }
+
+    synchronized void addTask(IngestJob ingestJob, AbstractFile file) {
+        try {
+            FileIngestTask fileTask = new FileIngestTask(file, ingestJob);
+            if (shouldEnqueueTask(fileTask)) {
+                fileTask.getIngestJob().notifyTaskPending();
+                fileTasks.put(fileTask); // Queue has unlimited capacity, does not block.
+            }
+        } catch (InterruptedException ex) {
+            // RJCTODO: Perhaps this is the convenience method?
+            // RJCTODO: Need undo
+        }
+    }
+
+    FileIngestTask getNextTask() throws InterruptedException {
+        FileIngestTask task = fileTasks.take();
+        updateQueues();
+        return task;
+    }
+
+    synchronized boolean hasTasksForJob(long ingestJobId) {
+        for (FileIngestTask task : rootDirectoryTasks) {
+            if (task.getIngestJob().getJobId() == ingestJobId) {
+                return true;
+            }
+        }
+
+        for (FileIngestTask task : directoryTasks) {
+            if (task.getIngestJob().getJobId() == ingestJobId) {
+                return true;
+            }
+        }
+
+        for (FileIngestTask task : fileTasks) {
+            if (task.getIngestJob().getJobId() == ingestJobId) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private void updateQueues() {
+        // we loop because we could have a directory that has all files
+        // that do not get enqueued
+        while (true) {
+            // There are files in the queue, we're done
+            if (fileTasks.isEmpty() == false) {
+                return;
+            }
+            // fill in the directory queue if it is empty.
+            if (this.directoryTasks.isEmpty()) {
+                // bail out if root is also empty -- we are done
+                if (rootDirectoryTasks.isEmpty()) {
+                    return;
+                }
+                FileIngestTask rootTask = this.rootDirectoryTasks.pollFirst();
+                directoryTasks.add(rootTask);
+            }
+            //pop and push AbstractFile directory children if any
+            //add the popped and its leaf children onto cur file list
+            FileIngestTask parentTask = directoryTasks.remove(directoryTasks.size() - 1);
+            final AbstractFile parentFile = parentTask.file;
+            // add itself to the file list
+            if (shouldEnqueueTask(parentTask)) {
+                // RJCTODO
+                try {
+                    parentTask.getIngestJob().notifyTaskPending();
+                    fileTasks.put(parentTask);
+                } catch (InterruptedException ex) {
+                    // RJCTODO: Maybe make a convenience method
+                    // RJCTODO: Need undo
+                }
+            }
+            // add its children to the file and directory lists
+            try {
+                List<Content> children = parentFile.getChildren();
+                for (Content c : children) {
+                    if (c instanceof AbstractFile) {
+                        AbstractFile childFile = (AbstractFile) c;
+                        FileIngestTask childTask = new FileIngestTask(childFile, parentTask.getIngestJob());
+                        if (childFile.hasChildren()) {
+                            this.directoryTasks.add(childTask);
+                        } else if (shouldEnqueueTask(childTask)) {
+                            // RJCTODO
+                            try {
+                                childTask.getIngestJob().notifyTaskPending();
+                                fileTasks.put(childTask);
+                            } catch (InterruptedException ex) {
+                                // RJCTODO: Maybe make a convenience method
+                                // RJCTODO: Need undo
+                            }
+                        }
+                    }
+                }
+            } catch (TskCoreException ex) {
+                logger.log(Level.SEVERE, "Could not get children of file and update file queues: " + parentFile.getName(), ex);
+            }
+        }
+    }
+
+    synchronized void emptyQueues() { // RJCTODO: Perhaps clear all...
+        this.rootDirectoryTasks.clear();
+        this.directoryTasks.clear();
+        this.fileTasks.clear();
+    }
+
+    /**
+     * Check if the file is a special file that we should skip
+     *
+     * @param processTask a task whose file to check if should be queued of
+     * skipped
+     * @return true if should be enqueued, false otherwise
+     */
+    private static boolean shouldEnqueueTask(final FileIngestTask processTask) {
+        final AbstractFile aFile = processTask.file;
+        //if it's unalloc file, skip if so scheduled
+        if (processTask.getIngestJob().shouldProcessUnallocatedSpace() == false && aFile.getType().equals(TskData.TSK_DB_FILES_TYPE_ENUM.UNALLOC_BLOCKS)) {
+            return false;
+        }
+        String fileName = aFile.getName();
+        if (fileName.equals(".") || fileName.equals("..")) {
+            return false;
+        } else if (aFile instanceof org.sleuthkit.datamodel.File) {
+            final org.sleuthkit.datamodel.File f = (File) aFile;
+            //skip files in root dir, starting with $, containing : (not default attributes)
+            //with meta address < 32, i.e. some special large NTFS and FAT files
+            FileSystem fs = null;
+            try {
+                fs = f.getFileSystem();
+            } catch (TskCoreException ex) {
+                logger.log(Level.SEVERE, "Could not get FileSystem for " + f, ex); //NON-NLS
+            }
+            TskData.TSK_FS_TYPE_ENUM fsType = TskData.TSK_FS_TYPE_ENUM.TSK_FS_TYPE_UNSUPP;
+            if (fs != null) {
+                fsType = fs.getFsType();
+            }
+            if ((fsType.getValue() & FAT_NTFS_FLAGS) == 0) {
+                //not fat or ntfs, accept all files
+                return true;
+            }
+            boolean isInRootDir = false;
+            try {
+                isInRootDir = f.getParentDirectory().isRoot();
+            } catch (TskCoreException ex) {
+                logger.log(Level.WARNING, "Could not check if should enqueue the file: " + f.getName(), ex); //NON-NLS
+            }
+            if (isInRootDir && f.getMetaAddr() < 32) {
+                String name = f.getName();
+                if (name.length() > 0 && name.charAt(0) == '$' && name.contains(":")) {
+                    return false;
+                }
+            } else {
+                return true;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Visitor that gets a collection of top level objects to be scheduled, such
+     * as root directories (if there is FS) or LayoutFiles and virtual
+     * directories, also if there is no FS.
+     */
+    static class GetRootDirectoryVisitor extends GetFilesContentVisitor {
+
+        @Override
+        public Collection<AbstractFile> visit(VirtualDirectory ld) {
+            //case when we hit a layout directoryor local file container, not under a real FS
+            //or when root virt dir is scheduled
+            Collection<AbstractFile> ret = new ArrayList<>();
+            ret.add(ld);
+            return ret;
+        }
+
+        @Override
+        public Collection<AbstractFile> visit(LayoutFile lf) {
+            //case when we hit a layout file, not under a real FS
+            Collection<AbstractFile> ret = new ArrayList<>();
+            ret.add(lf);
+            return ret;
+        }
+
+        @Override
+        public Collection<AbstractFile> visit(Directory drctr) {
+            //we hit a real directory, a child of real FS
+            Collection<AbstractFile> ret = new ArrayList<>();
+            ret.add(drctr);
+            return ret;
+        }
+
+        @Override
+        public Collection<AbstractFile> visit(FileSystem fs) {
+            return getAllFromChildren(fs);
+        }
+
+        @Override
+        public Collection<AbstractFile> visit(File file) {
+            //can have derived files
+            return getAllFromChildren(file);
+        }
+
+        @Override
+        public Collection<AbstractFile> visit(DerivedFile derivedFile) {
+            //can have derived files
+            //TODO test this and overall scheduler with derived files
+            return getAllFromChildren(derivedFile);
+        }
+
+        @Override
+        public Collection<AbstractFile> visit(LocalFile localFile) {
+            //can have local files
+            //TODO test this and overall scheduler with local files
+            return getAllFromChildren(localFile);
+        }
+    }
+
+    /**
+     * Root directory sorter
+     */
+    private static class RootDirectoryTaskComparator implements Comparator<FileIngestTask> {
+
+        @Override
+        public int compare(FileIngestTask q1, FileIngestTask q2) {
+            AbstractFilePriority.Priority p1 = AbstractFilePriority.getPriority(q1.file);
+            AbstractFilePriority.Priority p2 = AbstractFilePriority.getPriority(q2.file);
+            if (p1 == p2) {
+                return (int) (q2.file.getId() - q1.file.getId());
+            } else {
+                return p2.ordinal() - p1.ordinal();
+            }
+        }
+
+        /**
+         * Priority determination for sorted AbstractFile, used by
+         * RootDirComparator
+         */
+        private static class AbstractFilePriority {
+
+            enum Priority {
+
+                LAST, LOW, MEDIUM, HIGH
+            }
+            static final List<Pattern> LAST_PRI_PATHS = new ArrayList<>();
+            static final List<Pattern> LOW_PRI_PATHS = new ArrayList<>();
+            static final List<Pattern> MEDIUM_PRI_PATHS = new ArrayList<>();
+            static final List<Pattern> HIGH_PRI_PATHS = new ArrayList<>();
+            /* prioritize root directory folders based on the assumption that we are
+             * looking for user content. Other types of investigations may want different
+             * priorities. */
+
+            static /* prioritize root directory folders based on the assumption that we are
+             * looking for user content. Other types of investigations may want different
+             * priorities. */ {
+                // these files have no structure, so they go last
+                //unalloc files are handled as virtual files in getPriority()
+                //LAST_PRI_PATHS.schedule(Pattern.compile("^\\$Unalloc", Pattern.CASE_INSENSITIVE));
+                //LAST_PRI_PATHS.schedule(Pattern.compile("^\\Unalloc", Pattern.CASE_INSENSITIVE));
+                LAST_PRI_PATHS.add(Pattern.compile("^pagefile", Pattern.CASE_INSENSITIVE));
+                LAST_PRI_PATHS.add(Pattern.compile("^hiberfil", Pattern.CASE_INSENSITIVE));
+                // orphan files are often corrupt and windows does not typically have
+                // user content, so put them towards the bottom
+                LOW_PRI_PATHS.add(Pattern.compile("^\\$OrphanFiles", Pattern.CASE_INSENSITIVE));
+                LOW_PRI_PATHS.add(Pattern.compile("^Windows", Pattern.CASE_INSENSITIVE));
+                // all other files go into the medium category too
+                MEDIUM_PRI_PATHS.add(Pattern.compile("^Program Files", Pattern.CASE_INSENSITIVE));
+                // user content is top priority
+                HIGH_PRI_PATHS.add(Pattern.compile("^Users", Pattern.CASE_INSENSITIVE));
+                HIGH_PRI_PATHS.add(Pattern.compile("^Documents and Settings", Pattern.CASE_INSENSITIVE));
+                HIGH_PRI_PATHS.add(Pattern.compile("^home", Pattern.CASE_INSENSITIVE));
+                HIGH_PRI_PATHS.add(Pattern.compile("^ProgramData", Pattern.CASE_INSENSITIVE));
+            }
+
+            /**
+             * Get the scheduling priority for a given file.
+             *
+             * @param abstractFile
+             * @return
+             */
+            static AbstractFilePriority.Priority getPriority(final AbstractFile abstractFile) {
+                if (!abstractFile.getType().equals(TskData.TSK_DB_FILES_TYPE_ENUM.FS)) {
+                    //quickly filter out unstructured content
+                    //non-fs virtual files and dirs, such as representing unalloc space
+                    return AbstractFilePriority.Priority.LAST;
+                }
+                //determine the fs files priority by name
+                final String path = abstractFile.getName();
+                if (path == null) {
+                    return AbstractFilePriority.Priority.MEDIUM;
+                }
+                for (Pattern p : HIGH_PRI_PATHS) {
+                    Matcher m = p.matcher(path);
+                    if (m.find()) {
+                        return AbstractFilePriority.Priority.HIGH;
+                    }
+                }
+                for (Pattern p : MEDIUM_PRI_PATHS) {
+                    Matcher m = p.matcher(path);
+                    if (m.find()) {
+                        return AbstractFilePriority.Priority.MEDIUM;
+                    }
+                }
+                for (Pattern p : LOW_PRI_PATHS) {
+                    Matcher m = p.matcher(path);
+                    if (m.find()) {
+                        return AbstractFilePriority.Priority.LOW;
+                    }
+                }
+                for (Pattern p : LAST_PRI_PATHS) {
+                    Matcher m = p.matcher(path);
+                    if (m.find()) {
+                        return AbstractFilePriority.Priority.LAST;
+                    }
+                }
+                //default is medium
+                return AbstractFilePriority.Priority.MEDIUM;
+            }
+        }
+    }
+}
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/GetFilesCountVisitor.java b/Core/src/org/sleuthkit/autopsy/ingest/GetFilesCountVisitor.java
new file mode 100755
index 0000000000..346da5d418
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/ingest/GetFilesCountVisitor.java
@@ -0,0 +1,99 @@
+/*
+ * Autopsy Forensic Browser
+ * 
+ * Copyright 2012-2014 Basis Technology Corp.
+ * Contact: carrier <at> sleuthkit <dot> org
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.autopsy.ingest;
+
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.sleuthkit.autopsy.casemodule.Case;
+import org.sleuthkit.datamodel.Content;
+import org.sleuthkit.datamodel.ContentVisitor;
+import org.sleuthkit.datamodel.FileSystem;
+import org.sleuthkit.datamodel.LayoutFile;
+import org.sleuthkit.datamodel.SleuthkitCase;
+import org.sleuthkit.datamodel.TskCoreException;
+import org.sleuthkit.datamodel.TskData;
+
+/**
+ * Get counts of ingestable files/dirs for the content input source.
+ *
+ * Note, also includes counts of all unalloc children files (for the fs, image,
+ * volume) even if ingest didn't ask for them
+ */
+final class GetFilesCountVisitor extends ContentVisitor.Default<Long> {
+
+    private static final Logger logger = Logger.getLogger(FileIngestTaskScheduler.class.getName());
+
+    @Override
+    public Long visit(FileSystem fs) {
+        //recursion stop here
+        //case of a real fs, query all files for it
+        SleuthkitCase sc = Case.getCurrentCase().getSleuthkitCase();
+        StringBuilder queryB = new StringBuilder();
+        queryB.append("( (fs_obj_id = ").append(fs.getId()); //NON-NLS
+        //queryB.append(") OR (fs_obj_id = NULL) )");
+        queryB.append(") )");
+        queryB.append(" AND ( (meta_type = ").append(TskData.TSK_FS_META_TYPE_ENUM.TSK_FS_META_TYPE_REG.getValue()); //NON-NLS
+        queryB.append(") OR (meta_type = ").append(TskData.TSK_FS_META_TYPE_ENUM.TSK_FS_META_TYPE_DIR.getValue()); //NON-NLS
+        queryB.append(" AND (name != '.') AND (name != '..')"); //NON-NLS
+        queryB.append(") )");
+        //queryB.append( "AND (type = ");
+        //queryB.append(TskData.TSK_DB_FILES_TYPE_ENUM.FS.getFileType());
+        //queryB.append(")");
+        try {
+            final String query = queryB.toString();
+            logger.log(Level.INFO, "Executing count files query: {0}", query); //NON-NLS
+            return sc.countFilesWhere(query);
+        } catch (TskCoreException ex) {
+            logger.log(Level.SEVERE, "Couldn't get count of all files in FileSystem", ex); //NON-NLS
+            return 0L;
+        }
+    }
+
+    @Override
+    public Long visit(LayoutFile lf) {
+        //recursion stop here
+        //case of LayoutFile child of Image or Volume
+        return 1L;
+    }
+
+    private long getCountFromChildren(Content content) {
+        long count = 0;
+        try {
+            List<Content> children = content.getChildren();
+            if (children.size() > 0) {
+                for (Content child : children) {
+                    count += child.accept(this);
+                }
+            } else {
+                count = 1;
+            }
+        } catch (TskCoreException ex) {
+            logger.log(Level.WARNING, "Could not get count of objects from children to get num of total files to be ingested", ex); //NON-NLS
+        }
+        return count;
+    }
+
+    @Override
+    protected Long defaultVisit(Content cntnt) {
+        //recurse assuming this is image/vs/volume
+        //recursion stops at fs or unalloc file
+        return getCountFromChildren(cntnt);
+    }
+}
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestJob.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestJob.java
index 6d41cac96a..8982be2061 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestJob.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestJob.java
@@ -19,12 +19,16 @@
 package org.sleuthkit.autopsy.ingest;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandleFactory;
 import org.openide.util.Cancellable;
 import org.openide.util.NbBundle;
+import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.Content;
 
 /**
@@ -33,31 +37,63 @@ import org.sleuthkit.datamodel.Content;
  */
 final class IngestJob {
 
-    private final long id;
+    private static final AtomicLong nextIngestJobId = new AtomicLong(0L);
+    private static final ConcurrentHashMap<Long, IngestJob> ingestJobs = new ConcurrentHashMap<>(); // Maps job ids to jobs.
+    private final long jobId;
     private final Content dataSource;
     private final List<IngestModuleTemplate> ingestModuleTemplates;
     private final boolean processUnallocatedSpace;
-    private final HashMap<Long, FileIngestPipeline> fileIngestPipelines = new HashMap<>();
-    private final HashMap<Long, DataSourceIngestPipeline> dataSourceIngestPipelines = new HashMap<>();
-    private final IngestScheduler.FileIngestScheduler fileScheduler = IngestScheduler.getInstance().getFileIngestScheduler();
-    private FileIngestPipeline initialFileIngestPipeline = null;
-    private DataSourceIngestPipeline initialDataSourceIngestPipeline = null;
-    private ProgressHandle dataSourceTaskProgress;
+    private final LinkedBlockingQueue<DataSourceIngestPipeline> dataSourceIngestPipelines = new LinkedBlockingQueue<>();
+    private final LinkedBlockingQueue<FileIngestPipeline> fileIngestPipelines = new LinkedBlockingQueue<>();
+    private final AtomicInteger tasksInProgress = new AtomicInteger(0);
+    private final AtomicLong processedFiles = new AtomicLong(0L);
+    private ProgressHandle dataSourceTasksProgress;
     private ProgressHandle fileTasksProgress;
-    int totalEnqueuedFiles = 0;
-    private int processedFiles = 0;
+    private long filesToIngestEstimate = 0;
     private volatile boolean cancelled;
 
-    IngestJob(long id, Content dataSource, List<IngestModuleTemplate> ingestModuleTemplates, boolean processUnallocatedSpace) {
-        this.id = id;
+    static List<IngestModuleError> startIngestJob(Content dataSource, List<IngestModuleTemplate> ingestModuleTemplates, boolean processUnallocatedSpace) { // RJCTODO: return errors
+        long jobId = nextIngestJobId.incrementAndGet();
+        IngestJob ingestJob = new IngestJob(jobId, dataSource, ingestModuleTemplates, processUnallocatedSpace);
+        List<IngestModuleError> errors = ingestJob.start();
+        if (errors.isEmpty()) {
+            ingestJobs.put(jobId, ingestJob);
+        }
+        return errors;
+    }
+
+    static boolean jobsAreRunning() {
+        for (IngestJob job : ingestJobs.values()) {
+            if (!job.isCancelled()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    static void addFileToIngestJob(long ingestJobId, AbstractFile file) { // RJCTODO: Move back to IngestManager
+        IngestJob job = ingestJobs.get(ingestJobId);
+        if (job != null) {
+            FileIngestTaskScheduler.getInstance().addTask(job, file);
+        }
+    }
+
+    static void cancelAllIngestJobs() {
+        for (IngestJob job : ingestJobs.values()) {
+            job.cancel();
+        }
+    }
+
+    private IngestJob(long id, Content dataSource, List<IngestModuleTemplate> ingestModuleTemplates, boolean processUnallocatedSpace) {
+        this.jobId = id;
         this.dataSource = dataSource;
         this.ingestModuleTemplates = ingestModuleTemplates;
         this.processUnallocatedSpace = processUnallocatedSpace;
         this.cancelled = false;
     }
 
-    long getId() {
-        return id;
+    long getJobId() {
+        return jobId;
     }
 
     Content getDataSource() {
@@ -68,34 +104,78 @@ final class IngestJob {
         return processUnallocatedSpace;
     }
 
-    synchronized List<IngestModuleError> startUpIngestPipelines() {
-        startDataSourceIngestProgressBar();
-        startFileIngestProgressBar();
-        return startUpInitialIngestPipelines();
+    List<IngestModuleError> start() {
+        List<IngestModuleError> errors = startUpIngestPipelines();
+        if (errors.isEmpty()) {
+            DataSourceIngestTaskScheduler.getInstance().addTask(new DataSourceIngestTask(this, dataSource));
+            FileIngestTaskScheduler.getInstance().addTasks(this, dataSource);
+            startDataSourceIngestProgressBar();
+            startFileIngestProgressBar();
+        }
+        return errors;
+    }
+
+    private List<IngestModuleError> startUpIngestPipelines() {
+        List<IngestModuleError> errors = new ArrayList<>();
+
+        int maxNumberOfPipelines = IngestManager.getMaxNumberOfDataSourceIngestThreads();
+        for (int i = 0; i < maxNumberOfPipelines; ++i) {
+            DataSourceIngestPipeline pipeline = new DataSourceIngestPipeline(this, ingestModuleTemplates);
+            errors.addAll(pipeline.startUp());
+            try {
+                dataSourceIngestPipelines.put(pipeline);
+            } catch (InterruptedException ex) {
+                // RJCTODO: log unexpected block and interrupt, or throw
+            }
+            if (errors.isEmpty()) {
+                // No need to accumulate presumably redundant erros.
+                break;
+            }
+        }
+
+        maxNumberOfPipelines = IngestManager.getMaxNumberOfFileIngestThreads();
+        for (int i = 0; i < maxNumberOfPipelines; ++i) {
+            FileIngestPipeline pipeline = new FileIngestPipeline(this, ingestModuleTemplates);
+            errors.addAll(pipeline.startUp());
+            try {
+                fileIngestPipelines.put(pipeline);
+            } catch (InterruptedException ex) {
+                // RJCTODO: log unexpected block and interrupt, or throw
+            }
+            if (errors.isEmpty()) {
+                // No need to accumulate presumably redundant erros.
+                break;
+            }
+        }
+
+        return errors;
     }
 
     private void startDataSourceIngestProgressBar() {
-        final String displayName = NbBundle
-                .getMessage(this.getClass(), "IngestJob.progress.dataSourceIngest.displayName", this.dataSource.getName());
-        dataSourceTaskProgress = ProgressHandleFactory.createHandle(displayName, new Cancellable() {
+        final String displayName = NbBundle.getMessage(this.getClass(),
+                "IngestJob.progress.dataSourceIngest.displayName",
+                dataSource.getName());
+        dataSourceTasksProgress = ProgressHandleFactory.createHandle(displayName, new Cancellable() {
             @Override
             public boolean cancel() {
-                if (dataSourceTaskProgress != null) {
-                    dataSourceTaskProgress.setDisplayName(NbBundle.getMessage(this.getClass(),
+                if (dataSourceTasksProgress != null) {
+                    dataSourceTasksProgress.setDisplayName(
+                            NbBundle.getMessage(this.getClass(),
                             "IngestJob.progress.cancelling",
                             displayName));
                 }
-                IngestManager.getInstance().cancelIngestJobs();
+                IngestJob.this.cancel();
                 return true;
             }
         });
-        dataSourceTaskProgress.start();
-        dataSourceTaskProgress.switchToIndeterminate();
+        dataSourceTasksProgress.start();
+        dataSourceTasksProgress.switchToIndeterminate(); // RJCTODO: check out the logic in the pipleine class
     }
 
     private void startFileIngestProgressBar() {
-        final String displayName = NbBundle
-                .getMessage(this.getClass(), "IngestJob.progress.fileIngest.displayName", this.dataSource.getName());
+        final String displayName = NbBundle.getMessage(this.getClass(),
+                "IngestJob.progress.fileIngest.displayName",
+                dataSource.getName());
         fileTasksProgress = ProgressHandleFactory.createHandle(displayName, new Cancellable() {
             @Override
             public boolean cancel() {
@@ -104,124 +184,90 @@ final class IngestJob {
                             NbBundle.getMessage(this.getClass(), "IngestJob.progress.cancelling",
                             displayName));
                 }
-                IngestManager.getInstance().cancelIngestJobs();
+                IngestJob.this.cancel();
                 return true;
             }
         });
+        filesToIngestEstimate = dataSource.accept(new GetFilesCountVisitor());
         fileTasksProgress.start();
-        fileTasksProgress.switchToIndeterminate();
-        totalEnqueuedFiles = fileScheduler.getFilesEnqueuedEst();
-        fileTasksProgress.switchToDeterminate(totalEnqueuedFiles);
+        fileTasksProgress.switchToDeterminate((int) filesToIngestEstimate);
     }
 
-    private List<IngestModuleError> startUpInitialIngestPipelines() {
-        // Create a per thread instance of each pipeline type right now to make 
-        // (reasonably) sure that the ingest modules can be started.
-        initialDataSourceIngestPipeline = new DataSourceIngestPipeline(this, ingestModuleTemplates);
-        initialFileIngestPipeline = new FileIngestPipeline(this, ingestModuleTemplates);
-        List<IngestModuleError> errors = new ArrayList<>();
-        errors.addAll(initialDataSourceIngestPipeline.startUp());
-        errors.addAll(initialFileIngestPipeline.startUp());
-        return errors;
+    /**
+     * Called by the ingest task schedulers when an ingest task for this ingest
+     * job is added to the scheduler's task queue.
+     */
+    void notifyTaskScheduled() {
+        // Increment the task counter when a task is scheduled so that there is 
+        // a persistent record of the task's existence even after it is removed
+        // from the scheduler by an ingest thread. The task counter is used by
+        // the job to determine when it is done.
+        tasksInProgress.incrementAndGet();
     }
 
-    synchronized DataSourceIngestPipeline getDataSourceIngestPipelineForThread(long threadId) {
-        DataSourceIngestPipeline pipeline;
-        if (initialDataSourceIngestPipeline != null) {
-            pipeline = initialDataSourceIngestPipeline;
-            initialDataSourceIngestPipeline = null;
-            dataSourceIngestPipelines.put(threadId, pipeline);
-        } else if (!dataSourceIngestPipelines.containsKey(threadId)) {
-            pipeline = new DataSourceIngestPipeline(this, ingestModuleTemplates);
-            pipeline.startUp();
-            dataSourceIngestPipelines.put(threadId, pipeline);
-        } else {
-            pipeline = dataSourceIngestPipelines.get(threadId);
-        }
-        return pipeline;
+    /**
+     * Called by the ingest schedulers as an "undo" operation for
+     * notifyTaskScheduled().
+     */
+    void notifyTaskCompleted() {
+        // Decrement the task counter when a task is discarded by a scheduler.  
+        // The task counter is used by the job to determine when it is done.
+        tasksInProgress.decrementAndGet();
     }
 
-    synchronized FileIngestPipeline getFileIngestPipelineForThread(long threadId) {
-        FileIngestPipeline pipeline;
-        if (initialFileIngestPipeline != null) {
-            pipeline = initialFileIngestPipeline;
-            initialFileIngestPipeline = null;
-            fileIngestPipelines.put(threadId, pipeline);
-        } else if (!fileIngestPipelines.containsKey(threadId)) {
-            pipeline = new FileIngestPipeline(this, ingestModuleTemplates);
-            pipeline.startUp();
-            fileIngestPipelines.put(threadId, pipeline);
-        } else {
-            pipeline = fileIngestPipelines.get(threadId);
+    void process() throws InterruptedException {
+        if (!isCancelled()) {
+            try {
+                DataSourceIngestPipeline pipeline = dataSourceIngestPipelines.take();
+                pipeline.process(); // RJCTODO: Pass data source through?
+                dataSourceIngestPipelines.put(pipeline);
+            } catch (InterruptedException ex) {
+                // RJCTODO:
+            }
         }
-        return pipeline;
+        ifCompletedShutDown();
     }
 
-    synchronized List<IngestModuleError> releaseIngestPipelinesForThread(long threadId) {
-        List<IngestModuleError> errors = new ArrayList<>();
-        
-        DataSourceIngestPipeline dataSourceIngestPipeline = dataSourceIngestPipelines.get(threadId);
-        if (dataSourceIngestPipeline != null) {
-            errors.addAll(dataSourceIngestPipeline.shutDown(cancelled));
-            dataSourceIngestPipelines.remove(threadId);
+    void process(AbstractFile file) {
+        if (!isCancelled()) {
+            try {
+                FileIngestPipeline pipeline = fileIngestPipelines.take();
+                fileTasksProgress.progress(file.getName(), (int) processedFiles.incrementAndGet());
+                pipeline.process(file);
+                fileIngestPipelines.put(pipeline);
+            } catch (InterruptedException ex) {
+                // RJCTODO: Log block and interrupt
+            }
         }
-        if (initialDataSourceIngestPipeline == null && dataSourceIngestPipelines.isEmpty() && dataSourceTaskProgress != null) {
-            dataSourceTaskProgress.finish();
-            dataSourceTaskProgress = null;
-        }
-
-        FileIngestPipeline fileIngestPipeline = fileIngestPipelines.get(threadId);
-        if (fileIngestPipeline != null) {
-            errors.addAll(fileIngestPipeline.shutDown(cancelled));
-            fileIngestPipelines.remove(threadId);
-        }
-        if (initialFileIngestPipeline == null && fileIngestPipelines.isEmpty() && fileTasksProgress != null) {
-            fileTasksProgress.finish();
-            fileTasksProgress = null;
-        }
-
-        return errors;
+        ifCompletedShutDown();
     }
 
-    synchronized boolean areIngestPipelinesShutDown() {
-        return (initialDataSourceIngestPipeline == null
-                && dataSourceIngestPipelines.isEmpty()
-                && initialFileIngestPipeline == null
-                && fileIngestPipelines.isEmpty());
+    void ifCompletedShutDown() {
+        if (tasksInProgress.decrementAndGet() == 0) {
+            while (!dataSourceIngestPipelines.isEmpty()) {
+                DataSourceIngestPipeline pipeline = dataSourceIngestPipelines.poll();
+                pipeline.shutDown(cancelled);
+            }
+            while (!fileIngestPipelines.isEmpty()) {
+                FileIngestPipeline pipeline = fileIngestPipelines.poll();
+                pipeline.shutDown(cancelled);
+            }
+            ingestJobs.remove(jobId);
+            IngestManager.getInstance().fireIngestJobCompleted(jobId);        
+        }
     }
 
-    synchronized ProgressHandle getDataSourceTaskProgressBar() {
-        return this.dataSourceTaskProgress;
-    }
-
-    synchronized void updateFileTasksProgressBar(String currentFileName) {
-        int newTotalEnqueuedFiles = fileScheduler.getFilesEnqueuedEst();
-        if (newTotalEnqueuedFiles > totalEnqueuedFiles) {
-            totalEnqueuedFiles = newTotalEnqueuedFiles + 1;
-            fileTasksProgress.switchToIndeterminate();
-            fileTasksProgress.switchToDeterminate(totalEnqueuedFiles);
-        }
-        if (processedFiles < totalEnqueuedFiles) {
-            ++processedFiles;
-        }
-
-        fileTasksProgress.progress(currentFileName, processedFiles);
-    }
-
-    synchronized void cancel() {
-        if (initialDataSourceIngestPipeline != null) {
-            initialDataSourceIngestPipeline.shutDown(true);
-            initialDataSourceIngestPipeline =  null;
-        }
-        if (initialFileIngestPipeline != null) {
-            initialFileIngestPipeline.shutDown(true);
-            initialFileIngestPipeline = null;
-        }
-       
-        cancelled = true;
+    ProgressHandle getDataSourceTaskProgressBar() {
+        return dataSourceTasksProgress; // RJCTODO: Should just pass the progress handle or the object to the pipeline
     }
 
     boolean isCancelled() {
         return cancelled;
     }
+
+    void cancel() {
+        cancelled = true;
+        fileTasksProgress.finish();
+        IngestManager.getInstance().fireIngestJobCancelled(jobId);
+    }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobContext.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobContext.java
index dc9fb58e3f..6a9b4a9454 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobContext.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobContext.java
@@ -39,7 +39,7 @@ public final class IngestJobContext {
      * @return The ingest job identifier.
      */
     public long getJobId() {
-        return this.ingestJob.getId();
+        return this.ingestJob.getJobId();
     }
 
     /**
@@ -60,7 +60,7 @@ public final class IngestJobContext {
      */
     public void addFiles(List<AbstractFile> files) {
         for (AbstractFile file : files) {
-            IngestManager.getInstance().addFileToIngestJob(ingestJob.getId(), file);
+            IngestJob.addFileToIngestJob(ingestJob.getJobId(), file);
         }
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
index d94ee00059..a5b0da296c 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
@@ -20,9 +20,7 @@ package org.sleuthkit.autopsy.ingest;
 
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.CancellationException;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -36,72 +34,146 @@ import org.netbeans.api.progress.ProgressHandleFactory;
 import org.openide.util.Cancellable;
 import org.openide.util.NbPreferences;
 import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
-import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.Content;
 import java.util.prefs.Preferences;
 import javax.swing.JOptionPane;
-import javax.swing.SwingWorker;
-import org.sleuthkit.autopsy.ingest.IngestScheduler.FileIngestScheduler.FileIngestTask;
 
 /**
  * Manages the execution of ingest jobs.
  */
 public class IngestManager {
 
+    private static final int MAX_NUMBER_OF_DATA_SOURCE_INGEST_THREADS = 1;
     private static final String NUMBER_OF_FILE_INGEST_THREADS_KEY = "NumberOfFileingestThreads"; //NON-NLS
     private static final int MIN_NUMBER_OF_FILE_INGEST_THREADS = 1;
     private static final int MAX_NUMBER_OF_FILE_INGEST_THREADS = 4;
     private static final int DEFAULT_NUMBER_OF_FILE_INGEST_THREADS = 2;
     private static final Logger logger = Logger.getLogger(IngestManager.class.getName());
-    private static final PropertyChangeSupport pcs = new PropertyChangeSupport(IngestManager.class);
     private static final Preferences userPreferences = NbPreferences.forModule(IngestManager.class);
     private static final IngestManager instance = new IngestManager();
-    private final IngestScheduler scheduler = IngestScheduler.getInstance();
+    private final PropertyChangeSupport pcs = new PropertyChangeSupport(IngestManager.class);
     private final IngestMonitor ingestMonitor = new IngestMonitor();
-    private final ExecutorService startIngestJobsExecutor = Executors.newSingleThreadExecutor();
-    private final ExecutorService dataSourceIngestTasksExecutor = Executors.newSingleThreadExecutor();
-    private final ExecutorService fileIngestTasksExecutor = Executors.newFixedThreadPool(MAX_NUMBER_OF_FILE_INGEST_THREADS);
-    private final ExecutorService fireEventTasksExecutor = Executors.newSingleThreadExecutor();
-    private final ConcurrentHashMap<Long, IngestJob> ingestJobs = new ConcurrentHashMap<>(1, 0.9f, 4); // Maps job ids to jobs.
-    private final ConcurrentHashMap<Long, Future<?>> ingestTasks = new ConcurrentHashMap<>(); // Maps task ids to task cancellation handles. Guarded by this.
-    private final AtomicLong ingestJobId = new AtomicLong(0L);
-    private final AtomicLong ingestTaskId = new AtomicLong(0L);
+    private final ExecutorService startIngestJobsThreadPool = Executors.newSingleThreadExecutor();
+    private final ConcurrentHashMap<Long, Future<?>> startIngestJobThreads = new ConcurrentHashMap<>(); // Maps thread ids to cancellation handles.
+    private final ExecutorService dataSourceIngestThreadPool = Executors.newSingleThreadExecutor();
+    private final ConcurrentHashMap<Long, Future<?>> dataSourceIngestThreads = new ConcurrentHashMap<>(); // Maps thread ids to cancellation handles.
+    private final ExecutorService fileIngestThreadPool = Executors.newFixedThreadPool(MAX_NUMBER_OF_FILE_INGEST_THREADS);
+    private final ExecutorService fireIngestJobEventsThreadPool = Executors.newSingleThreadExecutor();
+    private final ConcurrentHashMap<Long, Future<?>> fileIngestThreads = new ConcurrentHashMap<>(); // Maps thread ids to cancellation handles.
+    private final AtomicLong nextThreadId = new AtomicLong(0L);
     private volatile IngestMessageTopComponent ingestMessageBox;
 
     /**
-     * Gets the IngestManager singleton, creating it if necessary.
+     * Gets the ingest manager.
      *
-     * @returns The IngestManager singleton.
+     * @returns A singleton IngestManager object.
      */
     public static IngestManager getInstance() {
         return instance;
     }
 
-    private IngestManager() {
-    }
-
     /**
-     * Signals to the ingest manager that it can go find the top component for
-     * the ingest messages in box. Called by the custom installer for this
-     * package once the window system is initialized.
+     * Starts the ingest monitor and the data source ingest and file ingest
+     * threads.
      */
-    void initIngestMessageInbox() {
-        if (this.ingestMessageBox == null) {
-            this.ingestMessageBox = IngestMessageTopComponent.findInstance();
+    private IngestManager() {
+        startDataSourceIngestThread();
+        int numberOfFileIngestThreads = getNumberOfFileIngestThreads();
+        for (int i = 0; i < numberOfFileIngestThreads; ++i) {
+            startFileIngestThread();
         }
     }
 
+    /**
+     * Signals to the ingest manager that it can go about finding the top
+     * component for the ingest messages in box. Called by the custom installer
+     * for this package once the window system is initialized.
+     */
+    void initIngestMessageInbox() {
+        if (ingestMessageBox == null) {
+            ingestMessageBox = IngestMessageTopComponent.findInstance();
+        }
+    }
+
+    /**
+     * Gets the maximum number of data source ingest threads the ingest manager
+     * will use.
+     */
+    public static int getMaxNumberOfDataSourceIngestThreads() {
+        return MAX_NUMBER_OF_DATA_SOURCE_INGEST_THREADS;
+    }
+
+    /**
+     * Gets the maximum number of file ingest threads the ingest manager will
+     * use.
+     */
+    public static int getMaxNumberOfFileIngestThreads() {
+        return MAX_NUMBER_OF_FILE_INGEST_THREADS;
+    }
+
+    /**
+     * Gets the number of file ingest threads the ingest manager will use.
+     */
     public synchronized static int getNumberOfFileIngestThreads() {
         return userPreferences.getInt(NUMBER_OF_FILE_INGEST_THREADS_KEY, DEFAULT_NUMBER_OF_FILE_INGEST_THREADS);
     }
 
+    /**
+     * Changes the number of file ingest threads the ingest manager will use to
+     * no more than MAX_NUMBER_OF_FILE_INGEST_THREADS and no less than
+     * MIN_NUMBER_OF_FILE_INGEST_THREADS. Out of range requests are converted to
+     * requests for DEFAULT_NUMBER_OF_FILE_INGEST_THREADS.
+     *
+     * @param numberOfThreads The desired number of file ingest threads.
+     */
     public synchronized static void setNumberOfFileIngestThreads(int numberOfThreads) {
-        if (numberOfThreads < MIN_NUMBER_OF_FILE_INGEST_THREADS
-                || numberOfThreads > MAX_NUMBER_OF_FILE_INGEST_THREADS) {
+        if ((numberOfThreads < MIN_NUMBER_OF_FILE_INGEST_THREADS) || (numberOfThreads > MAX_NUMBER_OF_FILE_INGEST_THREADS)) {
             numberOfThreads = DEFAULT_NUMBER_OF_FILE_INGEST_THREADS;
         }
-
         userPreferences.putInt(NUMBER_OF_FILE_INGEST_THREADS_KEY, numberOfThreads);
+
+        if (instance.fileIngestThreads.size() != numberOfThreads) {
+            if (instance.fileIngestThreads.size() > numberOfThreads) {
+                Long[] threadIds = instance.fileIngestThreads.keySet().toArray(new Long[instance.fileIngestThreads.size()]);
+                int numberOfThreadsToCancel = instance.fileIngestThreads.size() - numberOfThreads;
+                for (int i = 0; i < numberOfThreadsToCancel; ++i) {
+                    instance.cancelFileIngestThread(threadIds[i]);
+                }
+            } else if (instance.fileIngestThreads.size() < numberOfThreads) {
+                int numberOfThreadsToAdd = numberOfThreads - instance.fileIngestThreads.size();
+                for (int i = 0; i < numberOfThreadsToAdd; ++i) {
+                    instance.startFileIngestThread();
+                }
+            }
+        }
+    }
+
+    /**
+     * Submits a DataSourceIngestThread Runnable to the data source ingest
+     * thread pool.
+     */
+    private void startDataSourceIngestThread() {
+        long threadId = nextThreadId.incrementAndGet();
+        Future<?> handle = dataSourceIngestThreadPool.submit(new DataSourceIngestThread(threadId));
+        dataSourceIngestThreads.put(threadId, handle);
+    }
+
+    /**
+     * Submits a DataSourceIngestThread Runnable to the data source ingest
+     * thread pool.
+     */
+    private void startFileIngestThread() {
+        long threadId = nextThreadId.incrementAndGet();
+        Future<?> handle = fileIngestThreadPool.submit(new FileIngestThread(threadId));
+        fileIngestThreads.put(threadId, handle);
+    }
+
+    /**
+     * Cancels a DataSourceIngestThread Runnable in the file ingest thread pool.
+     */
+    private void cancelFileIngestThread(long threadId) {
+        Future<?> handle = fileIngestThreads.remove(threadId);
+        handle.cancel(true);
     }
 
     synchronized void startIngestJobs(final List<Content> dataSources, final List<IngestModuleTemplate> moduleTemplates, boolean processUnallocatedSpace) {
@@ -109,9 +181,9 @@ public class IngestManager {
             ingestMessageBox.clearMessages();
         }
 
-        long taskId = ingestTaskId.incrementAndGet();
-        Future<?> task = startIngestJobsExecutor.submit(new StartIngestJobsTask(taskId, dataSources, moduleTemplates, processUnallocatedSpace));
-        ingestTasks.put(taskId, task);
+        long taskId = nextThreadId.incrementAndGet();
+        Future<?> task = startIngestJobsThreadPool.submit(new StartIngestJobsThread(taskId, dataSources, moduleTemplates, processUnallocatedSpace));
+        fileIngestThreads.put(taskId, task);
 
         if (ingestMessageBox != null) {
             ingestMessageBox.restoreMessages();
@@ -121,43 +193,42 @@ public class IngestManager {
     /**
      * Test if any ingest jobs are in progress.
      *
-     * @return True if any ingest jobs are in progress, false otherwise
+     * @return True if any ingest jobs are in progress, false otherwise.
      */
     public boolean isIngestRunning() {
-        return (ingestJobs.isEmpty() == false);
+        return IngestJob.jobsAreRunning();
     }
 
-    void addFileToIngestJob(long ingestJobId, AbstractFile file) {
-        IngestJob job = ingestJobs.get(ingestJobId);
-        if (job != null) {
-            scheduler.getFileIngestScheduler().queueFile(job, file);
+    public void cancelAllIngestJobs() {
+        cancelStartIngestJobsTasks();
+        IngestJob.cancelAllIngestJobs();
+    }
+
+    private void cancelStartIngestJobsTasks() {
+        for (Future<?> future : startIngestJobThreads.values()) {
+            future.cancel(true);
         }
-    }
-
-    void cancelIngestJobs() {
-        new IngestCancellationWorker().execute();
+        startIngestJobThreads.clear();
     }
 
     /**
      * Ingest events.
      */
-    public enum IngestEvent {
+    public enum IngestEvent { // RJCTODO: Update comments if time permits
 
         /**
-         * Property change event fired when an ingest job is started. The ingest
-         * job id is in old value field of the PropertyChangeEvent object.
+         * Property change event fired when an ingest job is started. The old
+         * and new values of the PropertyChangeEvent object are set to null.
          */
         INGEST_JOB_STARTED,
         /**
-         * Property change event fired when an ingest job is completed. The
-         * ingest job id is in old value field of the PropertyChangeEvent
-         * object.
+         * Property change event fired when an ingest job is completed. The old
+         * and new values of the PropertyChangeEvent object are set to null.
          */
         INGEST_JOB_COMPLETED,
         /**
-         * Property change event fired when an ingest job is canceled. The
-         * ingest job id is in old value field of the PropertyChangeEvent
-         * object.
+         * Property change event fired when an ingest job is canceled. The old
+         * and new values of the PropertyChangeEvent object are set to null.
          */
         INGEST_JOB_CANCELLED,
         /**
@@ -182,79 +253,84 @@ public class IngestManager {
     };
 
     /**
-     * Add property change listener to listen to ingest events.
+     * Add an ingest event property change listener.
      *
-     * @param listener PropertyChangeListener to register
+     * @param listener The PropertyChangeListener to register.
      */
-    public static void addPropertyChangeListener(final PropertyChangeListener listener) {
+    public void addPropertyChangeListener(final PropertyChangeListener listener) {
         pcs.addPropertyChangeListener(listener);
     }
 
-    public static void removePropertyChangeListener(final PropertyChangeListener listener) {
+    /**
+     * Remove an ingest event property change listener.
+     *
+     * @param listener The PropertyChangeListener to unregister.
+     */
+    public void removePropertyChangeListener(final PropertyChangeListener listener) {
         pcs.removePropertyChangeListener(listener);
     }
 
-    static void fireIngestJobEvent(String eventType, long jobId) {
-        try {
-            pcs.firePropertyChange(eventType, jobId, null);
-        } catch (Exception e) {
-            logger.log(Level.SEVERE, "Ingest manager listener threw exception", e); //NON-NLS
-            MessageNotifyUtil.Notify.show(NbBundle.getMessage(IngestManager.class, "IngestManager.moduleErr"),
-                    NbBundle.getMessage(IngestManager.class, "IngestManager.moduleErr.errListenToUpdates.msg"),
-                    MessageNotifyUtil.MessageType.ERROR);
-        }
+    /**
+     * Fire an ingest event signifying an ingest job started.
+     *
+     * @param ingestJobId The ingest job id.
+     */
+    void fireIngestJobStarted(long ingestJobId) {
+        fireIngestJobEventsThreadPool.submit(new FireIngestEventThread(IngestEvent.INGEST_JOB_STARTED, ingestJobId, null));
     }
 
     /**
-     * Fire event when file is done with a pipeline run
+     * Fire an ingest event signifying an ingest job finished.
      *
-     * @param fileId ID of file that is done
+     * @param ingestJobId The ingest job id.
      */
-    static void fireFileIngestDone(long fileId) {
-        try {
-            pcs.firePropertyChange(IngestEvent.FILE_DONE.toString(), fileId, null);
-        } catch (Exception e) {
-            logger.log(Level.SEVERE, "Ingest manager listener threw exception", e); //NON-NLS
-            MessageNotifyUtil.Notify.show(NbBundle.getMessage(IngestManager.class, "IngestManager.moduleErr"),
-                    NbBundle.getMessage(IngestManager.class, "IngestManager.moduleErr.errListenToUpdates.msg"),
-                    MessageNotifyUtil.MessageType.ERROR);
-        }
+    void fireIngestJobCompleted(long ingestJobId) {
+        fireIngestJobEventsThreadPool.submit(new FireIngestEventThread(IngestEvent.INGEST_JOB_COMPLETED, ingestJobId, null));
     }
 
     /**
-     * Fire event for ModuleDataEvent (when modules post data to blackboard,
-     * etc.)
+     * Fire an ingest event signifying an ingest job was canceled.
      *
-     * @param moduleDataEvent
+     * @param ingestJobId The ingest job id.
      */
-    static void fireModuleDataEvent(ModuleDataEvent moduleDataEvent) {
-        try {
-            pcs.firePropertyChange(IngestEvent.DATA.toString(), moduleDataEvent, null);
-        } catch (Exception e) {
-            logger.log(Level.SEVERE, "Ingest manager listener threw exception", e); //NON-NLS
-            MessageNotifyUtil.Notify.show(NbBundle.getMessage(IngestManager.class, "IngestManager.moduleErr"),
-                    NbBundle.getMessage(IngestManager.class, "IngestManager.moduleErr.errListenToUpdates.msg"),
-                    MessageNotifyUtil.MessageType.ERROR);
-        }
+    void fireIngestJobCancelled(long ingestJobId) {
+        fireIngestJobEventsThreadPool.submit(new FireIngestEventThread(IngestEvent.INGEST_JOB_CANCELLED, ingestJobId, null));
     }
 
     /**
-     * Fire event for ModuleContentChanged (when modules create new content that
-     * needs to be analyzed)
+     * Fire an ingest event signifying the ingest of a file is completed.
      *
-     * @param moduleContentEvent
+     * @param fileId The object id of file.
      */
-    static void fireModuleContentEvent(ModuleContentEvent moduleContentEvent) {
-        try {
-            pcs.firePropertyChange(IngestEvent.CONTENT_CHANGED.toString(), moduleContentEvent, null);
-        } catch (Exception e) {
-            logger.log(Level.SEVERE, "Ingest manager listener threw exception", e); //NON-NLS
-            MessageNotifyUtil.Notify.show(NbBundle.getMessage(IngestManager.class, "IngestManager.moduleErr"),
-                    NbBundle.getMessage(IngestManager.class, "IngestManager.moduleErr.errListenToUpdates.msg"),
-                    MessageNotifyUtil.MessageType.ERROR);
-        }
+    void fireFileIngestDone(long fileId) {
+        fireIngestJobEventsThreadPool.submit(new FireIngestEventThread(IngestEvent.FILE_DONE, fileId, null));
     }
 
+    /**
+     * Fire an event signifying a blackboard post by an ingest module.
+     *
+     * @param moduleDataEvent A ModuleDataEvent with the details of the posting.
+     */
+    void fireIngestModuleDataEvent(ModuleDataEvent moduleDataEvent) {
+        fireIngestJobEventsThreadPool.submit(new FireIngestEventThread(IngestEvent.DATA, moduleDataEvent, null));
+    }
+
+    /**
+     * Fire an event signifying discovery of additional content by an ingest
+     * module.
+     *
+     * @param moduleDataEvent A ModuleContentEvent with the details of the new
+     * content.
+     */
+    void fireIngestModuleContentEvent(ModuleContentEvent moduleContentEvent) {
+        fireIngestJobEventsThreadPool.submit(new FireIngestEventThread(IngestEvent.CONTENT_CHANGED, moduleContentEvent, null));
+    }
+
+    /**
+     * Post a message to the ingest messages in box.
+     *
+     * @param message The message to be posted.
+     */
     void postIngestMessage(IngestMessage message) {
         if (ingestMessageBox != null) {
             ingestMessageBox.displayMessage(message);
@@ -262,11 +338,10 @@ public class IngestManager {
     }
 
     /**
-     * Get free disk space of a drive where ingest data are written to That
-     * drive is being monitored by IngestMonitor thread when ingest is running.
-     * Use this method to get amount of free disk space anytime.
+     * Get the free disk space of the drive where to which ingest data is being
+     * written, as reported by the ingest monitor.
      *
-     * @return amount of disk space, -1 if unknown
+     * @return Free disk space, -1 if unknown // RJCTODO: What units?
      */
     long getFreeDiskSpace() {
         if (ingestMonitor != null) {
@@ -276,33 +351,20 @@ public class IngestManager {
         }
     }
 
-    private void reportRunIngestModulesTaskDone(long taskId) {
-        ingestTasks.remove(taskId);
+    /**
+     * A Runnable that creates ingest jobs and submits the initial data source
+     * and file ingest tasks to the task schedulers.
+     */
+    private class StartIngestJobsThread implements Runnable {
 
-        List<Long> completedJobs = new ArrayList<>();
-        for (IngestJob job : ingestJobs.values()) {
-            job.releaseIngestPipelinesForThread(taskId);
-            if (job.areIngestPipelinesShutDown() == true) {
-                completedJobs.add(job.getId());
-            }
-        }
-
-        for (Long jobId : completedJobs) {
-            IngestJob job = ingestJobs.remove(jobId);
-            fireEventTasksExecutor.submit(new FireIngestJobEventTask(jobId, job.isCancelled() ? IngestEvent.INGEST_JOB_CANCELLED : IngestEvent.INGEST_JOB_COMPLETED));
-        }
-    }
-
-    private class StartIngestJobsTask implements Runnable {
-
-        private final long id;
+        private final long threadId;
         private final List<Content> dataSources;
         private final List<IngestModuleTemplate> moduleTemplates;
         private final boolean processUnallocatedSpace;
         private ProgressHandle progress;
 
-        StartIngestJobsTask(long taskId, List<Content> dataSources, List<IngestModuleTemplate> moduleTemplates, boolean processUnallocatedSpace) {
-            this.id = taskId;
+        StartIngestJobsThread(long threadId, List<Content> dataSources, List<IngestModuleTemplate> moduleTemplates, boolean processUnallocatedSpace) {
+            this.threadId = threadId;
             this.dataSources = dataSources;
             this.moduleTemplates = moduleTemplates;
             this.processUnallocatedSpace = processUnallocatedSpace;
@@ -321,12 +383,16 @@ public class IngestManager {
                                     "IngestManager.StartIngestJobsTask.run.cancelling",
                                     displayName));
                         }
-                        IngestManager.getInstance().cancelIngestJobs();
+                        cancelFileIngestThread(threadId);
                         return true;
                     }
                 });
+                progress.start(dataSources.size() * 2);
+
+                if (!ingestMonitor.isRunning()) {
+                    ingestMonitor.start();
+                }
 
-                progress.start(2 * dataSources.size());
                 int workUnitsCompleted = 0;
                 for (Content dataSource : dataSources) {
                     if (Thread.currentThread().isInterrupted()) {
@@ -334,14 +400,7 @@ public class IngestManager {
                     }
 
                     // Create an ingest job.
-                    IngestJob ingestJob = new IngestJob(IngestManager.this.ingestJobId.incrementAndGet(), dataSource, moduleTemplates, processUnallocatedSpace);
-                    ingestJobs.put(ingestJob.getId(), ingestJob);
-
-                    // Start at least one instance of each kind of ingest 
-                    // pipeline for this ingest job. This allows for an early out 
-                    // if the full ingest module lineup specified by the user  
-                    // cannot be started up.
-                    List<IngestModuleError> errors = ingestJob.startUpIngestPipelines();
+                    List<IngestModuleError> errors = IngestJob.startIngestJob(dataSource, moduleTemplates, processUnallocatedSpace);
                     if (!errors.isEmpty()) {
                         // Report the error to the user.
                         StringBuilder moduleStartUpErrors = new StringBuilder();
@@ -367,169 +426,116 @@ public class IngestManager {
                         JOptionPane.showMessageDialog(null, notifyMessage.toString(),
                                 NbBundle.getMessage(this.getClass(),
                                 "IngestManager.StartIngestJobsTask.run.startupErr.dlgTitle"), JOptionPane.ERROR_MESSAGE);
-
-                        // Jettison the ingest job and move on to the next one.
-                        ingestJob.cancel();
-                        ingestJobs.remove(ingestJob.getId());
-                        break;
                     }
 
-                    // Queue the data source ingest tasks for the ingest job.
+                    fireIngestJobEventsThreadPool.submit(new FireIngestEventThread(IngestEvent.INGEST_JOB_STARTED));
+
+                    // Queue a data source ingest task for the ingest job.
                     final String inputName = dataSource.getName();
                     progress.progress(
-                            NbBundle.getMessage(this.getClass(), "IngestManager.StartIngestJobsTask.run.progress.msg1",
+                            NbBundle.getMessage(this.getClass(), "IngestManager.StartIngestJobsThread.run.progress.msg1",
                             inputName), workUnitsCompleted);
-                    scheduler.getDataSourceIngestScheduler().queueForIngest(ingestJob);
+                    DataSourceIngestTaskScheduler.getInstance().addTask(new DataSourceIngestTask(ingestJob, ingestJob.getDataSource()));
                     progress.progress(
-                            NbBundle.getMessage(this.getClass(), "IngestManager.StartIngestJobsTask.run.progress.msg2",
+                            NbBundle.getMessage(this.getClass(), "IngestManager.StartIngestJobsThread.run.progress.msg2",
                             inputName), ++workUnitsCompleted);
 
                     // Queue the file ingest tasks for the ingest job.
                     progress.progress(
-                            NbBundle.getMessage(this.getClass(), "IngestManager.StartIngestJobsTask.run.progress.msg3",
+                            NbBundle.getMessage(this.getClass(), "IngestManager.StartIngestJobsThread.run.progress.msg3",
                             inputName), workUnitsCompleted);
-                    scheduler.getFileIngestScheduler().queueForIngest(ingestJob);
+                    FileIngestTaskScheduler.getInstance().addTasks(ingestJob, ingestJob.getDataSource());
                     progress.progress(
-                            NbBundle.getMessage(this.getClass(), "IngestManager.StartIngestJobsTask.run.progress.msg4",
+                            NbBundle.getMessage(this.getClass(), "IngestManager.StartIngestJobsThread.run.progress.msg4",
                             inputName), ++workUnitsCompleted);
 
                     if (!Thread.currentThread().isInterrupted()) {
-                        if (!ingestMonitor.isRunning()) {
-                            ingestMonitor.start();
-                        }
-
-                        long taskId = ingestTaskId.incrementAndGet();
-                        Future<?> task = dataSourceIngestTasksExecutor.submit(new RunDataSourceIngestModulesTask(taskId));
-                        ingestTasks.put(taskId, task);
-
-                        int numberOfFileTasksRequested = getNumberOfFileIngestThreads();
-                        for (int i = 0; i < numberOfFileTasksRequested; ++i) {
-                            taskId = ingestTaskId.incrementAndGet();
-                            task = fileIngestTasksExecutor.submit(new RunFileSourceIngestModulesTask(taskId));
-                            ingestTasks.put(taskId, task);
-                        }
-
-                        fireEventTasksExecutor.submit(new FireIngestJobEventTask(ingestJob.getId(), IngestEvent.INGEST_JOB_STARTED));
+                        break;
                     }
                 }
             } catch (Exception ex) {
-                String message = String.format("StartIngestJobsTask (id=%d) caught exception", id); //NON-NLS
+                String message = String.format("StartIngestJobsTask (id=%d) caught exception", threadId); //NON-NLS
                 logger.log(Level.SEVERE, message, ex);
                 MessageNotifyUtil.Message.error(
                         NbBundle.getMessage(this.getClass(), "IngestManager.StartIngestJobsTask.run.catchException.msg"));
             } finally {
                 progress.finish();
-                ingestTasks.remove(id);
+                startIngestJobThreads.remove(threadId);
             }
         }
     }
 
-    private class RunDataSourceIngestModulesTask implements Runnable {
-
-        private final long id;
-
-        RunDataSourceIngestModulesTask(long taskId) {
-            id = taskId;
-        }
+    /**
+     * A Runnable that acts as a consumer for the data ingest task scheduler's
+     * task queue.
+     */
+    private class DataSourceIngestThread implements Runnable {
 
         @Override
         public void run() {
-            try {
-                IngestScheduler.DataSourceIngestScheduler scheduler = IngestScheduler.getInstance().getDataSourceIngestScheduler();
-                IngestJob job = scheduler.getNextTask();
-                while (job != null) {
-                    if (Thread.currentThread().isInterrupted()) {
-                        break;
-                    }
-                    job.getDataSourceIngestPipelineForThread(id).process();
-                    job = scheduler.getNextTask();
+            DataSourceIngestTaskScheduler scheduler = DataSourceIngestTaskScheduler.getInstance();
+            while (true) {
+                try {
+                    DataSourceIngestTask task = scheduler.getNextTask(); // Blocks.
+                    task.execute();
+                } catch (InterruptedException ex) {
+                    break;
+                }
+                if (Thread.currentThread().isInterrupted()) {
+                    break;
                 }
-            } catch (Exception ex) {
-                String message = String.format("RunDataSourceIngestModulesTask (id=%d) caught exception", id); //NON-NLS
-                logger.log(Level.SEVERE, message, ex);
-            } finally {
-                reportRunIngestModulesTaskDone(id);
             }
         }
     }
 
-    private class RunFileSourceIngestModulesTask implements Runnable {
-
-        private final long id;
-
-        RunFileSourceIngestModulesTask(long taskId) {
-            id = taskId;
-        }
+    /**
+     * A Runnable that acts as a consumer for the file task scheduler's task
+     * queue.
+     */
+    private static class FileIngestThread implements Runnable {
 
         @Override
         public void run() {
-            try {
-                IngestScheduler.FileIngestScheduler fileScheduler = IngestScheduler.getInstance().getFileIngestScheduler();
-                FileIngestTask task = fileScheduler.getNextTask();
-                while (task != null) {
-                    if (Thread.currentThread().isInterrupted()) {
-                        break;
-                    }
-                    IngestJob job = task.getJob();
-                    job.updateFileTasksProgressBar(task.getFile().getName());
-                    job.getFileIngestPipelineForThread(id).process(task.getFile());
-                    task = fileScheduler.getNextTask();
+            FileIngestTaskScheduler scheduler = FileIngestTaskScheduler.getInstance();
+            while (true) {
+                try {
+                    FileIngestTask task = scheduler.getNextTask(); // Blocks.
+                    task.execute();
+                } catch (InterruptedException ex) {
+                    break;
+                }
+                if (Thread.currentThread().isInterrupted()) {
+                    break;
                 }
-            } catch (Exception ex) {
-                String message = String.format("RunFileSourceIngestModulesTask (id=%d) caught exception", id); //NON-NLS
-                logger.log(Level.SEVERE, message, ex);
-            } finally {
-                reportRunIngestModulesTaskDone(id);
             }
         }
     }
 
-    private class FireIngestJobEventTask implements Runnable {
+    /**
+     * A Runnable that fire ingest events to ingest manager property change
+     * listeners.
+     */
+    private class FireIngestEventThread implements Runnable {
 
-        private final long ingestJobId;
         private final IngestEvent event;
+        private final Object oldValue;
+        private final Object newValue;
 
-        FireIngestJobEventTask(long ingestJobId, IngestEvent event) {
-            this.ingestJobId = ingestJobId;
+        FireIngestEventThread(IngestEvent event, Object oldValue, Object newValue) {
             this.event = event;
+            this.oldValue = oldValue;
+            this.newValue = newValue;
         }
 
         @Override
         public void run() {
-            fireIngestJobEvent(event.toString(), ingestJobId);
-        }
-    }
-
-    private class IngestCancellationWorker extends SwingWorker<Void, Void> {
-
-        @Override
-        protected Void doInBackground() throws Exception {
-            // First mark all of the ingest jobs as cancelled. This way the 
-            // ingest modules will know they are being shut down due to 
-            // cancellation when the cancelled run ingest module tasks release 
-            // their pipelines. 
-            for (IngestJob job : ingestJobs.values()) {
-                job.cancel();
-            }
-
-            for (Future<?> task : ingestTasks.values()) {
-                task.cancel(true);
-            }
-
-            // Jettision the remaining data source and file ingest tasks.
-            scheduler.getFileIngestScheduler().emptyQueues();
-            scheduler.getDataSourceIngestScheduler().emptyQueues();
-
-            return null;
-        }
-
-        @Override
-        protected void done() {
             try {
-                super.get();
-            } catch (CancellationException | InterruptedException ex) {
-            } catch (Exception ex) {
-                logger.log(Level.SEVERE, "Error while cancelling ingest jobs", ex); //NON-NLS
+                pcs.firePropertyChange(event.toString(), oldValue, newValue);
+            } catch (Exception e) {
+                logger.log(Level.SEVERE, "Ingest manager listener threw exception", e); //NON-NLS
+                MessageNotifyUtil.Notify.show(NbBundle.getMessage(IngestManager.class, "IngestManager.moduleErr"), // RJCTODO: Oddly named strings
+                        NbBundle.getMessage(IngestManager.class, "IngestManager.moduleErr.errListenToUpdates.msg"),
+                        MessageNotifyUtil.MessageType.ERROR);
             }
         }
     }
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java
index 7b2bcd9804..4a6f63caff 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java
@@ -224,7 +224,7 @@ import org.sleuthkit.datamodel.Content;
                         manager = IngestManager.getInstance();
                     }
                     try {
-                        manager.cancelIngestJobs();
+                        manager.cancelAllIngestJobs();
                     } finally {
                         //clear inbox 
                         clearMessages();
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMonitor.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMonitor.java
index 17ef4f41fc..3fee18f391 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMonitor.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMonitor.java
@@ -165,7 +165,7 @@ public final class IngestMonitor {
                 final String diskPath = root.getAbsolutePath();
                 MONITOR_LOGGER.log(Level.SEVERE, "Stopping ingest due to low disk space on disk {0}", diskPath); //NON-NLS
                 logger.log(Level.SEVERE, "Stopping ingest due to low disk space on disk {0}", diskPath); //NON-NLS
-                manager.cancelIngestJobs();
+                manager.cancelAllIngestJobs();
                 IngestServices.getInstance().postMessage(IngestMessage.createManagerErrorMessage(
                         NbBundle.getMessage(this.getClass(), "IngestMonitor.mgrErrMsg.lowDiskSpace.title", diskPath),
                         NbBundle.getMessage(this.getClass(), "IngestMonitor.mgrErrMsg.lowDiskSpace.msg", diskPath)));
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java
deleted file mode 100644
index 70abc43381..0000000000
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java
+++ /dev/null
@@ -1,744 +0,0 @@
-/*
- * Autopsy Forensic Browser
- *
- * Copyright 2012-2014 Basis Technology Corp.
- * Contact: carrier <at> sleuthkit <dot> org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.sleuthkit.autopsy.ingest;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.openide.util.NbBundle;
-import org.sleuthkit.autopsy.casemodule.Case;
-import org.sleuthkit.autopsy.ingest.IngestScheduler.FileIngestScheduler.FileIngestTask;
-import org.sleuthkit.datamodel.AbstractFile;
-import org.sleuthkit.datamodel.Content;
-import org.sleuthkit.datamodel.ContentVisitor;
-import org.sleuthkit.datamodel.DerivedFile;
-import org.sleuthkit.datamodel.Directory;
-import org.sleuthkit.datamodel.File;
-import org.sleuthkit.datamodel.FileSystem;
-import org.sleuthkit.datamodel.VirtualDirectory;
-import org.sleuthkit.datamodel.LayoutFile;
-import org.sleuthkit.datamodel.LocalFile;
-import org.sleuthkit.datamodel.SleuthkitCase;
-import org.sleuthkit.datamodel.TskCoreException;
-import org.sleuthkit.datamodel.TskData;
-import org.sleuthkit.datamodel.TskData.TSK_DB_FILES_TYPE_ENUM;
-import org.sleuthkit.datamodel.TskData.TSK_FS_META_TYPE_ENUM;
-
-/**
- * Enqueues data source ingest and file ingest tasks for processing.
- */
-final class IngestScheduler {
-
-    private static IngestScheduler instance;
-    private static final Logger logger = Logger.getLogger(IngestScheduler.class.getName());
-    private final DataSourceIngestScheduler dataSourceIngestScheduler = new DataSourceIngestScheduler();
-    private final FileIngestScheduler fileIngestScheduler = new FileIngestScheduler();
-
-    private IngestScheduler() {
-    }
-
-    static synchronized IngestScheduler getInstance() {
-        if (instance == null) {
-            instance = new IngestScheduler();
-        }
-
-        return instance;
-    }
-
-    DataSourceIngestScheduler getDataSourceIngestScheduler() {
-        return dataSourceIngestScheduler;
-    }
-
-    FileIngestScheduler getFileIngestScheduler() {
-        return fileIngestScheduler;
-    }
-
-    static class FileIngestScheduler {
-
-        private TreeSet<FileIngestTask> rootDirectoryTasks;  
-        private List<FileIngestTask> directoryTasks;
-        private LinkedList<FileIngestTask> fileTasks; //need to add to start and end quickly
-        private int filesEnqueuedEst = 0;
-        private int filesDequeued = 0;
-        private final static int FAT_NTFS_FLAGS = TskData.TSK_FS_TYPE_ENUM.TSK_FS_TYPE_FAT12.getValue()
-                | TskData.TSK_FS_TYPE_ENUM.TSK_FS_TYPE_FAT16.getValue()
-                | TskData.TSK_FS_TYPE_ENUM.TSK_FS_TYPE_FAT32.getValue()
-                | TskData.TSK_FS_TYPE_ENUM.TSK_FS_TYPE_NTFS.getValue();
-
-        private FileIngestScheduler() {
-            rootDirectoryTasks = new TreeSet<>(new RootTaskComparator());
-            directoryTasks = new ArrayList<>();
-            fileTasks = new LinkedList<>();
-            resetCounters();
-        }
-
-        private void resetCounters() {
-            filesEnqueuedEst = 0;
-            filesDequeued = 0;
-        }        
-        
-        @Override
-        public synchronized String toString() {
-            StringBuilder sb = new StringBuilder();
-            sb.append(NbBundle.getMessage(this.getClass(), "IngestScheduler.FileSched.toString.rootDirs.text")).append(rootDirectoryTasks.size());
-            for (FileIngestTask task : rootDirectoryTasks) {
-                sb.append(task.toString()).append(" ");
-            }
-            sb.append(NbBundle.getMessage(this.getClass(), "IngestScheduler.FileSched.toString.curDirs.text")).append(directoryTasks.size());
-            for (FileIngestTask task : directoryTasks) {
-                sb.append(task.toString()).append(" ");
-            }
-            sb.append(NbBundle.getMessage(this.getClass(), "IngestScheduler.FileSched.toString.curFiles.text")).append(fileTasks.size());
-            for (FileIngestTask task : fileTasks) {
-                sb.append(task.toString()).append(" ");
-            }
-            return sb.toString();
-        }
-
-        synchronized void queueForIngest(IngestJob dataSourceTask) {
-            Content dataSource = dataSourceTask.getDataSource();
-            Collection<AbstractFile> rootObjects = dataSource.accept(new GetRootDirVisitor());
-            List<AbstractFile> firstLevelFiles = new ArrayList<>();
-            if (rootObjects.isEmpty() && dataSource instanceof AbstractFile) {
-                // The data source is file.
-                firstLevelFiles.add((AbstractFile) dataSource);
-            } else {
-                for (AbstractFile root : rootObjects) {
-                    List<Content> children;
-                    try {
-                        children = root.getChildren();
-                        if (children.isEmpty()) {
-                            //add the root itself, could be unalloc file, child of volume or image
-                            firstLevelFiles.add(root);
-                        } else {
-                            //root for fs root dir, schedule children dirs/files
-                            for (Content child : children) {
-                                if (child instanceof AbstractFile) {
-                                    firstLevelFiles.add((AbstractFile) child);
-                                }
-                            }
-                        }
-                    } catch (TskCoreException ex) {
-                        logger.log(Level.WARNING, "Could not get children of root to enqueue: " + root.getId() + ": " + root.getName(), ex); //NON-NLS
-                    }
-                }
-            }
-
-            for (AbstractFile firstLevelFile : firstLevelFiles) {
-                FileIngestTask fileTask = new FileIngestTask(firstLevelFile, dataSourceTask);
-                if (shouldEnqueueTask(fileTask)) {
-                    rootDirectoryTasks.add(fileTask);
-                }
-            }
-
-            // Update approx count of files to process in queues
-            filesEnqueuedEst = queryNumFilesinEnqueuedContents();
-
-            // Reshuffle/update the dir and file level queues if needed
-            updateQueues();
-        }
-
-        synchronized void queueFile(IngestJob ingestJob, AbstractFile file) {
-            FileIngestTask fileTask = new FileIngestTask(file, ingestJob);
-            if (shouldEnqueueTask(fileTask)) {
-                fileTasks.addFirst(fileTask);
-                ++filesEnqueuedEst;
-            }
-        }
-
-        float getPercentageDone() {
-            if (filesEnqueuedEst == 0) {
-                return 0;
-            }
-            return ((100.f) * filesDequeued) / filesEnqueuedEst;
-        }
-
-        /**
-         * query num files enqueued total num of files to be enqueued.
-         *
-         * Counts all files for all the sources currently in the queues.
-         *
-         * @return approx. total num of files enqueued (or to be enqueued)
-         */
-        private synchronized int queryNumFilesinEnqueuedContents() {
-            int totalFiles = 0;
-            List<Content> contents = this.getSourceContent();
-
-            final GetFilesCountVisitor countVisitor =
-                    new GetFilesCountVisitor();
-            for (Content content : contents) {
-                totalFiles += content.accept(countVisitor);
-            }
-
-            logger.log(Level.INFO, "Total files to queue up: {0}", totalFiles); //NON-NLS
-
-            return totalFiles;
-        }
-
-        /**
-         * get total est. number of files to be enqueued for current ingest
-         * input sources in queues
-         *
-         * @return total number of files
-         */
-        int getFilesEnqueuedEst() {
-            return filesEnqueuedEst;
-        }
-
-        /**
-         * Get number of files dequeued so far. This is reset after the same
-         * content is enqueued that is already in a queue
-         *
-         * @return number of files dequeued so far
-         */
-        int getFilesDequeued() {
-            return filesDequeued;
-        }
-
-        synchronized FileIngestTask getNextTask() {
-            final FileIngestTask task = fileTasks.pollLast();
-            if (task != null) {
-                filesDequeued++;
-                updateQueues();
-            }
-            return task;
-        }
-
-        /**
-         * Shuffle the queues so that there are files in the files queue.
-         *
-         * @returns true if no more data in queue
-         */
-        private synchronized void updateQueues() {
-
-            // we loop because we could have a directory that has all files
-            // that do not get enqueued
-            while (true) {
-                // There are files in the queue, we're done
-                if (this.fileTasks.isEmpty() == false) {
-                    return;
-                }
-
-                // fill in the directory queue if it is empty. 
-                if (this.directoryTasks.isEmpty()) {
-                    // bail out if root is also empty -- we are done
-                    if (rootDirectoryTasks.isEmpty()) {
-                        return;
-                    }
-                    FileIngestTask rootTask = this.rootDirectoryTasks.pollFirst();
-                    directoryTasks.add(rootTask);
-                }
-
-                //pop and push AbstractFile directory children if any
-                //add the popped and its leaf children onto cur file list
-                FileIngestTask parentTask = directoryTasks.remove(directoryTasks.size() - 1);
-                final AbstractFile parentFile = parentTask.file;
-
-                // add itself to the file list
-                if (shouldEnqueueTask(parentTask)) {
-                    this.fileTasks.addLast(parentTask);
-                }
-
-                // add its children to the file and directory lists
-                try {
-                    List<Content> children = parentFile.getChildren();
-                    for (Content c : children) {
-                        if (c instanceof AbstractFile) {
-                            AbstractFile childFile = (AbstractFile) c;
-                            FileIngestTask childTask = new FileIngestTask(childFile, parentTask.getJob());
-
-                            if (childFile.hasChildren()) {
-                                this.directoryTasks.add(childTask);
-                            } else if (shouldEnqueueTask(childTask)) {
-                                this.fileTasks.addLast(childTask);
-                            }
-                        }
-                    }
-                } catch (TskCoreException ex) {
-                    logger.log(Level.SEVERE, "Could not get children of file and update file queues: " //NON-NLS
-                            + parentFile.getName(), ex);
-                }
-            }
-        }
-
-        /**
-         * Return list of content objects that are in the queue to be processed.
-         *
-         * Helpful to determine whether ingest for particular input Content is
-         * active
-         *
-         * @return list of parent source content objects for files currently
-         * enqueued
-         */
-        synchronized List<Content> getSourceContent() {
-            final Set<Content> contentSet = new HashSet<>();
-
-            for (FileIngestTask task : rootDirectoryTasks) {
-                contentSet.add(task.getJob().getDataSource());
-            }
-            for (FileIngestTask task : directoryTasks) {
-                contentSet.add(task.getJob().getDataSource());
-            }
-            for (FileIngestTask task : fileTasks) {
-                contentSet.add(task.getJob().getDataSource());
-            }
-
-            return new ArrayList<>(contentSet);
-        }
-
-        synchronized void emptyQueues() {
-            this.rootDirectoryTasks.clear();
-            this.directoryTasks.clear();
-            this.fileTasks.clear();
-        }
-
-        /**
-         * Check if the file is a special file that we should skip
-         *
-         * @param processTask a task whose file to check if should be queued of
-         * skipped
-         * @return true if should be enqueued, false otherwise
-         */
-        private static boolean shouldEnqueueTask(final FileIngestTask processTask) {
-            final AbstractFile aFile = processTask.file;
-
-            //if it's unalloc file, skip if so scheduled
-            if (processTask.getJob().shouldProcessUnallocatedSpace() == false
-                    && aFile.getType().equals(TSK_DB_FILES_TYPE_ENUM.UNALLOC_BLOCKS //unalloc files
-                    )) {
-                return false;
-            }
-
-            String fileName = aFile.getName();
-            if (fileName.equals(".") || fileName.equals("..")) {
-                return false;
-            } else if (aFile instanceof org.sleuthkit.datamodel.File) {
-                final org.sleuthkit.datamodel.File f = (File) aFile;
-
-                //skip files in root dir, starting with $, containing : (not default attributes)
-                //with meta address < 32, i.e. some special large NTFS and FAT files
-                FileSystem fs = null;
-                try {
-                    fs = f.getFileSystem();
-                } catch (TskCoreException ex) {
-                    logger.log(Level.SEVERE, "Could not get FileSystem for " + f, ex); //NON-NLS
-                }
-                TskData.TSK_FS_TYPE_ENUM fsType = TskData.TSK_FS_TYPE_ENUM.TSK_FS_TYPE_UNSUPP;
-                if (fs != null) {
-                    fsType = fs.getFsType();
-                }
-
-                if ((fsType.getValue() & FAT_NTFS_FLAGS) == 0) {
-                    //not fat or ntfs, accept all files
-                    return true;
-                }
-
-                boolean isInRootDir = false;
-                try {
-                    isInRootDir = f.getParentDirectory().isRoot();
-                } catch (TskCoreException ex) {
-                    logger.log(Level.WARNING, "Could not check if should enqueue the file: " + f.getName(), ex); //NON-NLS
-                }
-
-                if (isInRootDir && f.getMetaAddr() < 32) {
-                    String name = f.getName();
-
-                    if (name.length() > 0
-                            && name.charAt(0) == '$'
-                            && name.contains(":")) {
-                        return false;
-                    }
-                } else {
-                    return true;
-                }
-
-            }
-
-            return true;
-        }
-
-        static class FileIngestTask {
-
-            private final AbstractFile file;
-            private final IngestJob task;
-
-            private FileIngestTask(AbstractFile file, IngestJob task) {
-                this.file = file;
-                this.task = task;
-            }
-
-            public IngestJob getJob() {
-                return task;
-            }
-
-            public AbstractFile getFile() {
-                return file;
-            }
-
-            @Override
-            public String toString() {
-                try {
-                    return "ProcessTask{" + "file=" + file.getId() + ": " //NON-NLS
-                            + file.getUniquePath() + "}"; // + ", dataSourceTask=" + dataSourceTask + '}';
-                } catch (TskCoreException ex) {
-                    logger.log(Level.SEVERE, "Cound not get unique path of file in queue, ", ex); //NON-NLS
-                }
-                return "ProcessTask{" + "file=" + file.getId() + ": " //NON-NLS
-                        + file.getName() + '}';
-            }
-
-            /**
-             * two process tasks are equal when the file/dir and modules are the
-             * same this enables are not to queue up the same file/dir, modules
-             * tuples into the root dir set
-             *
-             * @param obj
-             * @return
-             */
-            @Override
-            public boolean equals(Object obj) {
-                if (obj == null) {
-                    return false;
-                }
-                if (getClass() != obj.getClass()) {
-                    return false;
-                }
-                final FileIngestTask other = (FileIngestTask) obj;
-                if (this.file != other.file && (this.file == null || !this.file.equals(other.file))) {
-                    return false;
-                }
-                IngestJob thisTask = this.getJob();
-                IngestJob otherTask = other.getJob();
-
-                if (thisTask != otherTask
-                        && (thisTask == null || !thisTask.equals(otherTask))) {
-                    return false;
-                }
-                return true;
-            }
-
-            @Override
-            public int hashCode() {
-                int hash = 5;
-                hash = 47 * hash + Objects.hashCode(this.file);
-                hash = 47 * hash + Objects.hashCode(this.task);
-                return hash;
-            }
-        }
-
-        /**
-         * Root dir sorter
-         */
-        private static class RootTaskComparator implements Comparator<FileIngestTask> {
-
-            @Override
-            public int compare(FileIngestTask q1, FileIngestTask q2) {
-                AbstractFilePriority.Priority p1 = AbstractFilePriority.getPriority(q1.file);
-                AbstractFilePriority.Priority p2 = AbstractFilePriority.getPriority(q2.file);
-                if (p1 == p2) {
-                    return (int) (q2.file.getId() - q1.file.getId());
-                } else {
-                    return p2.ordinal() - p1.ordinal();
-                }
-
-            }
-
-            /**
-             * Priority determination for sorted AbstractFile, used by
-             * RootDirComparator
-             */
-            private static class AbstractFilePriority {
-
-                enum Priority {
-
-                    LAST, LOW, MEDIUM, HIGH
-                };
-                static final List<Pattern> LAST_PRI_PATHS = new ArrayList<>();
-                static final List<Pattern> LOW_PRI_PATHS = new ArrayList<>();
-                static final List<Pattern> MEDIUM_PRI_PATHS = new ArrayList<>();
-                static final List<Pattern> HIGH_PRI_PATHS = new ArrayList<>();
-
-                /* prioritize root directory folders based on the assumption that we are
-                 * looking for user content. Other types of investigations may want different
-                 * priorities. */
-                static {
-                    // these files have no structure, so they go last
-                    //unalloc files are handled as virtual files in getPriority()
-                    //LAST_PRI_PATHS.schedule(Pattern.compile("^\\$Unalloc", Pattern.CASE_INSENSITIVE));
-                    //LAST_PRI_PATHS.schedule(Pattern.compile("^\\Unalloc", Pattern.CASE_INSENSITIVE));
-                    LAST_PRI_PATHS.add(Pattern.compile("^pagefile", Pattern.CASE_INSENSITIVE));
-                    LAST_PRI_PATHS.add(Pattern.compile("^hiberfil", Pattern.CASE_INSENSITIVE));
-
-                    // orphan files are often corrupt and windows does not typically have
-                    // user content, so put them towards the bottom
-                    LOW_PRI_PATHS.add(Pattern.compile("^\\$OrphanFiles", Pattern.CASE_INSENSITIVE));
-                    LOW_PRI_PATHS.add(Pattern.compile("^Windows", Pattern.CASE_INSENSITIVE));
-
-                    // all other files go into the medium category too
-                    MEDIUM_PRI_PATHS.add(Pattern.compile("^Program Files", Pattern.CASE_INSENSITIVE));
-
-                    // user content is top priority
-                    HIGH_PRI_PATHS.add(Pattern.compile("^Users", Pattern.CASE_INSENSITIVE));
-                    HIGH_PRI_PATHS.add(Pattern.compile("^Documents and Settings", Pattern.CASE_INSENSITIVE));
-                    HIGH_PRI_PATHS.add(Pattern.compile("^home", Pattern.CASE_INSENSITIVE));
-                    HIGH_PRI_PATHS.add(Pattern.compile("^ProgramData", Pattern.CASE_INSENSITIVE));
-                }
-
-                /**
-                 * Get the scheduling priority for a given file.
-                 *
-                 * @param abstractFile
-                 * @return
-                 */
-                static AbstractFilePriority.Priority getPriority(final AbstractFile abstractFile) {
-                    if (!abstractFile.getType().equals(TskData.TSK_DB_FILES_TYPE_ENUM.FS)) {
-                        //quickly filter out unstructured content
-                        //non-fs virtual files and dirs, such as representing unalloc space
-                        return AbstractFilePriority.Priority.LAST;
-                    }
-
-                    //determine the fs files priority by name
-                    final String path = abstractFile.getName();
-
-                    if (path == null) {
-                        return AbstractFilePriority.Priority.MEDIUM;
-                    }
-
-                    for (Pattern p : HIGH_PRI_PATHS) {
-                        Matcher m = p.matcher(path);
-                        if (m.find()) {
-                            return AbstractFilePriority.Priority.HIGH;
-                        }
-                    }
-
-                    for (Pattern p : MEDIUM_PRI_PATHS) {
-                        Matcher m = p.matcher(path);
-                        if (m.find()) {
-                            return AbstractFilePriority.Priority.MEDIUM;
-                        }
-                    }
-
-                    for (Pattern p : LOW_PRI_PATHS) {
-                        Matcher m = p.matcher(path);
-                        if (m.find()) {
-                            return AbstractFilePriority.Priority.LOW;
-                        }
-                    }
-
-                    for (Pattern p : LAST_PRI_PATHS) {
-                        Matcher m = p.matcher(path);
-                        if (m.find()) {
-                            return AbstractFilePriority.Priority.LAST;
-                        }
-                    }
-
-                    //default is medium
-                    return AbstractFilePriority.Priority.MEDIUM;
-                }
-            }
-        }
-
-        /**
-         * Get counts of ingestable files/dirs for the content input source.
-         *
-         * Note, also includes counts of all unalloc children files (for the fs,
-         * image, volume) even if ingest didn't ask for them
-         */
-        static class GetFilesCountVisitor extends ContentVisitor.Default<Long> {
-
-            @Override
-            public Long visit(FileSystem fs) {
-                //recursion stop here
-                //case of a real fs, query all files for it
-
-                SleuthkitCase sc = Case.getCurrentCase().getSleuthkitCase();
-
-                StringBuilder queryB = new StringBuilder();
-                queryB.append("( (fs_obj_id = ").append(fs.getId()); //NON-NLS
-                //queryB.append(") OR (fs_obj_id = NULL) )");
-                queryB.append(") )");
-                queryB.append(" AND ( (meta_type = ").append(TSK_FS_META_TYPE_ENUM.TSK_FS_META_TYPE_REG.getValue()); //NON-NLS
-                queryB.append(") OR (meta_type = ").append(TSK_FS_META_TYPE_ENUM.TSK_FS_META_TYPE_DIR.getValue()); //NON-NLS
-                queryB.append(" AND (name != '.') AND (name != '..')"); //NON-NLS
-                queryB.append(") )");
-
-                //queryB.append( "AND (type = ");
-                //queryB.append(TskData.TSK_DB_FILES_TYPE_ENUM.FS.getFileType());
-                //queryB.append(")");
-                try {
-                    final String query = queryB.toString();
-                    logger.log(Level.INFO, "Executing count files query: {0}", query); //NON-NLS
-                    return sc.countFilesWhere(query);
-                } catch (TskCoreException ex) {
-                    logger.log(Level.SEVERE, "Couldn't get count of all files in FileSystem", ex); //NON-NLS
-                    return 0L;
-                }
-            }
-
-            @Override
-            public Long visit(LayoutFile lf) {
-                //recursion stop here
-                //case of LayoutFile child of Image or Volume
-                return 1L;
-            }
-
-            private long getCountFromChildren(Content content) {
-                long count = 0;
-                try {
-                    List<Content> children = content.getChildren();
-                    if (children.size() > 0) {
-                        for (Content child : children) {
-                            count += child.accept(this);
-                        }
-                    } else {
-                        count = 1;
-                    }
-                } catch (TskCoreException ex) {
-                    logger.log(Level.WARNING, "Could not get count of objects from children to get num of total files to be ingested", ex); //NON-NLS
-                }
-                return count;
-            }
-
-            @Override
-            protected Long defaultVisit(Content cntnt) {
-                //recurse assuming this is image/vs/volume 
-                //recursion stops at fs or unalloc file
-                return getCountFromChildren(cntnt);
-            }
-        }
-
-        /**
-         * Visitor that gets a collection of top level objects to be scheduled,
-         * such as root Dirs (if there is FS) or LayoutFiles and virtual
-         * directories, also if there is no FS.
-         */
-        static class GetRootDirVisitor extends GetFilesContentVisitor {
-
-            @Override
-            public Collection<AbstractFile> visit(VirtualDirectory ld) {
-                //case when we hit a layout directoryor local file container, not under a real FS
-                //or when root virt dir is scheduled 
-                Collection<AbstractFile> ret = new ArrayList<>();
-                ret.add(ld);
-                return ret;
-            }
-
-            @Override
-            public Collection<AbstractFile> visit(LayoutFile lf) {
-                //case when we hit a layout file, not under a real FS
-                Collection<AbstractFile> ret = new ArrayList<>();
-                ret.add(lf);
-                return ret;
-            }
-
-            @Override
-            public Collection<AbstractFile> visit(Directory drctr) {
-                //we hit a real directory, a child of real FS
-
-                Collection<AbstractFile> ret = new ArrayList<>();
-
-                ret.add(drctr);
-
-                return ret;
-            }
-
-            @Override
-            public Collection<AbstractFile> visit(FileSystem fs) {
-                return getAllFromChildren(fs);
-
-            }
-
-            @Override
-            public Collection<AbstractFile> visit(File file) {
-                //can have derived files
-                return getAllFromChildren(file);
-            }
-
-            @Override
-            public Collection<AbstractFile> visit(DerivedFile derivedFile) {
-                //can have derived files
-                //TODO test this and overall scheduler with derived files
-                return getAllFromChildren(derivedFile);
-            }
-
-            @Override
-            public Collection<AbstractFile> visit(LocalFile localFile) {
-                //can have local files
-                //TODO test this and overall scheduler with local files
-                return getAllFromChildren(localFile);
-            }
-        }
-    }
-
-    static class DataSourceIngestScheduler {
-
-        private final LinkedList<IngestJob> tasks = new LinkedList<>();
-
-        private DataSourceIngestScheduler() {
-        }
-
-        synchronized void queueForIngest(IngestJob job) {
-            try {
-                if (job.getDataSource().getParent() != null) {
-                    logger.log(Level.SEVERE, "Only parent-less Content (data sources) can be scheduled for DataSource ingest, skipping: {0}", job.getDataSource()); //NON-NLS
-                    return;
-                }
-            } catch (TskCoreException e) {
-                logger.log(Level.SEVERE, "Error validating data source to be scheduled for DataSource ingest" + job.getDataSource(), e); //NON-NLS
-                return;
-            }
-
-            tasks.addLast(job);
-        }
-
-        public synchronized IngestJob getNextTask() {
-            return tasks.pollFirst();
-        }
-
-        synchronized void emptyQueues() {
-            tasks.clear();
-        }
-
-        synchronized int getCount() {
-            return tasks.size();
-        }
-
-        @Override
-        public String toString() {
-            StringBuilder sb = new StringBuilder();
-            sb.append(NbBundle.getMessage(this.getClass(), "IngestScheduler.DataSourceScheduler.toString.size"))
-              .append(getCount());
-            for (IngestJob task : tasks) {
-                sb.append(task.toString()).append(" ");
-            }
-            return sb.toString();
-        }
-    }
-}
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestServices.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestServices.java
index 8efe079e1d..c573753281 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestServices.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestServices.java
@@ -95,7 +95,7 @@ public final class IngestServices {
      * artifact data
      */
     public void fireModuleDataEvent(ModuleDataEvent moduleDataEvent) {
-        IngestManager.fireModuleDataEvent(moduleDataEvent);
+        IngestManager.fireIngestModuleDataEvent(moduleDataEvent);
     }
 
     /**
@@ -107,7 +107,7 @@ public final class IngestServices {
      * changed
      */
     public void fireModuleContentEvent(ModuleContentEvent moduleContentEvent) {
-        IngestManager.fireModuleContentEvent(moduleContentEvent);
+        IngestManager.fireIngestModuleContentEvent(moduleContentEvent);
     }
 
     /**

From a128f4a5266396389f8b88b04b4a41ef25985bdb Mon Sep 17 00:00:00 2001
From: alexjacks92 <alexjacks@comcast.net>
Date: Wed, 30 Apr 2014 10:43:02 -0400
Subject: [PATCH 04/24] Code cleanup.

---
 test/script/tskdbdiff.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/test/script/tskdbdiff.py b/test/script/tskdbdiff.py
index e175af50aa..cd07ce69d7 100755
--- a/test/script/tskdbdiff.py
+++ b/test/script/tskdbdiff.py
@@ -268,7 +268,6 @@ class TskDbDiff(object):
 class TskDbDiffException(Exception):
     pass
 
-
 def replace_id(line, table):
     """Remove the object id from a line.
 
@@ -276,24 +275,25 @@ def replace_id(line, table):
         line: a String, the line to remove the object id from.
         table: a map from object ids to file paths.
     """
+
     files_index = line.find('INSERT INTO "tsk_files"')
     path_index = line.find('INSERT INTO "tsk_files_path"')
     object_index = line.find('INSERT INTO "tsk_objects"')
+    
     if (files_index != -1 or path_index != -1):
-    # take the portion of the string between the open parenthesis and the comma (ie, the object id)
-    obj_id = line[line.find('(') + 1 : line.find(',')]
-    if files_index != -1:
+        # take the portion of the string between the open parenthesis and the first comma (ie, the object id)
+        obj_id = int(line[line.find('(') + 1 : line.find(',')])
         # takes everything from the beginning of the string up to the opening
         # parenthesis, the path associated with the object id, and everything after 
         # the first comma, and concactenate it
-        newLine = (line[:line.find('('):] + '(' + table[int(obj_id)] + line[line.find(','):])
-        return newLine
-    elif path_index != -1:
-        newLine = (line[:line.find('('):] + '(' + table[int(obj_id)] + line[line.find(','):])
+        newLine = (line[:line.find('('):] + '(' + table[obj_id] + line[line.find(','):])
         return newLine
+    
     elif (object_index != -1):
+        # take the portion of the string between the open parenthesis and the first comma (ie, the object id)
         obj_id = line[line.find('(') + 1 : line.find(',')]
         parent_id = line[line.find(',') + 2 : line.find(',', line.find(',') + 1)]
+    
         try:
             path = table[int(obj_id)]
             parent_path = table[int(parent_id)]
@@ -303,6 +303,7 @@ def replace_id(line, table):
         except Exception as e: 
             # objects table has things that aren't files. if lookup fails, don't replace the object id.
             return line
+    
     else:
         return line
 

From 98e4a782dbe72d64ce6867fba14b4e6b4ac03ce6 Mon Sep 17 00:00:00 2001
From: alexjacks92 <alexjacks@comcast.net>
Date: Wed, 30 Apr 2014 11:09:17 -0400
Subject: [PATCH 05/24] Fixing branding.

---
 .../core/core.jar/org/netbeans/core/startup/Bundle.properties   | 2 +-
 .../org/netbeans/core/windows/view/ui/Bundle.properties         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
index d22a89c799..28783ec7c0 100644
--- a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
+++ b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
@@ -1,5 +1,5 @@
 #Updated by build script
-#Tue, 29 Apr 2014 10:05:28 -0400
+#Tue, 22 Apr 2014 16:06:14 -0400
 LBL_splash_window_title=Starting Autopsy
 SPLASH_HEIGHT=288
 SPLASH_WIDTH=538
diff --git a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
index fe8e0abbcc..fe9124784d 100644
--- a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
+++ b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
@@ -1,5 +1,5 @@
 #Updated by build script
-#Tue, 29 Apr 2014 10:05:28 -0400
+#Tue, 22 Apr 2014 16:06:14 -0400
 
 CTL_MainWindow_Title=Autopsy 3.1.0_Beta
 CTL_MainWindow_Title_No_Project=Autopsy 3.1.0_Beta

From c1003191d4efa3ad15c6f936b4054346a4cf6ab2 Mon Sep 17 00:00:00 2001
From: alexjacks92 <alexjacks@comcast.net>
Date: Wed, 30 Apr 2014 11:11:03 -0400
Subject: [PATCH 06/24] More useful variable names.

---
 test/script/regression.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/script/regression.py b/test/script/regression.py
index 3704901106..e9c829c13e 100755
--- a/test/script/regression.py
+++ b/test/script/regression.py
@@ -838,10 +838,10 @@ class TestResultsDiffer(object):
         goldHtml = goldHtml[goldHtml.find("<ul>"):]
         outputHtml = outputHtml[outputHtml.find("<ul>"):]
 
-        g_list = TestResultsDiffer._split(goldHtml, 50)
-        o_list = TestResultsDiffer._split(outputHtml, 50)
-        if not len(g_list) == len(o_list):
-            ex = (len(g_list), len(o_list))
+        gold_list = TestResultsDiffer._split(goldHtml, 50)
+        output_list = TestResultsDiffer._split(outputHtml, 50)
+        if not len(gold_list) == len(output_list):
+            ex = (len(gold_list), len(output_list))
             print("846 ex is " + str(ex))
             return ex
         else:

From a77d566a82cc7b8c97f7dfd2f15b45baadee43e9 Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Thu, 1 May 2014 09:41:01 -0400
Subject: [PATCH 07/24] Preserve intermediate state of improved ingest
 framework

---
 .../DirectoryTreeTopComponent.java            |   3 +-
 .../autopsy/ingest/Bundle.properties          |   8 +-
 .../autopsy/ingest/Bundle_ja.properties       |   4 -
 .../DataSourceIngestModuleProgress.java       |  14 +-
 .../ingest/DataSourceIngestPipeline.java      |  18 +-
 .../autopsy/ingest/DataSourceIngestTask.java  |   4 +-
 .../ingest/DataSourceIngestTaskScheduler.java |  38 ++--
 .../autopsy/ingest/FileIngestPipeline.java    |  17 +-
 .../autopsy/ingest/FileIngestTask.java        |  46 ++---
 .../ingest/FileIngestTaskScheduler.java       | 124 +++++------
 .../sleuthkit/autopsy/ingest/IngestJob.java   | 195 +++++++++---------
 .../autopsy/ingest/IngestJobContext.java      |   4 +-
 .../autopsy/ingest/IngestManager.java         | 173 +++++++++-------
 .../autopsy/ingest/IngestServices.java        |   4 +-
 .../hashdatabase/HashLookupSettingsPanel.java |   2 +-
 .../KeywordSearchEditListPanel.java           |   2 +-
 .../KeywordSearchListsViewerPanel.java        |   2 +-
 c:casesSamll2Againautopsy.db                  |   0
 18 files changed, 329 insertions(+), 329 deletions(-)
 create mode 100755 c:casesSamll2Againautopsy.db

diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java
index a03933abf6..f7067adf6e 100644
--- a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java
@@ -131,7 +131,8 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
     private void setListener() {
         Case.addPropertyChangeListener(this);// add this class to listen to any changes in the Case.java class
         this.em.addPropertyChangeListener(this);
-        IngestManager.addPropertyChangeListener(this);
+        IngestManager.getInstance().addIngestJobEventListener(this);
+        IngestManager.getInstance().addIngestModuleEventListener(this);
     }
 
     public void setDirectoryListingActive() {
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties b/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties
index 144c7359fd..253f4f390d 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties
@@ -60,13 +60,9 @@ IngestMessagePanel.sortByComboBox.model.priority=Priority
 IngestMessagesToolbar.customizeButton.toolTipText=Ingest Messages
 IngestMessageTopComponent.initComponents.name=Ingest Inbox
 IngestManager.StartIngestJobsTask.run.startupErr.dlgMsg=Unable to start up one or more ingest modules, ingest job cancelled.
-IngestManager.StartIngestJobsTask.run.startupErr.dlgSolution=Please disable the failed modules or fix the errors and then restart ingest\
+IngestManager.StartIngestJobsTask.run.startupErr.dlgSolution=Please disable the failed modules or fix the errors and then restart ingest \
 by right clicking on the data source and selecting Run Ingest Modules.
-IngestManager.StartIngestJobsTask.run.startupErr.dlgErrorList=Errors\:\
+IngestManager.StartIngestJobsTask.run.startupErr.dlgErrorList=Errors\: \
 \
 {0}
 IngestManager.StartIngestJobsTask.run.startupErr.dlgTitle=Ingest Failure
-IngestManager.StartIngestJobsTask.run.progress.msg1=Data source ingest tasks for {0}
-IngestManager.StartIngestJobsTask.run.progress.msg2=Data source ingest tasks for {0}
-IngestManager.StartIngestJobsTask.run.progress.msg3=Data source ingest tasks for {0}
-IngestManager.StartIngestJobsTask.run.progress.msg4=Data source ingest tasks for {0}
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/ingest/Bundle_ja.properties
index e3433daff3..c6a50ca915 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/ingest/Bundle_ja.properties
@@ -56,10 +56,6 @@ IngestMonitor.mgrErrMsg.lowDiskSpace.msg=\u30c7\u30a3\u30b9\u30af{0}\u306e\u30c7
 IngestMonitor.mgrErrMsg.lowDiskSpace.title=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u304c\u4e2d\u6b62\u3055\u308c\u307e\u3057\u305f\u30fc{0}\u306e\u30c7\u30a3\u30b9\u30af\u9818\u57df\u4e0d\u8db3
 IngestScheduler.DataSourceScheduler.toString.size=DataSourceQueue, \u30b5\u30a4\u30ba\uff1a
 OpenIDE-Module-Name=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8
-IngestManager.StartIngestJobsTask.run.progress.msg1={0}\u306e\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30bf\u30b9\u30af
-IngestManager.StartIngestJobsTask.run.progress.msg2={0}\u306e\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30bf\u30b9\u30af
-IngestManager.StartIngestJobsTask.run.progress.msg3={0}\u306e\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30bf\u30b9\u30af
-IngestManager.StartIngestJobsTask.run.progress.msg4={0}\u306e\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30bf\u30b9\u30af
 IngestManager.StartIngestJobsTask.run.startupErr.dlgErrorList=\u30a8\u30e9\u30fc\uff1a\
 \
 {0}
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestModuleProgress.java b/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestModuleProgress.java
index 39fbca98fe..db2c4b3e37 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestModuleProgress.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestModuleProgress.java
@@ -18,16 +18,18 @@
  */
 package org.sleuthkit.autopsy.ingest;
 
+import org.netbeans.api.progress.ProgressHandle;
+
 /**
  * Used by data source ingest modules to report progress.
  */
 public class DataSourceIngestModuleProgress {
 
-    private final IngestJob ingestJob;
+    private final ProgressHandle progress;
     private final String moduleDisplayName;
 
-    DataSourceIngestModuleProgress(IngestJob ingestJob, String moduleDisplayName) {
-        this.ingestJob = ingestJob;
+    DataSourceIngestModuleProgress(ProgressHandle progress, String moduleDisplayName) {
+        this.progress = progress;
         this.moduleDisplayName = moduleDisplayName;
     }
 
@@ -40,7 +42,7 @@ public class DataSourceIngestModuleProgress {
      * data source.
      */
     public void switchToDeterminate(int workUnits) {
-        ingestJob.getDataSourceTaskProgressBar().switchToDeterminate(workUnits);
+        progress.switchToDeterminate(workUnits);
     }
 
     /**
@@ -48,7 +50,7 @@ public class DataSourceIngestModuleProgress {
      * the total work units to process the data source is unknown.
      */
     public void switchToIndeterminate() {
-        ingestJob.getDataSourceTaskProgressBar().switchToIndeterminate();
+        progress.switchToIndeterminate();
     }
 
     /**
@@ -58,6 +60,6 @@ public class DataSourceIngestModuleProgress {
      * @param workUnits Number of work units performed so far by the module.
      */
     public void progress(int workUnits) {
-        ingestJob.getDataSourceTaskProgressBar().progress(this.moduleDisplayName, workUnits);
+        progress.progress(this.moduleDisplayName, workUnits);
     }
 }
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestPipeline.java b/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestPipeline.java
index b824ffe615..86d001f1f8 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestPipeline.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestPipeline.java
@@ -22,6 +22,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.netbeans.api.progress.ProgressHandle;
 import org.sleuthkit.datamodel.Content;
 
 /**
@@ -30,12 +31,12 @@ import org.sleuthkit.datamodel.Content;
  */
 final class DataSourceIngestPipeline {
 
-    private final IngestJob job;
+    private final IngestJobContext context;
     private final List<IngestModuleTemplate> moduleTemplates;
     private List<DataSourceIngestModuleDecorator> modules = new ArrayList<>();
 
-    DataSourceIngestPipeline(IngestJob job, List<IngestModuleTemplate> moduleTemplates) {
-        this.job = job;
+    DataSourceIngestPipeline(IngestJobContext context, List<IngestModuleTemplate> moduleTemplates) {
+        this.context = context;
         this.moduleTemplates = moduleTemplates;
     }
 
@@ -50,7 +51,6 @@ final class DataSourceIngestPipeline {
         for (IngestModuleTemplate template : moduleTemplates) {
             if (template.isDataSourceIngestModuleTemplate()) {
                 DataSourceIngestModuleDecorator module = new DataSourceIngestModuleDecorator(template.createDataSourceIngestModule(), template.getModuleName());
-                IngestJobContext context = new IngestJobContext(job);
                 try {
                     module.startUp(context);
                     modulesByClass.put(module.getClassName(), module);
@@ -75,26 +75,26 @@ final class DataSourceIngestPipeline {
         return errors;
     }
 
-    List<IngestModuleError> process() {
+    List<IngestModuleError> process(Content dataSource, ProgressHandle progress) {
         List<IngestModuleError> errors = new ArrayList<>();
         for (DataSourceIngestModuleDecorator module : this.modules) {
             try {
-                module.process(job.getDataSource(), new DataSourceIngestModuleProgress(job, module.getDisplayName()));
+                module.process(dataSource, new DataSourceIngestModuleProgress(progress, module.getDisplayName()));
             } catch (Exception ex) {
                 errors.add(new IngestModuleError(module.getDisplayName(), ex));
             }
-            if (job.isCancelled()) {
+            if (context.isJobCancelled()) {
                 break;
             }
         }
         return errors;
     }
 
-    List<IngestModuleError> shutDown(boolean ingestJobCancelled) {
+    List<IngestModuleError> shutDown() {
         List<IngestModuleError> errors = new ArrayList<>();
         for (DataSourceIngestModuleDecorator module : this.modules) {
             try {
-                module.shutDown(ingestJobCancelled);
+                module.shutDown(context.isJobCancelled());
             } catch (Exception ex) {
                 errors.add(new IngestModuleError(module.getDisplayName(), ex));
             }
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestTask.java b/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestTask.java
index af27d9b8c0..2ad3c644e3 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestTask.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestTask.java
@@ -38,7 +38,7 @@ final class DataSourceIngestTask {
         return dataSource;
     }    
     
-    void execute() {
-        ingestJob.process();
+    void execute() throws InterruptedException {
+        ingestJob.process(dataSource);
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestTaskScheduler.java b/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestTaskScheduler.java
index 22a6124396..ca22a6267b 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestTaskScheduler.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestTaskScheduler.java
@@ -32,26 +32,30 @@ final class DataSourceIngestTaskScheduler {
     private DataSourceIngestTaskScheduler() {
     }
 
-    synchronized void addTask(DataSourceIngestTask task) throws InterruptedException {
-        task.getIngestJob().notifyTaskPending();
-        try {
-            tasks.put(task);
-        }
-        catch (InterruptedException ex) {
-            // RJCTOD: Need a safety notification to undo above
+    synchronized void addTask(DataSourceIngestTask task) {
+        // The capacity of the tasks queue is not bounded, so the call 
+        // to put() should not block except for normal synchronized access. 
+        // Still, notify the job that the task has been added first so that 
+        // the take() of the task cannot occur before the notification.
+        task.getIngestJob().notifyTaskAdded();
+
+        // If the thread executing this code is ever interrupted, it is 
+        // because the number of ingest threads has been decreased while
+        // ingest jobs are running. This thread will exit in an orderly fashion,
+        // but the task still needs to be enqueued rather than lost.
+        while (true) {
+            try {
+                tasks.put(task);
+                break;
+            } catch (InterruptedException ex) {
+                // Reset the interrupted status of the thread so the orderly
+                // exit can occur in the intended place.
+                Thread.currentThread().interrupt();
+            }
         }
     }
 
     DataSourceIngestTask getNextTask() throws InterruptedException {
-        return tasks.take();
-    }
-
-    boolean hasTasksForIngestJob(long jobId) {
-        for (DataSourceIngestTask task : tasks) {
-            if (task.getIngestJobId() == jobId) {
-                return true;
-            }
-        }
-        return false;
+        return tasks.take(); 
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/FileIngestPipeline.java b/Core/src/org/sleuthkit/autopsy/ingest/FileIngestPipeline.java
index 2cd7d838e4..1b3743e616 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/FileIngestPipeline.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/FileIngestPipeline.java
@@ -30,12 +30,12 @@ import org.sleuthkit.datamodel.AbstractFile;
  */
 final class FileIngestPipeline {
 
-    private final IngestJob job;
+    private final IngestJobContext context;
     private final List<IngestModuleTemplate> moduleTemplates;
     private List<FileIngestModuleDecorator> modules = new ArrayList<>();
 
-    FileIngestPipeline(IngestJob task, List<IngestModuleTemplate> moduleTemplates) {
-        this.job = task;
+    FileIngestPipeline(IngestJobContext context, List<IngestModuleTemplate> moduleTemplates) {
+        this.context = context;
         this.moduleTemplates = moduleTemplates;
     }
 
@@ -50,7 +50,6 @@ final class FileIngestPipeline {
         for (IngestModuleTemplate template : moduleTemplates) {
             if (template.isFileIngestModuleTemplate()) {
                 FileIngestModuleDecorator module = new FileIngestModuleDecorator(template.createFileIngestModule(), template.getModuleName());
-                IngestJobContext context = new IngestJobContext(job);
                 try {
                     module.startUp(context);
                     modulesByClass.put(module.getClassName(), module);
@@ -83,22 +82,22 @@ final class FileIngestPipeline {
             } catch (Exception ex) {
                 errors.add(new IngestModuleError(module.getDisplayName(), ex));
             }
-            if (job.isCancelled()) {
+            if (context.isJobCancelled()) {
                 break;
             }
         }
         file.close();
-        if (!job.isCancelled()) {
-            IngestManager.fireFileIngestDone(file.getId());
+        if (!context.isJobCancelled()) {
+            IngestManager.getInstance().fireFileIngestDone(file.getId());
         }
         return errors;
     }
 
-    List<IngestModuleError> shutDown(boolean ingestJobCancelled) {
+    List<IngestModuleError> shutDown() {
         List<IngestModuleError> errors = new ArrayList<>();
         for (FileIngestModuleDecorator module : this.modules) {
             try {
-                module.shutDown(ingestJobCancelled);
+                module.shutDown(context.isJobCancelled());
             } catch (Exception ex) {
                 errors.add(new IngestModuleError(module.getDisplayName(), ex));
             }
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/FileIngestTask.java b/Core/src/org/sleuthkit/autopsy/ingest/FileIngestTask.java
index db0edf9edf..54ed9a8501 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/FileIngestTask.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/FileIngestTask.java
@@ -19,17 +19,16 @@
 package org.sleuthkit.autopsy.ingest;
 
 import java.util.Objects;
-import java.util.logging.Level;
 import org.sleuthkit.datamodel.AbstractFile;
-import org.sleuthkit.datamodel.TskCoreException;
 
 final class FileIngestTask {
-    final AbstractFile file;
-    private final IngestJob ingestJob;
 
-    FileIngestTask(AbstractFile file, IngestJob task) {
-        this.file = file;
+    private final IngestJob ingestJob;
+    private final AbstractFile file;
+
+    FileIngestTask(IngestJob task, AbstractFile file) {
         this.ingestJob = task;
+        this.file = file;
     }
 
     public IngestJob getIngestJob() {
@@ -39,30 +38,11 @@ final class FileIngestTask {
     public AbstractFile getFile() {
         return file;
     }
-    
-    void execute(long threadId) {
+
+    void execute() throws InterruptedException {
         ingestJob.process(file);
     }
 
-    @Override
-    public String toString() { //RJCTODO: May not keep this
-        try {
-            return "ProcessTask{" + "file=" + file.getId() + ": " + file.getUniquePath() + "}"; // + ", dataSourceTask=" + dataSourceTask + '}';
-        } catch (TskCoreException ex) {
-            // RJCTODO
-//            FileIngestTaskScheduler.logger.log(Level.SEVERE, "Cound not get unique path of file in queue, ", ex); //NON-NLS
-        }
-        return "ProcessTask{" + "file=" + file.getId() + ": " + file.getName() + '}';
-    }
-
-    /**
-     * two process tasks are equal when the file/dir and modules are the
-     * same this enables are not to queue up the same file/dir, modules
-     * tuples into the root dir set
-     *
-     * @param obj
-     * @return
-     */
     @Override
     public boolean equals(Object obj) {
         if (obj == null) {
@@ -71,13 +51,11 @@ final class FileIngestTask {
         if (getClass() != obj.getClass()) {
             return false;
         }
-        final FileIngestTask other = (FileIngestTask) obj;
-        if (this.file != other.file && (this.file == null || !this.file.equals(other.file))) {
+        FileIngestTask other = (FileIngestTask) obj;
+        if (this.ingestJob != other.ingestJob && (this.ingestJob == null || !this.ingestJob.equals(other.ingestJob))) {
             return false;
         }
-        IngestJob thisTask = this.getIngestJob();
-        IngestJob otherTask = other.getIngestJob();
-        if (thisTask != otherTask && (thisTask == null || !thisTask.equals(otherTask))) {
+        if (this.file != other.file && (this.file == null || !this.file.equals(other.file))) {
             return false;
         }
         return true;
@@ -86,8 +64,8 @@ final class FileIngestTask {
     @Override
     public int hashCode() {
         int hash = 5;
-        hash = 47 * hash + Objects.hashCode(this.file);
         hash = 47 * hash + Objects.hashCode(this.ingestJob);
+        hash = 47 * hash + Objects.hashCode(this.file);
         return hash;
-    }    
+    }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/FileIngestTaskScheduler.java b/Core/src/org/sleuthkit/autopsy/ingest/FileIngestTaskScheduler.java
index 280012ebf8..fcbceab6ec 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/FileIngestTaskScheduler.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/FileIngestTaskScheduler.java
@@ -43,23 +43,20 @@ import org.sleuthkit.datamodel.VirtualDirectory;
 final class FileIngestTaskScheduler {
 
     private static final Logger logger = Logger.getLogger(FileIngestTaskScheduler.class.getName());
-    private static FileIngestTaskScheduler instance;
+    private static FileIngestTaskScheduler instance = new FileIngestTaskScheduler();
     private final TreeSet<FileIngestTask> rootDirectoryTasks = new TreeSet<>(new RootDirectoryTaskComparator());
     private final List<FileIngestTask> directoryTasks = new ArrayList<>();
-    private final LinkedBlockingQueue<FileIngestTask> fileTasks = new LinkedBlockingQueue<>(); // Unlimited capacity
+    private final LinkedBlockingQueue<FileIngestTask> fileTasks = new LinkedBlockingQueue<>();
     private static final int FAT_NTFS_FLAGS = TskData.TSK_FS_TYPE_ENUM.TSK_FS_TYPE_FAT12.getValue() | TskData.TSK_FS_TYPE_ENUM.TSK_FS_TYPE_FAT16.getValue() | TskData.TSK_FS_TYPE_ENUM.TSK_FS_TYPE_FAT32.getValue() | TskData.TSK_FS_TYPE_ENUM.TSK_FS_TYPE_NTFS.getValue();
 
-    static synchronized FileIngestTaskScheduler getInstance() {
-        if (instance == null) {
-            instance = new FileIngestTaskScheduler();
-        }
+    static FileIngestTaskScheduler getInstance() {
         return instance;
     }
 
     private FileIngestTaskScheduler() {
     }
 
-    synchronized void addTasks(IngestJob dataSourceTask, Content dataSource) {
+    synchronized void addTasks(IngestJob job, Content dataSource) throws InterruptedException {
         Collection<AbstractFile> rootObjects = dataSource.accept(new GetRootDirectoryVisitor());
         List<AbstractFile> firstLevelFiles = new ArrayList<>();
         if (rootObjects.isEmpty() && dataSource instanceof AbstractFile) {
@@ -87,9 +84,9 @@ final class FileIngestTaskScheduler {
             }
         }
         for (AbstractFile firstLevelFile : firstLevelFiles) {
-            FileIngestTask fileTask = new FileIngestTask(firstLevelFile, dataSourceTask);
+            FileIngestTask fileTask = new FileIngestTask(job, firstLevelFile);
             if (shouldEnqueueTask(fileTask)) {
-                rootDirectoryTasks.add(fileTask);
+                addTaskToRootDirectoryQueue(fileTask);
             }
         }
 
@@ -97,16 +94,9 @@ final class FileIngestTaskScheduler {
         updateQueues();
     }
 
-    synchronized void addTask(IngestJob ingestJob, AbstractFile file) {
-        try {
-            FileIngestTask fileTask = new FileIngestTask(file, ingestJob);
-            if (shouldEnqueueTask(fileTask)) {
-                fileTask.getIngestJob().notifyTaskPending();
-                fileTasks.put(fileTask); // Queue has unlimited capacity, does not block.
-            }
-        } catch (InterruptedException ex) {
-            // RJCTODO: Perhaps this is the convenience method?
-            // RJCTODO: Need undo
+    synchronized void addTask(FileIngestTask task) {
+        if (shouldEnqueueTask(task)) {
+            addTaskToFileQueue(task);
         }
     }
 
@@ -116,29 +106,7 @@ final class FileIngestTaskScheduler {
         return task;
     }
 
-    synchronized boolean hasTasksForJob(long ingestJobId) {
-        for (FileIngestTask task : rootDirectoryTasks) {
-            if (task.getIngestJob().getJobId() == ingestJobId) {
-                return true;
-            }
-        }
-
-        for (FileIngestTask task : directoryTasks) {
-            if (task.getIngestJob().getJobId() == ingestJobId) {
-                return true;
-            }
-        }
-
-        for (FileIngestTask task : fileTasks) {
-            if (task.getIngestJob().getJobId() == ingestJobId) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    private void updateQueues() {
+    private void updateQueues() throws InterruptedException {
         // we loop because we could have a directory that has all files
         // that do not get enqueued
         while (true) {
@@ -152,23 +120,15 @@ final class FileIngestTaskScheduler {
                 if (rootDirectoryTasks.isEmpty()) {
                     return;
                 }
-                FileIngestTask rootTask = this.rootDirectoryTasks.pollFirst();
-                directoryTasks.add(rootTask);
+                addTaskToDirectoryQueue(rootDirectoryTasks.pollFirst(), false);
             }
             //pop and push AbstractFile directory children if any
             //add the popped and its leaf children onto cur file list
             FileIngestTask parentTask = directoryTasks.remove(directoryTasks.size() - 1);
-            final AbstractFile parentFile = parentTask.file;
+            final AbstractFile parentFile = parentTask.getFile();
             // add itself to the file list
             if (shouldEnqueueTask(parentTask)) {
-                // RJCTODO
-                try {
-                    parentTask.getIngestJob().notifyTaskPending();
-                    fileTasks.put(parentTask);
-                } catch (InterruptedException ex) {
-                    // RJCTODO: Maybe make a convenience method
-                    // RJCTODO: Need undo
-                }
+                addTaskToFileQueue(parentTask);
             }
             // add its children to the file and directory lists
             try {
@@ -176,18 +136,11 @@ final class FileIngestTaskScheduler {
                 for (Content c : children) {
                     if (c instanceof AbstractFile) {
                         AbstractFile childFile = (AbstractFile) c;
-                        FileIngestTask childTask = new FileIngestTask(childFile, parentTask.getIngestJob());
+                        FileIngestTask childTask = new FileIngestTask(parentTask.getIngestJob(), childFile);
                         if (childFile.hasChildren()) {
-                            this.directoryTasks.add(childTask);
+                            addTaskToDirectoryQueue(childTask, true);
                         } else if (shouldEnqueueTask(childTask)) {
-                            // RJCTODO
-                            try {
-                                childTask.getIngestJob().notifyTaskPending();
-                                fileTasks.put(childTask);
-                            } catch (InterruptedException ex) {
-                                // RJCTODO: Maybe make a convenience method
-                                // RJCTODO: Need undo
-                            }
+                            addTaskToFileQueue(childTask);
                         }
                     }
                 }
@@ -197,10 +150,39 @@ final class FileIngestTaskScheduler {
         }
     }
 
-    synchronized void emptyQueues() { // RJCTODO: Perhaps clear all...
-        this.rootDirectoryTasks.clear();
-        this.directoryTasks.clear();
-        this.fileTasks.clear();
+    private void addTaskToRootDirectoryQueue(FileIngestTask task) {
+        directoryTasks.add(task);
+        task.getIngestJob().notifyTaskAdded();
+    }
+
+    private void addTaskToDirectoryQueue(FileIngestTask task, boolean isNewTask) {
+        if (isNewTask) {
+            directoryTasks.add(task);
+        }
+        task.getIngestJob().notifyTaskAdded();
+    }
+
+    private void addTaskToFileQueue(FileIngestTask task) {
+        // The capacity of the file tasks queue is not bounded, so the call 
+        // to put() should not block except for normal synchronized access. 
+        // Still, notify the job that the task has been added first so that 
+        // the take() of the task cannot occur before the notification.
+        task.getIngestJob().notifyTaskAdded();
+
+        // If the thread executing this code is ever interrupted, it is 
+        // because the number of ingest threads has been decreased while
+        // ingest jobs are running. This thread will exit in an orderly fashion,
+        // but the task still needs to be enqueued rather than lost.
+        while (true) {
+            try {
+                fileTasks.put(task);
+                break;
+            } catch (InterruptedException ex) {
+                // Reset the interrupted status of the thread so the orderly
+                // exit can occur in the intended place.
+                Thread.currentThread().interrupt();
+            }
+        }
     }
 
     /**
@@ -211,7 +193,7 @@ final class FileIngestTaskScheduler {
      * @return true if should be enqueued, false otherwise
      */
     private static boolean shouldEnqueueTask(final FileIngestTask processTask) {
-        final AbstractFile aFile = processTask.file;
+        final AbstractFile aFile = processTask.getFile();
         //if it's unalloc file, skip if so scheduled
         if (processTask.getIngestJob().shouldProcessUnallocatedSpace() == false && aFile.getType().equals(TskData.TSK_DB_FILES_TYPE_ENUM.UNALLOC_BLOCKS)) {
             return false;
@@ -320,10 +302,10 @@ final class FileIngestTaskScheduler {
 
         @Override
         public int compare(FileIngestTask q1, FileIngestTask q2) {
-            AbstractFilePriority.Priority p1 = AbstractFilePriority.getPriority(q1.file);
-            AbstractFilePriority.Priority p2 = AbstractFilePriority.getPriority(q2.file);
+            AbstractFilePriority.Priority p1 = AbstractFilePriority.getPriority(q1.getFile());
+            AbstractFilePriority.Priority p2 = AbstractFilePriority.getPriority(q2.getFile());
             if (p1 == p2) {
-                return (int) (q2.file.getId() - q1.file.getId());
+                return (int) (q2.getFile().getId() - q1.getFile().getId());
             } else {
                 return p2.ordinal() - p1.ordinal();
             }
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestJob.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestJob.java
index 8982be2061..a07c135e89 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestJob.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestJob.java
@@ -24,10 +24,12 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.logging.Level;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandleFactory;
 import org.openide.util.Cancellable;
 import org.openide.util.NbBundle;
+import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.Content;
 
@@ -37,33 +39,48 @@ import org.sleuthkit.datamodel.Content;
  */
 final class IngestJob {
 
+    private static final Logger logger = Logger.getLogger(IngestManager.class.getName());
     private static final AtomicLong nextIngestJobId = new AtomicLong(0L);
-    private static final ConcurrentHashMap<Long, IngestJob> ingestJobs = new ConcurrentHashMap<>(); // Maps job ids to jobs.
-    private final long jobId;
-    private final Content dataSource;
+    private static final ConcurrentHashMap<Long, IngestJob> ingestJobsById = new ConcurrentHashMap<>();
+    private final long id;
+    private final Content rootDataSource;
     private final List<IngestModuleTemplate> ingestModuleTemplates;
     private final boolean processUnallocatedSpace;
     private final LinkedBlockingQueue<DataSourceIngestPipeline> dataSourceIngestPipelines = new LinkedBlockingQueue<>();
     private final LinkedBlockingQueue<FileIngestPipeline> fileIngestPipelines = new LinkedBlockingQueue<>();
     private final AtomicInteger tasksInProgress = new AtomicInteger(0);
     private final AtomicLong processedFiles = new AtomicLong(0L);
+    private final AtomicLong filesToIngestEstimate = new AtomicLong(0L);
     private ProgressHandle dataSourceTasksProgress;
     private ProgressHandle fileTasksProgress;
-    private long filesToIngestEstimate = 0;
     private volatile boolean cancelled;
 
-    static List<IngestModuleError> startIngestJob(Content dataSource, List<IngestModuleTemplate> ingestModuleTemplates, boolean processUnallocatedSpace) { // RJCTODO: return errors
+    /**
+     * Creates an ingest job for a data source and starts up the ingest
+     * pipelines for the job.
+     *
+     * @param rootDataSource The data source to ingest.
+     * @param ingestModuleTemplates The ingest module templates to use to create
+     * the ingest pipelines for the job.
+     * @param processUnallocatedSpace Whether or not the job should include
+     * processing of unallocated space.
+     * @return A collection of ingest module startUp up errors, empty on
+     * success.
+     * @throws InterruptedException
+     */
+    static List<IngestModuleError> startJob(Content dataSource, List<IngestModuleTemplate> ingestModuleTemplates, boolean processUnallocatedSpace) throws InterruptedException {
         long jobId = nextIngestJobId.incrementAndGet();
         IngestJob ingestJob = new IngestJob(jobId, dataSource, ingestModuleTemplates, processUnallocatedSpace);
-        List<IngestModuleError> errors = ingestJob.start();
+        List<IngestModuleError> errors = ingestJob.startUp();
         if (errors.isEmpty()) {
-            ingestJobs.put(jobId, ingestJob);
+            ingestJobsById.put(jobId, ingestJob);
+            IngestManager.getInstance().fireIngestJobStarted(jobId);
         }
         return errors;
     }
 
     static boolean jobsAreRunning() {
-        for (IngestJob job : ingestJobs.values()) {
+        for (IngestJob job : ingestJobsById.values()) {
             if (!job.isCancelled()) {
                 return true;
             }
@@ -71,79 +88,72 @@ final class IngestJob {
         return false;
     }
 
-    static void addFileToIngestJob(long ingestJobId, AbstractFile file) { // RJCTODO: Move back to IngestManager
-        IngestJob job = ingestJobs.get(ingestJobId);
+    static void addFileToJob(long ingestJobId, AbstractFile file) { // RJCTODO: Just one at a time?
+        IngestJob job = ingestJobsById.get(ingestJobId);
         if (job != null) {
-            FileIngestTaskScheduler.getInstance().addTask(job, file);
+//            long adjustedFilesCount = job.filesToIngestEstimate.incrementAndGet(); // RJCTODO: Not the best name now?
+//            job.fileTasksProgress.switchToIndeterminate(); // RJCTODO: Comment this stuff
+//            job.fileTasksProgress.switchToDeterminate((int) adjustedFilesCount);
+//            job.fileTasksProgress.progress(job.processedFiles.intValue());
+            FileIngestTaskScheduler.getInstance().addTask(new FileIngestTask(job, file));
         }
     }
 
-    static void cancelAllIngestJobs() {
-        for (IngestJob job : ingestJobs.values()) {
+    static void cancelAllJobs() {
+        for (IngestJob job : ingestJobsById.values()) {
             job.cancel();
         }
     }
 
     private IngestJob(long id, Content dataSource, List<IngestModuleTemplate> ingestModuleTemplates, boolean processUnallocatedSpace) {
-        this.jobId = id;
-        this.dataSource = dataSource;
+        this.id = id;
+        this.rootDataSource = dataSource;
         this.ingestModuleTemplates = ingestModuleTemplates;
         this.processUnallocatedSpace = processUnallocatedSpace;
         this.cancelled = false;
     }
 
-    long getJobId() {
-        return jobId;
-    }
-
-    Content getDataSource() {
-        return dataSource;
+    long getId() {
+        return id;
     }
 
     boolean shouldProcessUnallocatedSpace() {
         return processUnallocatedSpace;
     }
 
-    List<IngestModuleError> start() {
+    List<IngestModuleError> startUp() throws InterruptedException {
         List<IngestModuleError> errors = startUpIngestPipelines();
         if (errors.isEmpty()) {
-            DataSourceIngestTaskScheduler.getInstance().addTask(new DataSourceIngestTask(this, dataSource));
-            FileIngestTaskScheduler.getInstance().addTasks(this, dataSource);
             startDataSourceIngestProgressBar();
             startFileIngestProgressBar();
+            FileIngestTaskScheduler.getInstance().addTasks(this, rootDataSource); // RJCTODO: Think about this ordering "solution" for small images
+            DataSourceIngestTaskScheduler.getInstance().addTask(new DataSourceIngestTask(this, rootDataSource));
         }
         return errors;
     }
 
-    private List<IngestModuleError> startUpIngestPipelines() {
+    private List<IngestModuleError> startUpIngestPipelines() throws InterruptedException {
+        IngestJobContext context = new IngestJobContext(this);
         List<IngestModuleError> errors = new ArrayList<>();
 
         int maxNumberOfPipelines = IngestManager.getMaxNumberOfDataSourceIngestThreads();
         for (int i = 0; i < maxNumberOfPipelines; ++i) {
-            DataSourceIngestPipeline pipeline = new DataSourceIngestPipeline(this, ingestModuleTemplates);
+            DataSourceIngestPipeline pipeline = new DataSourceIngestPipeline(context, ingestModuleTemplates);
             errors.addAll(pipeline.startUp());
-            try {
-                dataSourceIngestPipelines.put(pipeline);
-            } catch (InterruptedException ex) {
-                // RJCTODO: log unexpected block and interrupt, or throw
-            }
-            if (errors.isEmpty()) {
-                // No need to accumulate presumably redundant erros.
+            dataSourceIngestPipelines.put(pipeline);
+            if (!errors.isEmpty()) {
+                // No need to accumulate presumably redundant errors.
                 break;
             }
         }
 
         maxNumberOfPipelines = IngestManager.getMaxNumberOfFileIngestThreads();
         for (int i = 0; i < maxNumberOfPipelines; ++i) {
-            FileIngestPipeline pipeline = new FileIngestPipeline(this, ingestModuleTemplates);
+            FileIngestPipeline pipeline = new FileIngestPipeline(context, ingestModuleTemplates);
             errors.addAll(pipeline.startUp());
-            try {
-                fileIngestPipelines.put(pipeline);
-            } catch (InterruptedException ex) {
-                // RJCTODO: log unexpected block and interrupt, or throw
-            }
-            if (errors.isEmpty()) {
-                // No need to accumulate presumably redundant erros.
+            fileIngestPipelines.put(pipeline);
+            if (!errors.isEmpty()) {
+                // No need to accumulate presumably redundant errors.
                 break;
             }
         }
@@ -154,7 +164,7 @@ final class IngestJob {
     private void startDataSourceIngestProgressBar() {
         final String displayName = NbBundle.getMessage(this.getClass(),
                 "IngestJob.progress.dataSourceIngest.displayName",
-                dataSource.getName());
+                rootDataSource.getName());
         dataSourceTasksProgress = ProgressHandleFactory.createHandle(displayName, new Cancellable() {
             @Override
             public boolean cancel() {
@@ -169,13 +179,13 @@ final class IngestJob {
             }
         });
         dataSourceTasksProgress.start();
-        dataSourceTasksProgress.switchToIndeterminate(); // RJCTODO: check out the logic in the pipleine class
+        dataSourceTasksProgress.switchToIndeterminate();
     }
 
     private void startFileIngestProgressBar() {
         final String displayName = NbBundle.getMessage(this.getClass(),
                 "IngestJob.progress.fileIngest.displayName",
-                dataSource.getName());
+                rootDataSource.getName());
         fileTasksProgress = ProgressHandleFactory.createHandle(displayName, new Cancellable() {
             @Override
             public boolean cancel() {
@@ -188,77 +198,78 @@ final class IngestJob {
                 return true;
             }
         });
-        filesToIngestEstimate = dataSource.accept(new GetFilesCountVisitor());
+        long initialFilesCount = rootDataSource.accept(new GetFilesCountVisitor());
+        filesToIngestEstimate.getAndAdd(initialFilesCount);
         fileTasksProgress.start();
-        fileTasksProgress.switchToDeterminate((int) filesToIngestEstimate);
+        fileTasksProgress.switchToDeterminate((int) initialFilesCount); // RJCTODO: This cast is troublesome, can use intValue
     }
 
     /**
-     * Called by the ingest task schedulers when an ingest task for this ingest
-     * job is added to the scheduler's task queue.
+     * Called by the ingest task schedulers when an ingest task is added to this
+     * ingest job.
      */
-    void notifyTaskScheduled() {
-        // Increment the task counter when a task is scheduled so that there is 
-        // a persistent record of the task's existence even after it is removed
-        // from the scheduler by an ingest thread. The task counter is used by
-        // the job to determine when it is done.
+    void notifyTaskAdded() {
         tasksInProgress.incrementAndGet();
     }
 
-    /**
-     * Called by the ingest schedulers as an "undo" operation for
-     * notifyTaskScheduled().
-     */
-    void notifyTaskCompleted() {
-        // Decrement the task counter when a task is discarded by a scheduler.  
-        // The task counter is used by the job to determine when it is done.
-        tasksInProgress.decrementAndGet();
+    void process(Content dataSource) throws InterruptedException {
+        // If the job is not cancelled, complete the task, otherwise just flush 
+        // it. In either case, the task counter needs to be decremented and the
+        // shut down check needs to occur.
+        if (!isCancelled()) {
+            List<IngestModuleError> errors = new ArrayList<>();
+            DataSourceIngestPipeline pipeline = dataSourceIngestPipelines.take();
+            errors.addAll(pipeline.process(dataSource, dataSourceTasksProgress));
+            if (!errors.isEmpty()) {
+                logIngestModuleErrors(errors);
+            }
+            dataSourceIngestPipelines.put(pipeline);
+        }
+        shutDownIfAllTasksCompleted();
     }
 
-    void process() throws InterruptedException {
+    void process(AbstractFile file) throws InterruptedException {
+        // If the job is not cancelled, complete the task, otherwise just flush 
+        // it. In either case, the task counter needs to be decremented and the
+        // shut down check needs to occur.
         if (!isCancelled()) {
-            try {
-                DataSourceIngestPipeline pipeline = dataSourceIngestPipelines.take();
-                pipeline.process(); // RJCTODO: Pass data source through?
-                dataSourceIngestPipelines.put(pipeline);
-            } catch (InterruptedException ex) {
-                // RJCTODO:
+            List<IngestModuleError> errors = new ArrayList<>();
+            FileIngestPipeline pipeline = fileIngestPipelines.take();
+//            fileTasksProgress.progress(file.getName(), (int) processedFiles.incrementAndGet()); RJCTODO
+            errors.addAll(pipeline.process(file));
+            fileIngestPipelines.put(pipeline);
+            if (!errors.isEmpty()) {
+                logIngestModuleErrors(errors);
             }
         }
-        ifCompletedShutDown();
+        shutDownIfAllTasksCompleted();
     }
 
-    void process(AbstractFile file) {
-        if (!isCancelled()) {
-            try {
-                FileIngestPipeline pipeline = fileIngestPipelines.take();
-                fileTasksProgress.progress(file.getName(), (int) processedFiles.incrementAndGet());
-                pipeline.process(file);
-                fileIngestPipelines.put(pipeline);
-            } catch (InterruptedException ex) {
-                // RJCTODO: Log block and interrupt
-            }
-        }
-        ifCompletedShutDown();
-    }
-
-    void ifCompletedShutDown() {
+    private void shutDownIfAllTasksCompleted() {
         if (tasksInProgress.decrementAndGet() == 0) {
+            List<IngestModuleError> errors = new ArrayList<>();
             while (!dataSourceIngestPipelines.isEmpty()) {
                 DataSourceIngestPipeline pipeline = dataSourceIngestPipelines.poll();
-                pipeline.shutDown(cancelled);
+                errors.addAll(pipeline.shutDown());
             }
             while (!fileIngestPipelines.isEmpty()) {
                 FileIngestPipeline pipeline = fileIngestPipelines.poll();
-                pipeline.shutDown(cancelled);
+                errors.addAll(pipeline.shutDown());
             }
-            ingestJobs.remove(jobId);
-            IngestManager.getInstance().fireIngestJobCompleted(jobId);        
+            fileTasksProgress.finish();
+            dataSourceTasksProgress.finish();
+            ingestJobsById.remove(id);
+            if (!errors.isEmpty()) {
+                logIngestModuleErrors(errors);
+            }
+            IngestManager.getInstance().fireIngestJobCompleted(id);
         }
     }
 
-    ProgressHandle getDataSourceTaskProgressBar() {
-        return dataSourceTasksProgress; // RJCTODO: Should just pass the progress handle or the object to the pipeline
+    private void logIngestModuleErrors(List<IngestModuleError> errors) {
+        for (IngestModuleError error : errors) {
+            logger.log(Level.SEVERE, error.getModuleDisplayName() + " experienced an error", error.getModuleError());
+        }
     }
 
     boolean isCancelled() {
@@ -267,7 +278,7 @@ final class IngestJob {
 
     void cancel() {
         cancelled = true;
-        fileTasksProgress.finish();
-        IngestManager.getInstance().fireIngestJobCancelled(jobId);
+        fileTasksProgress.finish(); // RJCTODO: What about the other progress bar?
+        IngestManager.getInstance().fireIngestJobCancelled(id);
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobContext.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobContext.java
index 6a9b4a9454..b8d4493de4 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobContext.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobContext.java
@@ -39,7 +39,7 @@ public final class IngestJobContext {
      * @return The ingest job identifier.
      */
     public long getJobId() {
-        return this.ingestJob.getJobId();
+        return this.ingestJob.getId();
     }
 
     /**
@@ -60,7 +60,7 @@ public final class IngestJobContext {
      */
     public void addFiles(List<AbstractFile> files) {
         for (AbstractFile file : files) {
-            IngestJob.addFileToIngestJob(ingestJob.getJobId(), file);
+                IngestJob.addFileToJob(ingestJob.getId(), file);
         }
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
index a5b0da296c..36cc73fefb 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
@@ -21,7 +21,9 @@ package org.sleuthkit.autopsy.ingest;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.util.List;
+import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
@@ -51,14 +53,15 @@ public class IngestManager {
     private static final Logger logger = Logger.getLogger(IngestManager.class.getName());
     private static final Preferences userPreferences = NbPreferences.forModule(IngestManager.class);
     private static final IngestManager instance = new IngestManager();
-    private final PropertyChangeSupport pcs = new PropertyChangeSupport(IngestManager.class);
+    private final PropertyChangeSupport ingestJobEventPublisher = new PropertyChangeSupport(IngestManager.class);
+    private final PropertyChangeSupport ingestModuleEventPublisher = new PropertyChangeSupport(IngestManager.class);
     private final IngestMonitor ingestMonitor = new IngestMonitor();
     private final ExecutorService startIngestJobsThreadPool = Executors.newSingleThreadExecutor();
-    private final ConcurrentHashMap<Long, Future<?>> startIngestJobThreads = new ConcurrentHashMap<>(); // Maps thread ids to cancellation handles.
     private final ExecutorService dataSourceIngestThreadPool = Executors.newSingleThreadExecutor();
-    private final ConcurrentHashMap<Long, Future<?>> dataSourceIngestThreads = new ConcurrentHashMap<>(); // Maps thread ids to cancellation handles.
     private final ExecutorService fileIngestThreadPool = Executors.newFixedThreadPool(MAX_NUMBER_OF_FILE_INGEST_THREADS);
-    private final ExecutorService fireIngestJobEventsThreadPool = Executors.newSingleThreadExecutor();
+    private final ExecutorService fireIngestEventsThreadPool = Executors.newSingleThreadExecutor();
+    private final ConcurrentHashMap<Long, Future<Void>> startIngestJobThreads = new ConcurrentHashMap<>(); // Maps thread ids to cancellation handles.
+    private final ConcurrentHashMap<Long, Future<?>> dataSourceIngestThreads = new ConcurrentHashMap<>(); // Maps thread ids to cancellation handles.
     private final ConcurrentHashMap<Long, Future<?>> fileIngestThreads = new ConcurrentHashMap<>(); // Maps thread ids to cancellation handles.
     private final AtomicLong nextThreadId = new AtomicLong(0L);
     private volatile IngestMessageTopComponent ingestMessageBox;
@@ -154,7 +157,7 @@ public class IngestManager {
      */
     private void startDataSourceIngestThread() {
         long threadId = nextThreadId.incrementAndGet();
-        Future<?> handle = dataSourceIngestThreadPool.submit(new DataSourceIngestThread(threadId));
+        Future<?> handle = dataSourceIngestThreadPool.submit(new DataSourceIngestThread());
         dataSourceIngestThreads.put(threadId, handle);
     }
 
@@ -164,7 +167,7 @@ public class IngestManager {
      */
     private void startFileIngestThread() {
         long threadId = nextThreadId.incrementAndGet();
-        Future<?> handle = fileIngestThreadPool.submit(new FileIngestThread(threadId));
+        Future<?> handle = fileIngestThreadPool.submit(new FileIngestThread());
         fileIngestThreads.put(threadId, handle);
     }
 
@@ -200,35 +203,48 @@ public class IngestManager {
     }
 
     public void cancelAllIngestJobs() {
-        cancelStartIngestJobsTasks();
-        IngestJob.cancelAllIngestJobs();
-    }
-
-    private void cancelStartIngestJobsTasks() {
-        for (Future<?> future : startIngestJobThreads.values()) {
-            future.cancel(true);
+        // Stop creating new ingest jobs.
+        for (Future<Void> handle : startIngestJobThreads.values()) {
+            handle.cancel(true);
+            try {
+                // Blocks until the job starting thread responds. The thread
+                // removes itself from this collection, which does not disrupt
+                // this loop since the collection is a ConcurrentHashMap.
+                handle.get();
+            } catch (InterruptedException | ExecutionException ex) {
+                // This should never happen, something is awry, but everything
+                // should be o.k. anyway.
+                logger.log(Level.SEVERE, "Unexpected thread interrupt", ex);
+            }
         }
-        startIngestJobThreads.clear();
+        startIngestJobThreads.clear(); // Make sure.
+
+        // Cancel all the jobs already created. This will make the the ingest
+        // threads flush out any lingering ingest tasks without processing them.
+        IngestJob.cancelAllJobs();
     }
 
     /**
      * Ingest events.
      */
-    public enum IngestEvent { // RJCTODO: Update comments if time permits
+    public enum IngestEvent {
 
         /**
          * Property change event fired when an ingest job is started. The old
-         * and new values of the PropertyChangeEvent object are set to null.
+         * value of the PropertyChangeEvent object is set to the ingest job id,
+         * and the new value is set to null.
          */
         INGEST_JOB_STARTED,
         /**
          * Property change event fired when an ingest job is completed. The old
-         * and new values of the PropertyChangeEvent object are set to null.
+         * value of the PropertyChangeEvent object is set to the ingest job id,
+         * and the new value is set to null.
          */
         INGEST_JOB_COMPLETED,
         /**
          * Property change event fired when an ingest job is canceled. The old
-         * and new values of the PropertyChangeEvent object are set to null.
+         * value of the PropertyChangeEvent object is set to the ingest job id,
+         * and the new value is set to null.
          */
         INGEST_JOB_CANCELLED,
         /**
@@ -253,21 +269,59 @@ public class IngestManager {
     };
 
     /**
-     * Add an ingest event property change listener.
+     * Add an ingest job event property change listener.
      *
      * @param listener The PropertyChangeListener to register.
      */
-    public void addPropertyChangeListener(final PropertyChangeListener listener) {
-        pcs.addPropertyChangeListener(listener);
+    public void addIngestJobEventListener(final PropertyChangeListener listener) {
+        ingestJobEventPublisher.addPropertyChangeListener(listener);
     }
 
     /**
-     * Remove an ingest event property change listener.
+     * Remove an ingest job event property change listener.
      *
      * @param listener The PropertyChangeListener to unregister.
      */
-    public void removePropertyChangeListener(final PropertyChangeListener listener) {
-        pcs.removePropertyChangeListener(listener);
+    public void removeIngestJobEventListener(final PropertyChangeListener listener) {
+        ingestJobEventPublisher.removePropertyChangeListener(listener);
+    }
+
+    /**
+     * Add an ingest module event property change listener.
+     *
+     * @param listener The PropertyChangeListener to register.
+     */
+    public void addIngestModuleEventListener(final PropertyChangeListener listener) {
+        ingestModuleEventPublisher.addPropertyChangeListener(listener);
+    }
+
+    /**
+     * Remove an ingest module event property change listener.
+     *
+     * @param listener The PropertyChangeListener to unregister.
+     */
+    public void removeIngestModuleEventListener(final PropertyChangeListener listener) {
+        ingestModuleEventPublisher.removePropertyChangeListener(listener);
+    }
+
+    /**
+     * Add an ingest module event property change listener.
+     *
+     * @deprecated
+     * @param listener The PropertyChangeListener to register.
+     */
+    public static void addPropertyChangeListener(final PropertyChangeListener listener) {
+        instance.ingestModuleEventPublisher.addPropertyChangeListener(listener);
+    }
+
+    /**
+     * Remove an ingest module event property change listener.
+     *
+     * @deprecated
+     * @param listener The PropertyChangeListener to unregister.
+     */
+    public static void removePropertyChangeListener(final PropertyChangeListener listener) {
+        instance.ingestModuleEventPublisher.removePropertyChangeListener(listener);
     }
 
     /**
@@ -276,7 +330,7 @@ public class IngestManager {
      * @param ingestJobId The ingest job id.
      */
     void fireIngestJobStarted(long ingestJobId) {
-        fireIngestJobEventsThreadPool.submit(new FireIngestEventThread(IngestEvent.INGEST_JOB_STARTED, ingestJobId, null));
+        fireIngestEventsThreadPool.submit(new FireIngestEventThread(ingestJobEventPublisher, IngestEvent.INGEST_JOB_STARTED, ingestJobId, null));
     }
 
     /**
@@ -285,7 +339,7 @@ public class IngestManager {
      * @param ingestJobId The ingest job id.
      */
     void fireIngestJobCompleted(long ingestJobId) {
-        fireIngestJobEventsThreadPool.submit(new FireIngestEventThread(IngestEvent.INGEST_JOB_COMPLETED, ingestJobId, null));
+        fireIngestEventsThreadPool.submit(new FireIngestEventThread(ingestJobEventPublisher, IngestEvent.INGEST_JOB_COMPLETED, ingestJobId, null));
     }
 
     /**
@@ -294,7 +348,7 @@ public class IngestManager {
      * @param ingestJobId The ingest job id.
      */
     void fireIngestJobCancelled(long ingestJobId) {
-        fireIngestJobEventsThreadPool.submit(new FireIngestEventThread(IngestEvent.INGEST_JOB_CANCELLED, ingestJobId, null));
+        fireIngestEventsThreadPool.submit(new FireIngestEventThread(ingestJobEventPublisher, IngestEvent.INGEST_JOB_CANCELLED, ingestJobId, null));
     }
 
     /**
@@ -303,7 +357,7 @@ public class IngestManager {
      * @param fileId The object id of file.
      */
     void fireFileIngestDone(long fileId) {
-        fireIngestJobEventsThreadPool.submit(new FireIngestEventThread(IngestEvent.FILE_DONE, fileId, null));
+        fireIngestEventsThreadPool.submit(new FireIngestEventThread(ingestModuleEventPublisher, IngestEvent.FILE_DONE, fileId, null));
     }
 
     /**
@@ -312,7 +366,7 @@ public class IngestManager {
      * @param moduleDataEvent A ModuleDataEvent with the details of the posting.
      */
     void fireIngestModuleDataEvent(ModuleDataEvent moduleDataEvent) {
-        fireIngestJobEventsThreadPool.submit(new FireIngestEventThread(IngestEvent.DATA, moduleDataEvent, null));
+        fireIngestEventsThreadPool.submit(new FireIngestEventThread(ingestModuleEventPublisher, IngestEvent.DATA, moduleDataEvent, null));
     }
 
     /**
@@ -323,7 +377,7 @@ public class IngestManager {
      * content.
      */
     void fireIngestModuleContentEvent(ModuleContentEvent moduleContentEvent) {
-        fireIngestJobEventsThreadPool.submit(new FireIngestEventThread(IngestEvent.CONTENT_CHANGED, moduleContentEvent, null));
+        fireIngestEventsThreadPool.submit(new FireIngestEventThread(ingestModuleEventPublisher, IngestEvent.CONTENT_CHANGED, moduleContentEvent, null));
     }
 
     /**
@@ -341,7 +395,7 @@ public class IngestManager {
      * Get the free disk space of the drive where to which ingest data is being
      * written, as reported by the ingest monitor.
      *
-     * @return Free disk space, -1 if unknown // RJCTODO: What units?
+     * @return Free disk space, -1 if unknown
      */
     long getFreeDiskSpace() {
         if (ingestMonitor != null) {
@@ -352,10 +406,10 @@ public class IngestManager {
     }
 
     /**
-     * A Runnable that creates ingest jobs and submits the initial data source
+     * A Callable that creates ingest jobs and submits the initial data source
      * and file ingest tasks to the task schedulers.
      */
-    private class StartIngestJobsThread implements Runnable {
+    private class StartIngestJobsThread implements Callable<Void> {
 
         private final long threadId;
         private final List<Content> dataSources;
@@ -371,7 +425,7 @@ public class IngestManager {
         }
 
         @Override
-        public void run() {
+        public Void call() {
             try {
                 final String displayName = NbBundle.getMessage(this.getClass(),
                         "IngestManager.StartIngestJobsTask.run.displayName");
@@ -387,26 +441,25 @@ public class IngestManager {
                         return true;
                     }
                 });
-                progress.start(dataSources.size() * 2);
+                progress.start(dataSources.size());
 
                 if (!ingestMonitor.isRunning()) {
                     ingestMonitor.start();
                 }
 
-                int workUnitsCompleted = 0;
+                int dataSourceProcessed = 0;
                 for (Content dataSource : dataSources) {
                     if (Thread.currentThread().isInterrupted()) {
                         break;
                     }
 
-                    // Create an ingest job.
-                    List<IngestModuleError> errors = IngestJob.startIngestJob(dataSource, moduleTemplates, processUnallocatedSpace);
+                    // Start an ingest job for the data source.
+                    List<IngestModuleError> errors = IngestJob.startJob(dataSource, moduleTemplates, processUnallocatedSpace);
                     if (!errors.isEmpty()) {
-                        // Report the error to the user.
+                        // Report the errors to the user. They have already been logged.
                         StringBuilder moduleStartUpErrors = new StringBuilder();
                         for (IngestModuleError error : errors) {
                             String moduleName = error.getModuleDisplayName();
-                            logger.log(Level.SEVERE, "The " + moduleName + " module failed to start up", error.getModuleError()); //NON-NLS
                             moduleStartUpErrors.append(moduleName);
                             moduleStartUpErrors.append(": ");
                             moduleStartUpErrors.append(error.getModuleError().getLocalizedMessage());
@@ -427,40 +480,16 @@ public class IngestManager {
                                 NbBundle.getMessage(this.getClass(),
                                 "IngestManager.StartIngestJobsTask.run.startupErr.dlgTitle"), JOptionPane.ERROR_MESSAGE);
                     }
-
-                    fireIngestJobEventsThreadPool.submit(new FireIngestEventThread(IngestEvent.INGEST_JOB_STARTED));
-
-                    // Queue a data source ingest task for the ingest job.
-                    final String inputName = dataSource.getName();
-                    progress.progress(
-                            NbBundle.getMessage(this.getClass(), "IngestManager.StartIngestJobsThread.run.progress.msg1",
-                            inputName), workUnitsCompleted);
-                    DataSourceIngestTaskScheduler.getInstance().addTask(new DataSourceIngestTask(ingestJob, ingestJob.getDataSource()));
-                    progress.progress(
-                            NbBundle.getMessage(this.getClass(), "IngestManager.StartIngestJobsThread.run.progress.msg2",
-                            inputName), ++workUnitsCompleted);
-
-                    // Queue the file ingest tasks for the ingest job.
-                    progress.progress(
-                            NbBundle.getMessage(this.getClass(), "IngestManager.StartIngestJobsThread.run.progress.msg3",
-                            inputName), workUnitsCompleted);
-                    FileIngestTaskScheduler.getInstance().addTasks(ingestJob, ingestJob.getDataSource());
-                    progress.progress(
-                            NbBundle.getMessage(this.getClass(), "IngestManager.StartIngestJobsThread.run.progress.msg4",
-                            inputName), ++workUnitsCompleted);
+                    progress.progress(++dataSourceProcessed);
 
                     if (!Thread.currentThread().isInterrupted()) {
                         break;
                     }
                 }
-            } catch (Exception ex) {
-                String message = String.format("StartIngestJobsTask (id=%d) caught exception", threadId); //NON-NLS
-                logger.log(Level.SEVERE, message, ex);
-                MessageNotifyUtil.Message.error(
-                        NbBundle.getMessage(this.getClass(), "IngestManager.StartIngestJobsTask.run.catchException.msg"));
             } finally {
                 progress.finish();
                 startIngestJobThreads.remove(threadId);
+                return null;
             }
         }
     }
@@ -512,16 +541,18 @@ public class IngestManager {
     }
 
     /**
-     * A Runnable that fire ingest events to ingest manager property change
+     * A Runnable that fires ingest events to ingest manager property change
      * listeners.
      */
-    private class FireIngestEventThread implements Runnable {
+    private static class FireIngestEventThread implements Runnable {
 
+        private final PropertyChangeSupport publisher;
         private final IngestEvent event;
         private final Object oldValue;
         private final Object newValue;
 
-        FireIngestEventThread(IngestEvent event, Object oldValue, Object newValue) {
+        FireIngestEventThread(PropertyChangeSupport publisher, IngestEvent event, Object oldValue, Object newValue) {
+            this.publisher = publisher;
             this.event = event;
             this.oldValue = oldValue;
             this.newValue = newValue;
@@ -530,10 +561,10 @@ public class IngestManager {
         @Override
         public void run() {
             try {
-                pcs.firePropertyChange(event.toString(), oldValue, newValue);
+                publisher.firePropertyChange(event.toString(), oldValue, newValue);
             } catch (Exception e) {
                 logger.log(Level.SEVERE, "Ingest manager listener threw exception", e); //NON-NLS
-                MessageNotifyUtil.Notify.show(NbBundle.getMessage(IngestManager.class, "IngestManager.moduleErr"), // RJCTODO: Oddly named strings
+                MessageNotifyUtil.Notify.show(NbBundle.getMessage(IngestManager.class, "IngestManager.moduleErr"),
                         NbBundle.getMessage(IngestManager.class, "IngestManager.moduleErr.errListenToUpdates.msg"),
                         MessageNotifyUtil.MessageType.ERROR);
             }
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestServices.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestServices.java
index c573753281..5bf4f182a7 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestServices.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestServices.java
@@ -95,7 +95,7 @@ public final class IngestServices {
      * artifact data
      */
     public void fireModuleDataEvent(ModuleDataEvent moduleDataEvent) {
-        IngestManager.fireIngestModuleDataEvent(moduleDataEvent);
+        IngestManager.getInstance().fireIngestModuleDataEvent(moduleDataEvent);
     }
 
     /**
@@ -107,7 +107,7 @@ public final class IngestServices {
      * changed
      */
     public void fireModuleContentEvent(ModuleContentEvent moduleContentEvent) {
-        IngestManager.fireIngestModuleContentEvent(moduleContentEvent);
+        IngestManager.getInstance().fireIngestModuleContentEvent(moduleContentEvent);
     }
 
     /**
diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashLookupSettingsPanel.java b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashLookupSettingsPanel.java
index 7e901fbc71..c414731036 100644
--- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashLookupSettingsPanel.java
+++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashLookupSettingsPanel.java
@@ -69,7 +69,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
 
         // Listen to the ingest modules to refresh the enabled/disabled state of 
         // the components in sync with file ingest.
-        IngestManager.addPropertyChangeListener(new PropertyChangeListener() {
+        IngestManager.getInstance().addIngestJobEventListener(new PropertyChangeListener() {
             @Override
             public void propertyChange(PropertyChangeEvent evt) {
                 if (isIngestJobEvent(evt)) {
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java
index 90e7f197d1..4ba2d39eb6 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java
@@ -126,7 +126,7 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec
 
         setButtonStates();
 
-        IngestManager.addPropertyChangeListener(new PropertyChangeListener() {
+        IngestManager.getInstance().addIngestJobEventListener(new PropertyChangeListener() {
             @Override
             public void propertyChange(PropertyChangeEvent evt) {
                 String changed = evt.getPropertyName();
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsViewerPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsViewerPanel.java
index 898b21bfc5..0e8c099aac 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsViewerPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsViewerPanel.java
@@ -118,7 +118,7 @@ class KeywordSearchListsViewerPanel extends AbstractKeywordSearchPerformer {
         ingestRunning = IngestManager.getInstance().isIngestRunning();
         updateComponents();
 
-        IngestManager.addPropertyChangeListener(new PropertyChangeListener() {
+        IngestManager.getInstance().addIngestJobEventListener(new PropertyChangeListener() {
             @Override
             public void propertyChange(PropertyChangeEvent evt) {
                 String changed = evt.getPropertyName();
diff --git a/c:casesSamll2Againautopsy.db b/c:casesSamll2Againautopsy.db
new file mode 100755
index 0000000000..e69de29bb2

From 6f0a440ca05a74d1c5f43a3fbce4499688288acf Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Thu, 1 May 2014 13:49:56 -0400
Subject: [PATCH 08/24] Fixed some bugs in management of IngestJob task counter

---
 .../autopsy/ingest/FileIngestTask.java        |  7 ++--
 .../ingest/FileIngestTaskScheduler.java       | 38 ++++++++-----------
 .../autopsy/ingest/GetFilesCountVisitor.java  |  1 +
 .../sleuthkit/autopsy/ingest/IngestJob.java   |  2 +-
 .../sleuthkit/autopsy/ingest/IngestTask.java  | 23 +++++++++++
 5 files changed, 44 insertions(+), 27 deletions(-)
 create mode 100755 Core/src/org/sleuthkit/autopsy/ingest/IngestTask.java

diff --git a/Core/src/org/sleuthkit/autopsy/ingest/FileIngestTask.java b/Core/src/org/sleuthkit/autopsy/ingest/FileIngestTask.java
index 54ed9a8501..75e9165ded 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/FileIngestTask.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/FileIngestTask.java
@@ -21,7 +21,7 @@ package org.sleuthkit.autopsy.ingest;
 import java.util.Objects;
 import org.sleuthkit.datamodel.AbstractFile;
 
-final class FileIngestTask {
+final class FileIngestTask implements IngestTask {
 
     private final IngestJob ingestJob;
     private final AbstractFile file;
@@ -31,7 +31,7 @@ final class FileIngestTask {
         this.file = file;
     }
 
-    public IngestJob getIngestJob() {
+    public IngestJob getIngestJob() { // RJCTODO: Maybe add to interface
         return ingestJob;
     }
 
@@ -39,7 +39,8 @@ final class FileIngestTask {
         return file;
     }
 
-    void execute() throws InterruptedException {
+    @Override
+    public void execute() throws InterruptedException {
         ingestJob.process(file);
     }
 
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/FileIngestTaskScheduler.java b/Core/src/org/sleuthkit/autopsy/ingest/FileIngestTaskScheduler.java
index fcbceab6ec..e0da1c0829 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/FileIngestTaskScheduler.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/FileIngestTaskScheduler.java
@@ -86,7 +86,8 @@ final class FileIngestTaskScheduler {
         for (AbstractFile firstLevelFile : firstLevelFiles) {
             FileIngestTask fileTask = new FileIngestTask(job, firstLevelFile);
             if (shouldEnqueueTask(fileTask)) {
-                addTaskToRootDirectoryQueue(fileTask);
+                rootDirectoryTasks.add(fileTask);
+                fileTask.getIngestJob().notifyTaskAdded();
             }
         }
 
@@ -96,7 +97,7 @@ final class FileIngestTaskScheduler {
 
     synchronized void addTask(FileIngestTask task) {
         if (shouldEnqueueTask(task)) {
-            addTaskToFileQueue(task);
+            addTaskToFileQueue(task, true);
         }
     }
 
@@ -120,7 +121,8 @@ final class FileIngestTaskScheduler {
                 if (rootDirectoryTasks.isEmpty()) {
                     return;
                 }
-                addTaskToDirectoryQueue(rootDirectoryTasks.pollFirst(), false);
+                FileIngestTask rootTask = rootDirectoryTasks.pollFirst();
+                directoryTasks.add(rootTask);
             }
             //pop and push AbstractFile directory children if any
             //add the popped and its leaf children onto cur file list
@@ -128,7 +130,7 @@ final class FileIngestTaskScheduler {
             final AbstractFile parentFile = parentTask.getFile();
             // add itself to the file list
             if (shouldEnqueueTask(parentTask)) {
-                addTaskToFileQueue(parentTask);
+                addTaskToFileQueue(parentTask, false);
             }
             // add its children to the file and directory lists
             try {
@@ -138,9 +140,10 @@ final class FileIngestTaskScheduler {
                         AbstractFile childFile = (AbstractFile) c;
                         FileIngestTask childTask = new FileIngestTask(parentTask.getIngestJob(), childFile);
                         if (childFile.hasChildren()) {
-                            addTaskToDirectoryQueue(childTask, true);
+                            directoryTasks.add(childTask);
+                            childTask.getIngestJob().notifyTaskAdded();
                         } else if (shouldEnqueueTask(childTask)) {
-                            addTaskToFileQueue(childTask);
+                            addTaskToFileQueue(childTask, true);
                         }
                     }
                 }
@@ -150,25 +153,14 @@ final class FileIngestTaskScheduler {
         }
     }
 
-    private void addTaskToRootDirectoryQueue(FileIngestTask task) {
-        directoryTasks.add(task);
-        task.getIngestJob().notifyTaskAdded();
-    }
-
-    private void addTaskToDirectoryQueue(FileIngestTask task, boolean isNewTask) {
+    private void addTaskToFileQueue(FileIngestTask task, boolean isNewTask) {
         if (isNewTask) {
-            directoryTasks.add(task);
+            // The capacity of the file tasks queue is not bounded, so the call 
+            // to put() should not block except for normal synchronized access. 
+            // Still, notify the job that the task has been added first so that 
+            // the take() of the task cannot occur before the notification.
+            task.getIngestJob().notifyTaskAdded();
         }
-        task.getIngestJob().notifyTaskAdded();
-    }
-
-    private void addTaskToFileQueue(FileIngestTask task) {
-        // The capacity of the file tasks queue is not bounded, so the call 
-        // to put() should not block except for normal synchronized access. 
-        // Still, notify the job that the task has been added first so that 
-        // the take() of the task cannot occur before the notification.
-        task.getIngestJob().notifyTaskAdded();
-
         // If the thread executing this code is ever interrupted, it is 
         // because the number of ingest threads has been decreased while
         // ingest jobs are running. This thread will exit in an orderly fashion,
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/GetFilesCountVisitor.java b/Core/src/org/sleuthkit/autopsy/ingest/GetFilesCountVisitor.java
index 346da5d418..f8c280628d 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/GetFilesCountVisitor.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/GetFilesCountVisitor.java
@@ -51,6 +51,7 @@ final class GetFilesCountVisitor extends ContentVisitor.Default<Long> {
         queryB.append(") )");
         queryB.append(" AND ( (meta_type = ").append(TskData.TSK_FS_META_TYPE_ENUM.TSK_FS_META_TYPE_REG.getValue()); //NON-NLS
         queryB.append(") OR (meta_type = ").append(TskData.TSK_FS_META_TYPE_ENUM.TSK_FS_META_TYPE_DIR.getValue()); //NON-NLS
+        queryB.append(") OR (meta_type = ").append(TskData.TSK_FS_META_TYPE_ENUM.TSK_FS_META_TYPE_VIRT.getValue()); //NON-NLS                
         queryB.append(" AND (name != '.') AND (name != '..')"); //NON-NLS
         queryB.append(") )");
         //queryB.append( "AND (type = ");
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestJob.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestJob.java
index a07c135e89..424aa638a2 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestJob.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestJob.java
@@ -235,7 +235,7 @@ final class IngestJob {
         if (!isCancelled()) {
             List<IngestModuleError> errors = new ArrayList<>();
             FileIngestPipeline pipeline = fileIngestPipelines.take();
-//            fileTasksProgress.progress(file.getName(), (int) processedFiles.incrementAndGet()); RJCTODO
+            fileTasksProgress.progress(file.getName(), (int) processedFiles.incrementAndGet());
             errors.addAll(pipeline.process(file));
             fileIngestPipelines.put(pipeline);
             if (!errors.isEmpty()) {
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestTask.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestTask.java
new file mode 100755
index 0000000000..1133be1210
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestTask.java
@@ -0,0 +1,23 @@
+/*
+ * Autopsy Forensic Browser
+ * 
+ * Copyright 2014 Basis Technology Corp.
+ * Contact: carrier <at> sleuthkit <dot> org
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.autopsy.ingest;
+
+interface IngestTask {
+    void execute() throws InterruptedException;    
+}

From 471478d4e45622f315d00be2c01a8fb85922ceec Mon Sep 17 00:00:00 2001
From: alexjacks92 <alexjacks@comcast.net>
Date: Thu, 1 May 2014 14:54:57 -0400
Subject: [PATCH 09/24] Added sorting to non-blackboard database dumping.

---
 test/script/tskdbdiff.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/script/tskdbdiff.py b/test/script/tskdbdiff.py
index cd07ce69d7..c6f5d46d65 100755
--- a/test/script/tskdbdiff.py
+++ b/test/script/tskdbdiff.py
@@ -244,6 +244,10 @@ class TskDbDiff(object):
             for line in conn.iterdump():
                 line = replace_id(line, id_path_table)
                 db_log.write('%s\n' % line)
+            # Now sort the file    
+            
+        srtcmdlst = ["sort", dump_file, "-o", dump_file]
+        subprocess.call(srtcmdlst)
 
         conn.close()
         # cleanup the backup

From 07e9956ee0f4f2692c12783160bd7c6f3f2d5547 Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Thu, 1 May 2014 17:46:35 -0400
Subject: [PATCH 10/24] Refactor ingest framework

---
 .../AddImageWizardIngestConfigPanel.java      |   6 +-
 .../autopsy/ingest/DataSourceIngestTask.java  |   5 +-
 .../ingest/DataSourceIngestTaskScheduler.java |  73 +-
 .../ingest/FileIngestTaskScheduler.java       | 701 +++++++++---------
 .../autopsy/ingest/GetFilesCountVisitor.java  |   2 +-
 .../sleuthkit/autopsy/ingest/IngestJob.java   |  55 +-
 ...uncher.java => IngestJobConfigurator.java} |   6 +-
 .../autopsy/ingest/IngestJobContext.java      |   2 +-
 .../autopsy/ingest/IngestJobScheduler.java    | 462 ++++++++++++
 .../autopsy/ingest/IngestManager.java         |  54 +-
 .../autopsy/ingest/IngestTaskQueue.java       |  23 +
 .../ingest/RunIngestModulesDialog.java        |   4 +-
 .../AddContentToHashDbAction.java             |   2 +-
 13 files changed, 902 insertions(+), 493 deletions(-)
 rename Core/src/org/sleuthkit/autopsy/ingest/{IngestJobLauncher.java => IngestJobConfigurator.java} (99%)
 create mode 100755 Core/src/org/sleuthkit/autopsy/ingest/IngestJobScheduler.java
 create mode 100755 Core/src/org/sleuthkit/autopsy/ingest/IngestTaskQueue.java

diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java
index a36c061bac..c5cc14d262 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java
@@ -19,7 +19,7 @@
 package org.sleuthkit.autopsy.casemodule;
 
 
-import org.sleuthkit.autopsy.ingest.IngestJobLauncher;
+import org.sleuthkit.autopsy.ingest.IngestJobConfigurator;
 import org.openide.util.NbBundle;
 import java.awt.Color;
 import java.awt.Component;
@@ -46,7 +46,7 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessor;
 class AddImageWizardIngestConfigPanel implements WizardDescriptor.Panel<WizardDescriptor> {
 
     private static final Logger logger = Logger.getLogger(AddImageWizardIngestConfigPanel.class.getName());
-    private IngestJobLauncher ingestConfig;
+    private IngestJobConfigurator ingestConfig;
     /**
      * The visual component that displays this panel. If you need to access the
      * component from this class, just use getComponent().
@@ -73,7 +73,7 @@ class AddImageWizardIngestConfigPanel implements WizardDescriptor.Panel<WizardDe
         this.progressPanel = proPanel;
         this.dataSourcePanel = dsPanel;
         
-        ingestConfig = new IngestJobLauncher(AddImageWizardIngestConfigPanel.class.getCanonicalName());
+        ingestConfig = new IngestJobConfigurator(AddImageWizardIngestConfigPanel.class.getCanonicalName());
         List<String> messages = ingestConfig.getIngestJobConfigWarnings();
         if (messages.isEmpty() == false) {
             StringBuilder warning = new StringBuilder();
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestTask.java b/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestTask.java
index 2ad3c644e3..c62b6796a1 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestTask.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestTask.java
@@ -20,7 +20,7 @@ package org.sleuthkit.autopsy.ingest;
 
 import org.sleuthkit.datamodel.Content;
 
-final class DataSourceIngestTask {
+final class DataSourceIngestTask implements IngestTask {
     
     private final IngestJob ingestJob;
     private final Content dataSource;
@@ -38,7 +38,8 @@ final class DataSourceIngestTask {
         return dataSource;
     }    
     
-    void execute() throws InterruptedException {
+    @Override
+    public void execute() throws InterruptedException {
         ingestJob.process(dataSource);
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestTaskScheduler.java b/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestTaskScheduler.java
index ca22a6267b..ba89a669a4 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestTaskScheduler.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestTaskScheduler.java
@@ -20,42 +20,37 @@ package org.sleuthkit.autopsy.ingest;
 
 import java.util.concurrent.LinkedBlockingQueue;
 
-final class DataSourceIngestTaskScheduler {
-
-    private static DataSourceIngestTaskScheduler instance = new DataSourceIngestTaskScheduler();
-    private final LinkedBlockingQueue<DataSourceIngestTask> tasks = new LinkedBlockingQueue<>();
-
-    static DataSourceIngestTaskScheduler getInstance() {
-        return instance;
-    }
-
-    private DataSourceIngestTaskScheduler() {
-    }
-
-    synchronized void addTask(DataSourceIngestTask task) {
-        // The capacity of the tasks queue is not bounded, so the call 
-        // to put() should not block except for normal synchronized access. 
-        // Still, notify the job that the task has been added first so that 
-        // the take() of the task cannot occur before the notification.
-        task.getIngestJob().notifyTaskAdded();
-
-        // If the thread executing this code is ever interrupted, it is 
-        // because the number of ingest threads has been decreased while
-        // ingest jobs are running. This thread will exit in an orderly fashion,
-        // but the task still needs to be enqueued rather than lost.
-        while (true) {
-            try {
-                tasks.put(task);
-                break;
-            } catch (InterruptedException ex) {
-                // Reset the interrupted status of the thread so the orderly
-                // exit can occur in the intended place.
-                Thread.currentThread().interrupt();
-            }
-        }
-    }
-
-    DataSourceIngestTask getNextTask() throws InterruptedException {
-        return tasks.take(); 
-    }
-}
+//final class DataSourceIngestTaskScheduler implements IngestTaskQueue {
+//
+//    private static DataSourceIngestTaskScheduler instance = new DataSourceIngestTaskScheduler();
+//    private final LinkedBlockingQueue<DataSourceIngestTask> tasks = new LinkedBlockingQueue<>();
+//
+//    static DataSourceIngestTaskScheduler getInstance() {
+//        return instance;
+//    }
+//
+//    private DataSourceIngestTaskScheduler() {
+//    }
+//
+//    void addTask(DataSourceIngestTask task) {
+//        // If the thread executing this code is interrupted, it is because the 
+//        // number of ingest threads has been decreased while ingest jobs are 
+//        // running. This thread will exit in an orderly fashion, but the task 
+//        // still needs to be enqueued rather than lost.
+//        while (true) {
+//            try {
+//                tasks.put(task);
+//                break;
+//            } catch (InterruptedException ex) {
+//                // Reset the interrupted status of the thread so the orderly
+//                // exit can occur in the intended place.
+//                Thread.currentThread().interrupt();
+//            }
+//        }
+//    }
+//
+//    @Override
+//    public DataSourceIngestTask getNextTask() throws InterruptedException {
+//        return tasks.take(); 
+//    }
+//}
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/FileIngestTaskScheduler.java b/Core/src/org/sleuthkit/autopsy/ingest/FileIngestTaskScheduler.java
index e0da1c0829..c0a4b34295 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/FileIngestTaskScheduler.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/FileIngestTaskScheduler.java
@@ -40,353 +40,354 @@ import org.sleuthkit.datamodel.TskCoreException;
 import org.sleuthkit.datamodel.TskData;
 import org.sleuthkit.datamodel.VirtualDirectory;
 
-final class FileIngestTaskScheduler {
-
-    private static final Logger logger = Logger.getLogger(FileIngestTaskScheduler.class.getName());
-    private static FileIngestTaskScheduler instance = new FileIngestTaskScheduler();
-    private final TreeSet<FileIngestTask> rootDirectoryTasks = new TreeSet<>(new RootDirectoryTaskComparator());
-    private final List<FileIngestTask> directoryTasks = new ArrayList<>();
-    private final LinkedBlockingQueue<FileIngestTask> fileTasks = new LinkedBlockingQueue<>();
-    private static final int FAT_NTFS_FLAGS = TskData.TSK_FS_TYPE_ENUM.TSK_FS_TYPE_FAT12.getValue() | TskData.TSK_FS_TYPE_ENUM.TSK_FS_TYPE_FAT16.getValue() | TskData.TSK_FS_TYPE_ENUM.TSK_FS_TYPE_FAT32.getValue() | TskData.TSK_FS_TYPE_ENUM.TSK_FS_TYPE_NTFS.getValue();
-
-    static FileIngestTaskScheduler getInstance() {
-        return instance;
-    }
-
-    private FileIngestTaskScheduler() {
-    }
-
-    synchronized void addTasks(IngestJob job, Content dataSource) throws InterruptedException {
-        Collection<AbstractFile> rootObjects = dataSource.accept(new GetRootDirectoryVisitor());
-        List<AbstractFile> firstLevelFiles = new ArrayList<>();
-        if (rootObjects.isEmpty() && dataSource instanceof AbstractFile) {
-            // The data source is file.
-            firstLevelFiles.add((AbstractFile) dataSource);
-        } else {
-            for (AbstractFile root : rootObjects) {
-                List<Content> children;
-                try {
-                    children = root.getChildren();
-                    if (children.isEmpty()) {
-                        //add the root itself, could be unalloc file, child of volume or image
-                        firstLevelFiles.add(root);
-                    } else {
-                        //root for fs root dir, schedule children dirs/files
-                        for (Content child : children) {
-                            if (child instanceof AbstractFile) {
-                                firstLevelFiles.add((AbstractFile) child);
-                            }
-                        }
-                    }
-                } catch (TskCoreException ex) {
-                    logger.log(Level.WARNING, "Could not get children of root to enqueue: " + root.getId() + ": " + root.getName(), ex); //NON-NLS
-                }
-            }
-        }
-        for (AbstractFile firstLevelFile : firstLevelFiles) {
-            FileIngestTask fileTask = new FileIngestTask(job, firstLevelFile);
-            if (shouldEnqueueTask(fileTask)) {
-                rootDirectoryTasks.add(fileTask);
-                fileTask.getIngestJob().notifyTaskAdded();
-            }
-        }
-
-        // Reshuffle/update the dir and file level queues if needed
-        updateQueues();
-    }
-
-    synchronized void addTask(FileIngestTask task) {
-        if (shouldEnqueueTask(task)) {
-            addTaskToFileQueue(task, true);
-        }
-    }
-
-    FileIngestTask getNextTask() throws InterruptedException {
-        FileIngestTask task = fileTasks.take();
-        updateQueues();
-        return task;
-    }
-
-    private void updateQueues() throws InterruptedException {
-        // we loop because we could have a directory that has all files
-        // that do not get enqueued
-        while (true) {
-            // There are files in the queue, we're done
-            if (fileTasks.isEmpty() == false) {
-                return;
-            }
-            // fill in the directory queue if it is empty.
-            if (this.directoryTasks.isEmpty()) {
-                // bail out if root is also empty -- we are done
-                if (rootDirectoryTasks.isEmpty()) {
-                    return;
-                }
-                FileIngestTask rootTask = rootDirectoryTasks.pollFirst();
-                directoryTasks.add(rootTask);
-            }
-            //pop and push AbstractFile directory children if any
-            //add the popped and its leaf children onto cur file list
-            FileIngestTask parentTask = directoryTasks.remove(directoryTasks.size() - 1);
-            final AbstractFile parentFile = parentTask.getFile();
-            // add itself to the file list
-            if (shouldEnqueueTask(parentTask)) {
-                addTaskToFileQueue(parentTask, false);
-            }
-            // add its children to the file and directory lists
-            try {
-                List<Content> children = parentFile.getChildren();
-                for (Content c : children) {
-                    if (c instanceof AbstractFile) {
-                        AbstractFile childFile = (AbstractFile) c;
-                        FileIngestTask childTask = new FileIngestTask(parentTask.getIngestJob(), childFile);
-                        if (childFile.hasChildren()) {
-                            directoryTasks.add(childTask);
-                            childTask.getIngestJob().notifyTaskAdded();
-                        } else if (shouldEnqueueTask(childTask)) {
-                            addTaskToFileQueue(childTask, true);
-                        }
-                    }
-                }
-            } catch (TskCoreException ex) {
-                logger.log(Level.SEVERE, "Could not get children of file and update file queues: " + parentFile.getName(), ex);
-            }
-        }
-    }
-
-    private void addTaskToFileQueue(FileIngestTask task, boolean isNewTask) {
-        if (isNewTask) {
-            // The capacity of the file tasks queue is not bounded, so the call 
-            // to put() should not block except for normal synchronized access. 
-            // Still, notify the job that the task has been added first so that 
-            // the take() of the task cannot occur before the notification.
-            task.getIngestJob().notifyTaskAdded();
-        }
-        // If the thread executing this code is ever interrupted, it is 
-        // because the number of ingest threads has been decreased while
-        // ingest jobs are running. This thread will exit in an orderly fashion,
-        // but the task still needs to be enqueued rather than lost.
-        while (true) {
-            try {
-                fileTasks.put(task);
-                break;
-            } catch (InterruptedException ex) {
-                // Reset the interrupted status of the thread so the orderly
-                // exit can occur in the intended place.
-                Thread.currentThread().interrupt();
-            }
-        }
-    }
-
-    /**
-     * Check if the file is a special file that we should skip
-     *
-     * @param processTask a task whose file to check if should be queued of
-     * skipped
-     * @return true if should be enqueued, false otherwise
-     */
-    private static boolean shouldEnqueueTask(final FileIngestTask processTask) {
-        final AbstractFile aFile = processTask.getFile();
-        //if it's unalloc file, skip if so scheduled
-        if (processTask.getIngestJob().shouldProcessUnallocatedSpace() == false && aFile.getType().equals(TskData.TSK_DB_FILES_TYPE_ENUM.UNALLOC_BLOCKS)) {
-            return false;
-        }
-        String fileName = aFile.getName();
-        if (fileName.equals(".") || fileName.equals("..")) {
-            return false;
-        } else if (aFile instanceof org.sleuthkit.datamodel.File) {
-            final org.sleuthkit.datamodel.File f = (File) aFile;
-            //skip files in root dir, starting with $, containing : (not default attributes)
-            //with meta address < 32, i.e. some special large NTFS and FAT files
-            FileSystem fs = null;
-            try {
-                fs = f.getFileSystem();
-            } catch (TskCoreException ex) {
-                logger.log(Level.SEVERE, "Could not get FileSystem for " + f, ex); //NON-NLS
-            }
-            TskData.TSK_FS_TYPE_ENUM fsType = TskData.TSK_FS_TYPE_ENUM.TSK_FS_TYPE_UNSUPP;
-            if (fs != null) {
-                fsType = fs.getFsType();
-            }
-            if ((fsType.getValue() & FAT_NTFS_FLAGS) == 0) {
-                //not fat or ntfs, accept all files
-                return true;
-            }
-            boolean isInRootDir = false;
-            try {
-                isInRootDir = f.getParentDirectory().isRoot();
-            } catch (TskCoreException ex) {
-                logger.log(Level.WARNING, "Could not check if should enqueue the file: " + f.getName(), ex); //NON-NLS
-            }
-            if (isInRootDir && f.getMetaAddr() < 32) {
-                String name = f.getName();
-                if (name.length() > 0 && name.charAt(0) == '$' && name.contains(":")) {
-                    return false;
-                }
-            } else {
-                return true;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Visitor that gets a collection of top level objects to be scheduled, such
-     * as root directories (if there is FS) or LayoutFiles and virtual
-     * directories, also if there is no FS.
-     */
-    static class GetRootDirectoryVisitor extends GetFilesContentVisitor {
-
-        @Override
-        public Collection<AbstractFile> visit(VirtualDirectory ld) {
-            //case when we hit a layout directoryor local file container, not under a real FS
-            //or when root virt dir is scheduled
-            Collection<AbstractFile> ret = new ArrayList<>();
-            ret.add(ld);
-            return ret;
-        }
-
-        @Override
-        public Collection<AbstractFile> visit(LayoutFile lf) {
-            //case when we hit a layout file, not under a real FS
-            Collection<AbstractFile> ret = new ArrayList<>();
-            ret.add(lf);
-            return ret;
-        }
-
-        @Override
-        public Collection<AbstractFile> visit(Directory drctr) {
-            //we hit a real directory, a child of real FS
-            Collection<AbstractFile> ret = new ArrayList<>();
-            ret.add(drctr);
-            return ret;
-        }
-
-        @Override
-        public Collection<AbstractFile> visit(FileSystem fs) {
-            return getAllFromChildren(fs);
-        }
-
-        @Override
-        public Collection<AbstractFile> visit(File file) {
-            //can have derived files
-            return getAllFromChildren(file);
-        }
-
-        @Override
-        public Collection<AbstractFile> visit(DerivedFile derivedFile) {
-            //can have derived files
-            //TODO test this and overall scheduler with derived files
-            return getAllFromChildren(derivedFile);
-        }
-
-        @Override
-        public Collection<AbstractFile> visit(LocalFile localFile) {
-            //can have local files
-            //TODO test this and overall scheduler with local files
-            return getAllFromChildren(localFile);
-        }
-    }
-
-    /**
-     * Root directory sorter
-     */
-    private static class RootDirectoryTaskComparator implements Comparator<FileIngestTask> {
-
-        @Override
-        public int compare(FileIngestTask q1, FileIngestTask q2) {
-            AbstractFilePriority.Priority p1 = AbstractFilePriority.getPriority(q1.getFile());
-            AbstractFilePriority.Priority p2 = AbstractFilePriority.getPriority(q2.getFile());
-            if (p1 == p2) {
-                return (int) (q2.getFile().getId() - q1.getFile().getId());
-            } else {
-                return p2.ordinal() - p1.ordinal();
-            }
-        }
-
-        /**
-         * Priority determination for sorted AbstractFile, used by
-         * RootDirComparator
-         */
-        private static class AbstractFilePriority {
-
-            enum Priority {
-
-                LAST, LOW, MEDIUM, HIGH
-            }
-            static final List<Pattern> LAST_PRI_PATHS = new ArrayList<>();
-            static final List<Pattern> LOW_PRI_PATHS = new ArrayList<>();
-            static final List<Pattern> MEDIUM_PRI_PATHS = new ArrayList<>();
-            static final List<Pattern> HIGH_PRI_PATHS = new ArrayList<>();
-            /* prioritize root directory folders based on the assumption that we are
-             * looking for user content. Other types of investigations may want different
-             * priorities. */
-
-            static /* prioritize root directory folders based on the assumption that we are
-             * looking for user content. Other types of investigations may want different
-             * priorities. */ {
-                // these files have no structure, so they go last
-                //unalloc files are handled as virtual files in getPriority()
-                //LAST_PRI_PATHS.schedule(Pattern.compile("^\\$Unalloc", Pattern.CASE_INSENSITIVE));
-                //LAST_PRI_PATHS.schedule(Pattern.compile("^\\Unalloc", Pattern.CASE_INSENSITIVE));
-                LAST_PRI_PATHS.add(Pattern.compile("^pagefile", Pattern.CASE_INSENSITIVE));
-                LAST_PRI_PATHS.add(Pattern.compile("^hiberfil", Pattern.CASE_INSENSITIVE));
-                // orphan files are often corrupt and windows does not typically have
-                // user content, so put them towards the bottom
-                LOW_PRI_PATHS.add(Pattern.compile("^\\$OrphanFiles", Pattern.CASE_INSENSITIVE));
-                LOW_PRI_PATHS.add(Pattern.compile("^Windows", Pattern.CASE_INSENSITIVE));
-                // all other files go into the medium category too
-                MEDIUM_PRI_PATHS.add(Pattern.compile("^Program Files", Pattern.CASE_INSENSITIVE));
-                // user content is top priority
-                HIGH_PRI_PATHS.add(Pattern.compile("^Users", Pattern.CASE_INSENSITIVE));
-                HIGH_PRI_PATHS.add(Pattern.compile("^Documents and Settings", Pattern.CASE_INSENSITIVE));
-                HIGH_PRI_PATHS.add(Pattern.compile("^home", Pattern.CASE_INSENSITIVE));
-                HIGH_PRI_PATHS.add(Pattern.compile("^ProgramData", Pattern.CASE_INSENSITIVE));
-            }
-
-            /**
-             * Get the scheduling priority for a given file.
-             *
-             * @param abstractFile
-             * @return
-             */
-            static AbstractFilePriority.Priority getPriority(final AbstractFile abstractFile) {
-                if (!abstractFile.getType().equals(TskData.TSK_DB_FILES_TYPE_ENUM.FS)) {
-                    //quickly filter out unstructured content
-                    //non-fs virtual files and dirs, such as representing unalloc space
-                    return AbstractFilePriority.Priority.LAST;
-                }
-                //determine the fs files priority by name
-                final String path = abstractFile.getName();
-                if (path == null) {
-                    return AbstractFilePriority.Priority.MEDIUM;
-                }
-                for (Pattern p : HIGH_PRI_PATHS) {
-                    Matcher m = p.matcher(path);
-                    if (m.find()) {
-                        return AbstractFilePriority.Priority.HIGH;
-                    }
-                }
-                for (Pattern p : MEDIUM_PRI_PATHS) {
-                    Matcher m = p.matcher(path);
-                    if (m.find()) {
-                        return AbstractFilePriority.Priority.MEDIUM;
-                    }
-                }
-                for (Pattern p : LOW_PRI_PATHS) {
-                    Matcher m = p.matcher(path);
-                    if (m.find()) {
-                        return AbstractFilePriority.Priority.LOW;
-                    }
-                }
-                for (Pattern p : LAST_PRI_PATHS) {
-                    Matcher m = p.matcher(path);
-                    if (m.find()) {
-                        return AbstractFilePriority.Priority.LAST;
-                    }
-                }
-                //default is medium
-                return AbstractFilePriority.Priority.MEDIUM;
-            }
-        }
-    }
-}
+//final class FileIngestTaskScheduler implements IngestTaskQueue {
+//
+//    private static final Logger logger = Logger.getLogger(FileIngestTaskScheduler.class.getName());
+//    private static FileIngestTaskScheduler instance = new FileIngestTaskScheduler();
+//    private final TreeSet<FileIngestTask> rootDirectoryTasks = new TreeSet<>(new RootDirectoryTaskComparator());
+//    private final List<FileIngestTask> directoryTasks = new ArrayList<>();
+//    private final LinkedBlockingQueue<FileIngestTask> fileTasks = new LinkedBlockingQueue<>();
+//    private static final int FAT_NTFS_FLAGS = TskData.TSK_FS_TYPE_ENUM.TSK_FS_TYPE_FAT12.getValue() | TskData.TSK_FS_TYPE_ENUM.TSK_FS_TYPE_FAT16.getValue() | TskData.TSK_FS_TYPE_ENUM.TSK_FS_TYPE_FAT32.getValue() | TskData.TSK_FS_TYPE_ENUM.TSK_FS_TYPE_NTFS.getValue();
+//
+//    static FileIngestTaskScheduler getInstance() {
+//        return instance;
+//    }
+//
+//    private FileIngestTaskScheduler() {
+//    }
+//
+//    synchronized void addTasks(IngestJob job, Content dataSource) throws InterruptedException {
+//        Collection<AbstractFile> rootObjects = dataSource.accept(new GetRootDirectoryVisitor());
+//        List<AbstractFile> firstLevelFiles = new ArrayList<>();
+//        if (rootObjects.isEmpty() && dataSource instanceof AbstractFile) {
+//            // The data source is file.
+//            firstLevelFiles.add((AbstractFile) dataSource);
+//        } else {
+//            for (AbstractFile root : rootObjects) {
+//                List<Content> children;
+//                try {
+//                    children = root.getChildren();
+//                    if (children.isEmpty()) {
+//                        //add the root itself, could be unalloc file, child of volume or image
+//                        firstLevelFiles.add(root);
+//                    } else {
+//                        //root for fs root dir, schedule children dirs/files
+//                        for (Content child : children) {
+//                            if (child instanceof AbstractFile) {
+//                                firstLevelFiles.add((AbstractFile) child);
+//                            }
+//                        }
+//                    }
+//                } catch (TskCoreException ex) {
+//                    logger.log(Level.WARNING, "Could not get children of root to enqueue: " + root.getId() + ": " + root.getName(), ex); //NON-NLS
+//                }
+//            }
+//        }
+//        for (AbstractFile firstLevelFile : firstLevelFiles) {
+//            FileIngestTask fileTask = new FileIngestTask(job, firstLevelFile);
+//            if (shouldEnqueueTask(fileTask)) {
+//                rootDirectoryTasks.add(fileTask);
+//                fileTask.getIngestJob().notifyTaskAdded();
+//            }
+//        }
+//
+//        // Reshuffle/update the dir and file level queues if needed
+//        updateQueues();
+//    }
+//
+//    synchronized void addTask(FileIngestTask task) {
+//        if (shouldEnqueueTask(task)) {
+//            addTaskToFileQueue(task, true);
+//        }
+//    }
+//
+//    @Override
+//    public FileIngestTask getNextTask() throws InterruptedException {
+//        FileIngestTask task = fileTasks.take();
+//        updateQueues();
+//        return task;
+//    }
+//
+//    private void updateQueues() throws InterruptedException {
+//        // we loop because we could have a directory that has all files
+//        // that do not get enqueued
+//        while (true) {
+//            // There are files in the queue, we're done
+//            if (fileTasks.isEmpty() == false) {
+//                return;
+//            }
+//            // fill in the directory queue if it is empty.
+//            if (this.directoryTasks.isEmpty()) {
+//                // bail out if root is also empty -- we are done
+//                if (rootDirectoryTasks.isEmpty()) {
+//                    return;
+//                }
+//                FileIngestTask rootTask = rootDirectoryTasks.pollFirst();
+//                directoryTasks.add(rootTask);
+//            }
+//            //pop and push AbstractFile directory children if any
+//            //add the popped and its leaf children onto cur file list
+//            FileIngestTask parentTask = directoryTasks.remove(directoryTasks.size() - 1);
+//            final AbstractFile parentFile = parentTask.getFile();
+//            // add itself to the file list
+//            if (shouldEnqueueTask(parentTask)) {
+//                addTaskToFileQueue(parentTask, false);
+//            }
+//            // add its children to the file and directory lists
+//            try {
+//                List<Content> children = parentFile.getChildren();
+//                for (Content c : children) {
+//                    if (c instanceof AbstractFile) {
+//                        AbstractFile childFile = (AbstractFile) c;
+//                        FileIngestTask childTask = new FileIngestTask(parentTask.getIngestJob(), childFile);
+//                        if (childFile.hasChildren()) {
+//                            directoryTasks.add(childTask);
+//                            childTask.getIngestJob().notifyTaskAdded();
+//                        } else if (shouldEnqueueTask(childTask)) {
+//                            addTaskToFileQueue(childTask, true);
+//                        }
+//                    }
+//                }
+//            } catch (TskCoreException ex) {
+//                logger.log(Level.SEVERE, "Could not get children of file and update file queues: " + parentFile.getName(), ex);
+//            }
+//        }
+//    }
+//
+//    private void addTaskToFileQueue(FileIngestTask task, boolean isNewTask) {
+//        if (isNewTask) {
+//            // The capacity of the file tasks queue is not bounded, so the call 
+//            // to put() should not block except for normal synchronized access. 
+//            // Still, notify the job that the task has been added first so that 
+//            // the take() of the task cannot occur before the notification.
+//            task.getIngestJob().notifyTaskAdded();
+//        }
+//        // If the thread executing this code is ever interrupted, it is 
+//        // because the number of ingest threads has been decreased while
+//        // ingest jobs are running. This thread will exit in an orderly fashion,
+//        // but the task still needs to be enqueued rather than lost.
+//        while (true) {
+//            try {
+//                fileTasks.put(task);
+//                break;
+//            } catch (InterruptedException ex) {
+//                // Reset the interrupted status of the thread so the orderly
+//                // exit can occur in the intended place.
+//                Thread.currentThread().interrupt();
+//            }
+//        }
+//    }
+//
+//    /**
+//     * Check if the file is a special file that we should skip
+//     *
+//     * @param processTask a task whose file to check if should be queued of
+//     * skipped
+//     * @return true if should be enqueued, false otherwise
+//     */
+//    private static boolean shouldEnqueueTask(final FileIngestTask processTask) {
+//        final AbstractFile aFile = processTask.getFile();
+//        //if it's unalloc file, skip if so scheduled
+//        if (processTask.getIngestJob().shouldProcessUnallocatedSpace() == false && aFile.getType().equals(TskData.TSK_DB_FILES_TYPE_ENUM.UNALLOC_BLOCKS)) {
+//            return false;
+//        }
+//        String fileName = aFile.getName();
+//        if (fileName.equals(".") || fileName.equals("..")) {
+//            return false;
+//        } else if (aFile instanceof org.sleuthkit.datamodel.File) {
+//            final org.sleuthkit.datamodel.File f = (File) aFile;
+//            //skip files in root dir, starting with $, containing : (not default attributes)
+//            //with meta address < 32, i.e. some special large NTFS and FAT files
+//            FileSystem fs = null;
+//            try {
+//                fs = f.getFileSystem();
+//            } catch (TskCoreException ex) {
+//                logger.log(Level.SEVERE, "Could not get FileSystem for " + f, ex); //NON-NLS
+//            }
+//            TskData.TSK_FS_TYPE_ENUM fsType = TskData.TSK_FS_TYPE_ENUM.TSK_FS_TYPE_UNSUPP;
+//            if (fs != null) {
+//                fsType = fs.getFsType();
+//            }
+//            if ((fsType.getValue() & FAT_NTFS_FLAGS) == 0) {
+//                //not fat or ntfs, accept all files
+//                return true;
+//            }
+//            boolean isInRootDir = false;
+//            try {
+//                isInRootDir = f.getParentDirectory().isRoot();
+//            } catch (TskCoreException ex) {
+//                logger.log(Level.WARNING, "Could not check if should enqueue the file: " + f.getName(), ex); //NON-NLS
+//            }
+//            if (isInRootDir && f.getMetaAddr() < 32) {
+//                String name = f.getName();
+//                if (name.length() > 0 && name.charAt(0) == '$' && name.contains(":")) {
+//                    return false;
+//                }
+//            } else {
+//                return true;
+//            }
+//        }
+//        return true;
+//    }
+//
+//    /**
+//     * Visitor that gets a collection of top level objects to be scheduled, such
+//     * as root directories (if there is FS) or LayoutFiles and virtual
+//     * directories, also if there is no FS.
+//     */
+//    static class GetRootDirectoryVisitor extends GetFilesContentVisitor {
+//
+//        @Override
+//        public Collection<AbstractFile> visit(VirtualDirectory ld) {
+//            //case when we hit a layout directoryor local file container, not under a real FS
+//            //or when root virt dir is scheduled
+//            Collection<AbstractFile> ret = new ArrayList<>();
+//            ret.add(ld);
+//            return ret;
+//        }
+//
+//        @Override
+//        public Collection<AbstractFile> visit(LayoutFile lf) {
+//            //case when we hit a layout file, not under a real FS
+//            Collection<AbstractFile> ret = new ArrayList<>();
+//            ret.add(lf);
+//            return ret;
+//        }
+//
+//        @Override
+//        public Collection<AbstractFile> visit(Directory drctr) {
+//            //we hit a real directory, a child of real FS
+//            Collection<AbstractFile> ret = new ArrayList<>();
+//            ret.add(drctr);
+//            return ret;
+//        }
+//
+//        @Override
+//        public Collection<AbstractFile> visit(FileSystem fs) {
+//            return getAllFromChildren(fs);
+//        }
+//
+//        @Override
+//        public Collection<AbstractFile> visit(File file) {
+//            //can have derived files
+//            return getAllFromChildren(file);
+//        }
+//
+//        @Override
+//        public Collection<AbstractFile> visit(DerivedFile derivedFile) {
+//            //can have derived files
+//            //TODO test this and overall scheduler with derived files
+//            return getAllFromChildren(derivedFile);
+//        }
+//
+//        @Override
+//        public Collection<AbstractFile> visit(LocalFile localFile) {
+//            //can have local files
+//            //TODO test this and overall scheduler with local files
+//            return getAllFromChildren(localFile);
+//        }
+//    }
+//
+//    /**
+//     * Root directory sorter
+//     */
+//    private static class RootDirectoryTaskComparator implements Comparator<FileIngestTask> {
+//
+//        @Override
+//        public int compare(FileIngestTask q1, FileIngestTask q2) {
+//            AbstractFilePriority.Priority p1 = AbstractFilePriority.getPriority(q1.getFile());
+//            AbstractFilePriority.Priority p2 = AbstractFilePriority.getPriority(q2.getFile());
+//            if (p1 == p2) {
+//                return (int) (q2.getFile().getId() - q1.getFile().getId());
+//            } else {
+//                return p2.ordinal() - p1.ordinal();
+//            }
+//        }
+//
+//        /**
+//         * Priority determination for sorted AbstractFile, used by
+//         * RootDirComparator
+//         */
+//        private static class AbstractFilePriority {
+//
+//            enum Priority {
+//
+//                LAST, LOW, MEDIUM, HIGH
+//            }
+//            static final List<Pattern> LAST_PRI_PATHS = new ArrayList<>();
+//            static final List<Pattern> LOW_PRI_PATHS = new ArrayList<>();
+//            static final List<Pattern> MEDIUM_PRI_PATHS = new ArrayList<>();
+//            static final List<Pattern> HIGH_PRI_PATHS = new ArrayList<>();
+//            /* prioritize root directory folders based on the assumption that we are
+//             * looking for user content. Other types of investigations may want different
+//             * priorities. */
+//
+//            static /* prioritize root directory folders based on the assumption that we are
+//             * looking for user content. Other types of investigations may want different
+//             * priorities. */ {
+//                // these files have no structure, so they go last
+//                //unalloc files are handled as virtual files in getPriority()
+//                //LAST_PRI_PATHS.schedule(Pattern.compile("^\\$Unalloc", Pattern.CASE_INSENSITIVE));
+//                //LAST_PRI_PATHS.schedule(Pattern.compile("^\\Unalloc", Pattern.CASE_INSENSITIVE));
+//                LAST_PRI_PATHS.add(Pattern.compile("^pagefile", Pattern.CASE_INSENSITIVE));
+//                LAST_PRI_PATHS.add(Pattern.compile("^hiberfil", Pattern.CASE_INSENSITIVE));
+//                // orphan files are often corrupt and windows does not typically have
+//                // user content, so put them towards the bottom
+//                LOW_PRI_PATHS.add(Pattern.compile("^\\$OrphanFiles", Pattern.CASE_INSENSITIVE));
+//                LOW_PRI_PATHS.add(Pattern.compile("^Windows", Pattern.CASE_INSENSITIVE));
+//                // all other files go into the medium category too
+//                MEDIUM_PRI_PATHS.add(Pattern.compile("^Program Files", Pattern.CASE_INSENSITIVE));
+//                // user content is top priority
+//                HIGH_PRI_PATHS.add(Pattern.compile("^Users", Pattern.CASE_INSENSITIVE));
+//                HIGH_PRI_PATHS.add(Pattern.compile("^Documents and Settings", Pattern.CASE_INSENSITIVE));
+//                HIGH_PRI_PATHS.add(Pattern.compile("^home", Pattern.CASE_INSENSITIVE));
+//                HIGH_PRI_PATHS.add(Pattern.compile("^ProgramData", Pattern.CASE_INSENSITIVE));
+//            }
+//
+//            /**
+//             * Get the scheduling priority for a given file.
+//             *
+//             * @param abstractFile
+//             * @return
+//             */
+//            static AbstractFilePriority.Priority getPriority(final AbstractFile abstractFile) {
+//                if (!abstractFile.getType().equals(TskData.TSK_DB_FILES_TYPE_ENUM.FS)) {
+//                    //quickly filter out unstructured content
+//                    //non-fs virtual files and dirs, such as representing unalloc space
+//                    return AbstractFilePriority.Priority.LAST;
+//                }
+//                //determine the fs files priority by name
+//                final String path = abstractFile.getName();
+//                if (path == null) {
+//                    return AbstractFilePriority.Priority.MEDIUM;
+//                }
+//                for (Pattern p : HIGH_PRI_PATHS) {
+//                    Matcher m = p.matcher(path);
+//                    if (m.find()) {
+//                        return AbstractFilePriority.Priority.HIGH;
+//                    }
+//                }
+//                for (Pattern p : MEDIUM_PRI_PATHS) {
+//                    Matcher m = p.matcher(path);
+//                    if (m.find()) {
+//                        return AbstractFilePriority.Priority.MEDIUM;
+//                    }
+//                }
+//                for (Pattern p : LOW_PRI_PATHS) {
+//                    Matcher m = p.matcher(path);
+//                    if (m.find()) {
+//                        return AbstractFilePriority.Priority.LOW;
+//                    }
+//                }
+//                for (Pattern p : LAST_PRI_PATHS) {
+//                    Matcher m = p.matcher(path);
+//                    if (m.find()) {
+//                        return AbstractFilePriority.Priority.LAST;
+//                    }
+//                }
+//                //default is medium
+//                return AbstractFilePriority.Priority.MEDIUM;
+//            }
+//        }
+//    }
+//}
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/GetFilesCountVisitor.java b/Core/src/org/sleuthkit/autopsy/ingest/GetFilesCountVisitor.java
index f8c280628d..b3bc34d1d5 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/GetFilesCountVisitor.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/GetFilesCountVisitor.java
@@ -38,7 +38,7 @@ import org.sleuthkit.datamodel.TskData;
  */
 final class GetFilesCountVisitor extends ContentVisitor.Default<Long> {
 
-    private static final Logger logger = Logger.getLogger(FileIngestTaskScheduler.class.getName());
+    private static final Logger logger = Logger.getLogger(GetFilesCountVisitor.class.getName());
 
     @Override
     public Long visit(FileSystem fs) {
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestJob.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestJob.java
index 424aa638a2..529e0f5d1e 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestJob.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestJob.java
@@ -40,7 +40,6 @@ import org.sleuthkit.datamodel.Content;
 final class IngestJob {
 
     private static final Logger logger = Logger.getLogger(IngestManager.class.getName());
-    private static final AtomicLong nextIngestJobId = new AtomicLong(0L);
     private static final ConcurrentHashMap<Long, IngestJob> ingestJobsById = new ConcurrentHashMap<>();
     private final long id;
     private final Content rootDataSource;
@@ -55,57 +54,7 @@ final class IngestJob {
     private ProgressHandle fileTasksProgress;
     private volatile boolean cancelled;
 
-    /**
-     * Creates an ingest job for a data source and starts up the ingest
-     * pipelines for the job.
-     *
-     * @param rootDataSource The data source to ingest.
-     * @param ingestModuleTemplates The ingest module templates to use to create
-     * the ingest pipelines for the job.
-     * @param processUnallocatedSpace Whether or not the job should include
-     * processing of unallocated space.
-     * @return A collection of ingest module startUp up errors, empty on
-     * success.
-     * @throws InterruptedException
-     */
-    static List<IngestModuleError> startJob(Content dataSource, List<IngestModuleTemplate> ingestModuleTemplates, boolean processUnallocatedSpace) throws InterruptedException {
-        long jobId = nextIngestJobId.incrementAndGet();
-        IngestJob ingestJob = new IngestJob(jobId, dataSource, ingestModuleTemplates, processUnallocatedSpace);
-        List<IngestModuleError> errors = ingestJob.startUp();
-        if (errors.isEmpty()) {
-            ingestJobsById.put(jobId, ingestJob);
-            IngestManager.getInstance().fireIngestJobStarted(jobId);
-        }
-        return errors;
-    }
-
-    static boolean jobsAreRunning() {
-        for (IngestJob job : ingestJobsById.values()) {
-            if (!job.isCancelled()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    static void addFileToJob(long ingestJobId, AbstractFile file) { // RJCTODO: Just one at a time?
-        IngestJob job = ingestJobsById.get(ingestJobId);
-        if (job != null) {
-//            long adjustedFilesCount = job.filesToIngestEstimate.incrementAndGet(); // RJCTODO: Not the best name now?
-//            job.fileTasksProgress.switchToIndeterminate(); // RJCTODO: Comment this stuff
-//            job.fileTasksProgress.switchToDeterminate((int) adjustedFilesCount);
-//            job.fileTasksProgress.progress(job.processedFiles.intValue());
-            FileIngestTaskScheduler.getInstance().addTask(new FileIngestTask(job, file));
-        }
-    }
-
-    static void cancelAllJobs() {
-        for (IngestJob job : ingestJobsById.values()) {
-            job.cancel();
-        }
-    }
-
-    private IngestJob(long id, Content dataSource, List<IngestModuleTemplate> ingestModuleTemplates, boolean processUnallocatedSpace) {
+    IngestJob(long id, Content dataSource, List<IngestModuleTemplate> ingestModuleTemplates, boolean processUnallocatedSpace) {
         this.id = id;
         this.rootDataSource = dataSource;
         this.ingestModuleTemplates = ingestModuleTemplates;
@@ -126,8 +75,6 @@ final class IngestJob {
         if (errors.isEmpty()) {
             startDataSourceIngestProgressBar();
             startFileIngestProgressBar();
-            FileIngestTaskScheduler.getInstance().addTasks(this, rootDataSource); // RJCTODO: Think about this ordering "solution" for small images
-            DataSourceIngestTaskScheduler.getInstance().addTask(new DataSourceIngestTask(this, rootDataSource));
         }
         return errors;
     }
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobLauncher.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobConfigurator.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/ingest/IngestJobLauncher.java
rename to Core/src/org/sleuthkit/autopsy/ingest/IngestJobConfigurator.java
index 23ab80d231..519df49999 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobLauncher.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobConfigurator.java
@@ -41,14 +41,14 @@ import org.sleuthkit.datamodel.Content;
  * for a particular context and for launching ingest jobs that process one or
  * more data sources using the ingest job configuration.
  */
-public final class IngestJobLauncher {
+public final class IngestJobConfigurator {
 
     private static final String ENABLED_INGEST_MODULES_KEY = "Enabled_Ingest_Modules"; //NON-NLS
     private static final String DISABLED_INGEST_MODULES_KEY = "Disabled_Ingest_Modules"; //NON-NLS
     private static final String PARSE_UNALLOC_SPACE_KEY = "Process_Unallocated_Space"; //NON-NLS
     private static final String MODULE_SETTINGS_FOLDER_PATH = new StringBuilder(PlatformUtil.getUserConfigDirectory()).append(File.separator).append("IngestModuleSettings").toString(); //NON-NLS            
     private static final String MODULE_SETTINGS_FILE_EXT = ".settings"; //NON-NLS
-    private static final Logger logger = Logger.getLogger(IngestJobLauncher.class.getName());
+    private static final Logger logger = Logger.getLogger(IngestJobConfigurator.class.getName());
     private final String launcherContext;
     private String moduleSettingsFolderForContext = null;
     private final List<String> warnings = new ArrayList<>();
@@ -61,7 +61,7 @@ public final class IngestJobLauncher {
      *
      * @param launcherContext The context identifier.
      */
-    public IngestJobLauncher(String launcherContext) {
+    public IngestJobConfigurator(String launcherContext) {
         this.launcherContext = launcherContext;
 
         createModuleSettingsFolderForContext();
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobContext.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobContext.java
index b8d4493de4..968f72a7f8 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobContext.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobContext.java
@@ -60,7 +60,7 @@ public final class IngestJobContext {
      */
     public void addFiles(List<AbstractFile> files) {
         for (AbstractFile file : files) {
-                IngestJob.addFileToJob(ingestJob.getId(), file);
+            IngestJobScheduler.getInstance().addFileToIngestJob(ingestJob, file);
         }
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobScheduler.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobScheduler.java
new file mode 100755
index 0000000000..0141f3587f
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobScheduler.java
@@ -0,0 +1,462 @@
+/*
+ * Autopsy Forensic Browser
+ * 
+ * Copyright 2012-2014 Basis Technology Corp.
+ * Contact: carrier <at> sleuthkit <dot> org
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.autopsy.ingest;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.sleuthkit.datamodel.AbstractFile;
+import org.sleuthkit.datamodel.Content;
+import org.sleuthkit.datamodel.DerivedFile;
+import org.sleuthkit.datamodel.Directory;
+import org.sleuthkit.datamodel.File;
+import org.sleuthkit.datamodel.FileSystem;
+import org.sleuthkit.datamodel.LayoutFile;
+import org.sleuthkit.datamodel.LocalFile;
+import org.sleuthkit.datamodel.TskCoreException;
+import org.sleuthkit.datamodel.TskData;
+import org.sleuthkit.datamodel.VirtualDirectory;
+
+final class IngestJobScheduler {
+
+    private static final Logger logger = Logger.getLogger(IngestJobScheduler.class.getName());
+    private static final int FAT_NTFS_FLAGS = TskData.TSK_FS_TYPE_ENUM.TSK_FS_TYPE_FAT12.getValue() | TskData.TSK_FS_TYPE_ENUM.TSK_FS_TYPE_FAT16.getValue() | TskData.TSK_FS_TYPE_ENUM.TSK_FS_TYPE_FAT32.getValue() | TskData.TSK_FS_TYPE_ENUM.TSK_FS_TYPE_NTFS.getValue();
+    private static IngestJobScheduler instance = new IngestJobScheduler();
+    private final AtomicLong nextIngestJobId = new AtomicLong(0L);
+    private final ConcurrentHashMap<Long, IngestJob> ingestJobsById = new ConcurrentHashMap<>();
+    private final LinkedBlockingQueue<DataSourceIngestTask> dataSourceTasks = new LinkedBlockingQueue<>();
+    private final TreeSet<FileIngestTask> rootDirectoryTasks = new TreeSet<>(new RootDirectoryTaskComparator());
+    private final List<FileIngestTask> directoryTasks = new ArrayList<>();
+    private final LinkedBlockingQueue<FileIngestTask> fileTasks = new LinkedBlockingQueue<>();
+    private final DataSourceIngestTaskQueue dataSourceIngestTaskQueue = new DataSourceIngestTaskQueue();
+    private final FileIngestTaskQueue fileIngestTaskQueue = new FileIngestTaskQueue();
+
+    static IngestJobScheduler getInstance() {
+        return instance;
+    }
+
+    private IngestJobScheduler() {
+    }
+
+    /**
+     * Creates an ingest job for a data source.
+     *
+     * @param rootDataSource The data source to ingest.
+     * @param ingestModuleTemplates The ingest module templates to use to create
+     * the ingest pipelines for the job.
+     * @param processUnallocatedSpace Whether or not the job should include
+     * processing of unallocated space.
+     * @return A collection of ingest module start up errors, empty on success.
+     * @throws InterruptedException
+     */
+    synchronized List<IngestModuleError> startIngestJob(Content dataSource, List<IngestModuleTemplate> ingestModuleTemplates, boolean processUnallocatedSpace) throws InterruptedException {
+        long jobId = nextIngestJobId.incrementAndGet();
+        IngestJob job = new IngestJob(jobId, dataSource, ingestModuleTemplates, processUnallocatedSpace);
+        ingestJobsById.put(jobId, job);
+        IngestManager.getInstance().fireIngestJobStarted(jobId);
+        List<IngestModuleError> errors = job.startUp();
+        if (errors.isEmpty()) {
+            addDataSourceToIngestJob(job, dataSource);
+        } else {
+            ingestJobsById.remove(jobId);
+            IngestManager.getInstance().fireIngestJobCancelled(jobId);
+        }
+        return errors;
+    }
+
+    boolean ingestJobsAreRunning() {
+        for (IngestJob job : ingestJobsById.values()) {
+            if (!job.isCancelled()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    synchronized void addDataSourceToIngestJob(IngestJob job, Content dataSource) throws InterruptedException {
+        // If the thread executing this code is interrupted, it is because the 
+        // the number of ingest threads has been decreased while ingest jobs are 
+        // running. The calling thread will exit in an orderly fashion, but the 
+        // task still needs to be enqueued rather than lost.
+        DataSourceIngestTask task = new DataSourceIngestTask(job, dataSource);
+        while (true) {
+            try {
+                dataSourceTasks.put(task);
+                break;
+            } catch (InterruptedException ex) {
+                // Reset the interrupted status of the thread so the orderly
+                // exit can occur in the intended place.
+                Thread.currentThread().interrupt();
+            }
+        }
+
+        Collection<AbstractFile> rootObjects = dataSource.accept(new GetRootDirectoryVisitor());
+        List<AbstractFile> firstLevelFiles = new ArrayList<>();
+        if (rootObjects.isEmpty() && dataSource instanceof AbstractFile) {
+            // The data source is file.
+            firstLevelFiles.add((AbstractFile) dataSource);
+        } else {
+            for (AbstractFile root : rootObjects) {
+                List<Content> children;
+                try {
+                    children = root.getChildren();
+                    if (children.isEmpty()) {
+                        //add the root itself, could be unalloc file, child of volume or image
+                        firstLevelFiles.add(root);
+                    } else {
+                        //root for fs root dir, schedule children dirs/files
+                        for (Content child : children) {
+                            if (child instanceof AbstractFile) {
+                                firstLevelFiles.add((AbstractFile) child);
+                            }
+                        }
+                    }
+                } catch (TskCoreException ex) {
+                    logger.log(Level.WARNING, "Could not get children of root to enqueue: " + root.getId() + ": " + root.getName(), ex); //NON-NLS
+                }
+            }
+        }
+        for (AbstractFile firstLevelFile : firstLevelFiles) {
+            FileIngestTask fileTask = new FileIngestTask(job, firstLevelFile);
+            if (shouldEnqueueFileTask(fileTask)) {
+                rootDirectoryTasks.add(fileTask);
+                fileTask.getIngestJob().notifyTaskAdded();
+            }
+        }
+
+        // Reshuffle/update the dir and file level queues if needed
+        updateFileTaskQueues();
+    }
+
+    synchronized void addFileToIngestJob(IngestJob job, AbstractFile file) { // RJCTODO: Just one at a time?
+        FileIngestTask task = new FileIngestTask(job, file);
+        if (shouldEnqueueFileTask(task)) {
+            addTaskToFileQueue(task);
+        }        
+    }
+
+    private synchronized void updateFileTaskQueues() throws InterruptedException {
+        // we loop because we could have a directory that has all files
+        // that do not get enqueued
+        while (true) {
+            // There are files in the queue, we're done
+            if (fileTasks.isEmpty() == false) {
+                return;
+            }
+            // fill in the directory queue if it is empty.
+            if (this.directoryTasks.isEmpty()) {
+                // bail out if root is also empty -- we are done
+                if (rootDirectoryTasks.isEmpty()) {
+                    return;
+                }
+                FileIngestTask rootTask = rootDirectoryTasks.pollFirst();
+                directoryTasks.add(rootTask);
+            }
+            //pop and push AbstractFile directory children if any
+            //add the popped and its leaf children onto cur file list
+            FileIngestTask parentTask = directoryTasks.remove(directoryTasks.size() - 1);
+            final AbstractFile parentFile = parentTask.getFile();
+            // add itself to the file list
+            if (shouldEnqueueFileTask(parentTask)) {
+                addTaskToFileQueue(parentTask);
+            }
+            // add its children to the file and directory lists
+            try {
+                List<Content> children = parentFile.getChildren();
+                for (Content c : children) {
+                    if (c instanceof AbstractFile) {
+                        AbstractFile childFile = (AbstractFile) c;
+                        FileIngestTask childTask = new FileIngestTask(parentTask.getIngestJob(), childFile);
+                        if (childFile.hasChildren()) {
+                            directoryTasks.add(childTask);
+                            childTask.getIngestJob().notifyTaskAdded();
+                        } else if (shouldEnqueueFileTask(childTask)) {
+                            addTaskToFileQueue(childTask);
+                        }
+                    }
+                }
+            } catch (TskCoreException ex) {
+                logger.log(Level.SEVERE, "Could not get children of file and update file queues: " + parentFile.getName(), ex);
+            }
+        }
+    }
+    
+    private void addTaskToFileQueue(FileIngestTask task) {
+        // If the thread executing this code is interrupted, it is because the 
+        // the number of ingest threads has been decreased while ingest jobs are 
+        // running. The calling thread will exit in an orderly fashion, but the 
+        // task still needs to be enqueued rather than lost.
+        while (true) {
+            try {
+                fileTasks.put(task);
+                break;
+            } catch (InterruptedException ex) {
+                // Reset the interrupted status of the thread so the orderly
+                // exit can occur in the intended place.
+                Thread.currentThread().interrupt();
+            }
+        }
+    }
+        
+    /**
+     * Check if the file is a special file that we should skip
+     *
+     * @param processTask a task whose file to check if should be queued of
+     * skipped
+     * @return true if should be enqueued, false otherwise
+     */
+    private static boolean shouldEnqueueFileTask(final FileIngestTask processTask) {
+        final AbstractFile aFile = processTask.getFile();
+        //if it's unalloc file, skip if so scheduled
+        if (processTask.getIngestJob().shouldProcessUnallocatedSpace() == false && aFile.getType().equals(TskData.TSK_DB_FILES_TYPE_ENUM.UNALLOC_BLOCKS)) {
+            return false;
+        }
+        String fileName = aFile.getName();
+        if (fileName.equals(".") || fileName.equals("..")) {
+            return false;
+        } else if (aFile instanceof org.sleuthkit.datamodel.File) {
+            final org.sleuthkit.datamodel.File f = (File) aFile;
+            //skip files in root dir, starting with $, containing : (not default attributes)
+            //with meta address < 32, i.e. some special large NTFS and FAT files
+            FileSystem fs = null;
+            try {
+                fs = f.getFileSystem();
+            } catch (TskCoreException ex) {
+                logger.log(Level.SEVERE, "Could not get FileSystem for " + f, ex); //NON-NLS
+            }
+            TskData.TSK_FS_TYPE_ENUM fsType = TskData.TSK_FS_TYPE_ENUM.TSK_FS_TYPE_UNSUPP;
+            if (fs != null) {
+                fsType = fs.getFsType();
+            }
+            if ((fsType.getValue() & FAT_NTFS_FLAGS) == 0) {
+                //not fat or ntfs, accept all files
+                return true;
+            }
+            boolean isInRootDir = false;
+            try {
+                isInRootDir = f.getParentDirectory().isRoot();
+            } catch (TskCoreException ex) {
+                logger.log(Level.WARNING, "Could not check if should enqueue the file: " + f.getName(), ex); //NON-NLS
+            }
+            if (isInRootDir && f.getMetaAddr() < 32) {
+                String name = f.getName();
+                if (name.length() > 0 && name.charAt(0) == '$' && name.contains(":")) {
+                    return false;
+                }
+            } else {
+                return true;
+            }
+        }
+        return true;
+    }
+
+    void cancelAllIngestJobs() {
+        for (IngestJob job : ingestJobsById.values()) {
+            job.cancel();
+        }
+    }
+
+    IngestTaskQueue getDataSourceIngestTaskQueue() {
+        return dataSourceIngestTaskQueue;
+    }
+
+    IngestTaskQueue getFileIngestTaskQueue() {
+        return fileIngestTaskQueue;
+    }
+
+    /**
+     * Finds top level objects such as file system root directories, layout
+     * files and virtual directories.
+     */
+    private static class GetRootDirectoryVisitor extends GetFilesContentVisitor {
+
+        @Override
+        public Collection<AbstractFile> visit(VirtualDirectory ld) {
+            //case when we hit a layout directoryor local file container, not under a real FS
+            //or when root virt dir is scheduled
+            Collection<AbstractFile> ret = new ArrayList<>();
+            ret.add(ld);
+            return ret;
+        }
+
+        @Override
+        public Collection<AbstractFile> visit(LayoutFile lf) {
+            //case when we hit a layout file, not under a real FS
+            Collection<AbstractFile> ret = new ArrayList<>();
+            ret.add(lf);
+            return ret;
+        }
+
+        @Override
+        public Collection<AbstractFile> visit(Directory drctr) {
+            //we hit a real directory, a child of real FS
+            Collection<AbstractFile> ret = new ArrayList<>();
+            ret.add(drctr);
+            return ret;
+        }
+
+        @Override
+        public Collection<AbstractFile> visit(FileSystem fs) {
+            return getAllFromChildren(fs);
+        }
+
+        @Override
+        public Collection<AbstractFile> visit(File file) {
+            //can have derived files
+            return getAllFromChildren(file);
+        }
+
+        @Override
+        public Collection<AbstractFile> visit(DerivedFile derivedFile) {
+            //can have derived files
+            //TODO test this and overall scheduler with derived files
+            return getAllFromChildren(derivedFile);
+        }
+
+        @Override
+        public Collection<AbstractFile> visit(LocalFile localFile) {
+            //can have local files
+            //TODO test this and overall scheduler with local files
+            return getAllFromChildren(localFile);
+        }
+    }
+
+    private static class RootDirectoryTaskComparator implements Comparator<FileIngestTask> {
+
+        @Override
+        public int compare(FileIngestTask q1, FileIngestTask q2) {
+            AbstractFilePriority.Priority p1 = AbstractFilePriority.getPriority(q1.getFile());
+            AbstractFilePriority.Priority p2 = AbstractFilePriority.getPriority(q2.getFile());
+            if (p1 == p2) {
+                return (int) (q2.getFile().getId() - q1.getFile().getId());
+            } else {
+                return p2.ordinal() - p1.ordinal();
+            }
+        }
+
+        private static class AbstractFilePriority {
+
+            enum Priority {
+
+                LAST, LOW, MEDIUM, HIGH
+            }
+            static final List<Pattern> LAST_PRI_PATHS = new ArrayList<>();
+            static final List<Pattern> LOW_PRI_PATHS = new ArrayList<>();
+            static final List<Pattern> MEDIUM_PRI_PATHS = new ArrayList<>();
+            static final List<Pattern> HIGH_PRI_PATHS = new ArrayList<>();
+            /* prioritize root directory folders based on the assumption that we are
+             * looking for user content. Other types of investigations may want different
+             * priorities. */
+
+            static /* prioritize root directory folders based on the assumption that we are
+             * looking for user content. Other types of investigations may want different
+             * priorities. */ {
+                // these files have no structure, so they go last
+                //unalloc files are handled as virtual files in getPriority()
+                //LAST_PRI_PATHS.schedule(Pattern.compile("^\\$Unalloc", Pattern.CASE_INSENSITIVE));
+                //LAST_PRI_PATHS.schedule(Pattern.compile("^\\Unalloc", Pattern.CASE_INSENSITIVE));
+                LAST_PRI_PATHS.add(Pattern.compile("^pagefile", Pattern.CASE_INSENSITIVE));
+                LAST_PRI_PATHS.add(Pattern.compile("^hiberfil", Pattern.CASE_INSENSITIVE));
+                // orphan files are often corrupt and windows does not typically have
+                // user content, so put them towards the bottom
+                LOW_PRI_PATHS.add(Pattern.compile("^\\$OrphanFiles", Pattern.CASE_INSENSITIVE));
+                LOW_PRI_PATHS.add(Pattern.compile("^Windows", Pattern.CASE_INSENSITIVE));
+                // all other files go into the medium category too
+                MEDIUM_PRI_PATHS.add(Pattern.compile("^Program Files", Pattern.CASE_INSENSITIVE));
+                // user content is top priority
+                HIGH_PRI_PATHS.add(Pattern.compile("^Users", Pattern.CASE_INSENSITIVE));
+                HIGH_PRI_PATHS.add(Pattern.compile("^Documents and Settings", Pattern.CASE_INSENSITIVE));
+                HIGH_PRI_PATHS.add(Pattern.compile("^home", Pattern.CASE_INSENSITIVE));
+                HIGH_PRI_PATHS.add(Pattern.compile("^ProgramData", Pattern.CASE_INSENSITIVE));
+            }
+
+            /**
+             * Get the scheduling priority for a given file.
+             *
+             * @param abstractFile
+             * @return
+             */
+            static AbstractFilePriority.Priority getPriority(final AbstractFile abstractFile) {
+                if (!abstractFile.getType().equals(TskData.TSK_DB_FILES_TYPE_ENUM.FS)) {
+                    //quickly filter out unstructured content
+                    //non-fs virtual files and dirs, such as representing unalloc space
+                    return AbstractFilePriority.Priority.LAST;
+                }
+                //determine the fs files priority by name
+                final String path = abstractFile.getName();
+                if (path == null) {
+                    return AbstractFilePriority.Priority.MEDIUM;
+                }
+                for (Pattern p : HIGH_PRI_PATHS) {
+                    Matcher m = p.matcher(path);
+                    if (m.find()) {
+                        return AbstractFilePriority.Priority.HIGH;
+                    }
+                }
+                for (Pattern p : MEDIUM_PRI_PATHS) {
+                    Matcher m = p.matcher(path);
+                    if (m.find()) {
+                        return AbstractFilePriority.Priority.MEDIUM;
+                    }
+                }
+                for (Pattern p : LOW_PRI_PATHS) {
+                    Matcher m = p.matcher(path);
+                    if (m.find()) {
+                        return AbstractFilePriority.Priority.LOW;
+                    }
+                }
+                for (Pattern p : LAST_PRI_PATHS) {
+                    Matcher m = p.matcher(path);
+                    if (m.find()) {
+                        return AbstractFilePriority.Priority.LAST;
+                    }
+                }
+                //default is medium
+                return AbstractFilePriority.Priority.MEDIUM;
+            }
+        }
+    }
+
+    private class DataSourceIngestTaskQueue implements IngestTaskQueue {
+
+        @Override
+        public IngestTask getNextTask() throws InterruptedException {
+            return dataSourceTasks.take();
+        }
+    }
+
+    private class FileIngestTaskQueue implements IngestTaskQueue {
+
+        @Override
+        public IngestTask getNextTask() throws InterruptedException {
+            FileIngestTask task = fileTasks.take();
+            updateFileTaskQueues();
+            return task;
+        }
+    }
+}
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
index 36cc73fefb..d09783f0d1 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
@@ -55,6 +55,7 @@ public class IngestManager {
     private static final IngestManager instance = new IngestManager();
     private final PropertyChangeSupport ingestJobEventPublisher = new PropertyChangeSupport(IngestManager.class);
     private final PropertyChangeSupport ingestModuleEventPublisher = new PropertyChangeSupport(IngestManager.class);
+    private final IngestJobScheduler scheduler = IngestJobScheduler.getInstance();
     private final IngestMonitor ingestMonitor = new IngestMonitor();
     private final ExecutorService startIngestJobsThreadPool = Executors.newSingleThreadExecutor();
     private final ExecutorService dataSourceIngestThreadPool = Executors.newSingleThreadExecutor();
@@ -157,7 +158,7 @@ public class IngestManager {
      */
     private void startDataSourceIngestThread() {
         long threadId = nextThreadId.incrementAndGet();
-        Future<?> handle = dataSourceIngestThreadPool.submit(new DataSourceIngestThread());
+        Future<?> handle = dataSourceIngestThreadPool.submit(new ExecuteIngestTasksThread(scheduler.getDataSourceIngestTaskQueue()));
         dataSourceIngestThreads.put(threadId, handle);
     }
 
@@ -167,7 +168,7 @@ public class IngestManager {
      */
     private void startFileIngestThread() {
         long threadId = nextThreadId.incrementAndGet();
-        Future<?> handle = fileIngestThreadPool.submit(new FileIngestThread());
+        Future<?> handle = fileIngestThreadPool.submit(new ExecuteIngestTasksThread(scheduler.getFileIngestTaskQueue()));
         fileIngestThreads.put(threadId, handle);
     }
 
@@ -199,7 +200,7 @@ public class IngestManager {
      * @return True if any ingest jobs are in progress, false otherwise.
      */
     public boolean isIngestRunning() {
-        return IngestJob.jobsAreRunning();
+        return scheduler.ingestJobsAreRunning();
     }
 
     public void cancelAllIngestJobs() {
@@ -221,7 +222,7 @@ public class IngestManager {
 
         // Cancel all the jobs already created. This will make the the ingest
         // threads flush out any lingering ingest tasks without processing them.
-        IngestJob.cancelAllJobs();
+        scheduler.cancelAllIngestJobs();
     }
 
     /**
@@ -406,8 +407,7 @@ public class IngestManager {
     }
 
     /**
-     * A Callable that creates ingest jobs and submits the initial data source
-     * and file ingest tasks to the task schedulers.
+     * Creates ingest jobs.
      */
     private class StartIngestJobsThread implements Callable<Void> {
 
@@ -454,7 +454,7 @@ public class IngestManager {
                     }
 
                     // Start an ingest job for the data source.
-                    List<IngestModuleError> errors = IngestJob.startJob(dataSource, moduleTemplates, processUnallocatedSpace);
+                    List<IngestModuleError> errors = scheduler.startIngestJob(dataSource, moduleTemplates, processUnallocatedSpace);
                     if (!errors.isEmpty()) {
                         // Report the errors to the user. They have already been logged.
                         StringBuilder moduleStartUpErrors = new StringBuilder();
@@ -495,17 +495,21 @@ public class IngestManager {
     }
 
     /**
-     * A Runnable that acts as a consumer for the data ingest task scheduler's
-     * task queue.
+     * A consumer for an ingest task queue.
      */
-    private class DataSourceIngestThread implements Runnable {
+    private class ExecuteIngestTasksThread implements Runnable {
+
+        private IngestTaskQueue tasks;
+
+        ExecuteIngestTasksThread(IngestTaskQueue tasks) {
+            this.tasks = tasks;
+        }
 
         @Override
         public void run() {
-            DataSourceIngestTaskScheduler scheduler = DataSourceIngestTaskScheduler.getInstance();
             while (true) {
                 try {
-                    DataSourceIngestTask task = scheduler.getNextTask(); // Blocks.
+                    IngestTask task = tasks.getNextTask(); // Blocks.
                     task.execute();
                 } catch (InterruptedException ex) {
                     break;
@@ -518,31 +522,7 @@ public class IngestManager {
     }
 
     /**
-     * A Runnable that acts as a consumer for the file task scheduler's task
-     * queue.
-     */
-    private static class FileIngestThread implements Runnable {
-
-        @Override
-        public void run() {
-            FileIngestTaskScheduler scheduler = FileIngestTaskScheduler.getInstance();
-            while (true) {
-                try {
-                    FileIngestTask task = scheduler.getNextTask(); // Blocks.
-                    task.execute();
-                } catch (InterruptedException ex) {
-                    break;
-                }
-                if (Thread.currentThread().isInterrupted()) {
-                    break;
-                }
-            }
-        }
-    }
-
-    /**
-     * A Runnable that fires ingest events to ingest manager property change
-     * listeners.
+     * Fires ingest events to ingest manager property change listeners.
      */
     private static class FireIngestEventThread implements Runnable {
 
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestTaskQueue.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestTaskQueue.java
new file mode 100755
index 0000000000..d18f7047b7
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestTaskQueue.java
@@ -0,0 +1,23 @@
+/*
+ * Autopsy Forensic Browser
+ * 
+ * Copyright 2014 Basis Technology Corp.
+ * Contact: carrier <at> sleuthkit <dot> org
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.autopsy.ingest;
+
+interface IngestTaskQueue {
+    IngestTask getNextTask() throws InterruptedException;
+}
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/RunIngestModulesDialog.java b/Core/src/org/sleuthkit/autopsy/ingest/RunIngestModulesDialog.java
index a31b92b27d..9f722789d2 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/RunIngestModulesDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/RunIngestModulesDialog.java
@@ -45,11 +45,11 @@ public final class RunIngestModulesDialog extends JDialog {
     private static final String TITLE = NbBundle.getMessage(RunIngestModulesDialog.class, "IngestDialog.title.text");
     private static Dimension DIMENSIONS = new Dimension(500, 300);
     private List<Content> dataSources = new ArrayList<>();
-    private IngestJobLauncher ingestJobLauncher;
+    private IngestJobConfigurator ingestJobLauncher;
 
     public RunIngestModulesDialog(JFrame frame, String title, boolean modal) {
         super(frame, title, modal);
-        ingestJobLauncher = new IngestJobLauncher(RunIngestModulesDialog.class.getCanonicalName());
+        ingestJobLauncher = new IngestJobConfigurator(RunIngestModulesDialog.class.getCanonicalName());
         List<String> messages = ingestJobLauncher.getIngestJobConfigWarnings();
         if (messages.isEmpty() == false) {
             StringBuilder warning = new StringBuilder();
diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/AddContentToHashDbAction.java b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/AddContentToHashDbAction.java
index b7099c5098..81189cc690 100755
--- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/AddContentToHashDbAction.java
+++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/AddContentToHashDbAction.java
@@ -32,7 +32,7 @@ import org.openide.util.NbBundle;
 import org.openide.util.Utilities;
 import org.openide.util.Lookup;
 import org.openide.util.actions.Presenter;
-import org.sleuthkit.autopsy.ingest.IngestJobLauncher;
+import org.sleuthkit.autopsy.ingest.IngestJobConfigurator;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.TskCoreException;

From c900f0f95a6f7eb43e6c31428f2e8cdaeea3e840 Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Fri, 2 May 2014 15:03:46 -0400
Subject: [PATCH 11/24] Complete improved ingest framework

---
 .../autopsy/corecomponents/GeneralPanel.form  |  11 +-
 .../autopsy/corecomponents/GeneralPanel.java  |  60 ++-
 .../autopsy/ingest/DataSourceIngestTask.java  |  17 +-
 .../ingest/DataSourceIngestTaskScheduler.java |  56 ---
 .../autopsy/ingest/FileIngestTask.java        |  23 +-
 .../ingest/FileIngestTaskScheduler.java       | 393 ------------------
 .../ingest/GetRootDirectoryVisitor.java       |  88 ++++
 .../sleuthkit/autopsy/ingest/IngestJob.java   |  80 ++--
 .../autopsy/ingest/IngestJobContext.java      |   2 +-
 .../autopsy/ingest/IngestManager.java         |  12 +-
 ...JobScheduler.java => IngestScheduler.java} | 166 ++++----
 .../sleuthkit/autopsy/ingest/IngestTask.java  |  15 +-
 12 files changed, 262 insertions(+), 661 deletions(-)
 delete mode 100755 Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestTaskScheduler.java
 delete mode 100755 Core/src/org/sleuthkit/autopsy/ingest/FileIngestTaskScheduler.java
 create mode 100755 Core/src/org/sleuthkit/autopsy/ingest/GetRootDirectoryVisitor.java
 rename Core/src/org/sleuthkit/autopsy/ingest/{IngestJobScheduler.java => IngestScheduler.java} (79%)

diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralPanel.form b/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralPanel.form
index ea8c8fed21..2c0bbd1ee6 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralPanel.form
@@ -188,15 +188,12 @@
     <Component class="javax.swing.JComboBox" name="numberOfFileIngestThreadsComboBox">
       <Properties>
         <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
-          <StringArray count="4">
-            <StringItem index="0" value="1"/>
-            <StringItem index="1" value="2"/>
-            <StringItem index="2" value="3"/>
-            <StringItem index="3" value="4"/>
-          </StringArray>
+          <StringArray count="0"/>
         </Property>
-        <Property name="selectedIndex" type="int" value="1"/>
       </Properties>
+      <AuxValues>
+        <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;Integer&gt;"/>
+      </AuxValues>
     </Component>
   </SubComponents>
 </Form>
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralPanel.java
index ea334dae46..d34a49b16a 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralPanel.java
@@ -19,6 +19,7 @@
 package org.sleuthkit.autopsy.corecomponents;
 
 import java.util.prefs.Preferences;
+import javax.swing.DefaultComboBoxModel;
 import org.openide.util.NbPreferences;
 import org.sleuthkit.autopsy.datamodel.ContentUtils;
 import org.sleuthkit.autopsy.ingest.IngestManager;
@@ -33,10 +34,35 @@ final class GeneralPanel extends javax.swing.JPanel {
 
     GeneralPanel(GeneralOptionsPanelController controller) {
         initComponents();
+        numberOfFileIngestThreadsComboBox.setModel(new DefaultComboBoxModel<>(new Integer[]{1, 2, 4, 8, 16}));
         ContentUtils.setDisplayInLocalTime(useLocalTimeRB.isSelected());
         // TODO listen to changes in form fields and call controller.changed()
     }
 
+    void load() {
+        boolean keepPreferredViewer = prefs.getBoolean(KEEP_PREFERRED_VIEWER, false);
+        keepCurrentViewerRB.setSelected(keepPreferredViewer);
+        useBestViewerRB.setSelected(!keepPreferredViewer);
+        boolean useLocalTime = prefs.getBoolean(USE_LOCAL_TIME, true);
+        useLocalTimeRB.setSelected(useLocalTime);
+        useGMTTimeRB.setSelected(!useLocalTime);
+        dataSourcesHideKnownCB.setSelected(prefs.getBoolean(DS_HIDE_KNOWN, false));
+        viewsHideKnownCB.setSelected(prefs.getBoolean(VIEWS_HIDE_KNOWN, true));
+        numberOfFileIngestThreadsComboBox.setSelectedItem(IngestManager.getNumberOfFileIngestThreads());
+    }
+
+    void store() {
+        prefs.putBoolean(KEEP_PREFERRED_VIEWER, keepCurrentViewerRB.isSelected());
+        prefs.putBoolean(USE_LOCAL_TIME, useLocalTimeRB.isSelected());
+        prefs.putBoolean(DS_HIDE_KNOWN, dataSourcesHideKnownCB.isSelected());
+        prefs.putBoolean(VIEWS_HIDE_KNOWN, viewsHideKnownCB.isSelected());
+        IngestManager.setNumberOfFileIngestThreads((Integer) numberOfFileIngestThreadsComboBox.getSelectedItem());
+    }
+
+    boolean valid() {
+        return true;
+    }
+
     /**
      * 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
@@ -57,7 +83,7 @@ final class GeneralPanel extends javax.swing.JPanel {
         dataSourcesHideKnownCB = new javax.swing.JCheckBox();
         viewsHideKnownCB = new javax.swing.JCheckBox();
         jLabel4 = new javax.swing.JLabel();
-        numberOfFileIngestThreadsComboBox = new javax.swing.JComboBox();
+        numberOfFileIngestThreadsComboBox = new javax.swing.JComboBox<Integer>();
 
         buttonGroup1.add(useBestViewerRB);
         useBestViewerRB.setSelected(true);
@@ -97,9 +123,6 @@ final class GeneralPanel extends javax.swing.JPanel {
 
         org.openide.awt.Mnemonics.setLocalizedText(jLabel4, org.openide.util.NbBundle.getMessage(GeneralPanel.class, "GeneralPanel.jLabel4.text")); // NOI18N
 
-        numberOfFileIngestThreadsComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "1", "2", "3", "4" }));
-        numberOfFileIngestThreadsComboBox.setSelectedIndex(1);
-
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
@@ -163,33 +186,8 @@ final class GeneralPanel extends javax.swing.JPanel {
     }//GEN-LAST:event_useBestViewerRBActionPerformed
 
     private void useGMTTimeRBActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_useGMTTimeRBActionPerformed
-         ContentUtils.setDisplayInLocalTime(useLocalTimeRB.isSelected());
+        ContentUtils.setDisplayInLocalTime(useLocalTimeRB.isSelected());
     }//GEN-LAST:event_useGMTTimeRBActionPerformed
-
-    void load() {
-        boolean keepPreferredViewer = prefs.getBoolean(KEEP_PREFERRED_VIEWER, false);
-        keepCurrentViewerRB.setSelected(keepPreferredViewer);
-        useBestViewerRB.setSelected(!keepPreferredViewer);
-        boolean useLocalTime = prefs.getBoolean(USE_LOCAL_TIME, true);
-        useLocalTimeRB.setSelected(useLocalTime);
-        useGMTTimeRB.setSelected(!useLocalTime);
-        dataSourcesHideKnownCB.setSelected(prefs.getBoolean(DS_HIDE_KNOWN, false));
-        viewsHideKnownCB.setSelected(prefs.getBoolean(VIEWS_HIDE_KNOWN, true));
-        numberOfFileIngestThreadsComboBox.setSelectedItem(IngestManager.getInstance().getNumberOfFileIngestThreads());
-    }
-
-    void store() {
-        prefs.putBoolean(KEEP_PREFERRED_VIEWER, keepCurrentViewerRB.isSelected());
-        prefs.putBoolean(USE_LOCAL_TIME, useLocalTimeRB.isSelected());
-        prefs.putBoolean(DS_HIDE_KNOWN, dataSourcesHideKnownCB.isSelected());
-        prefs.putBoolean(VIEWS_HIDE_KNOWN, viewsHideKnownCB.isSelected());
-        IngestManager.getInstance().setNumberOfFileIngestThreads(Integer.valueOf(numberOfFileIngestThreadsComboBox.getSelectedItem().toString()));
-    }
-
-    boolean valid() {
-        // TODO check whether form is consistent and complete
-        return true;
-    }
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.ButtonGroup buttonGroup1;
     private javax.swing.ButtonGroup buttonGroup3;
@@ -199,7 +197,7 @@ final class GeneralPanel extends javax.swing.JPanel {
     private javax.swing.JLabel jLabel3;
     private javax.swing.JLabel jLabel4;
     private javax.swing.JRadioButton keepCurrentViewerRB;
-    private javax.swing.JComboBox numberOfFileIngestThreadsComboBox;
+    private javax.swing.JComboBox<Integer> numberOfFileIngestThreadsComboBox;
     private javax.swing.JRadioButton useBestViewerRB;
     private javax.swing.JRadioButton useGMTTimeRB;
     private javax.swing.JRadioButton useLocalTimeRB;
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestTask.java b/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestTask.java
index c62b6796a1..5598033397 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestTask.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestTask.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  * 
- * Copyright 2014 Basis Technology Corp.
+ * Copyright 2012-2014 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,26 +20,21 @@ package org.sleuthkit.autopsy.ingest;
 
 import org.sleuthkit.datamodel.Content;
 
-final class DataSourceIngestTask implements IngestTask {
+final class DataSourceIngestTask extends IngestTask {
     
-    private final IngestJob ingestJob;
     private final Content dataSource;
     
     DataSourceIngestTask(IngestJob ingestJob, Content dataSource) {
-        this.ingestJob = ingestJob;
+        super(ingestJob);
         this.dataSource = dataSource;                        
     }
-    
-    IngestJob getIngestJob() {
-        return ingestJob;
-    }
-    
+        
     Content getDataSource() {
         return dataSource;
     }    
     
     @Override
-    public void execute() throws InterruptedException {
-        ingestJob.process(dataSource);
+    void execute() throws InterruptedException {
+        getIngestJob().process(dataSource);
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestTaskScheduler.java b/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestTaskScheduler.java
deleted file mode 100755
index ba89a669a4..0000000000
--- a/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestTaskScheduler.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Autopsy Forensic Browser
- * 
- * Copyright 2012-2014 Basis Technology Corp.
- * Contact: carrier <at> sleuthkit <dot> org
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.sleuthkit.autopsy.ingest;
-
-import java.util.concurrent.LinkedBlockingQueue;
-
-//final class DataSourceIngestTaskScheduler implements IngestTaskQueue {
-//
-//    private static DataSourceIngestTaskScheduler instance = new DataSourceIngestTaskScheduler();
-//    private final LinkedBlockingQueue<DataSourceIngestTask> tasks = new LinkedBlockingQueue<>();
-//
-//    static DataSourceIngestTaskScheduler getInstance() {
-//        return instance;
-//    }
-//
-//    private DataSourceIngestTaskScheduler() {
-//    }
-//
-//    void addTask(DataSourceIngestTask task) {
-//        // If the thread executing this code is interrupted, it is because the 
-//        // number of ingest threads has been decreased while ingest jobs are 
-//        // running. This thread will exit in an orderly fashion, but the task 
-//        // still needs to be enqueued rather than lost.
-//        while (true) {
-//            try {
-//                tasks.put(task);
-//                break;
-//            } catch (InterruptedException ex) {
-//                // Reset the interrupted status of the thread so the orderly
-//                // exit can occur in the intended place.
-//                Thread.currentThread().interrupt();
-//            }
-//        }
-//    }
-//
-//    @Override
-//    public DataSourceIngestTask getNextTask() throws InterruptedException {
-//        return tasks.take(); 
-//    }
-//}
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/FileIngestTask.java b/Core/src/org/sleuthkit/autopsy/ingest/FileIngestTask.java
index 75e9165ded..3134b6deb6 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/FileIngestTask.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/FileIngestTask.java
@@ -21,27 +21,22 @@ package org.sleuthkit.autopsy.ingest;
 import java.util.Objects;
 import org.sleuthkit.datamodel.AbstractFile;
 
-final class FileIngestTask implements IngestTask {
+final class FileIngestTask extends IngestTask {
 
-    private final IngestJob ingestJob;
     private final AbstractFile file;
 
-    FileIngestTask(IngestJob task, AbstractFile file) {
-        this.ingestJob = task;
+    FileIngestTask(IngestJob job, AbstractFile file) {
+        super(job);
         this.file = file;
     }
 
-    public IngestJob getIngestJob() { // RJCTODO: Maybe add to interface
-        return ingestJob;
-    }
-
-    public AbstractFile getFile() {
+    AbstractFile getFile() {
         return file;
     }
 
     @Override
-    public void execute() throws InterruptedException {
-        ingestJob.process(file);
+    void execute() throws InterruptedException {
+        getIngestJob().process(file);
     }
 
     @Override
@@ -53,7 +48,9 @@ final class FileIngestTask implements IngestTask {
             return false;
         }
         FileIngestTask other = (FileIngestTask) obj;
-        if (this.ingestJob != other.ingestJob && (this.ingestJob == null || !this.ingestJob.equals(other.ingestJob))) {
+        IngestJob job = getIngestJob();
+        IngestJob otherJob = other.getIngestJob();
+        if (job != otherJob && (job == null || !job.equals(otherJob))) {
             return false;
         }
         if (this.file != other.file && (this.file == null || !this.file.equals(other.file))) {
@@ -65,7 +62,7 @@ final class FileIngestTask implements IngestTask {
     @Override
     public int hashCode() {
         int hash = 5;
-        hash = 47 * hash + Objects.hashCode(this.ingestJob);
+        hash = 47 * hash + Objects.hashCode(getIngestJob());
         hash = 47 * hash + Objects.hashCode(this.file);
         return hash;
     }
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/FileIngestTaskScheduler.java b/Core/src/org/sleuthkit/autopsy/ingest/FileIngestTaskScheduler.java
deleted file mode 100755
index c0a4b34295..0000000000
--- a/Core/src/org/sleuthkit/autopsy/ingest/FileIngestTaskScheduler.java
+++ /dev/null
@@ -1,393 +0,0 @@
-/*
- * Autopsy Forensic Browser
- * 
- * Copyright 2012-2014 Basis Technology Corp.
- * Contact: carrier <at> sleuthkit <dot> org
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.sleuthkit.autopsy.ingest;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.List;
-import java.util.TreeSet;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.sleuthkit.datamodel.AbstractFile;
-import org.sleuthkit.datamodel.Content;
-import org.sleuthkit.datamodel.DerivedFile;
-import org.sleuthkit.datamodel.Directory;
-import org.sleuthkit.datamodel.File;
-import org.sleuthkit.datamodel.FileSystem;
-import org.sleuthkit.datamodel.LayoutFile;
-import org.sleuthkit.datamodel.LocalFile;
-import org.sleuthkit.datamodel.TskCoreException;
-import org.sleuthkit.datamodel.TskData;
-import org.sleuthkit.datamodel.VirtualDirectory;
-
-//final class FileIngestTaskScheduler implements IngestTaskQueue {
-//
-//    private static final Logger logger = Logger.getLogger(FileIngestTaskScheduler.class.getName());
-//    private static FileIngestTaskScheduler instance = new FileIngestTaskScheduler();
-//    private final TreeSet<FileIngestTask> rootDirectoryTasks = new TreeSet<>(new RootDirectoryTaskComparator());
-//    private final List<FileIngestTask> directoryTasks = new ArrayList<>();
-//    private final LinkedBlockingQueue<FileIngestTask> fileTasks = new LinkedBlockingQueue<>();
-//    private static final int FAT_NTFS_FLAGS = TskData.TSK_FS_TYPE_ENUM.TSK_FS_TYPE_FAT12.getValue() | TskData.TSK_FS_TYPE_ENUM.TSK_FS_TYPE_FAT16.getValue() | TskData.TSK_FS_TYPE_ENUM.TSK_FS_TYPE_FAT32.getValue() | TskData.TSK_FS_TYPE_ENUM.TSK_FS_TYPE_NTFS.getValue();
-//
-//    static FileIngestTaskScheduler getInstance() {
-//        return instance;
-//    }
-//
-//    private FileIngestTaskScheduler() {
-//    }
-//
-//    synchronized void addTasks(IngestJob job, Content dataSource) throws InterruptedException {
-//        Collection<AbstractFile> rootObjects = dataSource.accept(new GetRootDirectoryVisitor());
-//        List<AbstractFile> firstLevelFiles = new ArrayList<>();
-//        if (rootObjects.isEmpty() && dataSource instanceof AbstractFile) {
-//            // The data source is file.
-//            firstLevelFiles.add((AbstractFile) dataSource);
-//        } else {
-//            for (AbstractFile root : rootObjects) {
-//                List<Content> children;
-//                try {
-//                    children = root.getChildren();
-//                    if (children.isEmpty()) {
-//                        //add the root itself, could be unalloc file, child of volume or image
-//                        firstLevelFiles.add(root);
-//                    } else {
-//                        //root for fs root dir, schedule children dirs/files
-//                        for (Content child : children) {
-//                            if (child instanceof AbstractFile) {
-//                                firstLevelFiles.add((AbstractFile) child);
-//                            }
-//                        }
-//                    }
-//                } catch (TskCoreException ex) {
-//                    logger.log(Level.WARNING, "Could not get children of root to enqueue: " + root.getId() + ": " + root.getName(), ex); //NON-NLS
-//                }
-//            }
-//        }
-//        for (AbstractFile firstLevelFile : firstLevelFiles) {
-//            FileIngestTask fileTask = new FileIngestTask(job, firstLevelFile);
-//            if (shouldEnqueueTask(fileTask)) {
-//                rootDirectoryTasks.add(fileTask);
-//                fileTask.getIngestJob().notifyTaskAdded();
-//            }
-//        }
-//
-//        // Reshuffle/update the dir and file level queues if needed
-//        updateQueues();
-//    }
-//
-//    synchronized void addTask(FileIngestTask task) {
-//        if (shouldEnqueueTask(task)) {
-//            addTaskToFileQueue(task, true);
-//        }
-//    }
-//
-//    @Override
-//    public FileIngestTask getNextTask() throws InterruptedException {
-//        FileIngestTask task = fileTasks.take();
-//        updateQueues();
-//        return task;
-//    }
-//
-//    private void updateQueues() throws InterruptedException {
-//        // we loop because we could have a directory that has all files
-//        // that do not get enqueued
-//        while (true) {
-//            // There are files in the queue, we're done
-//            if (fileTasks.isEmpty() == false) {
-//                return;
-//            }
-//            // fill in the directory queue if it is empty.
-//            if (this.directoryTasks.isEmpty()) {
-//                // bail out if root is also empty -- we are done
-//                if (rootDirectoryTasks.isEmpty()) {
-//                    return;
-//                }
-//                FileIngestTask rootTask = rootDirectoryTasks.pollFirst();
-//                directoryTasks.add(rootTask);
-//            }
-//            //pop and push AbstractFile directory children if any
-//            //add the popped and its leaf children onto cur file list
-//            FileIngestTask parentTask = directoryTasks.remove(directoryTasks.size() - 1);
-//            final AbstractFile parentFile = parentTask.getFile();
-//            // add itself to the file list
-//            if (shouldEnqueueTask(parentTask)) {
-//                addTaskToFileQueue(parentTask, false);
-//            }
-//            // add its children to the file and directory lists
-//            try {
-//                List<Content> children = parentFile.getChildren();
-//                for (Content c : children) {
-//                    if (c instanceof AbstractFile) {
-//                        AbstractFile childFile = (AbstractFile) c;
-//                        FileIngestTask childTask = new FileIngestTask(parentTask.getIngestJob(), childFile);
-//                        if (childFile.hasChildren()) {
-//                            directoryTasks.add(childTask);
-//                            childTask.getIngestJob().notifyTaskAdded();
-//                        } else if (shouldEnqueueTask(childTask)) {
-//                            addTaskToFileQueue(childTask, true);
-//                        }
-//                    }
-//                }
-//            } catch (TskCoreException ex) {
-//                logger.log(Level.SEVERE, "Could not get children of file and update file queues: " + parentFile.getName(), ex);
-//            }
-//        }
-//    }
-//
-//    private void addTaskToFileQueue(FileIngestTask task, boolean isNewTask) {
-//        if (isNewTask) {
-//            // The capacity of the file tasks queue is not bounded, so the call 
-//            // to put() should not block except for normal synchronized access. 
-//            // Still, notify the job that the task has been added first so that 
-//            // the take() of the task cannot occur before the notification.
-//            task.getIngestJob().notifyTaskAdded();
-//        }
-//        // If the thread executing this code is ever interrupted, it is 
-//        // because the number of ingest threads has been decreased while
-//        // ingest jobs are running. This thread will exit in an orderly fashion,
-//        // but the task still needs to be enqueued rather than lost.
-//        while (true) {
-//            try {
-//                fileTasks.put(task);
-//                break;
-//            } catch (InterruptedException ex) {
-//                // Reset the interrupted status of the thread so the orderly
-//                // exit can occur in the intended place.
-//                Thread.currentThread().interrupt();
-//            }
-//        }
-//    }
-//
-//    /**
-//     * Check if the file is a special file that we should skip
-//     *
-//     * @param processTask a task whose file to check if should be queued of
-//     * skipped
-//     * @return true if should be enqueued, false otherwise
-//     */
-//    private static boolean shouldEnqueueTask(final FileIngestTask processTask) {
-//        final AbstractFile aFile = processTask.getFile();
-//        //if it's unalloc file, skip if so scheduled
-//        if (processTask.getIngestJob().shouldProcessUnallocatedSpace() == false && aFile.getType().equals(TskData.TSK_DB_FILES_TYPE_ENUM.UNALLOC_BLOCKS)) {
-//            return false;
-//        }
-//        String fileName = aFile.getName();
-//        if (fileName.equals(".") || fileName.equals("..")) {
-//            return false;
-//        } else if (aFile instanceof org.sleuthkit.datamodel.File) {
-//            final org.sleuthkit.datamodel.File f = (File) aFile;
-//            //skip files in root dir, starting with $, containing : (not default attributes)
-//            //with meta address < 32, i.e. some special large NTFS and FAT files
-//            FileSystem fs = null;
-//            try {
-//                fs = f.getFileSystem();
-//            } catch (TskCoreException ex) {
-//                logger.log(Level.SEVERE, "Could not get FileSystem for " + f, ex); //NON-NLS
-//            }
-//            TskData.TSK_FS_TYPE_ENUM fsType = TskData.TSK_FS_TYPE_ENUM.TSK_FS_TYPE_UNSUPP;
-//            if (fs != null) {
-//                fsType = fs.getFsType();
-//            }
-//            if ((fsType.getValue() & FAT_NTFS_FLAGS) == 0) {
-//                //not fat or ntfs, accept all files
-//                return true;
-//            }
-//            boolean isInRootDir = false;
-//            try {
-//                isInRootDir = f.getParentDirectory().isRoot();
-//            } catch (TskCoreException ex) {
-//                logger.log(Level.WARNING, "Could not check if should enqueue the file: " + f.getName(), ex); //NON-NLS
-//            }
-//            if (isInRootDir && f.getMetaAddr() < 32) {
-//                String name = f.getName();
-//                if (name.length() > 0 && name.charAt(0) == '$' && name.contains(":")) {
-//                    return false;
-//                }
-//            } else {
-//                return true;
-//            }
-//        }
-//        return true;
-//    }
-//
-//    /**
-//     * Visitor that gets a collection of top level objects to be scheduled, such
-//     * as root directories (if there is FS) or LayoutFiles and virtual
-//     * directories, also if there is no FS.
-//     */
-//    static class GetRootDirectoryVisitor extends GetFilesContentVisitor {
-//
-//        @Override
-//        public Collection<AbstractFile> visit(VirtualDirectory ld) {
-//            //case when we hit a layout directoryor local file container, not under a real FS
-//            //or when root virt dir is scheduled
-//            Collection<AbstractFile> ret = new ArrayList<>();
-//            ret.add(ld);
-//            return ret;
-//        }
-//
-//        @Override
-//        public Collection<AbstractFile> visit(LayoutFile lf) {
-//            //case when we hit a layout file, not under a real FS
-//            Collection<AbstractFile> ret = new ArrayList<>();
-//            ret.add(lf);
-//            return ret;
-//        }
-//
-//        @Override
-//        public Collection<AbstractFile> visit(Directory drctr) {
-//            //we hit a real directory, a child of real FS
-//            Collection<AbstractFile> ret = new ArrayList<>();
-//            ret.add(drctr);
-//            return ret;
-//        }
-//
-//        @Override
-//        public Collection<AbstractFile> visit(FileSystem fs) {
-//            return getAllFromChildren(fs);
-//        }
-//
-//        @Override
-//        public Collection<AbstractFile> visit(File file) {
-//            //can have derived files
-//            return getAllFromChildren(file);
-//        }
-//
-//        @Override
-//        public Collection<AbstractFile> visit(DerivedFile derivedFile) {
-//            //can have derived files
-//            //TODO test this and overall scheduler with derived files
-//            return getAllFromChildren(derivedFile);
-//        }
-//
-//        @Override
-//        public Collection<AbstractFile> visit(LocalFile localFile) {
-//            //can have local files
-//            //TODO test this and overall scheduler with local files
-//            return getAllFromChildren(localFile);
-//        }
-//    }
-//
-//    /**
-//     * Root directory sorter
-//     */
-//    private static class RootDirectoryTaskComparator implements Comparator<FileIngestTask> {
-//
-//        @Override
-//        public int compare(FileIngestTask q1, FileIngestTask q2) {
-//            AbstractFilePriority.Priority p1 = AbstractFilePriority.getPriority(q1.getFile());
-//            AbstractFilePriority.Priority p2 = AbstractFilePriority.getPriority(q2.getFile());
-//            if (p1 == p2) {
-//                return (int) (q2.getFile().getId() - q1.getFile().getId());
-//            } else {
-//                return p2.ordinal() - p1.ordinal();
-//            }
-//        }
-//
-//        /**
-//         * Priority determination for sorted AbstractFile, used by
-//         * RootDirComparator
-//         */
-//        private static class AbstractFilePriority {
-//
-//            enum Priority {
-//
-//                LAST, LOW, MEDIUM, HIGH
-//            }
-//            static final List<Pattern> LAST_PRI_PATHS = new ArrayList<>();
-//            static final List<Pattern> LOW_PRI_PATHS = new ArrayList<>();
-//            static final List<Pattern> MEDIUM_PRI_PATHS = new ArrayList<>();
-//            static final List<Pattern> HIGH_PRI_PATHS = new ArrayList<>();
-//            /* prioritize root directory folders based on the assumption that we are
-//             * looking for user content. Other types of investigations may want different
-//             * priorities. */
-//
-//            static /* prioritize root directory folders based on the assumption that we are
-//             * looking for user content. Other types of investigations may want different
-//             * priorities. */ {
-//                // these files have no structure, so they go last
-//                //unalloc files are handled as virtual files in getPriority()
-//                //LAST_PRI_PATHS.schedule(Pattern.compile("^\\$Unalloc", Pattern.CASE_INSENSITIVE));
-//                //LAST_PRI_PATHS.schedule(Pattern.compile("^\\Unalloc", Pattern.CASE_INSENSITIVE));
-//                LAST_PRI_PATHS.add(Pattern.compile("^pagefile", Pattern.CASE_INSENSITIVE));
-//                LAST_PRI_PATHS.add(Pattern.compile("^hiberfil", Pattern.CASE_INSENSITIVE));
-//                // orphan files are often corrupt and windows does not typically have
-//                // user content, so put them towards the bottom
-//                LOW_PRI_PATHS.add(Pattern.compile("^\\$OrphanFiles", Pattern.CASE_INSENSITIVE));
-//                LOW_PRI_PATHS.add(Pattern.compile("^Windows", Pattern.CASE_INSENSITIVE));
-//                // all other files go into the medium category too
-//                MEDIUM_PRI_PATHS.add(Pattern.compile("^Program Files", Pattern.CASE_INSENSITIVE));
-//                // user content is top priority
-//                HIGH_PRI_PATHS.add(Pattern.compile("^Users", Pattern.CASE_INSENSITIVE));
-//                HIGH_PRI_PATHS.add(Pattern.compile("^Documents and Settings", Pattern.CASE_INSENSITIVE));
-//                HIGH_PRI_PATHS.add(Pattern.compile("^home", Pattern.CASE_INSENSITIVE));
-//                HIGH_PRI_PATHS.add(Pattern.compile("^ProgramData", Pattern.CASE_INSENSITIVE));
-//            }
-//
-//            /**
-//             * Get the scheduling priority for a given file.
-//             *
-//             * @param abstractFile
-//             * @return
-//             */
-//            static AbstractFilePriority.Priority getPriority(final AbstractFile abstractFile) {
-//                if (!abstractFile.getType().equals(TskData.TSK_DB_FILES_TYPE_ENUM.FS)) {
-//                    //quickly filter out unstructured content
-//                    //non-fs virtual files and dirs, such as representing unalloc space
-//                    return AbstractFilePriority.Priority.LAST;
-//                }
-//                //determine the fs files priority by name
-//                final String path = abstractFile.getName();
-//                if (path == null) {
-//                    return AbstractFilePriority.Priority.MEDIUM;
-//                }
-//                for (Pattern p : HIGH_PRI_PATHS) {
-//                    Matcher m = p.matcher(path);
-//                    if (m.find()) {
-//                        return AbstractFilePriority.Priority.HIGH;
-//                    }
-//                }
-//                for (Pattern p : MEDIUM_PRI_PATHS) {
-//                    Matcher m = p.matcher(path);
-//                    if (m.find()) {
-//                        return AbstractFilePriority.Priority.MEDIUM;
-//                    }
-//                }
-//                for (Pattern p : LOW_PRI_PATHS) {
-//                    Matcher m = p.matcher(path);
-//                    if (m.find()) {
-//                        return AbstractFilePriority.Priority.LOW;
-//                    }
-//                }
-//                for (Pattern p : LAST_PRI_PATHS) {
-//                    Matcher m = p.matcher(path);
-//                    if (m.find()) {
-//                        return AbstractFilePriority.Priority.LAST;
-//                    }
-//                }
-//                //default is medium
-//                return AbstractFilePriority.Priority.MEDIUM;
-//            }
-//        }
-//    }
-//}
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/GetRootDirectoryVisitor.java b/Core/src/org/sleuthkit/autopsy/ingest/GetRootDirectoryVisitor.java
new file mode 100755
index 0000000000..a81ce17f6a
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/ingest/GetRootDirectoryVisitor.java
@@ -0,0 +1,88 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2012 Basis Technology Corp.
+ * Contact: carrier <at> sleuthkit <dot> org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.autopsy.ingest;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import org.sleuthkit.datamodel.AbstractFile;
+import org.sleuthkit.datamodel.DerivedFile;
+import org.sleuthkit.datamodel.Directory;
+import org.sleuthkit.datamodel.File;
+import org.sleuthkit.datamodel.FileSystem;
+import org.sleuthkit.datamodel.LayoutFile;
+import org.sleuthkit.datamodel.LocalFile;
+import org.sleuthkit.datamodel.VirtualDirectory;
+
+/**
+ * Finds top level objects such as file system root directories, layout
+ * files and virtual directories.
+ */
+final class GetRootDirectoryVisitor extends GetFilesContentVisitor {
+
+    @Override
+    public Collection<AbstractFile> visit(VirtualDirectory ld) {
+        //case when we hit a layout directoryor local file container, not under a real FS
+        //or when root virt dir is scheduled
+        Collection<AbstractFile> ret = new ArrayList<>();
+        ret.add(ld);
+        return ret;
+    }
+
+    @Override
+    public Collection<AbstractFile> visit(LayoutFile lf) {
+        //case when we hit a layout file, not under a real FS
+        Collection<AbstractFile> ret = new ArrayList<>();
+        ret.add(lf);
+        return ret;
+    }
+
+    @Override
+    public Collection<AbstractFile> visit(Directory drctr) {
+        //we hit a real directory, a child of real FS
+        Collection<AbstractFile> ret = new ArrayList<>();
+        ret.add(drctr);
+        return ret;
+    }
+
+    @Override
+    public Collection<AbstractFile> visit(FileSystem fs) {
+        return getAllFromChildren(fs);
+    }
+
+    @Override
+    public Collection<AbstractFile> visit(File file) {
+        //can have derived files
+        return getAllFromChildren(file);
+    }
+
+    @Override
+    public Collection<AbstractFile> visit(DerivedFile derivedFile) {
+        //can have derived files
+        //TODO test this and overall scheduler with derived files
+        return getAllFromChildren(derivedFile);
+    }
+
+    @Override
+    public Collection<AbstractFile> visit(LocalFile localFile) {
+        //can have local files
+        //TODO test this and overall scheduler with local files
+        return getAllFromChildren(localFile);
+    }
+    
+}
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestJob.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestJob.java
index 529e0f5d1e..22d32b3638 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestJob.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestJob.java
@@ -20,10 +20,7 @@ package org.sleuthkit.autopsy.ingest;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
 import java.util.logging.Level;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandleFactory;
@@ -33,33 +30,26 @@ import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.Content;
 
-/**
- * Encapsulates a data source and the ingest module pipelines to be used to
- * ingest the data source.
- */
 final class IngestJob {
 
     private static final Logger logger = Logger.getLogger(IngestManager.class.getName());
-    private static final ConcurrentHashMap<Long, IngestJob> ingestJobsById = new ConcurrentHashMap<>();
     private final long id;
     private final Content rootDataSource;
     private final List<IngestModuleTemplate> ingestModuleTemplates;
     private final boolean processUnallocatedSpace;
     private final LinkedBlockingQueue<DataSourceIngestPipeline> dataSourceIngestPipelines = new LinkedBlockingQueue<>();
     private final LinkedBlockingQueue<FileIngestPipeline> fileIngestPipelines = new LinkedBlockingQueue<>();
-    private final AtomicInteger tasksInProgress = new AtomicInteger(0);
-    private final AtomicLong processedFiles = new AtomicLong(0L);
-    private final AtomicLong filesToIngestEstimate = new AtomicLong(0L);
+    private long estimatedFilesToProcess = 0L; // Guarded by this
+    private long processedFiles = 0L; // Guarded by this
     private ProgressHandle dataSourceTasksProgress;
     private ProgressHandle fileTasksProgress;
-    private volatile boolean cancelled;
+    private volatile boolean cancelled = false;
 
     IngestJob(long id, Content dataSource, List<IngestModuleTemplate> ingestModuleTemplates, boolean processUnallocatedSpace) {
         this.id = id;
         this.rootDataSource = dataSource;
         this.ingestModuleTemplates = ingestModuleTemplates;
         this.processUnallocatedSpace = processUnallocatedSpace;
-        this.cancelled = false;
     }
 
     long getId() {
@@ -73,8 +63,8 @@ final class IngestJob {
     List<IngestModuleError> startUp() throws InterruptedException {
         List<IngestModuleError> errors = startUpIngestPipelines();
         if (errors.isEmpty()) {
-            startDataSourceIngestProgressBar();
             startFileIngestProgressBar();
+            startDataSourceIngestProgressBar();
         }
         return errors;
     }
@@ -105,7 +95,8 @@ final class IngestJob {
             }
         }
 
-        return errors;
+        logIngestModuleErrors(errors);
+        return errors; // Returned so UI can report to user.
     }
 
     private void startDataSourceIngestProgressBar() {
@@ -145,18 +136,9 @@ final class IngestJob {
                 return true;
             }
         });
-        long initialFilesCount = rootDataSource.accept(new GetFilesCountVisitor());
-        filesToIngestEstimate.getAndAdd(initialFilesCount);
+        estimatedFilesToProcess = rootDataSource.accept(new GetFilesCountVisitor());
         fileTasksProgress.start();
-        fileTasksProgress.switchToDeterminate((int) initialFilesCount); // RJCTODO: This cast is troublesome, can use intValue
-    }
-
-    /**
-     * Called by the ingest task schedulers when an ingest task is added to this
-     * ingest job.
-     */
-    void notifyTaskAdded() {
-        tasksInProgress.incrementAndGet();
+        fileTasksProgress.switchToDeterminate((int) estimatedFilesToProcess);
     }
 
     void process(Content dataSource) throws InterruptedException {
@@ -172,7 +154,6 @@ final class IngestJob {
             }
             dataSourceIngestPipelines.put(pipeline);
         }
-        shutDownIfAllTasksCompleted();
     }
 
     void process(AbstractFile file) throws InterruptedException {
@@ -181,35 +162,37 @@ final class IngestJob {
         // shut down check needs to occur.
         if (!isCancelled()) {
             List<IngestModuleError> errors = new ArrayList<>();
+            synchronized (this) {
+                ++processedFiles;
+                if (processedFiles <= estimatedFilesToProcess) {
+                    fileTasksProgress.progress(file.getName(), (int) processedFiles);
+                } else {
+                    fileTasksProgress.progress(file.getName(), (int) estimatedFilesToProcess);
+                }
+            }
             FileIngestPipeline pipeline = fileIngestPipelines.take();
-            fileTasksProgress.progress(file.getName(), (int) processedFiles.incrementAndGet());
             errors.addAll(pipeline.process(file));
             fileIngestPipelines.put(pipeline);
             if (!errors.isEmpty()) {
                 logIngestModuleErrors(errors);
             }
         }
-        shutDownIfAllTasksCompleted();
     }
 
-    private void shutDownIfAllTasksCompleted() {
-        if (tasksInProgress.decrementAndGet() == 0) {
-            List<IngestModuleError> errors = new ArrayList<>();
-            while (!dataSourceIngestPipelines.isEmpty()) {
-                DataSourceIngestPipeline pipeline = dataSourceIngestPipelines.poll();
-                errors.addAll(pipeline.shutDown());
-            }
-            while (!fileIngestPipelines.isEmpty()) {
-                FileIngestPipeline pipeline = fileIngestPipelines.poll();
-                errors.addAll(pipeline.shutDown());
-            }
-            fileTasksProgress.finish();
-            dataSourceTasksProgress.finish();
-            ingestJobsById.remove(id);
-            if (!errors.isEmpty()) {
-                logIngestModuleErrors(errors);
-            }
-            IngestManager.getInstance().fireIngestJobCompleted(id);
+    void shutDown() {
+        List<IngestModuleError> errors = new ArrayList<>();
+        while (!dataSourceIngestPipelines.isEmpty()) {
+            DataSourceIngestPipeline pipeline = dataSourceIngestPipelines.poll();
+            errors.addAll(pipeline.shutDown());
+        }
+        while (!fileIngestPipelines.isEmpty()) {
+            FileIngestPipeline pipeline = fileIngestPipelines.poll();
+            errors.addAll(pipeline.shutDown());
+        }
+        fileTasksProgress.finish();
+        dataSourceTasksProgress.finish();
+        if (!errors.isEmpty()) {
+            logIngestModuleErrors(errors);
         }
     }
 
@@ -225,7 +208,8 @@ final class IngestJob {
 
     void cancel() {
         cancelled = true;
-        fileTasksProgress.finish(); // RJCTODO: What about the other progress bar?
+        fileTasksProgress.finish(); 
+        dataSourceTasksProgress.finish();
         IngestManager.getInstance().fireIngestJobCancelled(id);
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobContext.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobContext.java
index 968f72a7f8..735f39bc28 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobContext.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobContext.java
@@ -60,7 +60,7 @@ public final class IngestJobContext {
      */
     public void addFiles(List<AbstractFile> files) {
         for (AbstractFile file : files) {
-            IngestJobScheduler.getInstance().addFileToIngestJob(ingestJob, file);
+            IngestScheduler.getInstance().addFileToIngestJob(ingestJob, file);
         }
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
index d09783f0d1..b5674ab698 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
@@ -48,23 +48,23 @@ public class IngestManager {
     private static final int MAX_NUMBER_OF_DATA_SOURCE_INGEST_THREADS = 1;
     private static final String NUMBER_OF_FILE_INGEST_THREADS_KEY = "NumberOfFileingestThreads"; //NON-NLS
     private static final int MIN_NUMBER_OF_FILE_INGEST_THREADS = 1;
-    private static final int MAX_NUMBER_OF_FILE_INGEST_THREADS = 4;
+    private static final int MAX_NUMBER_OF_FILE_INGEST_THREADS = 16;
     private static final int DEFAULT_NUMBER_OF_FILE_INGEST_THREADS = 2;
     private static final Logger logger = Logger.getLogger(IngestManager.class.getName());
     private static final Preferences userPreferences = NbPreferences.forModule(IngestManager.class);
     private static final IngestManager instance = new IngestManager();
     private final PropertyChangeSupport ingestJobEventPublisher = new PropertyChangeSupport(IngestManager.class);
     private final PropertyChangeSupport ingestModuleEventPublisher = new PropertyChangeSupport(IngestManager.class);
-    private final IngestJobScheduler scheduler = IngestJobScheduler.getInstance();
+    private final IngestScheduler scheduler = IngestScheduler.getInstance();
     private final IngestMonitor ingestMonitor = new IngestMonitor();
     private final ExecutorService startIngestJobsThreadPool = Executors.newSingleThreadExecutor();
     private final ExecutorService dataSourceIngestThreadPool = Executors.newSingleThreadExecutor();
     private final ExecutorService fileIngestThreadPool = Executors.newFixedThreadPool(MAX_NUMBER_OF_FILE_INGEST_THREADS);
     private final ExecutorService fireIngestEventsThreadPool = Executors.newSingleThreadExecutor();
+    private final AtomicLong nextThreadId = new AtomicLong(0L);
     private final ConcurrentHashMap<Long, Future<Void>> startIngestJobThreads = new ConcurrentHashMap<>(); // Maps thread ids to cancellation handles.
     private final ConcurrentHashMap<Long, Future<?>> dataSourceIngestThreads = new ConcurrentHashMap<>(); // Maps thread ids to cancellation handles.
     private final ConcurrentHashMap<Long, Future<?>> fileIngestThreads = new ConcurrentHashMap<>(); // Maps thread ids to cancellation handles.
-    private final AtomicLong nextThreadId = new AtomicLong(0L);
     private volatile IngestMessageTopComponent ingestMessageBox;
 
     /**
@@ -186,8 +186,8 @@ public class IngestManager {
         }
 
         long taskId = nextThreadId.incrementAndGet();
-        Future<?> task = startIngestJobsThreadPool.submit(new StartIngestJobsThread(taskId, dataSources, moduleTemplates, processUnallocatedSpace));
-        fileIngestThreads.put(taskId, task);
+        Future<Void> task = startIngestJobsThreadPool.submit(new StartIngestJobsThread(taskId, dataSources, moduleTemplates, processUnallocatedSpace));
+        startIngestJobThreads.put(taskId, task);
 
         if (ingestMessageBox != null) {
             ingestMessageBox.restoreMessages();
@@ -218,7 +218,6 @@ public class IngestManager {
                 logger.log(Level.SEVERE, "Unexpected thread interrupt", ex);
             }
         }
-        startIngestJobThreads.clear(); // Make sure.
 
         // Cancel all the jobs already created. This will make the the ingest
         // threads flush out any lingering ingest tasks without processing them.
@@ -511,6 +510,7 @@ public class IngestManager {
                 try {
                     IngestTask task = tasks.getNextTask(); // Blocks.
                     task.execute();
+                    scheduler.ingestTaskIsCompleted(task);
                 } catch (InterruptedException ex) {
                     break;
                 }
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobScheduler.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java
similarity index 79%
rename from Core/src/org/sleuthkit/autopsy/ingest/IngestJobScheduler.java
rename to Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java
index 0141f3587f..6bad7b6ab7 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobScheduler.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java
@@ -32,35 +32,31 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.Content;
-import org.sleuthkit.datamodel.DerivedFile;
-import org.sleuthkit.datamodel.Directory;
 import org.sleuthkit.datamodel.File;
 import org.sleuthkit.datamodel.FileSystem;
-import org.sleuthkit.datamodel.LayoutFile;
-import org.sleuthkit.datamodel.LocalFile;
 import org.sleuthkit.datamodel.TskCoreException;
 import org.sleuthkit.datamodel.TskData;
-import org.sleuthkit.datamodel.VirtualDirectory;
 
-final class IngestJobScheduler {
+final class IngestScheduler {
 
-    private static final Logger logger = Logger.getLogger(IngestJobScheduler.class.getName());
+    private static final IngestScheduler instance = new IngestScheduler();
+    private static final Logger logger = Logger.getLogger(IngestScheduler.class.getName());
     private static final int FAT_NTFS_FLAGS = TskData.TSK_FS_TYPE_ENUM.TSK_FS_TYPE_FAT12.getValue() | TskData.TSK_FS_TYPE_ENUM.TSK_FS_TYPE_FAT16.getValue() | TskData.TSK_FS_TYPE_ENUM.TSK_FS_TYPE_FAT32.getValue() | TskData.TSK_FS_TYPE_ENUM.TSK_FS_TYPE_NTFS.getValue();
-    private static IngestJobScheduler instance = new IngestJobScheduler();
-    private final AtomicLong nextIngestJobId = new AtomicLong(0L);
     private final ConcurrentHashMap<Long, IngestJob> ingestJobsById = new ConcurrentHashMap<>();
     private final LinkedBlockingQueue<DataSourceIngestTask> dataSourceTasks = new LinkedBlockingQueue<>();
-    private final TreeSet<FileIngestTask> rootDirectoryTasks = new TreeSet<>(new RootDirectoryTaskComparator());
-    private final List<FileIngestTask> directoryTasks = new ArrayList<>();
-    private final LinkedBlockingQueue<FileIngestTask> fileTasks = new LinkedBlockingQueue<>();
-    private final DataSourceIngestTaskQueue dataSourceIngestTaskQueue = new DataSourceIngestTaskQueue();
-    private final FileIngestTaskQueue fileIngestTaskQueue = new FileIngestTaskQueue();
+    private final TreeSet<FileIngestTask> rootDirectoryTasks = new TreeSet<>(new RootDirectoryTaskComparator()); // Guarded by this
+    private final List<FileIngestTask> directoryTasks = new ArrayList<>();  // Guarded by this
+    private final LinkedBlockingQueue<FileIngestTask> fileTasks = new LinkedBlockingQueue<>();  // Guarded by this
+    private final List<IngestTask> tasksInProgress = new ArrayList<>();  // Guarded by this
+    private final DataSourceIngestTaskQueue dataSourceTaskDispenser = new DataSourceIngestTaskQueue();
+    private final FileIngestTaskQueue fileTaskDispenser = new FileIngestTaskQueue();
+    private final AtomicLong nextIngestJobId = new AtomicLong(0L);
 
-    static IngestJobScheduler getInstance() {
+    static IngestScheduler getInstance() {
         return instance;
     }
 
-    private IngestJobScheduler() {
+    private IngestScheduler() {
     }
 
     /**
@@ -74,7 +70,7 @@ final class IngestJobScheduler {
      * @return A collection of ingest module start up errors, empty on success.
      * @throws InterruptedException
      */
-    synchronized List<IngestModuleError> startIngestJob(Content dataSource, List<IngestModuleTemplate> ingestModuleTemplates, boolean processUnallocatedSpace) throws InterruptedException {
+    List<IngestModuleError> startIngestJob(Content dataSource, List<IngestModuleTemplate> ingestModuleTemplates, boolean processUnallocatedSpace) throws InterruptedException {
         long jobId = nextIngestJobId.incrementAndGet();
         IngestJob job = new IngestJob(jobId, dataSource, ingestModuleTemplates, processUnallocatedSpace);
         ingestJobsById.put(jobId, job);
@@ -99,10 +95,11 @@ final class IngestJobScheduler {
     }
 
     synchronized void addDataSourceToIngestJob(IngestJob job, Content dataSource) throws InterruptedException {
+        // Enqueue a data source ingest task for the data source.
         // If the thread executing this code is interrupted, it is because the 
         // the number of ingest threads has been decreased while ingest jobs are 
         // running. The calling thread will exit in an orderly fashion, but the 
-        // task still needs to be enqueued rather than lost.
+        // task still needs to be enqueued rather than lost, hence the loop.
         DataSourceIngestTask task = new DataSourceIngestTask(job, dataSource);
         while (true) {
             try {
@@ -115,24 +112,27 @@ final class IngestJobScheduler {
             }
         }
 
+        // Get the top level files of the data source.
         Collection<AbstractFile> rootObjects = dataSource.accept(new GetRootDirectoryVisitor());
-        List<AbstractFile> firstLevelFiles = new ArrayList<>();
+        List<AbstractFile> toptLevelFiles = new ArrayList<>();
         if (rootObjects.isEmpty() && dataSource instanceof AbstractFile) {
-            // The data source is file.
-            firstLevelFiles.add((AbstractFile) dataSource);
+            // The data source is itself a file.
+            toptLevelFiles.add((AbstractFile) dataSource);
         } else {
             for (AbstractFile root : rootObjects) {
                 List<Content> children;
                 try {
                     children = root.getChildren();
                     if (children.isEmpty()) {
-                        //add the root itself, could be unalloc file, child of volume or image
-                        firstLevelFiles.add(root);
+                        // Add the root object itself, it could be an unallocated space 
+                        // file, or a child of a volume or an image.
+                        toptLevelFiles.add(root);
                     } else {
-                        //root for fs root dir, schedule children dirs/files
+                        // The root object is a file system root directory, get
+                        // the files within it.
                         for (Content child : children) {
                             if (child instanceof AbstractFile) {
-                                firstLevelFiles.add((AbstractFile) child);
+                                toptLevelFiles.add((AbstractFile) child);
                             }
                         }
                     }
@@ -141,26 +141,30 @@ final class IngestJobScheduler {
                 }
             }
         }
-        for (AbstractFile firstLevelFile : firstLevelFiles) {
+
+        // Enqueue file ingest tasks for the top level files.
+        for (AbstractFile firstLevelFile : toptLevelFiles) {
             FileIngestTask fileTask = new FileIngestTask(job, firstLevelFile);
             if (shouldEnqueueFileTask(fileTask)) {
                 rootDirectoryTasks.add(fileTask);
-                fileTask.getIngestJob().notifyTaskAdded();
             }
         }
 
-        // Reshuffle/update the dir and file level queues if needed
-        updateFileTaskQueues();
+        updateFileTaskQueues(null);
     }
 
-    synchronized void addFileToIngestJob(IngestJob job, AbstractFile file) { // RJCTODO: Just one at a time?
+    void addFileToIngestJob(IngestJob job, AbstractFile file) {
         FileIngestTask task = new FileIngestTask(job, file);
         if (shouldEnqueueFileTask(task)) {
             addTaskToFileQueue(task);
-        }        
+        }
     }
 
-    private synchronized void updateFileTaskQueues() throws InterruptedException {
+    private synchronized void updateFileTaskQueues(FileIngestTask taskInProgress) throws InterruptedException {
+        if (taskInProgress != null) {
+            tasksInProgress.add(taskInProgress);
+        }
+
         // we loop because we could have a directory that has all files
         // that do not get enqueued
         while (true) {
@@ -194,7 +198,6 @@ final class IngestJobScheduler {
                         FileIngestTask childTask = new FileIngestTask(parentTask.getIngestJob(), childFile);
                         if (childFile.hasChildren()) {
                             directoryTasks.add(childTask);
-                            childTask.getIngestJob().notifyTaskAdded();
                         } else if (shouldEnqueueFileTask(childTask)) {
                             addTaskToFileQueue(childTask);
                         }
@@ -205,7 +208,7 @@ final class IngestJobScheduler {
             }
         }
     }
-    
+
     private void addTaskToFileQueue(FileIngestTask task) {
         // If the thread executing this code is interrupted, it is because the 
         // the number of ingest threads has been decreased while ingest jobs are 
@@ -222,14 +225,7 @@ final class IngestJobScheduler {
             }
         }
     }
-        
-    /**
-     * Check if the file is a special file that we should skip
-     *
-     * @param processTask a task whose file to check if should be queued of
-     * skipped
-     * @return true if should be enqueued, false otherwise
-     */
+
     private static boolean shouldEnqueueFileTask(final FileIngestTask processTask) {
         final AbstractFile aFile = processTask.getFile();
         //if it's unalloc file, skip if so scheduled
@@ -282,68 +278,52 @@ final class IngestJobScheduler {
     }
 
     IngestTaskQueue getDataSourceIngestTaskQueue() {
-        return dataSourceIngestTaskQueue;
+        return dataSourceTaskDispenser;
     }
 
     IngestTaskQueue getFileIngestTaskQueue() {
-        return fileIngestTaskQueue;
+        return fileTaskDispenser;
     }
 
-    /**
-     * Finds top level objects such as file system root directories, layout
-     * files and virtual directories.
-     */
-    private static class GetRootDirectoryVisitor extends GetFilesContentVisitor {
-
-        @Override
-        public Collection<AbstractFile> visit(VirtualDirectory ld) {
-            //case when we hit a layout directoryor local file container, not under a real FS
-            //or when root virt dir is scheduled
-            Collection<AbstractFile> ret = new ArrayList<>();
-            ret.add(ld);
-            return ret;
+    void ingestTaskIsCompleted(IngestTask completedTask) {
+        if (ingestJobIsCompleted(completedTask)) {
+            IngestJob job = completedTask.getIngestJob();
+            job.shutDown();
+            ingestJobsById.remove(job.getId());
+            IngestManager.getInstance().fireIngestJobCompleted(job.getId());
         }
+    }
 
-        @Override
-        public Collection<AbstractFile> visit(LayoutFile lf) {
-            //case when we hit a layout file, not under a real FS
-            Collection<AbstractFile> ret = new ArrayList<>();
-            ret.add(lf);
-            return ret;
+    private synchronized boolean ingestJobIsCompleted(IngestTask completedTask) {
+        tasksInProgress.remove(completedTask);
+        IngestJob job = completedTask.getIngestJob();
+        long jobId = job.getId();
+        for (IngestTask task : tasksInProgress) {
+            if (task.getIngestJob().getId() == jobId) {
+                return false;
+            }
         }
-
-        @Override
-        public Collection<AbstractFile> visit(Directory drctr) {
-            //we hit a real directory, a child of real FS
-            Collection<AbstractFile> ret = new ArrayList<>();
-            ret.add(drctr);
-            return ret;
+        for (FileIngestTask task : fileTasks) {
+            if (task.getIngestJob().getId() == jobId) {
+                return false;
+            }
         }
-
-        @Override
-        public Collection<AbstractFile> visit(FileSystem fs) {
-            return getAllFromChildren(fs);
+        for (FileIngestTask task : directoryTasks) {
+            if (task.getIngestJob().getId() == jobId) {
+                return false;
+            }
         }
-
-        @Override
-        public Collection<AbstractFile> visit(File file) {
-            //can have derived files
-            return getAllFromChildren(file);
+        for (FileIngestTask task : rootDirectoryTasks) {
+            if (task.getIngestJob().getId() == jobId) {
+                return false;
+            }
         }
-
-        @Override
-        public Collection<AbstractFile> visit(DerivedFile derivedFile) {
-            //can have derived files
-            //TODO test this and overall scheduler with derived files
-            return getAllFromChildren(derivedFile);
-        }
-
-        @Override
-        public Collection<AbstractFile> visit(LocalFile localFile) {
-            //can have local files
-            //TODO test this and overall scheduler with local files
-            return getAllFromChildren(localFile);
+        for (DataSourceIngestTask task : dataSourceTasks) {
+            if (task.getIngestJob().getId() == jobId) {
+                return false;
+            }
         }
+        return true;
     }
 
     private static class RootDirectoryTaskComparator implements Comparator<FileIngestTask> {
@@ -455,7 +435,7 @@ final class IngestJobScheduler {
         @Override
         public IngestTask getNextTask() throws InterruptedException {
             FileIngestTask task = fileTasks.take();
-            updateFileTaskQueues();
+            updateFileTaskQueues(task);
             return task;
         }
     }
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestTask.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestTask.java
index 1133be1210..414128fd5f 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestTask.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestTask.java
@@ -18,6 +18,17 @@
  */
 package org.sleuthkit.autopsy.ingest;
 
-interface IngestTask {
-    void execute() throws InterruptedException;    
+abstract class IngestTask {
+    
+    private final IngestJob job;
+
+    IngestTask(IngestJob job) {
+        this.job = job;
+    }
+
+    IngestJob getIngestJob() {
+        return job;
+    }
+        
+    abstract void execute() throws InterruptedException;    
 }

From 2f65d7b9323aba12fafb55827f2fb6ddeb1809ff Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Fri, 2 May 2014 15:53:25 -0400
Subject: [PATCH 12/24] Update old property change listener add/remove methods
 of IngestManager

---
 Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
index b5674ab698..3b566decd4 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
@@ -311,6 +311,7 @@ public class IngestManager {
      * @param listener The PropertyChangeListener to register.
      */
     public static void addPropertyChangeListener(final PropertyChangeListener listener) {
+        instance.ingestJobEventPublisher.addPropertyChangeListener(listener);
         instance.ingestModuleEventPublisher.addPropertyChangeListener(listener);
     }
 
@@ -321,6 +322,7 @@ public class IngestManager {
      * @param listener The PropertyChangeListener to unregister.
      */
     public static void removePropertyChangeListener(final PropertyChangeListener listener) {
+        instance.ingestJobEventPublisher.removePropertyChangeListener(listener);
         instance.ingestModuleEventPublisher.removePropertyChangeListener(listener);
     }
 

From 8c635c058bf14799839f95adea63e100770edc87 Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Fri, 2 May 2014 16:37:05 -0400
Subject: [PATCH 13/24] Relax ingest module unique display name constraint

---
 .../ingest/IngestModuleFactoryLoader.java     | 41 ++++++++++---------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactoryLoader.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactoryLoader.java
index 510e777091..c40f9e3e4f 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactoryLoader.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactoryLoader.java
@@ -44,7 +44,7 @@ final class IngestModuleFactoryLoader {
         }
         return instance;
     }
-    
+
     synchronized List<IngestModuleFactory> getIngestModuleFactories() {
         // Discover the ingest module factories, making sure that there are no
         // duplicate module display names. The duplicates requirement could be
@@ -58,30 +58,31 @@ final class IngestModuleFactoryLoader {
         Collection<? extends IngestModuleFactory> factories = Lookup.getDefault().lookupAll(IngestModuleFactory.class);
         for (IngestModuleFactory factory : factories) {
             logger.log(Level.INFO, "Found ingest module factory: name = {0}, version = {1}", new Object[]{factory.getModuleDisplayName(), factory.getModuleVersionNumber()}); //NON-NLS
+            moduleFactoriesByClass.put(factory.getClass().getCanonicalName(), factory);
+            moduleDisplayNames.add(factory.getModuleDisplayName());
             if (!moduleDisplayNames.contains(factory.getModuleDisplayName())) {
-                moduleFactoriesByClass.put(factory.getClass().getCanonicalName(), factory);
-                moduleDisplayNames.add(factory.getModuleDisplayName());
-            } else {
                 // Not popping up a message box to keep this class UI-indepdent.
-                logger.log(Level.SEVERE, "Found duplicate ingest module display name, discarding ingest module factory (name = {0}", new Object[]{factory.getModuleDisplayName(), factory.getModuleVersionNumber()}); //NON-NLS
+                logger.log(Level.SEVERE, "Found duplicate ingest module display name (name = {0})", factory.getModuleDisplayName()); //NON-NLS
             }
         }
-        
+
         // Kick out the sample modules factory.
         moduleFactoriesByClass.remove("org.sleuthkit.autopsy.examples.SampleIngestModuleFactory");
-        
+
         // Do the core ingest module ordering hack described above.
-        ArrayList<String> coreModuleOrdering = new ArrayList<String>() {{
-            add("org.sleuthkit.autopsy.recentactivity.RecentActivityExtracterModuleFactory");
-            add("org.sleuthkit.autopsy.ewfverify.EwfVerifierModuleFactory");
-            add("org.sleuthkit.autopsy.hashdatabase.HashLookupModuleFactory");
-            add("org.sleuthkit.autopsy.modules.filetypeid.FileTypeIdModuleFactory");
-            add("org.sleuthkit.autopsy.modules.sevenzip.ArchiveFileExtractorModuleFactory");
-            add("org.sleuthkit.autopsy.modules.exif.ExifParserModuleFactory");
-            add("org.sleuthkit.autopsy.keywordsearch.KeywordSearchModuleFactory");
-            add("org.sleuthkit.autopsy.thunderbirdparser.EmailParserModuleFactory");
-            add("org.sleuthkit.autopsy.modules.fileextmismatch.FileExtMismatchDetectorModuleFactory");
-        }};
+        ArrayList<String> coreModuleOrdering = new ArrayList<String>() {
+            {
+                add("org.sleuthkit.autopsy.recentactivity.RecentActivityExtracterModuleFactory");
+                add("org.sleuthkit.autopsy.ewfverify.EwfVerifierModuleFactory");
+                add("org.sleuthkit.autopsy.hashdatabase.HashLookupModuleFactory");
+                add("org.sleuthkit.autopsy.modules.filetypeid.FileTypeIdModuleFactory");
+                add("org.sleuthkit.autopsy.modules.sevenzip.ArchiveFileExtractorModuleFactory");
+                add("org.sleuthkit.autopsy.modules.exif.ExifParserModuleFactory");
+                add("org.sleuthkit.autopsy.keywordsearch.KeywordSearchModuleFactory");
+                add("org.sleuthkit.autopsy.thunderbirdparser.EmailParserModuleFactory");
+                add("org.sleuthkit.autopsy.modules.fileextmismatch.FileExtMismatchDetectorModuleFactory");
+            }
+        };
         List<IngestModuleFactory> orderedModuleFactories = new ArrayList<>();
         for (String className : coreModuleOrdering) {
             IngestModuleFactory coreFactory = moduleFactoriesByClass.remove(className);
@@ -89,12 +90,12 @@ final class IngestModuleFactoryLoader {
                 orderedModuleFactories.add(coreFactory);
             }
         }
-        
+
         // Add in any non-core factories discovered. Order is not guaranteed!
         for (IngestModuleFactory nonCoreFactory : moduleFactoriesByClass.values()) {
             orderedModuleFactories.add(nonCoreFactory);
         }
-        
+
         return orderedModuleFactories;
     }
 }
\ No newline at end of file

From eb3f9bbbf316ee6593bf0eabcd7ba8561a2b2a17 Mon Sep 17 00:00:00 2001
From: alexjacks92 <alexjacks@comcast.net>
Date: Tue, 6 May 2014 14:09:02 -0400
Subject: [PATCH 14/24] Reimplemented object ID replacement in a more sane way.

---
 test/script/tskdbdiff.py | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/test/script/tskdbdiff.py b/test/script/tskdbdiff.py
index c6f5d46d65..3dec5e1579 100755
--- a/test/script/tskdbdiff.py
+++ b/test/script/tskdbdiff.py
@@ -283,29 +283,32 @@ def replace_id(line, table):
     files_index = line.find('INSERT INTO "tsk_files"')
     path_index = line.find('INSERT INTO "tsk_files_path"')
     object_index = line.find('INSERT INTO "tsk_objects"')
+    parens = line[line.find('(') + 1 : line.find(')')]
+    fields_list = parens.replace(" ", "").split(',')
     
-    if (files_index != -1 or path_index != -1):
-        # take the portion of the string between the open parenthesis and the first comma (ie, the object id)
-        obj_id = int(line[line.find('(') + 1 : line.find(',')])
-        # takes everything from the beginning of the string up to the opening
-        # parenthesis, the path associated with the object id, and everything after 
-        # the first comma, and concactenate it
-        newLine = (line[:line.find('('):] + '(' + table[obj_id] + line[line.find(','):])
+    if (files_index != -1):
+        obj_id = fields_list[0]
+        path = table[int(obj_id)]
+        newLine = ('INSERT INTO "tsk_files" VALUES(' + path + ', '.join(fields_list[1:]) + ');') 
+        return newLine
+    
+    elif (path_index != -1):
+        obj_id = fields_list[0]
+        path = table[int(obj_id)]
+        newLine = ('INSERT INTO "tsk_files_path" VALUES(' + path + ', '.join(fields_list[1:]) + ');') 
         return newLine
     
     elif (object_index != -1):
-        # take the portion of the string between the open parenthesis and the first comma (ie, the object id)
-        obj_id = line[line.find('(') + 1 : line.find(',')]
-        parent_id = line[line.find(',') + 2 : line.find(',', line.find(',') + 1)]
+        obj_id = fields_list[0]
+        parent_id = fields_list[1]
     
         try:
-            path = table[int(obj_id)]
-            parent_path = table[int(parent_id)]
-            no_ID = (line[:line.find('('):] + '(' + path + line[line.find(','):])
-            newLine = (no_ID[:no_ID.find(',') + 1] + " " + parent_path + no_ID[no_ID.find(parent_id) + 1:])
-            return newLine
+             path = table[int(obj_id)]
+             parent_path = table[int(parent_id)]
+             newLine = ('INSERT INTO "tsk_objects" VALUES(' + path + ', ' + parent_path + ', '.join(fields_list[2:]) + ');') 
+             return newLine
         except Exception as e: 
-            # objects table has things that aren't files. if lookup fails, don't replace the object id.
+            # objects table has things that aren't files. if lookup fails, don't replace anything.
             return line
     
     else:

From 45aa584f2aeb160edb34f91feee3294afe61493d Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Tue, 6 May 2014 17:43:37 -0400
Subject: [PATCH 15/24] Added UserPreferences class

---
 .../autopsy/core/UserPreferences.java         |  80 +++++++
 Core/src/org/sleuthkit/autopsy/core/layer.xml |   7 +
 ...ralPanel.form => AutopsyOptionsPanel.form} |  27 ++-
 ...ralPanel.java => AutopsyOptionsPanel.java} |  74 ++----
 ...ava => AutopsyOptionsPanelController.java} |  10 +-
 .../autopsy/corecomponents/Bundle.properties  |  24 +-
 .../corecomponents/Bundle_ja.properties       | 221 +++++++++---------
 .../corecomponents/DataContentPanel.java      |  30 ++-
 .../autopsy/datamodel/ContentUtils.java       |  41 ++--
 .../autopsy/datamodel/FileTypeChildren.java   |  73 +++---
 .../datamodel/KnownFileFilterNode.java        |  79 ++-----
 .../DirectoryTreeTopComponent.java            |  31 ++-
 .../sleuthkit/autopsy/timeline/Timeline.java  |   2 +-
 13 files changed, 381 insertions(+), 318 deletions(-)
 create mode 100755 Core/src/org/sleuthkit/autopsy/core/UserPreferences.java
 rename Core/src/org/sleuthkit/autopsy/corecomponents/{GeneralPanel.form => AutopsyOptionsPanel.form} (85%)
 rename Core/src/org/sleuthkit/autopsy/corecomponents/{GeneralPanel.java => AutopsyOptionsPanel.java} (70%)
 rename Core/src/org/sleuthkit/autopsy/corecomponents/{GeneralOptionsPanelController.java => AutopsyOptionsPanelController.java} (92%)

diff --git a/Core/src/org/sleuthkit/autopsy/core/UserPreferences.java b/Core/src/org/sleuthkit/autopsy/core/UserPreferences.java
new file mode 100755
index 0000000000..ea2604ba89
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/core/UserPreferences.java
@@ -0,0 +1,80 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2014 Basis Technology Corp.
+ * Contact: carrier <at> sleuthkit <dot> org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.autopsy.core;
+
+import java.util.prefs.PreferenceChangeListener;
+import java.util.prefs.Preferences;
+import org.openide.util.NbPreferences;
+
+/**
+ * Provides convenient access to a Preferences node for user preferences with
+ * default values.
+ */
+public final class UserPreferences {
+
+    private static final Preferences preferences = NbPreferences.forModule(UserPreferences.class);
+    public static final String KEEP_PREFERRED_VIEWER = "KeepPreferredViewer"; // NON-NLS    
+    public static final String HIDE_KNOWN_FILES_IN_DATA_SOURCES_TREE = "HideKnownFilesInDataSourcesTree"; //NON-NLS 
+    public static final String HIDE_KNOWN_FILES_IN_VIEWS_TREE = "HideKnownFilesInViewsTree"; //NON-NLS 
+    public static final String DISPLAY_TIMES_IN_LOCAL_TIME = "DisplayTimesInLocalTime"; //NON-NLS
+
+    // Prevent instantiation.
+    private UserPreferences() {
+    }
+
+    public static void addChangeListener(PreferenceChangeListener listener) {
+        preferences.addPreferenceChangeListener(listener);
+    }
+
+    public static void removeChangeListener(PreferenceChangeListener listener) {
+        preferences.removePreferenceChangeListener(listener);
+    }
+
+    public static boolean keepPreferredContentViewer() {
+        return preferences.getBoolean(KEEP_PREFERRED_VIEWER, false);
+    }
+
+    public static void setKeepPreferredContentViewer(boolean value) {
+        preferences.putBoolean(KEEP_PREFERRED_VIEWER, value);
+    }
+
+    public static boolean hideKnownFilesInDataSourcesTree() {
+        return preferences.getBoolean(HIDE_KNOWN_FILES_IN_DATA_SOURCES_TREE, false);
+    }
+
+    public static void setHideKnownFilesInDataSourcesTree(boolean value) {
+        preferences.putBoolean(HIDE_KNOWN_FILES_IN_DATA_SOURCES_TREE, value);
+    }
+
+    public static boolean hideKnownFilesInViewsTree() {
+        return preferences.getBoolean(HIDE_KNOWN_FILES_IN_VIEWS_TREE, true);
+    }
+
+    public static void setHideKnownFilesInViewsTree(boolean value) {
+        preferences.putBoolean(HIDE_KNOWN_FILES_IN_VIEWS_TREE, value);
+    }
+    
+    public static boolean displayTimesInLocalTime() {
+        return preferences.getBoolean(DISPLAY_TIMES_IN_LOCAL_TIME, true);
+    }
+
+    public static void setDisplayTimesInLocalTime(boolean value) {
+        preferences.putBoolean(DISPLAY_TIMES_IN_LOCAL_TIME, value);
+    }    
+}
diff --git a/Core/src/org/sleuthkit/autopsy/core/layer.xml b/Core/src/org/sleuthkit/autopsy/core/layer.xml
index 0a0d481991..4553e5d146 100644
--- a/Core/src/org/sleuthkit/autopsy/core/layer.xml
+++ b/Core/src/org/sleuthkit/autopsy/core/layer.xml
@@ -18,6 +18,13 @@
         <folder name="Keymaps.instance_hidden"/> <!-- Keymap -->
         <folder name="Java.instance_hidden"/>
         <folder name="Advanced.instance_hidden"/> <!-- Miscellaneous -->
+        <file name="org-sleuthkit-autopsy-corecomponents-AutopsyOptionsPanelController.instance">
+            <attr name="iconBase" stringvalue="org/sleuthkit/autopsy/corecomponents/checkbox.png"/>
+            <attr name="instanceCreate" methodvalue="org.netbeans.spi.options.OptionsCategory.createCategory"/>
+            <attr name="keywordsCategory" stringvalue="General"/>
+            <attr name="position" intvalue="1"/>
+        </file>
+        <file name="org-sleuthkit-autopsy-corecomponents-GeneralOptionsPanelController.instance_hidden"/>
     </folder>
     <file name="OptionsExport_hidden"/> <!-- Hide import/export in Options -->
     
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralPanel.form b/Core/src/org/sleuthkit/autopsy/corecomponents/AutopsyOptionsPanel.form
similarity index 85%
rename from Core/src/org/sleuthkit/autopsy/corecomponents/GeneralPanel.form
rename to Core/src/org/sleuthkit/autopsy/corecomponents/AutopsyOptionsPanel.form
index 2c0bbd1ee6..6f2a24b8b0 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/AutopsyOptionsPanel.form
@@ -96,10 +96,10 @@
         </Property>
         <Property name="selected" type="boolean" value="true"/>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="GeneralPanel.useBestViewerRB.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="AutopsyOptionsPanel.useBestViewerRB.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
         <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="GeneralPanel.useBestViewerRB.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="AutopsyOptionsPanel.useBestViewerRB.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -112,24 +112,27 @@
           <ComponentRef name="buttonGroup1"/>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="GeneralPanel.keepCurrentViewerRB.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="AutopsyOptionsPanel.keepCurrentViewerRB.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
         <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="GeneralPanel.keepCurrentViewerRB.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="AutopsyOptionsPanel.keepCurrentViewerRB.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
+      <Events>
+        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="keepCurrentViewerRBActionPerformed"/>
+      </Events>
     </Component>
     <Component class="javax.swing.JLabel" name="jLabel1">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="GeneralPanel.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="AutopsyOptionsPanel.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JLabel" name="jLabel2">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="GeneralPanel.jLabel2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="AutopsyOptionsPanel.jLabel2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
@@ -140,7 +143,7 @@
         </Property>
         <Property name="selected" type="boolean" value="true"/>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="GeneralPanel.useLocalTimeRB.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="AutopsyOptionsPanel.useLocalTimeRB.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
@@ -150,7 +153,7 @@
           <ComponentRef name="buttonGroup3"/>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="GeneralPanel.useGMTTimeRB.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="AutopsyOptionsPanel.useGMTTimeRB.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -160,28 +163,28 @@
     <Component class="javax.swing.JLabel" name="jLabel3">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="GeneralPanel.jLabel3.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="AutopsyOptionsPanel.jLabel3.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JCheckBox" name="dataSourcesHideKnownCB">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="GeneralPanel.dataSourcesHideKnownCB.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="AutopsyOptionsPanel.dataSourcesHideKnownCB.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JCheckBox" name="viewsHideKnownCB">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="GeneralPanel.viewsHideKnownCB.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="AutopsyOptionsPanel.viewsHideKnownCB.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JLabel" name="jLabel4">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="GeneralPanel.jLabel4.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="AutopsyOptionsPanel.jLabel4.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/AutopsyOptionsPanel.java
similarity index 70%
rename from Core/src/org/sleuthkit/autopsy/corecomponents/GeneralPanel.java
rename to Core/src/org/sleuthkit/autopsy/corecomponents/AutopsyOptionsPanel.java
index d34a49b16a..ae46e94cce 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/AutopsyOptionsPanel.java
@@ -18,44 +18,35 @@
  */
 package org.sleuthkit.autopsy.corecomponents;
 
-import java.util.prefs.Preferences;
 import javax.swing.DefaultComboBoxModel;
-import org.openide.util.NbPreferences;
-import org.sleuthkit.autopsy.datamodel.ContentUtils;
+import org.sleuthkit.autopsy.core.UserPreferences;
 import org.sleuthkit.autopsy.ingest.IngestManager;
 
-final class GeneralPanel extends javax.swing.JPanel {
-
-    private static final String KEEP_PREFERRED_VIEWER = "keepPreferredViewer"; //NON-NLS
-    private static final String USE_LOCAL_TIME = "useLocalTime"; //NON-NLS
-    private static final String DS_HIDE_KNOWN = "dataSourcesHideKnown"; // Default false NON-NLS
-    private static final String VIEWS_HIDE_KNOWN = "viewsHideKnown"; // Default true NON-NLS
-    private final Preferences prefs = NbPreferences.forModule(this.getClass());
-
-    GeneralPanel(GeneralOptionsPanelController controller) {
+final class AutopsyOptionsPanel extends javax.swing.JPanel {
+    
+    AutopsyOptionsPanel(AutopsyOptionsPanelController controller) {
         initComponents();
         numberOfFileIngestThreadsComboBox.setModel(new DefaultComboBoxModel<>(new Integer[]{1, 2, 4, 8, 16}));
-        ContentUtils.setDisplayInLocalTime(useLocalTimeRB.isSelected());
         // TODO listen to changes in form fields and call controller.changed()
     }
 
     void load() {
-        boolean keepPreferredViewer = prefs.getBoolean(KEEP_PREFERRED_VIEWER, false);
+        boolean keepPreferredViewer = UserPreferences.keepPreferredContentViewer();
         keepCurrentViewerRB.setSelected(keepPreferredViewer);
         useBestViewerRB.setSelected(!keepPreferredViewer);
-        boolean useLocalTime = prefs.getBoolean(USE_LOCAL_TIME, true);
+        dataSourcesHideKnownCB.setSelected(UserPreferences.hideKnownFilesInDataSourcesTree());
+        viewsHideKnownCB.setSelected(UserPreferences.hideKnownFilesInViewsTree());
+        boolean useLocalTime = UserPreferences.displayTimesInLocalTime();
         useLocalTimeRB.setSelected(useLocalTime);
         useGMTTimeRB.setSelected(!useLocalTime);
-        dataSourcesHideKnownCB.setSelected(prefs.getBoolean(DS_HIDE_KNOWN, false));
-        viewsHideKnownCB.setSelected(prefs.getBoolean(VIEWS_HIDE_KNOWN, true));
         numberOfFileIngestThreadsComboBox.setSelectedItem(IngestManager.getNumberOfFileIngestThreads());
     }
 
     void store() {
-        prefs.putBoolean(KEEP_PREFERRED_VIEWER, keepCurrentViewerRB.isSelected());
-        prefs.putBoolean(USE_LOCAL_TIME, useLocalTimeRB.isSelected());
-        prefs.putBoolean(DS_HIDE_KNOWN, dataSourcesHideKnownCB.isSelected());
-        prefs.putBoolean(VIEWS_HIDE_KNOWN, viewsHideKnownCB.isSelected());
+        UserPreferences.setKeepPreferredContentViewer(keepCurrentViewerRB.isSelected());
+        UserPreferences.setHideKnownFilesInDataSourcesTree(dataSourcesHideKnownCB.isSelected());
+        UserPreferences.setHideKnownFilesInViewsTree(viewsHideKnownCB.isSelected());
+        UserPreferences.setDisplayTimesInLocalTime(useLocalTimeRB.isSelected());
         IngestManager.setNumberOfFileIngestThreads((Integer) numberOfFileIngestThreadsComboBox.getSelectedItem());
     }
 
@@ -87,41 +78,31 @@ final class GeneralPanel extends javax.swing.JPanel {
 
         buttonGroup1.add(useBestViewerRB);
         useBestViewerRB.setSelected(true);
-        org.openide.awt.Mnemonics.setLocalizedText(useBestViewerRB, org.openide.util.NbBundle.getMessage(GeneralPanel.class, "GeneralPanel.useBestViewerRB.text")); // NOI18N
-        useBestViewerRB.setToolTipText(org.openide.util.NbBundle.getMessage(GeneralPanel.class, "GeneralPanel.useBestViewerRB.toolTipText")); // NOI18N
-        useBestViewerRB.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                useBestViewerRBActionPerformed(evt);
-            }
-        });
+        org.openide.awt.Mnemonics.setLocalizedText(useBestViewerRB, org.openide.util.NbBundle.getMessage(AutopsyOptionsPanel.class, "AutopsyOptionsPanel.useBestViewerRB.text")); // NOI18N
+        useBestViewerRB.setToolTipText(org.openide.util.NbBundle.getMessage(AutopsyOptionsPanel.class, "AutopsyOptionsPanel.useBestViewerRB.toolTipText")); // NOI18N
 
         buttonGroup1.add(keepCurrentViewerRB);
-        org.openide.awt.Mnemonics.setLocalizedText(keepCurrentViewerRB, org.openide.util.NbBundle.getMessage(GeneralPanel.class, "GeneralPanel.keepCurrentViewerRB.text")); // NOI18N
-        keepCurrentViewerRB.setToolTipText(org.openide.util.NbBundle.getMessage(GeneralPanel.class, "GeneralPanel.keepCurrentViewerRB.toolTipText")); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(keepCurrentViewerRB, org.openide.util.NbBundle.getMessage(AutopsyOptionsPanel.class, "AutopsyOptionsPanel.keepCurrentViewerRB.text")); // NOI18N
+        keepCurrentViewerRB.setToolTipText(org.openide.util.NbBundle.getMessage(AutopsyOptionsPanel.class, "AutopsyOptionsPanel.keepCurrentViewerRB.toolTipText")); // NOI18N
 
-        org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(GeneralPanel.class, "GeneralPanel.jLabel1.text")); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(AutopsyOptionsPanel.class, "AutopsyOptionsPanel.jLabel1.text")); // NOI18N
 
-        org.openide.awt.Mnemonics.setLocalizedText(jLabel2, org.openide.util.NbBundle.getMessage(GeneralPanel.class, "GeneralPanel.jLabel2.text")); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(jLabel2, org.openide.util.NbBundle.getMessage(AutopsyOptionsPanel.class, "AutopsyOptionsPanel.jLabel2.text")); // NOI18N
 
         buttonGroup3.add(useLocalTimeRB);
         useLocalTimeRB.setSelected(true);
-        org.openide.awt.Mnemonics.setLocalizedText(useLocalTimeRB, org.openide.util.NbBundle.getMessage(GeneralPanel.class, "GeneralPanel.useLocalTimeRB.text")); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(useLocalTimeRB, org.openide.util.NbBundle.getMessage(AutopsyOptionsPanel.class, "AutopsyOptionsPanel.useLocalTimeRB.text")); // NOI18N
 
         buttonGroup3.add(useGMTTimeRB);
-        org.openide.awt.Mnemonics.setLocalizedText(useGMTTimeRB, org.openide.util.NbBundle.getMessage(GeneralPanel.class, "GeneralPanel.useGMTTimeRB.text")); // NOI18N
-        useGMTTimeRB.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                useGMTTimeRBActionPerformed(evt);
-            }
-        });
+        org.openide.awt.Mnemonics.setLocalizedText(useGMTTimeRB, org.openide.util.NbBundle.getMessage(AutopsyOptionsPanel.class, "AutopsyOptionsPanel.useGMTTimeRB.text")); // NOI18N
 
-        org.openide.awt.Mnemonics.setLocalizedText(jLabel3, org.openide.util.NbBundle.getMessage(GeneralPanel.class, "GeneralPanel.jLabel3.text")); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(jLabel3, org.openide.util.NbBundle.getMessage(AutopsyOptionsPanel.class, "AutopsyOptionsPanel.jLabel3.text")); // NOI18N
 
-        org.openide.awt.Mnemonics.setLocalizedText(dataSourcesHideKnownCB, org.openide.util.NbBundle.getMessage(GeneralPanel.class, "GeneralPanel.dataSourcesHideKnownCB.text")); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(dataSourcesHideKnownCB, org.openide.util.NbBundle.getMessage(AutopsyOptionsPanel.class, "AutopsyOptionsPanel.dataSourcesHideKnownCB.text")); // NOI18N
 
-        org.openide.awt.Mnemonics.setLocalizedText(viewsHideKnownCB, org.openide.util.NbBundle.getMessage(GeneralPanel.class, "GeneralPanel.viewsHideKnownCB.text")); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(viewsHideKnownCB, org.openide.util.NbBundle.getMessage(AutopsyOptionsPanel.class, "AutopsyOptionsPanel.viewsHideKnownCB.text")); // NOI18N
 
-        org.openide.awt.Mnemonics.setLocalizedText(jLabel4, org.openide.util.NbBundle.getMessage(GeneralPanel.class, "GeneralPanel.jLabel4.text")); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(jLabel4, org.openide.util.NbBundle.getMessage(AutopsyOptionsPanel.class, "AutopsyOptionsPanel.jLabel4.text")); // NOI18N
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
@@ -181,13 +162,6 @@ final class GeneralPanel extends javax.swing.JPanel {
         );
     }// </editor-fold>//GEN-END:initComponents
 
-    private void useBestViewerRBActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_useBestViewerRBActionPerformed
-        // TODO add your handling code here:
-    }//GEN-LAST:event_useBestViewerRBActionPerformed
-
-    private void useGMTTimeRBActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_useGMTTimeRBActionPerformed
-        ContentUtils.setDisplayInLocalTime(useLocalTimeRB.isSelected());
-    }//GEN-LAST:event_useGMTTimeRBActionPerformed
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.ButtonGroup buttonGroup1;
     private javax.swing.ButtonGroup buttonGroup3;
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralOptionsPanelController.java b/Core/src/org/sleuthkit/autopsy/corecomponents/AutopsyOptionsPanelController.java
similarity index 92%
rename from Core/src/org/sleuthkit/autopsy/corecomponents/GeneralOptionsPanelController.java
rename to Core/src/org/sleuthkit/autopsy/corecomponents/AutopsyOptionsPanelController.java
index 990576ea0c..c0de3942ea 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralOptionsPanelController.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/AutopsyOptionsPanelController.java
@@ -34,12 +34,12 @@ import org.sleuthkit.autopsy.coreutils.Logger;
         position = 1,
         keywords = "#OptionsCategory_Keywords_General",
         keywordsCategory = "General")
-public final class GeneralOptionsPanelController extends OptionsPanelController {
+public final class AutopsyOptionsPanelController extends OptionsPanelController {
 
-    private GeneralPanel panel;
+    private AutopsyOptionsPanel panel;
     private final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
     private boolean changed;
-    private static final Logger logger = Logger.getLogger(GeneralOptionsPanelController.class.getName());
+    private static final Logger logger = Logger.getLogger(AutopsyOptionsPanelController.class.getName());
 
     @Override
     public void update() {
@@ -87,9 +87,9 @@ public final class GeneralOptionsPanelController extends OptionsPanelController
         pcs.removePropertyChangeListener(l);
     }
 
-    private GeneralPanel getPanel() {
+    private AutopsyOptionsPanel getPanel() {
         if (panel == null) {
-            panel = new GeneralPanel(this);
+            panel = new AutopsyOptionsPanel(this);
         }
         return panel;
     }
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties b/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties
index 4eb9d18d40..b5cef39ee8 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties
@@ -60,11 +60,6 @@ DataResultViewerThumbnail.pageNumLabel.text=-
 DataResultViewerThumbnail.filePathLabel.text=\ \ \ 
 DataResultViewerThumbnail.goToPageLabel.text=Go to Page:
 DataResultViewerThumbnail.goToPageField.text=
-GeneralPanel.jLabel1.text=When selecting a file:
-GeneralPanel.useBestViewerRB.text=Change to the most specific file viewer
-GeneralPanel.keepCurrentViewerRB.text=Stay on the same file viewer
-GeneralPanel.useBestViewerRB.toolTipText=For example, change from Hex to Media when a JPEG is selected.
-GeneralPanel.keepCurrentViewerRB.toolTipText=For example, stay in Hex view when a JPEG is selected.
 AdvancedConfigurationDialog.cancelButton.text=Cancel
 DataResultPanel.directoryTablePath.text=directoryPath
 DataResultPanel.numberMatchLabel.text=0
@@ -73,12 +68,6 @@ MediaViewVideoPanel.pauseButton.text=\u25ba
 MediaViewVideoPanel.progressLabel.text=00:00
 DataContentViewerMedia.AccessibleContext.accessibleDescription=
 MediaViewVideoPanel.infoLabel.text=info
-GeneralPanel.jLabel2.text=When displaying times:
-GeneralPanel.useLocalTimeRB.text=Use local time zone
-GeneralPanel.useGMTTimeRB.text=Use GMT
-GeneralPanel.jLabel3.text=Hide known files (i.e. those in the NIST NSRL) in the:
-GeneralPanel.viewsHideKnownCB.text= Views area
-GeneralPanel.dataSourcesHideKnownCB.text=Data Sources area (the directory hierarchy)
 DataContentViewerArtifact.waitText=Retrieving and preparing data, please wait...
 DataContentViewerArtifact.errorText=Error retrieving result
 DataContentViewerArtifact.title=Results
@@ -137,5 +126,16 @@ DataResultViewerThumbnail.switchPage.done.errMsg=Error making thumbnails\: {0}
 FXVideoPanel.pauseButton.infoLabel.playbackErr=Playback error.
 GstVideoPanel.progress.infoLabel.updateErr=Error updating video progress\: {0}
 GstVideoPanel.ExtractMedia.progress.buffering=Buffering {0}
-GeneralPanel.jLabel4.text=Number of threads to use for file ingest:
 AboutWindowPanel.actVerboseLogging.text=Activate verbose logging
+AutopsyOptionsPanel.jLabel4.text=Number of threads to use for file ingest:
+AutopsyOptionsPanel.viewsHideKnownCB.text=Views area
+AutopsyOptionsPanel.dataSourcesHideKnownCB.text=Data Sources area (the directory hierarchy)
+AutopsyOptionsPanel.jLabel3.text=Hide known files (i.e. those in the NIST NSRL) in the:
+AutopsyOptionsPanel.useBestViewerRB.toolTipText=For example, change from Hex to Media when a JPEG is selected.
+AutopsyOptionsPanel.useBestViewerRB.text=Change to the most specific file viewer
+AutopsyOptionsPanel.useGMTTimeRB.text=Use GMT
+AutopsyOptionsPanel.useLocalTimeRB.text=Use local time zone
+AutopsyOptionsPanel.keepCurrentViewerRB.toolTipText=For example, stay in Hex view when a JPEG is selected.
+AutopsyOptionsPanel.keepCurrentViewerRB.text=Stay on the same file viewer
+AutopsyOptionsPanel.jLabel1.text=When selecting a file:
+AutopsyOptionsPanel.jLabel2.text=When displaying times:
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle_ja.properties
index 01f91dc4d8..d111a9c60a 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle_ja.properties
@@ -1,123 +1,134 @@
-CTL_DataContentAction=\u30C7\u30FC\u30BF\u30B3\u30F3\u30C6\u30F3\u30C4
+CTL_DataContentAction=\u30c7\u30fc\u30bf\u30b3\u30f3\u30c6\u30f3\u30c4
 OptionsCategory_Name_General=Autopsy
-OptionsCategory_Keywords_General=Autopsy\u30AA\u30D7\u30B7\u30E7\u30F3
-CTL_CustomAboutAction=Autopsy\u306B\u3064\u3044\u3066
-CTL_DataContentTopComponent=\u30C7\u30FC\u30BF\u30B3\u30F3\u30C6\u30F3\u30C4
-HINT_DataContentTopComponent=\u3053\u308C\u306F\u30C7\u30FC\u30BF\u30B3\u30F3\u30C6\u30F3\u30C4\u306E\u30A6\u30A3\u30F3\u30C9\u30A6\u3067\u3059
-HINT_NodeTableTopComponent=\u3053\u308C\u306F\u30C7\u30FC\u30BF\u7D50\u679C\u306E\u30A6\u30A3\u30F3\u30C9\u30A6\u3067\u3059
-OpenIDE-Module-Name=\u4E3B\u8981\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8
-DataContentViewerHex.pageLabel.text_1=\u30DA\u30FC\u30B8\uFF1A
+OptionsCategory_Keywords_General=Autopsy\u30aa\u30d7\u30b7\u30e7\u30f3
+CTL_CustomAboutAction=Autopsy\u306b\u3064\u3044\u3066
+CTL_DataContentTopComponent=\u30c7\u30fc\u30bf\u30b3\u30f3\u30c6\u30f3\u30c4
+HINT_DataContentTopComponent=\u3053\u308c\u306f\u30c7\u30fc\u30bf\u30b3\u30f3\u30c6\u30f3\u30c4\u306e\u30a6\u30a3\u30f3\u30c9\u30a6\u3067\u3059
+HINT_NodeTableTopComponent=\u3053\u308c\u306f\u30c7\u30fc\u30bf\u7d50\u679c\u306e\u30a6\u30a3\u30f3\u30c9\u30a6\u3067\u3059
+OpenIDE-Module-Name=\u4e3b\u8981\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8
+DataContentViewerHex.pageLabel.text_1=\u30da\u30fc\u30b8\uff1a
 DataContentViewerHex.currentPageLabel.text_1=1
 DataContentViewerHex.totalPageLabel.text_1=100
-DataContentViewerString.pageLabel.text_1=\u30DA\u30FC\u30B8\uFF1A
+DataContentViewerString.pageLabel.text_1=\u30da\u30fc\u30b8\uff1a
 DataContentViewerString.currentPageLabel.text_1=1
 DataContentViewerString.totalPageLabel.text_1=100
-DataContentViewerHex.pageLabel2.text=\u30DA\u30FC\u30B8
-DataContentViewerString.pageLabel2.text=\u30DA\u30FC\u30B8
-Format_OperatingSystem_Value={0} \u30D0\u30FC\u30B8\u30E7\u30F3 {1} \u30A2\u30FC\u30AD\u30C6\u30AF\u30C1\u30E3 {2}
+DataContentViewerHex.pageLabel2.text=\u30da\u30fc\u30b8
+DataContentViewerString.pageLabel2.text=\u30da\u30fc\u30b8
+Format_OperatingSystem_Value={0} \u30d0\u30fc\u30b8\u30e7\u30f3 {1} \u30a2\u30fc\u30ad\u30c6\u30af\u30c1\u30e3 {2}
 URL_ON_IMG=http\://www.sleuthkit.org/
-LBL_Close=\u9589\u3058\u308B
-DataContentViewerString.copyMenuItem.text=\u30B3\u30D4\u30FC
-DataContentViewerHex.copyMenuItem.text=\u30B3\u30D4\u30FC
-DataContentViewerString.selectAllMenuItem.text=\u3059\u3079\u3066\u9078\u629E
-DataContentViewerHex.selectAllMenuItem.text=\u3059\u3079\u3066\u9078\u629E
+LBL_Close=\u9589\u3058\u308b
+DataContentViewerString.copyMenuItem.text=\u30b3\u30d4\u30fc
+DataContentViewerHex.copyMenuItem.text=\u30b3\u30d4\u30fc
+DataContentViewerString.selectAllMenuItem.text=\u3059\u3079\u3066\u9078\u629e
+DataContentViewerHex.selectAllMenuItem.text=\u3059\u3079\u3066\u9078\u629e
 DataContentViewerArtifact.totalPageLabel.text=100
-DataContentViewerArtifact.pageLabel2.text=\u7D50\u679C
+DataContentViewerArtifact.pageLabel2.text=\u7d50\u679c
 DataContentViewerArtifact.currentPageLabel.text=1
-DataContentViewerArtifact.copyMenuItem.text=\u30B3\u30D4\u30FC
-DataContentViewerArtifact.selectAllMenuItem.text=\u3059\u3079\u3066\u9078\u629E
-DataContentViewerArtifact.pageLabel.text=\u7D50\u679C\uFF1A
+DataContentViewerArtifact.copyMenuItem.text=\u30b3\u30d4\u30fc
+DataContentViewerArtifact.selectAllMenuItem.text=\u3059\u3079\u3066\u9078\u629e
+DataContentViewerArtifact.pageLabel.text=\u7d50\u679c\uff1a
 AdvancedConfigurationDialog.applyButton.text=OK
-DataContentViewerString.goToPageLabel.text=\u4E0B\u8A18\u306E\u30DA\u30FC\u30B8\u3078\u79FB\u52D5\uFF1A
-DataContentViewerHex.goToPageLabel.text=\u4E0B\u8A18\u306E\u30DA\u30FC\u30B8\u3078\u79FB\u52D5\uFF1A
-DataContentViewerString.languageLabel.text=\u30B9\u30AF\u30EA\u30D7\u30C8\uFF1A
-DataContentViewerString.languageCombo.toolTipText=\u30D0\u30A4\u30CA\u30EA\u30B9\u30C8\u30EA\u30F3\u30B0\u306E\u51E6\u7406\uFF08\u62BD\u51FA\u304A\u3088\u3073\u30C7\u30B3\u30FC\u30C9\uFF09\u306B\u4F7F\u7528\u3059\u308B\u8A00\u8A9E
-DataResultViewerThumbnail.pageLabel.text=\u30DA\u30FC\u30B8\uFF1A
-DataResultViewerThumbnail.pagesLabel.text=\u30DA\u30FC\u30B8\uFF1A
-DataResultViewerThumbnail.imagesLabel.text=\u30A4\u30E1\u30FC\u30B8\uFF1A
+DataContentViewerString.goToPageLabel.text=\u4e0b\u8a18\u306e\u30da\u30fc\u30b8\u3078\u79fb\u52d5\uff1a
+DataContentViewerHex.goToPageLabel.text=\u4e0b\u8a18\u306e\u30da\u30fc\u30b8\u3078\u79fb\u52d5\uff1a
+DataContentViewerString.languageLabel.text=\u30b9\u30af\u30ea\u30d7\u30c8\uff1a
+DataContentViewerString.languageCombo.toolTipText=\u30d0\u30a4\u30ca\u30ea\u30b9\u30c8\u30ea\u30f3\u30b0\u306e\u51e6\u7406\uff08\u62bd\u51fa\u304a\u3088\u3073\u30c7\u30b3\u30fc\u30c9\uff09\u306b\u4f7f\u7528\u3059\u308b\u8a00\u8a9e
+DataResultViewerThumbnail.pageLabel.text=\u30da\u30fc\u30b8\uff1a
+DataResultViewerThumbnail.pagesLabel.text=\u30da\u30fc\u30b8\uff1a
+DataResultViewerThumbnail.imagesLabel.text=\u30a4\u30e1\u30fc\u30b8\uff1a
 DataResultViewerThumbnail.imagesRangeLabel.text=-
 DataResultViewerThumbnail.pageNumLabel.text=-
-DataResultViewerThumbnail.goToPageLabel.text=\u4E0B\u8A18\u306E\u30DA\u30FC\u30B8\u306B\u79FB\u52D5\uFF1A
-GeneralPanel.jLabel1.text=\u30D5\u30A1\u30A4\u30EB\u3092\u9078\u629E\u3059\u308B\u5834\u5408\uFF1A
-GeneralPanel.useBestViewerRB.text=\u6700\u3082\u5C02\u9580\u7684\u306A\u30D5\u30A1\u30A4\u30EB\u30D3\u30E5\u30FC\u30A2\u306B\u5909\u66F4
-GeneralPanel.keepCurrentViewerRB.text=\u305D\u306E\u307E\u307E\u540C\u3058\u30D5\u30A1\u30A4\u30EB\u30D3\u30E5\u30FC\u30A2\u3092\u4F7F\u7528
-GeneralPanel.useBestViewerRB.toolTipText=\u4F8B\u3048\u3070\u3001JPEG\u304C\u9078\u629E\u3055\u308C\u305F\u5834\u5408\u306B\u306FHEX\u304B\u3089\u30E1\u30C7\u30A3\u30A2\u306B\u5909\u66F4\u3059\u308B\u3002
-GeneralPanel.keepCurrentViewerRB.toolTipText=\u4F8B\u3048\u3070\u3001JPEG\u304C\u9078\u629E\u3055\u308C\u305F\u5834\u5408\u306B\u305D\u306E\u307E\u307EHEX\u30D3\u30E5\u30FC\u3092\u4F7F\u7528\u3002
-AdvancedConfigurationDialog.cancelButton.text=\u30AD\u30E3\u30F3\u30BB\u30EB
-DataResultPanel.directoryTablePath.text=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30D1\u30B9
+DataResultViewerThumbnail.goToPageLabel.text=\u4e0b\u8a18\u306e\u30da\u30fc\u30b8\u306b\u79fb\u52d5\uff1a
+AdvancedConfigurationDialog.cancelButton.text=\u30ad\u30e3\u30f3\u30bb\u30eb
+DataResultPanel.directoryTablePath.text=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30d1\u30b9
 DataResultPanel.numberMatchLabel.text=0
-DataResultPanel.matchLabel.text=\u7D50\u679C
-MediaViewVideoPanel.pauseButton.text=\u25BA
+DataResultPanel.matchLabel.text=\u7d50\u679c
+MediaViewVideoPanel.pauseButton.text=\u25ba
 MediaViewVideoPanel.progressLabel.text=00\:00
-MediaViewVideoPanel.infoLabel.text=\u60C5\u5831
-GeneralPanel.jLabel2.text=\u30A2\u30A4\u30C6\u30E0\u3092\u8868\u793A\u3059\u308B\u5834\u5408\uFF1A
-GeneralPanel.useLocalTimeRB.text=\u30ED\u30FC\u30AB\u30EB\u30BF\u30A4\u30E0\u30BE\u30FC\u30F3\u3092\u4F7F\u7528
-GeneralPanel.useGMTTimeRB.text=GMT\u3092\u4F7F\u7528
-GeneralPanel.jLabel3.text=\u65E2\u77E5\u30D5\u30A1\u30A4\u30EB\uFF08NIST NSRL\u5185\u306E\uFF09\u3092\u4E0B\u8A18\u306B\u96A0\u3059\uFF1A
-GeneralPanel.viewsHideKnownCB.text=\u30D3\u30E5\u30FC\u304B\u3089\u9078\u629E\u3057\u3066\u3044\u308B\u5834\u5408
-GeneralPanel.dataSourcesHideKnownCB.text=\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u30A8\u30EA\u30A2\uFF08\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u968E\u5C64\uFF09
-DataContentViewerArtifact.waitText=\u30C7\u30FC\u30BF\u3092\u53D6\u8FBC\u307F\u304A\u3088\u3073\u6E96\u5099\u4E2D\u3002\u3057\u3070\u3089\u304F\u304A\u5F85\u3061\u4E0B\u3055\u3044\u2026
-DataContentViewerArtifact.errorText=\u7D50\u679C\u306E\u53D6\u8FBC\u307F\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
-DataContentViewerArtifact.title=\u7D50\u679C
-DataContentViewerArtifact.toolTip=\u30D5\u30A1\u30A4\u30EB\u306B\u95A2\u9023\u3059\u308B\u7D50\u679C\u3092\u8868\u793A\u3057\u307E\u3059
-DataContentViewerHex.goToPageTextField.msgDlg=\uFF11\u304B\u3089 {0}\u306E\u9593\u306E\u6709\u52B9\u306A\u30DA\u30FC\u30B8\u6570\u3092\u5165\u529B\u3057\u3066\u4E0B\u3055\u3044
-DataContentViewerHex.goToPageTextField.err=\u7121\u52B9\u306A\u30DA\u30FC\u30B8\u6570
-DataContentViewerHex.setDataView.errorText=\uFF08\u30AA\u30D5\u30BB\u30C3\u30C8{0}-{1}\u306F\u8AAD\u307F\u53D6\u308C\u307E\u305B\u3093\u3067\u3057\u305F\uFF09
+MediaViewVideoPanel.infoLabel.text=\u60c5\u5831
+DataContentViewerArtifact.waitText=\u30c7\u30fc\u30bf\u3092\u53d6\u8fbc\u307f\u304a\u3088\u3073\u6e96\u5099\u4e2d\u3002\u3057\u3070\u3089\u304f\u304a\u5f85\u3061\u4e0b\u3055\u3044\u2026
+DataContentViewerArtifact.errorText=\u7d50\u679c\u306e\u53d6\u8fbc\u307f\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
+DataContentViewerArtifact.title=\u7d50\u679c
+DataContentViewerArtifact.toolTip=\u30d5\u30a1\u30a4\u30eb\u306b\u95a2\u9023\u3059\u308b\u7d50\u679c\u3092\u8868\u793a\u3057\u307e\u3059
+DataContentViewerHex.goToPageTextField.msgDlg=\uff11\u304b\u3089 {0}\u306e\u9593\u306e\u6709\u52b9\u306a\u30da\u30fc\u30b8\u6570\u3092\u5165\u529b\u3057\u3066\u4e0b\u3055\u3044
+DataContentViewerHex.goToPageTextField.err=\u7121\u52b9\u306a\u30da\u30fc\u30b8\u6570
+DataContentViewerHex.setDataView.errorText=\uff08\u30aa\u30d5\u30bb\u30c3\u30c8{0}-{1}\u306f\u8aad\u307f\u53d6\u308c\u307e\u305b\u3093\u3067\u3057\u305f\uff09
 DataContentViewerHex.title=HEX
-DataContentViewerHex.toolTip=\u30D0\u30A4\u30CA\u30EA\u30B3\u30F3\u30C6\u30F3\u30C4\u3092HEX\u30D5\u30A1\u30A4\u30EB\u3068\u3057\u3066\u8868\u793A\u3057\u3001ASCII\u3068\u3057\u3066\u8868\u793A\u3067\u304D\u308B\u30D0\u30A4\u30C8\u306F\u53F3\u5074\u306B\u8868\u793A\u3057\u307E\u3059\u3002
-DataContentViewerMedia.title=\u30E1\u30C7\u30A3\u30A2
-DataContentViewerMedia.toolTip=\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u30DE\u30EB\u30C1\u30E1\u30C7\u30A3\u30A2\u30D5\u30A1\u30A4\u30EB\uFF08\u30A4\u30E1\u30FC\u30B8\u3001\u30D3\u30C7\u30AA\u3001\u30AA\u30FC\u30C7\u30A3\u30AA\uFF09\u3092\u8868\u793A\u3057\u307E\u3059\u3002
-DataContentViewerString.goToPageTextField.msgDlg=\uFF11\u304B\u3089{0}\u306E\u9593\u306E\u6709\u52B9\u306A\u30DA\u30FC\u30B8\u6570\u3092\u5165\u529B\u3057\u3066\u4E0B\u3055\u3044
-DataContentViewerString.goToPageTextField.err=\u7121\u52B9\u306A\u30DA\u30FC\u30B8\u6570
-DataContentViewerString.setDataView.errorText=\uFF08\u30AA\u30D5\u30BB\u30C3\u30C8{0}-{1}\u306F\u8AAD\u307F\u53D6\u308C\u307E\u305B\u3093\u3067\u3057\u305F\uFF09
-DataContentViewerString.title=\u30B9\u30C8\u30EA\u30F3\u30B0
-DataContentViewerString.toolTip=\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u62BD\u51FA\u3055\u308C\u305FASCII\u304A\u3088\u3073\u30E6\u30CB\u30B3\u30FC\u30C9\u306E\u30B9\u30C8\u30EA\u30F3\u30B0\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002
-DataResultPanel.dummyNodeDisplayName=\u3057\u3070\u3089\u304F\u304A\u5F85\u3061\u304F\u3060\u3055\u3044\u2026
-DataResultViewerTable.firstColLbl=\u540D\u524D
-DataResultViewerTable.illegalArgExc.noChildFromParent=\u6307\u5B9A\u3055\u308C\u305F\u30DA\u30A2\u30EC\u30F3\u30C8\u304B\u3089\u30C1\u30E3\u30A4\u30EB\u30C9\u30CE\u30FC\u30C9\u3092\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
-DataResultViewerTable.illegalArgExc.childWithoutPropertySet=\u30C1\u30E3\u30A4\u30EB\u30C9\u30CE\u30FC\u30C9\u306F\u901A\u5E38\u306EPropertySet\u3092\u6301\u3063\u3066\u3044\u307E\u305B\u3093\u3002
-DataResultViewerTable.title=\u30C6\u30FC\u30D6\u30EB
-DataResultViewerTable.dummyNodeDisplayName=\u3057\u3070\u3089\u304F\u304A\u5F85\u3061\u304F\u3060\u3055\u3044\u2026
-DataResultViewerThumbnail.title=\u30B5\u30E0\u30CD\u30A4\u30EB
-DataResultViewerThumbnail.goToPageTextField.msgDlg=\uFF11\u304B\u3089{0}\u306E\u9593\u306E\u6709\u52B9\u306A\u30DA\u30FC\u30B8\u6570\u3092\u5165\u529B\u3057\u3066\u4E0B\u3055\u3044
-DataResultViewerThumbnail.goToPageTextField.err=\u7121\u52B9\u306A\u30DA\u30FC\u30B8\u6570
-DataResultViewerThumbnail.genThumbs=\u30B5\u30E0\u30CD\u30A4\u30EB\u3092\u4F5C\u6210\u4E2D\u2026
-DataResultViewerThumbnail.pageNumbers.curOfTotal={0}\uFF0F{1}\u3064\u76EE
-FXVideoPanel.mediaPane.infoLabel=\u524A\u9664\u3055\u308C\u305F\u30D3\u30C7\u30AA\u306E\u518D\u751F\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u5916\u90E8\u30D7\u30EC\u30FC\u30E4\u30FC\u3092\u4F7F\u7528\u3057\u3066\u4E0B\u3055\u3044\u3002
-FXVideoPanel.progress.bufferingFile={0}\u3092\u30D0\u30C3\u30D5\u30A1\u30EA\u30F3\u30B0
-FXVideoPanel.progressLabel.buffering=\u30D0\u30C3\u30D5\u30A1\u30EA\u30F3\u30B0\u4E2D\u2026
-FXVideoPanel.media.unsupportedFormat=\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u306A\u3044\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u3067\u3059\u3002
-GeneralOptionsPanelController.moduleErr=\u30E2\u30B8\u30E5\u30FC\u30EB\u30A8\u30E9\u30FC
-GeneralOptionsPanelController.moduleErr.msg=GeneralOptionsPanelController\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3092\u78BA\u8A8D\u4E2D\u306B\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u30A8\u30E9\u30FC\u3092\u8D77\u3053\u3057\u307E\u3057\u305F\u3002\u3069\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u304B\u30ED\u30B0\u3067\u78BA\u8A8D\u3057\u3066\u4E0B\u3055\u3044\u3002\u4E00\u90E8\u306E\u30C7\u30FC\u30BF\u304C\u4E0D\u5B8C\u5168\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002
-GstVideoPanel.cannotProcFile.err=\u30E1\u30C7\u30A4\u30A2\u30D7\u30EC\u30FC\u30E4\u30FC\u304C\u3053\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u51E6\u7406\u3067\u304D\u307E\u305B\u3093\u3002
-GstVideoPanel.initGst.gstException.msg=\u30AA\u30FC\u30C7\u30A3\u30AA\uFF0F\u30D3\u30C7\u30AA\u306E\u518D\u751F\u304A\u3088\u3073\u30D5\u30EC\u30FC\u30E0\u306E\u62BD\u51FA\u306B\u4F7F\u7528\u3059\u308BGStreamer\u306E\u521D\u671F\u5316\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u30D3\u30C7\u30AA\u304A\u3088\u3073\u30AA\u30FC\u30C7\u30A3\u30AA\u518D\u751F\u304C\u7121\u52B9\u5316\u3055\u308C\u307E\u3059\u3002
-GstVideoPanel.initGst.otherException.msg=\u30AA\u30FC\u30C7\u30A3\u30AA\uFF0F\u30D3\u30C7\u30AA\u306E\u518D\u751F\u304A\u3088\u3073\u30D5\u30EC\u30FC\u30E0\u306E\u62BD\u51FA\u306B\u4F7F\u7528\u3059\u308BGStreamer\u306E\u521D\u671F\u5316\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u30D3\u30C7\u30AA\u304A\u3088\u3073\u30AA\u30FC\u30C7\u30A3\u30AA\u518D\u751F\u304C\u7121\u52B9\u5316\u3055\u308C\u307E\u3059\u3002
-GstVideoPanel.setupVideo.infoLabel.text=\u524A\u9664\u3055\u308C\u305F\u30D3\u30C7\u30AA\u306E\u518D\u751F\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u5916\u90E8\u30D7\u30EC\u30FC\u30E4\u30FC\u3092\u4F7F\u7528\u3057\u3066\u4E0B\u3055\u3044\u3002
-GstVideoPanel.exception.problemFile.msg=\u30D5\u30A1\u30A4\u30EB({0})\u304B\u3089\u306F\u30D5\u30EC\u30FC\u30E0\u3092\u62BD\u51FA\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
-GstVideoPanel.exception.problemPlay.msg=\u30D3\u30C7\u30AA\u30D5\u30A1\u30A4\u30EB\u306B\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u9577\u3055\u3092\u78BA\u8A8D\u4E2D\u306B\u518D\u751F\u3092\u3057\u3088\u3046\u3068\u3057\u305F\u969B\u306B\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
-LBL_Description=<div style\="font-size\: 12pt; font-family\: Verdana, 'Verdana CE',  Arial, 'Arial CE', 'Lucida Grande CE', lucida, 'Helvetica CE', sans-serif;">\n    <b>\u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\uFF1A</b> {0} ({9}) <br><b>Sleuth Kit\u30D0\u30FC\u30B8\u30E7\u30F3\uFF1A</b> {7} <br><b>Netbeans RCP\u30D3\u30EB\u30C9\:</b> {8} <br> <b>Java\:</b> {1}; {2}<br> <b>\u30B7\u30B9\u30C6\u30E0\uFF1A</b> {3}; {4}; {5}<br><b>\u30E6\u30FC\u30B6\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u540D</b> {6}</div>
-LBL_Copyright=<div style\="font-size\: 12pt; font-family\: Verdana, 'Verdana CE',  Arial, 'Arial CE', 'Lucida Grande CE', lucida, 'Helvetica CE', sans-serif; ">Autopsy&trade;\u306FSleuth Kit&trade;\u3084\u305D\u306E\u4ED6\u30C4\u30FC\u30EB\u3092\u57FA\u306B\u3057\u305F\u30C7\u30B8\u30BF\u30EB\u30FB\u30D5\u30A9\u30EC\u30F3\u30B8\u30C3\u30AF\u30FB\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u3067\u3059\u3002<br> <br>Copyright &copy; 2003-2013. \u8A73\u7D30\u306F\u4E0B\u8A18\u3092\u3054\u89A7\u4E0B\u3055\u3044\u3002 <a style\="color\: \#1E2A60;" href\="http\://www.sleuthkit.org">http\://www.sleuthkit.org</a>. </div>
-GstVideoPanel.exception.problemPause.msg=\u30D3\u30C7\u30AA\u30D5\u30A1\u30A4\u30EB\u306B\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u9577\u3055\u3092\u78BA\u8A8D\u4E2D\u306B\u4E00\u6642\u505C\u6B62\u3092\u3057\u3088\u3046\u3068\u3057\u305F\u969B\u306B\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
-GstVideoPanel.exception.problemPauseCaptFrame.msg=\u30D3\u30C7\u30AA\u30D5\u30A1\u30A4\u30EB\u306B\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u30D5\u30EC\u30FC\u30E0\u306E\u62BD\u51FA\u4E2D\u306B\u4E00\u6642\u505C\u6B62\u3092\u3057\u3088\u3046\u3068\u3057\u305F\u969B\u306B\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
-GstVideoPanel.exception.problemPlayCaptFrame.msg=\u30D3\u30C7\u30AA\u30D5\u30A1\u30A4\u30EB\u306B\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u30D5\u30EC\u30FC\u30E0\u306E\u62BD\u51FA\u4E2D\u306B\u518D\u751F\u3057\u3088\u3046\u3068\u3057\u305F\u969B\u306B\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
-GstVideoPanel.exception.problemStopCaptFrame.msg=\u30D3\u30C7\u30AA\u30D5\u30A1\u30A4\u30EB\u306B\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u30D5\u30EC\u30FC\u30E0\u306E\u62BD\u51FA\u4E2D\u306B\u505C\u6B62\u3057\u3088\u3046\u3068\u3057\u305F\u969B\u306B\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
-GstVideoPanel.progress.buffering=\u30D0\u30C3\u30D5\u30A1\u30EA\u30F3\u30B0\u4E2D\u2026
-GstVideoPanel.progressLabel.bufferingErr=\u30D5\u30A1\u30A4\u30EB\u306E\u30D0\u30C3\u30D5\u30A1\u30EA\u30F3\u30B0\u30A8\u30E9\u30FC
-MediaViewImagePanel.imgFileTooLarge.msg=\u30A4\u30E1\u30FC\u30B8\u30D5\u30A1\u30A4\u30EB\u3092\u8AAD\u307F\u8FBC\u3081\u307E\u305B\u3093\u3067\u3057\u305F\uFF08\u5927\u304D\u3059\u304E\u3067\u3059\uFF09\uFF1A {0}
-ProductInformationPanel.verbLoggingEnabled.text=Verbose\u30ED\u30B0\u304C\u6709\u52B9\u3067\u3059
-ProductInformationPanel.propertyUnknown.text=\u4E0D\u660E
+DataContentViewerHex.toolTip=\u30d0\u30a4\u30ca\u30ea\u30b3\u30f3\u30c6\u30f3\u30c4\u3092HEX\u30d5\u30a1\u30a4\u30eb\u3068\u3057\u3066\u8868\u793a\u3057\u3001ASCII\u3068\u3057\u3066\u8868\u793a\u3067\u304d\u308b\u30d0\u30a4\u30c8\u306f\u53f3\u5074\u306b\u8868\u793a\u3057\u307e\u3059\u3002
+DataContentViewerMedia.title=\u30e1\u30c7\u30a3\u30a2
+DataContentViewerMedia.toolTip=\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u308b\u30de\u30eb\u30c1\u30e1\u30c7\u30a3\u30a2\u30d5\u30a1\u30a4\u30eb\uff08\u30a4\u30e1\u30fc\u30b8\u3001\u30d3\u30c7\u30aa\u3001\u30aa\u30fc\u30c7\u30a3\u30aa\uff09\u3092\u8868\u793a\u3057\u307e\u3059\u3002
+DataContentViewerString.goToPageTextField.msgDlg=\uff11\u304b\u3089{0}\u306e\u9593\u306e\u6709\u52b9\u306a\u30da\u30fc\u30b8\u6570\u3092\u5165\u529b\u3057\u3066\u4e0b\u3055\u3044
+DataContentViewerString.goToPageTextField.err=\u7121\u52b9\u306a\u30da\u30fc\u30b8\u6570
+DataContentViewerString.setDataView.errorText=\uff08\u30aa\u30d5\u30bb\u30c3\u30c8{0}-{1}\u306f\u8aad\u307f\u53d6\u308c\u307e\u305b\u3093\u3067\u3057\u305f\uff09
+DataContentViewerString.title=\u30b9\u30c8\u30ea\u30f3\u30b0
+DataContentViewerString.toolTip=\u30d5\u30a1\u30a4\u30eb\u304b\u3089\u62bd\u51fa\u3055\u308c\u305fASCII\u304a\u3088\u3073\u30e6\u30cb\u30b3\u30fc\u30c9\u306e\u30b9\u30c8\u30ea\u30f3\u30b0\u304c\u8868\u793a\u3055\u308c\u307e\u3059\u3002
+DataResultPanel.dummyNodeDisplayName=\u3057\u3070\u3089\u304f\u304a\u5f85\u3061\u304f\u3060\u3055\u3044\u2026
+DataResultViewerTable.firstColLbl=\u540d\u524d
+DataResultViewerTable.illegalArgExc.noChildFromParent=\u6307\u5b9a\u3055\u308c\u305f\u30da\u30a2\u30ec\u30f3\u30c8\u304b\u3089\u30c1\u30e3\u30a4\u30eb\u30c9\u30ce\u30fc\u30c9\u3092\u53d6\u5f97\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
+DataResultViewerTable.illegalArgExc.childWithoutPropertySet=\u30c1\u30e3\u30a4\u30eb\u30c9\u30ce\u30fc\u30c9\u306f\u901a\u5e38\u306ePropertySet\u3092\u6301\u3063\u3066\u3044\u307e\u305b\u3093\u3002
+DataResultViewerTable.title=\u30c6\u30fc\u30d6\u30eb
+DataResultViewerTable.dummyNodeDisplayName=\u3057\u3070\u3089\u304f\u304a\u5f85\u3061\u304f\u3060\u3055\u3044\u2026
+DataResultViewerThumbnail.title=\u30b5\u30e0\u30cd\u30a4\u30eb
+DataResultViewerThumbnail.goToPageTextField.msgDlg=\uff11\u304b\u3089{0}\u306e\u9593\u306e\u6709\u52b9\u306a\u30da\u30fc\u30b8\u6570\u3092\u5165\u529b\u3057\u3066\u4e0b\u3055\u3044
+DataResultViewerThumbnail.goToPageTextField.err=\u7121\u52b9\u306a\u30da\u30fc\u30b8\u6570
+DataResultViewerThumbnail.genThumbs=\u30b5\u30e0\u30cd\u30a4\u30eb\u3092\u4f5c\u6210\u4e2d\u2026
+DataResultViewerThumbnail.pageNumbers.curOfTotal={0}\uff0f{1}\u3064\u76ee
+FXVideoPanel.mediaPane.infoLabel=\u524a\u9664\u3055\u308c\u305f\u30d3\u30c7\u30aa\u306e\u518d\u751f\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u5916\u90e8\u30d7\u30ec\u30fc\u30e4\u30fc\u3092\u4f7f\u7528\u3057\u3066\u4e0b\u3055\u3044\u3002
+FXVideoPanel.progress.bufferingFile={0}\u3092\u30d0\u30c3\u30d5\u30a1\u30ea\u30f3\u30b0
+FXVideoPanel.progressLabel.buffering=\u30d0\u30c3\u30d5\u30a1\u30ea\u30f3\u30b0\u4e2d\u2026
+FXVideoPanel.media.unsupportedFormat=\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u306a\u3044\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u3067\u3059\u3002
+GeneralOptionsPanelController.moduleErr=\u30e2\u30b8\u30e5\u30fc\u30eb\u30a8\u30e9\u30fc
+GeneralOptionsPanelController.moduleErr.msg=GeneralOptionsPanelController\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u3092\u78ba\u8a8d\u4e2d\u306b\u30e2\u30b8\u30e5\u30fc\u30eb\u304c\u30a8\u30e9\u30fc\u3092\u8d77\u3053\u3057\u307e\u3057\u305f\u3002\u3069\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u304b\u30ed\u30b0\u3067\u78ba\u8a8d\u3057\u3066\u4e0b\u3055\u3044\u3002\u4e00\u90e8\u306e\u30c7\u30fc\u30bf\u304c\u4e0d\u5b8c\u5168\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002
+GstVideoPanel.cannotProcFile.err=\u30e1\u30c7\u30a4\u30a2\u30d7\u30ec\u30fc\u30e4\u30fc\u304c\u3053\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u51e6\u7406\u3067\u304d\u307e\u305b\u3093\u3002
+GstVideoPanel.initGst.gstException.msg=\u30aa\u30fc\u30c7\u30a3\u30aa\uff0f\u30d3\u30c7\u30aa\u306e\u518d\u751f\u304a\u3088\u3073\u30d5\u30ec\u30fc\u30e0\u306e\u62bd\u51fa\u306b\u4f7f\u7528\u3059\u308bGStreamer\u306e\u521d\u671f\u5316\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u30d3\u30c7\u30aa\u304a\u3088\u3073\u30aa\u30fc\u30c7\u30a3\u30aa\u518d\u751f\u304c\u7121\u52b9\u5316\u3055\u308c\u307e\u3059\u3002
+GstVideoPanel.initGst.otherException.msg=\u30aa\u30fc\u30c7\u30a3\u30aa\uff0f\u30d3\u30c7\u30aa\u306e\u518d\u751f\u304a\u3088\u3073\u30d5\u30ec\u30fc\u30e0\u306e\u62bd\u51fa\u306b\u4f7f\u7528\u3059\u308bGStreamer\u306e\u521d\u671f\u5316\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u30d3\u30c7\u30aa\u304a\u3088\u3073\u30aa\u30fc\u30c7\u30a3\u30aa\u518d\u751f\u304c\u7121\u52b9\u5316\u3055\u308c\u307e\u3059\u3002
+GstVideoPanel.setupVideo.infoLabel.text=\u524a\u9664\u3055\u308c\u305f\u30d3\u30c7\u30aa\u306e\u518d\u751f\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u5916\u90e8\u30d7\u30ec\u30fc\u30e4\u30fc\u3092\u4f7f\u7528\u3057\u3066\u4e0b\u3055\u3044\u3002
+GstVideoPanel.exception.problemFile.msg=\u30d5\u30a1\u30a4\u30eb({0})\u304b\u3089\u306f\u30d5\u30ec\u30fc\u30e0\u3092\u62bd\u51fa\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
+GstVideoPanel.exception.problemPlay.msg=\u30d3\u30c7\u30aa\u30d5\u30a1\u30a4\u30eb\u306b\u554f\u984c\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u9577\u3055\u3092\u78ba\u8a8d\u4e2d\u306b\u518d\u751f\u3092\u3057\u3088\u3046\u3068\u3057\u305f\u969b\u306b\u554f\u984c\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
+LBL_Description=<div style\="font-size\: 12pt; font-family\: Verdana, 'Verdana CE',  Arial, 'Arial CE', 'Lucida Grande CE', lucida, 'Helvetica CE', sans-serif;">\n    <b>\u88fd\u54c1\u30d0\u30fc\u30b8\u30e7\u30f3\uff1a</b> {0} ({9}) <br><b>Sleuth Kit\u30d0\u30fc\u30b8\u30e7\u30f3\uff1a</b> {7} <br><b>Netbeans RCP\u30d3\u30eb\u30c9\:</b> {8} <br> <b>Java\:</b> {1}; {2}<br> <b>\u30b7\u30b9\u30c6\u30e0\uff1a</b> {3}; {4}; {5}<br><b>\u30e6\u30fc\u30b6\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u540d</b> {6}</div>
+LBL_Copyright=<div style\="font-size\: 12pt; font-family\: Verdana, 'Verdana CE',  Arial, 'Arial CE', 'Lucida Grande CE', lucida, 'Helvetica CE', sans-serif; ">Autopsy&trade;\u306fSleuth Kit&trade;\u3084\u305d\u306e\u4ed6\u30c4\u30fc\u30eb\u3092\u57fa\u306b\u3057\u305f\u30c7\u30b8\u30bf\u30eb\u30fb\u30d5\u30a9\u30ec\u30f3\u30b8\u30c3\u30af\u30fb\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u3067\u3059\u3002<br> <br>Copyright &copy; 2003-2013. \u8a73\u7d30\u306f\u4e0b\u8a18\u3092\u3054\u89a7\u4e0b\u3055\u3044\u3002 <a style\="color\: \#1E2A60;" href\="http\://www.sleuthkit.org">http\://www.sleuthkit.org</a>. </div>
+GstVideoPanel.exception.problemPause.msg=\u30d3\u30c7\u30aa\u30d5\u30a1\u30a4\u30eb\u306b\u554f\u984c\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u9577\u3055\u3092\u78ba\u8a8d\u4e2d\u306b\u4e00\u6642\u505c\u6b62\u3092\u3057\u3088\u3046\u3068\u3057\u305f\u969b\u306b\u554f\u984c\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
+GstVideoPanel.exception.problemPauseCaptFrame.msg=\u30d3\u30c7\u30aa\u30d5\u30a1\u30a4\u30eb\u306b\u554f\u984c\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u30d5\u30ec\u30fc\u30e0\u306e\u62bd\u51fa\u4e2d\u306b\u4e00\u6642\u505c\u6b62\u3092\u3057\u3088\u3046\u3068\u3057\u305f\u969b\u306b\u554f\u984c\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
+GstVideoPanel.exception.problemPlayCaptFrame.msg=\u30d3\u30c7\u30aa\u30d5\u30a1\u30a4\u30eb\u306b\u554f\u984c\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u30d5\u30ec\u30fc\u30e0\u306e\u62bd\u51fa\u4e2d\u306b\u518d\u751f\u3057\u3088\u3046\u3068\u3057\u305f\u969b\u306b\u554f\u984c\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
+GstVideoPanel.exception.problemStopCaptFrame.msg=\u30d3\u30c7\u30aa\u30d5\u30a1\u30a4\u30eb\u306b\u554f\u984c\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u30d5\u30ec\u30fc\u30e0\u306e\u62bd\u51fa\u4e2d\u306b\u505c\u6b62\u3057\u3088\u3046\u3068\u3057\u305f\u969b\u306b\u554f\u984c\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
+GstVideoPanel.progress.buffering=\u30d0\u30c3\u30d5\u30a1\u30ea\u30f3\u30b0\u4e2d\u2026
+GstVideoPanel.progressLabel.bufferingErr=\u30d5\u30a1\u30a4\u30eb\u306e\u30d0\u30c3\u30d5\u30a1\u30ea\u30f3\u30b0\u30a8\u30e9\u30fc
+MediaViewImagePanel.imgFileTooLarge.msg=\u30a4\u30e1\u30fc\u30b8\u30d5\u30a1\u30a4\u30eb\u3092\u8aad\u307f\u8fbc\u3081\u307e\u305b\u3093\u3067\u3057\u305f\uff08\u5927\u304d\u3059\u304e\u3067\u3059\uff09\uff1a {0}
+ProductInformationPanel.verbLoggingEnabled.text=Verbose\u30ed\u30b0\u304c\u6709\u52b9\u3067\u3059
+ProductInformationPanel.propertyUnknown.text=\u4e0d\u660e
 ProductInformationPanel.getVMValue.text={0} {1}
-TableFilterNode.displayName.text=\u540D\u524D
+TableFilterNode.displayName.text=\u540d\u524d
 DataContentViewerHex.ofLabel.text_1=of
 DataContentViewerString.ofLabel.text_1=of
 DataContentViewerArtifact.ofLabel.text=of
-DataContentViewerString.setDataView.errorNoText=\uFF08\u30AA\u30D5\u30BB\u30C3\u30C8{0}-{1}\u306B\u306F\u30C6\u30AD\u30B9\u30C8\u304C\u3042\u308A\u307E\u305B\u3093\uFF09
-DataResultViewerThumbnail.comboBox.smallThumbnails=\u30B5\u30E0\u30CD\u30A4\u30EB\uFF08\u5C0F\uFF09
-DataResultViewerThumbnail.comboBox.mediumThumbnails=\u30B5\u30E0\u30CD\u30A4\u30EB\uFF08\u4E2D\uFF09
-DataResultViewerThumbnail.comboBox.largeThumbnails=\u30B5\u30E0\u30CD\u30A4\u30EB\uFF08\u5927\uFF09
-DataResultViewerThumbnail.switchPage.done.errMsg=\u30B5\u30E0\u30CD\u30A4\u30EB\u4F5C\u6210\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\uFF1A {0}
-FXVideoPanel.pauseButton.infoLabel.playbackErr=\u518D\u751F\u30A8\u30E9\u30FC\u3002
-GstVideoPanel.progress.infoLabel.updateErr=\u30D3\u30C7\u30AA\u30D7\u30ED\u30B0\u30EC\u30B9\u306E\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\uFF1A {0}
-GstVideoPanel.ExtractMedia.progress.buffering={0}\u3092\u30D0\u30C3\u30D5\u30A1\u30EA\u30F3\u30B0\u4E2D
-AboutWindowPanel.actVerboseLogging.text=Verbose\u30ED\u30B0\u3092\u30A2\u30AF\u30C6\u30A3\u30D9\u30FC\u30C8
-GeneralPanel.jLabel4.text=\u30D5\u30A1\u30A4\u30EB\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u306B\u4F7F\u7528\u3059\u308B\u30B9\u30EC\u30C3\u30C9\u6570\uFF1A
\ No newline at end of file
+DataContentViewerString.setDataView.errorNoText=\uff08\u30aa\u30d5\u30bb\u30c3\u30c8{0}-{1}\u306b\u306f\u30c6\u30ad\u30b9\u30c8\u304c\u3042\u308a\u307e\u305b\u3093\uff09
+DataResultViewerThumbnail.comboBox.smallThumbnails=\u30b5\u30e0\u30cd\u30a4\u30eb\uff08\u5c0f\uff09
+DataResultViewerThumbnail.comboBox.mediumThumbnails=\u30b5\u30e0\u30cd\u30a4\u30eb\uff08\u4e2d\uff09
+DataResultViewerThumbnail.comboBox.largeThumbnails=\u30b5\u30e0\u30cd\u30a4\u30eb\uff08\u5927\uff09
+DataResultViewerThumbnail.switchPage.done.errMsg=\u30b5\u30e0\u30cd\u30a4\u30eb\u4f5c\u6210\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\uff1a {0}
+FXVideoPanel.pauseButton.infoLabel.playbackErr=\u518d\u751f\u30a8\u30e9\u30fc\u3002
+GstVideoPanel.progress.infoLabel.updateErr=\u30d3\u30c7\u30aa\u30d7\u30ed\u30b0\u30ec\u30b9\u306e\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\uff1a {0}
+GstVideoPanel.ExtractMedia.progress.buffering={0}\u3092\u30d0\u30c3\u30d5\u30a1\u30ea\u30f3\u30b0\u4e2d
+AboutWindowPanel.actVerboseLogging.text=Verbose\u30ed\u30b0\u3092\u30a2\u30af\u30c6\u30a3\u30d9\u30fc\u30c8
+AutopsyOptionsPanel.jLabel4.text=\u30d5\u30a1\u30a4\u30eb\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u306b\u4f7f\u7528\u3059\u308b\u30b9\u30ec\u30c3\u30c9\u6570\uff1a
+
+AutopsyOptionsPanel.viewsHideKnownCB.text=\u30d3\u30e5\u30fc\u304b\u3089\u9078\u629e\u3057\u3066\u3044\u308b\u5834\u5408
+
+AutopsyOptionsPanel.dataSourcesHideKnownCB.text=\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9\u30a8\u30ea\u30a2\uff08\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u968e\u5c64\uff09
+
+AutopsyOptionsPanel.jLabel3.text=\u65e2\u77e5\u30d5\u30a1\u30a4\u30eb\uff08NIST NSRL\u5185\u306e\uff09\u3092\u4e0b\u8a18\u306b\u96a0\u3059\uff1a
+
+AutopsyOptionsPanel.useBestViewerRB.toolTipText=\u4f8b\u3048\u3070\u3001JPEG\u304c\u9078\u629e\u3055\u308c\u305f\u5834\u5408\u306b\u306fHEX\u304b\u3089\u30e1\u30c7\u30a3\u30a2\u306b\u5909\u66f4\u3059\u308b\u3002
+
+AutopsyOptionsPanel.useBestViewerRB.text=\u6700\u3082\u5c02\u9580\u7684\u306a\u30d5\u30a1\u30a4\u30eb\u30d3\u30e5\u30fc\u30a2\u306b\u5909\u66f4
+
+AutopsyOptionsPanel.useGMTTimeRB.text=GMT\u3092\u4f7f\u7528
+
+AutopsyOptionsPanel.useLocalTimeRB.text=\u30ed\u30fc\u30ab\u30eb\u30bf\u30a4\u30e0\u30be\u30fc\u30f3\u3092\u4f7f\u7528
+
+AutopsyOptionsPanel.keepCurrentViewerRB.toolTipText=\u4f8b\u3048\u3070\u3001JPEG\u304c\u9078\u629e\u3055\u308c\u305f\u5834\u5408\u306b\u305d\u306e\u307e\u307eHEX\u30d3\u30e5\u30fc\u3092\u4f7f\u7528\u3002
+
+AutopsyOptionsPanel.keepCurrentViewerRB.text=\u305d\u306e\u307e\u307e\u540c\u3058\u30d5\u30a1\u30a4\u30eb\u30d3\u30e5\u30fc\u30a2\u3092\u4f7f\u7528
+
+AutopsyOptionsPanel.jLabel1.text=\u30d5\u30a1\u30a4\u30eb\u3092\u9078\u629e\u3059\u308b\u5834\u5408\uff1a
+
+AutopsyOptionsPanel.jLabel2.text=\u30a2\u30a4\u30c6\u30e0\u3092\u8868\u793a\u3059\u308b\u5834\u5408\uff1a
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentPanel.java
index f04a485a12..7e5a235c0c 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentPanel.java
@@ -1,6 +1,20 @@
 /*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
+ * Autopsy Forensic Browser
+ * 
+ * Copyright 2011-2014 Basis Technology Corp.
+ * Contact: carrier <at> sleuthkit <dot> org
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.sleuthkit.autopsy.corecomponents;
 
@@ -10,14 +24,13 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.logging.Level;
-import java.util.prefs.Preferences;
 import javax.swing.JTabbedPane;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import org.openide.nodes.Node;
 import org.openide.util.Lookup;
 import org.openide.util.NbBundle;
-import org.openide.util.NbPreferences;
+import org.sleuthkit.autopsy.core.UserPreferences;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataContent;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataContentViewer;
 import org.sleuthkit.autopsy.coreutils.Logger;
@@ -34,7 +47,7 @@ import org.sleuthkit.datamodel.TskCoreException;
     private Node currentNode;
     private final boolean isMain;
     private boolean listeningToTabbedPane = false;    
-    
+     
     /**
      * Creates new DataContentPanel panel
      * The main data content panel can only be created by the data content top component, 
@@ -162,10 +175,6 @@ import org.sleuthkit.datamodel.TskCoreException;
             listeningToTabbedPane = true;
         }
                 
-        // get the preference for the preferred viewer
-        Preferences pref = NbPreferences.forModule(GeneralPanel.class);
-        boolean keepCurrentViewer = pref.getBoolean("keepPreferredViewer", false); //NON-NLS
-
         int currTabIndex = jTabbedPane1.getSelectedIndex();
         int totalTabs = jTabbedPane1.getTabCount();
         int maxPreferred = 0;
@@ -190,8 +199,7 @@ import org.sleuthkit.datamodel.TskCoreException;
         }
         
         // let the user decide if we should stay with the current viewer
-        int tabIndex = keepCurrentViewer ? currTabIndex : preferredViewerIndex;
-
+        int tabIndex = UserPreferences.keepPreferredContentViewer() ? currTabIndex : preferredViewerIndex;
         
         UpdateWrapper dcv = viewers.get(tabIndex);
         // this is really only needed if no tabs were enabled 
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ContentUtils.java b/Core/src/org/sleuthkit/autopsy/datamodel/ContentUtils.java
index 8310d430ed..fd3c00a3a1 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/ContentUtils.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/ContentUtils.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011 Basis Technology Corp.
+ * Copyright 2011-2014 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,13 +24,13 @@ import java.io.InputStream;
 import java.text.SimpleDateFormat;
 import java.util.TimeZone;
 import java.util.logging.Level;
-import java.util.prefs.Preferences;
-
+import java.util.prefs.PreferenceChangeEvent;
+import java.util.prefs.PreferenceChangeListener;
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import javax.swing.SwingWorker;
 import org.netbeans.api.progress.ProgressHandle;
-import org.openide.util.NbPreferences;
+import org.sleuthkit.autopsy.core.UserPreferences;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.Content;
 import org.sleuthkit.datamodel.ContentVisitor;
@@ -50,9 +50,21 @@ import org.sleuthkit.datamodel.VirtualDirectory;
 public final class ContentUtils {
 
     private final static Logger logger = Logger.getLogger(ContentUtils.class.getName());
+    private static boolean displayTimesInLocalTime = UserPreferences.displayTimesInLocalTime();
     private static final SimpleDateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss z");
     private static final SimpleDateFormat dateFormatterISO8601 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
-    private static boolean displayInLocalTime;
+
+    static {
+        UserPreferences.addChangeListener(new PreferenceChangeListener() {
+            @Override
+            public void preferenceChange(PreferenceChangeEvent evt) {
+                if (evt.getKey().equals(UserPreferences.DISPLAY_TIMES_IN_LOCAL_TIME)) {
+                    displayTimesInLocalTime = UserPreferences.displayTimesInLocalTime();
+                }
+            }
+        });
+    }
+        
     // don't instantiate
     private ContentUtils() {
         throw new AssertionError();
@@ -110,7 +122,7 @@ public final class ContentUtils {
     public static TimeZone getTimeZone(Content c) {
         
         try {
-            if (!getDisplayInLocalTime()) {
+            if (!shouldDisplayTimesInLocalTime()) {
                 return TimeZone.getTimeZone("GMT");
             }
             else {
@@ -362,18 +374,13 @@ public final class ContentUtils {
                                                                         cntnt.getClass().getSimpleName()));
         }
     }
-    /**sets displayInlocalTime value based on button in GeneralPanel.java
+
+    /**
+     * Indicates whether or not times should be displayed using local time.
      * 
-     * @param flag 
+     * @return True or false.
      */
-    public static void setDisplayInLocalTime(boolean flag) {
-    displayInLocalTime = flag;
-    }
-    /** get global timezone setting for displaying time values 
-     *  
-     * @return 
-     */
-    public static boolean getDisplayInLocalTime(){
-        return displayInLocalTime;
+    public static boolean shouldDisplayTimesInLocalTime(){
+        return displayTimesInLocalTime;
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeChildren.java b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeChildren.java
index 281e6593eb..463efc547b 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeChildren.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeChildren.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  * 
- * Copyright 2011 Basis Technology Corp.
+ * Copyright 2011-2014 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,16 +18,14 @@
  */
 package org.sleuthkit.autopsy.datamodel;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
-
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.openide.nodes.AbstractNode;
 import org.openide.nodes.ChildFactory;
 import org.openide.nodes.Node;
-import org.sleuthkit.datamodel.AbstractFile;
+import org.sleuthkit.autopsy.core.UserPreferences;
 import org.sleuthkit.datamodel.Content;
 import org.sleuthkit.datamodel.ContentVisitor;
 import org.sleuthkit.datamodel.DerivedFile;
@@ -40,50 +38,19 @@ import org.sleuthkit.datamodel.TskCoreException;
 import org.sleuthkit.datamodel.TskData;
 
 /**
- * Children factory for a specific file type - does the database query. 
+ * Child node factory for a specific file type - does the database query. 
  */
-class FileTypeChildren extends ChildFactory<Content> {
-
+public class FileTypeChildren extends ChildFactory<Content> {
+ 
     private SleuthkitCase skCase;
     private FileTypeExtensionFilters.SearchFilterInterface filter;
     private static final Logger logger = Logger.getLogger(FileTypeChildren.class.getName());
-    //private final static int MAX_OBJECTS = 2000;
-
-    public FileTypeChildren(FileTypeExtensionFilters.SearchFilterInterface filter, SleuthkitCase skCase) {
+        
+    FileTypeChildren(FileTypeExtensionFilters.SearchFilterInterface filter, SleuthkitCase skCase) {
         this.filter = filter;
         this.skCase = skCase;
     }
 
-    @Override
-    protected boolean createKeys(List<Content> list) {
-        list.addAll(runQuery());
-        return true;
-    }
-    
-    private String createQuery(){
-        String query = "(dir_type = " + TskData.TSK_FS_NAME_TYPE_ENUM.REG.getValue() + ")" //NON-NLS
-                + " AND (known IS NULL OR known != " + TskData.FileKnown.KNOWN.getFileKnownValue() + ") AND (0"; //NON-NLS
-        for(String s : filter.getFilter()){
-            query += " OR name LIKE '%" + s + "'"; //NON-NLS
-        }
-        query += ')';
-//        query += " LIMIT " + MAX_OBJECTS;
-        return query;
-    }
-
-    
-    private List<AbstractFile> runQuery(){
-        List<AbstractFile> list = new ArrayList<>();
-        try {
-            list = skCase.findAllFilesWhere(createQuery());
-        } catch (TskCoreException ex) {
-            logger.log(Level.SEVERE, "Couldn't get search results", ex); //NON-NLS
-        }
-
-        return list;
-        
-    }
-    
     /**
      * Get children count without actually loading all nodes
      * @return 
@@ -96,7 +63,31 @@ class FileTypeChildren extends ChildFactory<Content> {
             return 0;
         }
     }
-
+    
+    @Override
+    protected boolean createKeys(List<Content> list) {
+        try {
+            list.addAll(skCase.findAllFilesWhere(createQuery()));
+        } catch (TskCoreException ex) {
+            logger.log(Level.SEVERE, "Couldn't get search results", ex); //NON-NLS
+        }
+        return true;
+    }
+    
+    private String createQuery(){
+        StringBuilder query = new StringBuilder();
+        query.append("(dir_type = ").append(TskData.TSK_FS_NAME_TYPE_ENUM.REG.getValue()).append(")"); //NON-NLS
+        if (UserPreferences.hideKnownFilesInViewsTree()) {
+            query.append(" AND (known IS NULL OR known != ").append(TskData.FileKnown.KNOWN.getFileKnownValue()).append(")"); //NON-NLS
+        }
+        query.append(" AND (0");
+        for(String s : filter.getFilter()){
+            query.append(" OR name LIKE '%").append(s).append("'"); //NON-NLS
+        }
+        query.append(')');
+        return query.toString();
+    }
+            
     @Override
     protected Node createNodeForKey(Content key) {
         return key.accept(new ContentVisitor.Default<AbstractNode>() {
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/KnownFileFilterNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/KnownFileFilterNode.java
index 8201fdd73d..5c63206874 100755
--- a/Core/src/org/sleuthkit/autopsy/datamodel/KnownFileFilterNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/KnownFileFilterNode.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2013 Basis Technology Corp.
+ * Copyright 2013-2014 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,11 +20,10 @@ package org.sleuthkit.autopsy.datamodel;
 
 import java.util.prefs.PreferenceChangeEvent;
 import java.util.prefs.PreferenceChangeListener;
-import java.util.prefs.Preferences;
 import org.openide.nodes.FilterNode;
 import org.openide.nodes.Node;
 import org.openide.util.NbBundle;
-import org.openide.util.NbPreferences;
+import org.sleuthkit.autopsy.core.UserPreferences;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.TskData;
 
@@ -39,26 +38,28 @@ import org.sleuthkit.datamodel.TskData;
  */
 public class KnownFileFilterNode extends FilterNode {
     
-    /** Preference key values. */
-    private static final String DS_HIDE_KNOWN = "dataSourcesHideKnown"; // Default false NON-NLS
-    private static final String VIEWS_HIDE_KNOWN = "viewsHideKnown"; // Default true NON-NLS
+    private static boolean filterFromDataSources = UserPreferences.hideKnownFilesInDataSourcesTree();
+    private static boolean filterFromViews = UserPreferences.hideKnownFilesInViewsTree();
+            
+    static {
+        UserPreferences.addChangeListener(new PreferenceChangeListener() {
+            @Override
+            public void preferenceChange(PreferenceChangeEvent evt) {
+                switch (evt.getKey()) {
+                    case UserPreferences.HIDE_KNOWN_FILES_IN_DATA_SOURCES_TREE:
+                        filterFromDataSources = UserPreferences.hideKnownFilesInDataSourcesTree();
+                        break;
+                    case UserPreferences.HIDE_KNOWN_FILES_IN_VIEWS_TREE:
+                        filterFromViews = UserPreferences.hideKnownFilesInViewsTree();
+                        break;
+                }
+            }
+        });
+    }
     
-    /** True if Nodes selected from the Views Node should filter Known Files. */
-    private static boolean filterFromViews = true;
-    
-    /** True if Nodes selected from the DataSources Node should filter Known Files. */
-    private static boolean filterFromDataSources = false;
-    
-    /** True if a listener has not been added to the preferences. */
-    private static boolean addListener = true;
-    
-    /**
-     * Represents the top level category the Node this KnownFileFilterNode wraps
-     * is a sub-node of. (i.e. Data Sources, Views, Results)
-     */
     public enum SelectionContext {
-        DATA_SOURCES(NbBundle.getMessage(KnownFileFilterNode.class, "KnownFileFilterNode.selectionContext.dataSources")),   // Subnode of DataSources
-        VIEWS(NbBundle.getMessage(KnownFileFilterNode.class, "KnownFileFilterNode.selectionContext.views")),                 // Subnode of Views
+        DATA_SOURCES(NbBundle.getMessage(KnownFileFilterNode.class, "KnownFileFilterNode.selectionContext.dataSources")),
+        VIEWS(NbBundle.getMessage(KnownFileFilterNode.class, "KnownFileFilterNode.selectionContext.views")),
         OTHER("");                      // Subnode of another node.
         
         private final String displayName;
@@ -67,13 +68,6 @@ public class KnownFileFilterNode extends FilterNode {
             this.displayName = displayName;
         }
         
-        /**
-         * Get the SelectionContext from the display name of a Node that is a
-         * direct child of the root node.
-         * 
-         * @param name
-         * @return 
-         */
         public static SelectionContext getContextFromName(String name) {
             if (name.equals(DATA_SOURCES.getName())) {
                 return DATA_SOURCES;
@@ -97,12 +91,7 @@ public class KnownFileFilterNode extends FilterNode {
      * @param context 
      */
     public KnownFileFilterNode(Node arg, SelectionContext context) {
-        super(arg, new KnownFileFilterChildren(arg, context));
-        
-        if (addListener) {
-            addPreferenceListener();
-            addListener = false;
-        }
+        super(arg, new KnownFileFilterChildren(arg, context));        
     }
     
     private KnownFileFilterNode(Node arg, boolean filter) {
@@ -127,28 +116,6 @@ public class KnownFileFilterNode extends FilterNode {
         }
     }
     
-    private void addPreferenceListener() {
-        Preferences prefs = NbPreferences.root().node("/org/sleuthkit/autopsy/core"); //NON-NLS
-        // Initialize with values stored in preferences
-        filterFromViews = prefs.getBoolean(VIEWS_HIDE_KNOWN, filterFromViews);
-        filterFromDataSources = prefs.getBoolean(DS_HIDE_KNOWN, filterFromDataSources);
-
-        // Add listener
-        prefs.addPreferenceChangeListener(new PreferenceChangeListener() {
-            @Override
-            public void preferenceChange(PreferenceChangeEvent evt) {
-                switch (evt.getKey()) {
-                    case VIEWS_HIDE_KNOWN:
-                        filterFromViews = evt.getNode().getBoolean(VIEWS_HIDE_KNOWN, filterFromViews);
-                        break;
-                    case DS_HIDE_KNOWN:
-                        filterFromDataSources = evt.getNode().getBoolean(DS_HIDE_KNOWN, filterFromDataSources);
-                        break;
-                }
-            }
-        });
-    }
-    
     /**
     * Complementary class to KnownFileFilterNode. 
     * 
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java
index f7067adf6e..0f61cecf01 100644
--- a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011 Basis Technology Corp.
+ * Copyright 2011-2014 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -31,6 +31,8 @@ import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.logging.Level;
+import java.util.prefs.PreferenceChangeEvent;
+import java.util.prefs.PreferenceChangeListener;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import javax.swing.Action;
 import javax.swing.JPanel;
@@ -49,6 +51,7 @@ import org.openide.nodes.Node;
 import org.openide.nodes.NodeNotFoundException;
 import org.openide.nodes.NodeOp;
 import org.sleuthkit.autopsy.casemodule.Case;
+import org.sleuthkit.autopsy.core.UserPreferences;
 import org.sleuthkit.autopsy.corecomponentinterfaces.BlackboardResultViewer;
 import org.sleuthkit.autopsy.corecomponents.DataResultTopComponent;
 import org.sleuthkit.autopsy.corecomponents.TableFilterNode;
@@ -111,25 +114,37 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
         setName(NbBundle.getMessage(DirectoryTreeTopComponent.class, "CTL_DirectoryTreeTopComponent"));
         setToolTipText(NbBundle.getMessage(DirectoryTreeTopComponent.class, "HINT_DirectoryTreeTopComponent"));
 
-        setListener();
+        subscribeToChangeEvents();
         associateLookup(ExplorerUtils.createLookup(em, getActionMap()));
 
 
         this.pcs = new PropertyChangeSupport(this);
 
         // set the back & forward list and also disable the back & forward button
-        this.backList = new LinkedList<String[]>();
-        this.forwardList = new LinkedList<String[]>();
+        this.backList = new LinkedList<>();
+        this.forwardList = new LinkedList<>();
         backButton.setEnabled(false);
         forwardButton.setEnabled(false);
     }
 
     /**
-     * Set the FileBrowserTopComponent as the listener to any property changes
-     * in the Case.java class
+     * Make this TopComponent a listener to various change events.
      */
-    private void setListener() {
-        Case.addPropertyChangeListener(this);// add this class to listen to any changes in the Case.java class
+    private void subscribeToChangeEvents() {
+        UserPreferences.addChangeListener(new PreferenceChangeListener() {
+            @Override
+            public void preferenceChange(PreferenceChangeEvent evt) {
+                switch (evt.getKey()) {
+                    case UserPreferences.HIDE_KNOWN_FILES_IN_DATA_SOURCES_TREE:
+                        refreshContentTreeSafe();
+                        break;
+                    case UserPreferences.HIDE_KNOWN_FILES_IN_VIEWS_TREE:
+                        // RJCTODO: There does not appear to be a way to refresh the Views subtree
+                        break;
+                }
+            }
+        });
+        Case.addPropertyChangeListener(this);
         this.em.addPropertyChangeListener(this);
         IngestManager.getInstance().addIngestJobEventListener(this);
         IngestManager.getInstance().addIngestModuleEventListener(this);
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/Timeline.java b/Core/src/org/sleuthkit/autopsy/timeline/Timeline.java
index 4607f809c5..fe9ad3dd65 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/Timeline.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/Timeline.java
@@ -961,7 +961,7 @@ public class Timeline extends CallableSystemAction implements Presenter.Toolbar,
            
             //conversion to GMT
                 
-            if (!ContentUtils.getDisplayInLocalTime()) {
+            if (!ContentUtils.shouldDisplayTimesInLocalTime()) {
                calendar.setTimeZone(TimeZone.getTimeZone("GMT"));
             }
             else{

From f771ca1634e7ee2b26cd28bdc233db2a9af5ca10 Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Wed, 7 May 2014 10:34:26 -0400
Subject: [PATCH 16/24] Add more change listeners for UserPreferences

---
 .../autopsy/core/UserPreferences.java         | 11 +++++-
 .../corecomponents/AutopsyOptionsPanel.java   | 11 +++---
 .../DirectoryTreeTopComponent.java            |  2 +-
 .../autopsy/ingest/IngestManager.java         | 35 +++++++++++--------
 4 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/core/UserPreferences.java b/Core/src/org/sleuthkit/autopsy/core/UserPreferences.java
index ea2604ba89..abd8056fee 100755
--- a/Core/src/org/sleuthkit/autopsy/core/UserPreferences.java
+++ b/Core/src/org/sleuthkit/autopsy/core/UserPreferences.java
@@ -33,7 +33,8 @@ public final class UserPreferences {
     public static final String HIDE_KNOWN_FILES_IN_DATA_SOURCES_TREE = "HideKnownFilesInDataSourcesTree"; //NON-NLS 
     public static final String HIDE_KNOWN_FILES_IN_VIEWS_TREE = "HideKnownFilesInViewsTree"; //NON-NLS 
     public static final String DISPLAY_TIMES_IN_LOCAL_TIME = "DisplayTimesInLocalTime"; //NON-NLS
-
+    public static final String NUMBER_OF_FILE_INGEST_THREADS = "NumberOfFileingestThreads"; //NON-NLS
+    
     // Prevent instantiation.
     private UserPreferences() {
     }
@@ -77,4 +78,12 @@ public final class UserPreferences {
     public static void setDisplayTimesInLocalTime(boolean value) {
         preferences.putBoolean(DISPLAY_TIMES_IN_LOCAL_TIME, value);
     }    
+    
+    public static int numberOfFileIngestThreads() {
+        return preferences.getInt(NUMBER_OF_FILE_INGEST_THREADS, 2);
+    }
+
+    public static void setNumberOfFileIngestThreads(int value) {
+        preferences.putInt(NUMBER_OF_FILE_INGEST_THREADS, value);
+    }        
 }
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/AutopsyOptionsPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/AutopsyOptionsPanel.java
index ae46e94cce..a39246e34b 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/AutopsyOptionsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/AutopsyOptionsPanel.java
@@ -20,10 +20,12 @@ package org.sleuthkit.autopsy.corecomponents;
 
 import javax.swing.DefaultComboBoxModel;
 import org.sleuthkit.autopsy.core.UserPreferences;
-import org.sleuthkit.autopsy.ingest.IngestManager;
 
+/**
+ * Options panel that allow users to set application preferences.
+ */
 final class AutopsyOptionsPanel extends javax.swing.JPanel {
-    
+
     AutopsyOptionsPanel(AutopsyOptionsPanelController controller) {
         initComponents();
         numberOfFileIngestThreadsComboBox.setModel(new DefaultComboBoxModel<>(new Integer[]{1, 2, 4, 8, 16}));
@@ -39,7 +41,7 @@ final class AutopsyOptionsPanel extends javax.swing.JPanel {
         boolean useLocalTime = UserPreferences.displayTimesInLocalTime();
         useLocalTimeRB.setSelected(useLocalTime);
         useGMTTimeRB.setSelected(!useLocalTime);
-        numberOfFileIngestThreadsComboBox.setSelectedItem(IngestManager.getNumberOfFileIngestThreads());
+        numberOfFileIngestThreadsComboBox.setSelectedItem(UserPreferences.numberOfFileIngestThreads());
     }
 
     void store() {
@@ -47,7 +49,7 @@ final class AutopsyOptionsPanel extends javax.swing.JPanel {
         UserPreferences.setHideKnownFilesInDataSourcesTree(dataSourcesHideKnownCB.isSelected());
         UserPreferences.setHideKnownFilesInViewsTree(viewsHideKnownCB.isSelected());
         UserPreferences.setDisplayTimesInLocalTime(useLocalTimeRB.isSelected());
-        IngestManager.setNumberOfFileIngestThreads((Integer) numberOfFileIngestThreadsComboBox.getSelectedItem());
+        UserPreferences.setNumberOfFileIngestThreads((Integer) numberOfFileIngestThreadsComboBox.getSelectedItem());
     }
 
     boolean valid() {
@@ -161,7 +163,6 @@ final class AutopsyOptionsPanel extends javax.swing.JPanel {
                 .addComponent(numberOfFileIngestThreadsComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
         );
     }// </editor-fold>//GEN-END:initComponents
-
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.ButtonGroup buttonGroup1;
     private javax.swing.ButtonGroup buttonGroup3;
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java
index 0f61cecf01..958387337d 100644
--- a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java
@@ -139,7 +139,7 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
                         refreshContentTreeSafe();
                         break;
                     case UserPreferences.HIDE_KNOWN_FILES_IN_VIEWS_TREE:
-                        // RJCTODO: There does not appear to be a way to refresh the Views subtree
+                        // TODO: Need a way to refresh the Views subtree
                         break;
                 }
             }
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
index 3b566decd4..6ded7ccf6a 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
@@ -29,16 +29,17 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.logging.Level;
+import java.util.prefs.PreferenceChangeEvent;
+import java.util.prefs.PreferenceChangeListener;
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandleFactory;
 import org.openide.util.Cancellable;
-import org.openide.util.NbPreferences;
 import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
 import org.sleuthkit.datamodel.Content;
-import java.util.prefs.Preferences;
 import javax.swing.JOptionPane;
+import org.sleuthkit.autopsy.core.UserPreferences;
 
 /**
  * Manages the execution of ingest jobs.
@@ -46,12 +47,10 @@ import javax.swing.JOptionPane;
 public class IngestManager {
 
     private static final int MAX_NUMBER_OF_DATA_SOURCE_INGEST_THREADS = 1;
-    private static final String NUMBER_OF_FILE_INGEST_THREADS_KEY = "NumberOfFileingestThreads"; //NON-NLS
     private static final int MIN_NUMBER_OF_FILE_INGEST_THREADS = 1;
     private static final int MAX_NUMBER_OF_FILE_INGEST_THREADS = 16;
     private static final int DEFAULT_NUMBER_OF_FILE_INGEST_THREADS = 2;
     private static final Logger logger = Logger.getLogger(IngestManager.class.getName());
-    private static final Preferences userPreferences = NbPreferences.forModule(IngestManager.class);
     private static final IngestManager instance = new IngestManager();
     private final PropertyChangeSupport ingestJobEventPublisher = new PropertyChangeSupport(IngestManager.class);
     private final PropertyChangeSupport ingestModuleEventPublisher = new PropertyChangeSupport(IngestManager.class);
@@ -82,10 +81,23 @@ public class IngestManager {
      */
     private IngestManager() {
         startDataSourceIngestThread();
-        int numberOfFileIngestThreads = getNumberOfFileIngestThreads();
+        int numberOfFileIngestThreads = UserPreferences.numberOfFileIngestThreads();
+        if ((numberOfFileIngestThreads < MIN_NUMBER_OF_FILE_INGEST_THREADS) || (numberOfFileIngestThreads > MAX_NUMBER_OF_FILE_INGEST_THREADS)) {
+            numberOfFileIngestThreads = DEFAULT_NUMBER_OF_FILE_INGEST_THREADS;
+            UserPreferences.setNumberOfFileIngestThreads(numberOfFileIngestThreads);
+        }
         for (int i = 0; i < numberOfFileIngestThreads; ++i) {
             startFileIngestThread();
         }
+
+        UserPreferences.addChangeListener(new PreferenceChangeListener() {
+            @Override
+            public void preferenceChange(PreferenceChangeEvent evt) {
+                if (evt.getKey().equals(UserPreferences.NUMBER_OF_FILE_INGEST_THREADS)) {
+                    setNumberOfFileIngestThreads();
+                }
+            }
+        });
     }
 
     /**
@@ -115,13 +127,6 @@ public class IngestManager {
         return MAX_NUMBER_OF_FILE_INGEST_THREADS;
     }
 
-    /**
-     * Gets the number of file ingest threads the ingest manager will use.
-     */
-    public synchronized static int getNumberOfFileIngestThreads() {
-        return userPreferences.getInt(NUMBER_OF_FILE_INGEST_THREADS_KEY, DEFAULT_NUMBER_OF_FILE_INGEST_THREADS);
-    }
-
     /**
      * Changes the number of file ingest threads the ingest manager will use to
      * no more than MAX_NUMBER_OF_FILE_INGEST_THREADS and no less than
@@ -130,12 +135,12 @@ public class IngestManager {
      *
      * @param numberOfThreads The desired number of file ingest threads.
      */
-    public synchronized static void setNumberOfFileIngestThreads(int numberOfThreads) {
+    public synchronized static void setNumberOfFileIngestThreads() {
+        int numberOfThreads = UserPreferences.numberOfFileIngestThreads();
         if ((numberOfThreads < MIN_NUMBER_OF_FILE_INGEST_THREADS) || (numberOfThreads > MAX_NUMBER_OF_FILE_INGEST_THREADS)) {
             numberOfThreads = DEFAULT_NUMBER_OF_FILE_INGEST_THREADS;
+            UserPreferences.setNumberOfFileIngestThreads(numberOfThreads);
         }
-        userPreferences.putInt(NUMBER_OF_FILE_INGEST_THREADS_KEY, numberOfThreads);
-
         if (instance.fileIngestThreads.size() != numberOfThreads) {
             if (instance.fileIngestThreads.size() > numberOfThreads) {
                 Long[] threadIds = instance.fileIngestThreads.keySet().toArray(new Long[instance.fileIngestThreads.size()]);

From 99acbdc40ebd6ee30b4bad9e3551da952ca421ac Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Wed, 7 May 2014 10:37:11 -0400
Subject: [PATCH 17/24] Fix spelling error in UserPreferences key

---
 Core/src/org/sleuthkit/autopsy/core/UserPreferences.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Core/src/org/sleuthkit/autopsy/core/UserPreferences.java b/Core/src/org/sleuthkit/autopsy/core/UserPreferences.java
index abd8056fee..aee3bc5217 100755
--- a/Core/src/org/sleuthkit/autopsy/core/UserPreferences.java
+++ b/Core/src/org/sleuthkit/autopsy/core/UserPreferences.java
@@ -33,7 +33,7 @@ public final class UserPreferences {
     public static final String HIDE_KNOWN_FILES_IN_DATA_SOURCES_TREE = "HideKnownFilesInDataSourcesTree"; //NON-NLS 
     public static final String HIDE_KNOWN_FILES_IN_VIEWS_TREE = "HideKnownFilesInViewsTree"; //NON-NLS 
     public static final String DISPLAY_TIMES_IN_LOCAL_TIME = "DisplayTimesInLocalTime"; //NON-NLS
-    public static final String NUMBER_OF_FILE_INGEST_THREADS = "NumberOfFileingestThreads"; //NON-NLS
+    public static final String NUMBER_OF_FILE_INGEST_THREADS = "NumberOfFileIngestThreads"; //NON-NLS
     
     // Prevent instantiation.
     private UserPreferences() {

From f993d04e4971dff69b9c72abb8ab7b1cf38da53e Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Wed, 7 May 2014 11:05:05 -0400
Subject: [PATCH 18/24] Resolve NetBeans code hints for Logger class

---
 Core/src/org/sleuthkit/autopsy/coreutils/Logger.java | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/Logger.java b/Core/src/org/sleuthkit/autopsy/coreutils/Logger.java
index b1b3e2402d..fe6bad50c2 100644
--- a/Core/src/org/sleuthkit/autopsy/coreutils/Logger.java
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/Logger.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2012 Basis Technology Corp.
+ * Copyright 2012-2014 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,9 +19,7 @@
 package org.sleuthkit.autopsy.coreutils;
 
 import java.io.IOException;
-import java.nio.charset.Charset;
 import java.util.logging.*;
-import org.openide.modules.Places;
 
 /**
  * Custom Autopsy logger wrapper over java.util.logging.Logger with default file
@@ -125,9 +123,6 @@ public class Logger extends java.util.logging.Logger {
         addHandler(traces);
     }
 
-
-       
-    
     /**
      * Log an action to autopsy_actions.log
      * @param actionClass class where user triggered action occurs
@@ -164,7 +159,7 @@ public class Logger extends java.util.logging.Logger {
 
     @Override
     public void log(Level level, String message, Throwable thrown) {
-        super.log(level, message + "\nException:  " + thrown.toString()); //NON-NLS
+        super.log(level, "{0}\nException:  {1}", new Object[]{message, thrown.toString()}); //NON-NLS
         removeHandler(normal);
         super.log(level, message, thrown);
         addHandler(normal);

From 390fa4f911e9db4192810893dd6f1f49858fdfad Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Wed, 7 May 2014 11:06:59 -0400
Subject: [PATCH 19/24] Apply NetBeans IDE formatting to Logger class

---
 .../sleuthkit/autopsy/coreutils/Logger.java   | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/Logger.java b/Core/src/org/sleuthkit/autopsy/coreutils/Logger.java
index fe6bad50c2..032994c8cf 100644
--- a/Core/src/org/sleuthkit/autopsy/coreutils/Logger.java
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/Logger.java
@@ -24,11 +24,12 @@ import java.util.logging.*;
 /**
  * Custom Autopsy logger wrapper over java.util.logging.Logger with default file
  * streams logging to autopsy.log (general high level messages),
- * autopsy_traces.log (also including exception traces).
- * In development build, those are also redirected to console / messages log.
+ * autopsy_traces.log (also including exception traces). In development build,
+ * those are also redirected to console / messages log.
+ *
+ * Contains a utility method to log user actions to autopsy_actions.log via
+ * noteAction()
  *
- * Contains a utility method to log user actions to autopsy_actions.log via noteAction()
- * 
  * Use like java.util.logging.Logger API, get a
  * org.sleuthkit.autopsy.coreutils.Logger handle using factory method
  * org.sleuthkit.autopsy.coreutils.Logger.getLogger(String name) passing
@@ -43,14 +44,11 @@ public class Logger extends java.util.logging.Logger {
     private static final String LOG_DIR = PlatformUtil.getLogDirectory();
     static final int LOG_SIZE = 0; // in bytes, zero is unlimited
     static final int LOG_FILE_COUNT = 10;
-    
     //File Handlers which point to the output logs
-    private static  final FileHandler traces = initTraces();
-    private static  final FileHandler normal = initNormal();
+    private static final FileHandler traces = initTraces();
+    private static final FileHandler normal = initNormal();
     private static final Handler console = new java.util.logging.ConsoleHandler();
     private static final java.util.logging.Logger actionsLogger = initActionsLogger();
-   
-
     /**
      * Main messages log file name
      */
@@ -59,7 +57,6 @@ public class Logger extends java.util.logging.Logger {
      * Detailed exception trace log file name
      */
     public static final String tracesLog = "autopsy_traces.log"; //NON-NLS
-    
     /**
      * Action logger file name
      */
@@ -68,7 +65,7 @@ public class Logger extends java.util.logging.Logger {
     /**
      * Static blocks to get around compile errors such as "variable might not
      * have been initialized
-   *
+     *
      */
     //<editor-fold defaultstate="visible" desc="static block initializers">
     private static FileHandler initTraces() {
@@ -94,7 +91,7 @@ public class Logger extends java.util.logging.Logger {
             throw new RuntimeException("Error initializing normal logger", e); //NON-NLS
         }
     }
-    
+
     private static java.util.logging.Logger initActionsLogger() {
         try {
             FileHandler f = new FileHandler(LOG_DIR + actionsLog, LOG_SIZE, LOG_FILE_COUNT);
@@ -125,6 +122,7 @@ public class Logger extends java.util.logging.Logger {
 
     /**
      * Log an action to autopsy_actions.log
+     *
      * @param actionClass class where user triggered action occurs
      */
     public static void noteAction(Class<?> actionClass) {

From 1024099d54ff888bd1c0892854fe4155ba82a83e Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Wed, 7 May 2014 15:39:48 -0400
Subject: [PATCH 20/24] Fix Logger bug

---
 .../autopsy/casemodule/AddImageAction.java    |   2 -
 .../autopsy/casemodule/CaseCloseAction.java   |  16 +-
 .../autopsy/casemodule/CaseDeleteAction.java  |  17 +-
 .../autopsy/casemodule/CaseNewAction.java     |   6 +-
 .../autopsy/casemodule/CaseOpenAction.java    |   6 +-
 .../casemodule/CasePropertiesAction.java      |   4 +-
 .../casemodule/NewCaseWizardAction.java       |   6 +-
 .../autopsy/casemodule/RecentCases.java       |   5 +-
 .../autopsy/casemodule/RecentItems.java       |   5 +-
 .../corecomponents/AboutWindowAction.java     |   5 +-
 .../sleuthkit/autopsy/coreutils/Logger.java   | 169 +++++++-----------
 .../directorytree/ChangeViewAction.java       |   5 +-
 .../autopsy/directorytree/CollapseAction.java |   5 +-
 .../ExplorerNodeActionVisitor.java            |  15 +-
 .../directorytree/ExternalViewerAction.java   |   5 +-
 .../directorytree/NewWindowViewAction.java    |   4 +-
 16 files changed, 90 insertions(+), 185 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageAction.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageAction.java
index f47d094110..363a7f8824 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageAction.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageAction.java
@@ -106,8 +106,6 @@ public final class AddImageAction extends CallableSystemAction implements Presen
      */
     @Override
     public void actionPerformed(ActionEvent e) {
-        Logger.noteAction(AddImageAction.class);
-        
         if (IngestManager.getInstance().isIngestRunning()) {
             final String msg = NbBundle.getMessage(this.getClass(), "AddImageAction.ingestConfig.ongoingIngest.msg");
             if (JOptionPane.showConfirmDialog(null, msg,
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CaseCloseAction.java b/Core/src/org/sleuthkit/autopsy/casemodule/CaseCloseAction.java
index e19666d209..900a355bf0 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/CaseCloseAction.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/CaseCloseAction.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011 Basis Technology Corp.
+ * Copyright 2011-2014 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,7 +23,16 @@ import java.awt.Component;
 import java.awt.EventQueue;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.util.logging.Level;;
+import java.util.logging.Level;import org.sleuthkit.autopsy.coreutils.Logger;
+import javax.swing.Action;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import org.openide.util.HelpCtx;
+import org.openide.util.NbBundle;
+import org.openide.util.actions.CallableSystemAction;
+import org.openide.util.actions.Presenter;
+;
+import org.sleuthkit.autopsy.coreutils.Logger;
 import javax.swing.Action;
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
@@ -40,7 +49,6 @@ import org.openide.util.NbBundle;
 import org.openide.util.actions.CallableSystemAction;
 import org.openide.util.actions.Presenter;
 
-
 /**
  * The action to close the current Case. This class should be disabled on
  * creation and it will be enabled on new case creation or case opened.
@@ -75,8 +83,6 @@ import org.openide.util.actions.Presenter;
      */
     @Override
     public void actionPerformed(ActionEvent e) {
-        Logger.noteAction(this.getClass());
-
         if (Case.existsCurrentCase() == false)
             return;
         
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CaseDeleteAction.java b/Core/src/org/sleuthkit/autopsy/casemodule/CaseDeleteAction.java
index 4b7291971d..cff30efed0 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/CaseDeleteAction.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/CaseDeleteAction.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011 Basis Technology Corp.
+ * Copyright 2011-2014 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,7 +21,7 @@ package org.sleuthkit.autopsy.casemodule;
 
 import java.awt.event.ActionEvent;
 import java.io.File;
-import java.util.logging.Level;;
+import java.util.logging.Level;import org.sleuthkit.autopsy.coreutils.Logger;
 import javax.swing.Action;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
@@ -31,6 +31,7 @@ import org.openide.NotifyDescriptor;
 import org.openide.util.HelpCtx;
 import org.openide.util.NbBundle;
 import org.openide.util.actions.CallableSystemAction;
+;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import javax.swing.Action;
 import javax.swing.JOptionPane;
@@ -38,16 +39,6 @@ import javax.swing.JPanel;
 import org.openide.DialogDescriptor;
 import org.openide.DialogDisplayer;
 import org.openide.NotifyDescriptor;
-import org.openide.util.Exceptions;
-import org.openide.util.HelpCtx;
-import org.openide.util.NbBundle;
-import org.openide.util.actions.CallableSystemAction;
-import javax.swing.Action;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import org.openide.DialogDescriptor;
-import org.openide.DialogDisplayer;
-import org.openide.NotifyDescriptor;
 import org.openide.util.HelpCtx;
 import org.openide.util.NbBundle;
 import org.openide.util.actions.CallableSystemAction;
@@ -86,8 +77,6 @@ import org.openide.util.actions.CallableSystemAction;
      */
     @Override
     public void actionPerformed(ActionEvent e) {
-        Logger.noteAction(this.getClass());
-
         Case currentCase = Case.getCurrentCase();
         File configFile = new File(currentCase.getConfigFilePath());
         File caseFolder = new File(configFile.getParent());
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CaseNewAction.java b/Core/src/org/sleuthkit/autopsy/casemodule/CaseNewAction.java
index 066cd10149..3be5ec7c57 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/CaseNewAction.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/CaseNewAction.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011 Basis Technology Corp.
+ * Copyright 2011-2014 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,10 +20,8 @@
 package org.sleuthkit.autopsy.casemodule;
 
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import org.openide.util.actions.SystemAction;
 import org.openide.util.lookup.ServiceProvider;
-import org.sleuthkit.autopsy.coreutils.Logger;
 
 /**
  * The action to create a new case. This action class is always enabled.
@@ -41,8 +39,6 @@ public final class CaseNewAction implements CaseNewActionInterface {
      */
     @Override
     public void actionPerformed(ActionEvent e) {
-        Logger.noteAction(this.getClass());
-
         wizard.performAction();
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CaseOpenAction.java b/Core/src/org/sleuthkit/autopsy/casemodule/CaseOpenAction.java
index 5944613d54..8bf7392026 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/CaseOpenAction.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/CaseOpenAction.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011 Basis Technology Corp.
+ * Copyright 2011-2014 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,7 +27,6 @@ import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
 import javax.swing.filechooser.FileFilter;
 import javax.swing.filechooser.FileNameExtensionFilter;
-
 import org.openide.util.NbBundle;
 import org.openide.util.lookup.ServiceProvider;
 import org.sleuthkit.autopsy.coreutils.ModuleSettings;
@@ -72,9 +71,6 @@ public final class CaseOpenAction implements ActionListener {
      */
     @Override
     public void actionPerformed(ActionEvent e) {
-        Logger.noteAction(this.getClass());
-
-
         int retval = fc.showOpenDialog((Component) e.getSource());
 
         if (retval == JFileChooser.APPROVE_OPTION) {
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesAction.java b/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesAction.java
index 5ef4c42347..a6a9e4f645 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesAction.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesAction.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011 Basis Technology Corp.
+ * Copyright 2011-2014 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -58,8 +58,6 @@ import org.sleuthkit.autopsy.coreutils.Logger;
      */
     @Override
     public void performAction() {
-        Logger.noteAction(this.getClass());
-        
         try {
             // create the popUp window for it
             String title = NbBundle.getMessage(this.getClass(), "CasePropertiesAction.window.title");
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardAction.java b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardAction.java
index 6fded53a73..6008a0e5be 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardAction.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardAction.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011 Basis Technology Corp.
+ * Copyright 2011-2014 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,7 +21,6 @@ package org.sleuthkit.autopsy.casemodule;
 
 import java.awt.Component;
 import java.awt.Dialog;
-import java.awt.event.ActionListener;
 import java.io.File;
 import java.text.MessageFormat;
 import java.util.logging.Level;
@@ -47,9 +46,6 @@ import org.sleuthkit.autopsy.coreutils.Logger;
 
     @Override
     public void performAction() {
-        Logger.noteAction(this.getClass());
-
-
         // there's a case open
         if (Case.existsCurrentCase()) {
             // show the confirmation first to close the current case and open the "New Case" wizard panel
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/RecentCases.java b/Core/src/org/sleuthkit/autopsy/casemodule/RecentCases.java
index 843950d56b..641d7d75eb 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/RecentCases.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/RecentCases.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011 Basis Technology Corp.
+ * Copyright 2011-2014 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -35,7 +35,6 @@ import org.openide.util.NbBundle;
 import org.openide.util.actions.CallableSystemAction;
 import org.openide.util.actions.Presenter;
 import org.openide.filesystems.FileUtil;
-import org.openide.util.Exceptions;
 import org.sleuthkit.autopsy.coreutils.ModuleSettings;
 import org.sleuthkit.autopsy.coreutils.Logger;
 
@@ -253,8 +252,6 @@ import org.sleuthkit.autopsy.coreutils.Logger;
      */
     @Override
     public void actionPerformed(ActionEvent e) {
-        Logger.noteAction(this.getClass());
-
         UpdateRecentCases.hasRecentCase = false;
 
         recentCases.clear();
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/RecentItems.java b/Core/src/org/sleuthkit/autopsy/casemodule/RecentItems.java
index 59cb40f9fd..f27facd68a 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/RecentItems.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/RecentItems.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011 Basis Technology Corp.
+ * Copyright 2011-2014 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,7 +26,6 @@ import java.io.File;
 import java.util.logging.Level;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
-
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 
@@ -53,8 +52,6 @@ class RecentItems implements ActionListener {
      */
     @Override
     public void actionPerformed(ActionEvent e) {
-        Logger.noteAction(this.getClass());
-        
         // check if the file exists
         if(caseName.equals("") || casePath.equals("") || (!new File(casePath).exists())){
             // throw an error here
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/AboutWindowAction.java b/Core/src/org/sleuthkit/autopsy/corecomponents/AboutWindowAction.java
index 1ecea43720..b580ab7eba 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/AboutWindowAction.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/AboutWindowAction.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011 Basis Technology Corp.
+ * Copyright 2011-2014 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,7 +23,6 @@ import org.openide.util.NbBundle;
 import org.netbeans.core.actions.AboutAction;
 import org.openide.DialogDescriptor;
 import org.openide.DialogDisplayer;
-import org.sleuthkit.autopsy.coreutils.Logger;
 
 /**
  * Action to open custom implementation of the "About" window from the Help menu.
@@ -32,8 +31,6 @@ import org.sleuthkit.autopsy.coreutils.Logger;
 
     @Override
     public void performAction() {
-        Logger.noteAction(this.getClass());
-
         AboutWindowPanel pip = new AboutWindowPanel();
         DialogDescriptor descriptor = new DialogDescriptor(
                 pip,
diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/Logger.java b/Core/src/org/sleuthkit/autopsy/coreutils/Logger.java
index 032994c8cf..1a239cddb5 100644
--- a/Core/src/org/sleuthkit/autopsy/coreutils/Logger.java
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/Logger.java
@@ -22,151 +22,104 @@ import java.io.IOException;
 import java.util.logging.*;
 
 /**
- * Custom Autopsy logger wrapper over java.util.logging.Logger with default file
- * streams logging to autopsy.log (general high level messages),
- * autopsy_traces.log (also including exception traces). In development build,
- * those are also redirected to console / messages log.
- *
- * Contains a utility method to log user actions to autopsy_actions.log via
- * noteAction()
- *
- * Use like java.util.logging.Logger API, get a
- * org.sleuthkit.autopsy.coreutils.Logger handle using factory method
- * org.sleuthkit.autopsy.coreutils.Logger.getLogger(String name) passing
- * component/module/class name.
- *
- * If logging behavior is to be customized, you can add or remove handlers or
- * filters from the provided Logger object.
+ * Autopsy specialization of the Java Logger class with custom file handlers.
  */
-public class Logger extends java.util.logging.Logger {
+public final class Logger extends java.util.logging.Logger {
 
     private static final String LOG_ENCODING = PlatformUtil.getLogFileEncoding();
     private static final String LOG_DIR = PlatformUtil.getLogDirectory();
-    static final int LOG_SIZE = 0; // in bytes, zero is unlimited
-    static final int LOG_FILE_COUNT = 10;
-    //File Handlers which point to the output logs
-    private static final FileHandler traces = initTraces();
-    private static final FileHandler normal = initNormal();
+    private static final int LOG_SIZE = 0; // In bytes, zero is unlimited
+    private static final int LOG_FILE_COUNT = 10;
+    private static final String LOG_WITHOUT_STACK_TRACES = "autopsy.log"; //NON-NLS
+    private static final String LOG_WITH_STACK_TRACES = "autopsy_traces.log"; //NON-NLS
+    private static final FileHandler userFriendlyLogFile = createFileHandler(LOG_WITHOUT_STACK_TRACES);
+    private static final FileHandler developersLogFile = createFileHandler(LOG_WITH_STACK_TRACES);
     private static final Handler console = new java.util.logging.ConsoleHandler();
-    private static final java.util.logging.Logger actionsLogger = initActionsLogger();
-    /**
-     * Main messages log file name
-     */
-    public static final String messagesLog = "autopsy.log"; //NON-NLS
-    /**
-     * Detailed exception trace log file name
-     */
-    public static final String tracesLog = "autopsy_traces.log"; //NON-NLS
-    /**
-     * Action logger file name
-     */
-    public static final String actionsLog = "autopsy_actions.log"; //NON-NLS
-
-    /**
-     * Static blocks to get around compile errors such as "variable might not
-     * have been initialized
-     *
-     */
-    //<editor-fold defaultstate="visible" desc="static block initializers">
-    private static FileHandler initTraces() {
 
+    private static FileHandler createFileHandler(String fileName) {
         try {
-
-            FileHandler f = new FileHandler(LOG_DIR + tracesLog, LOG_SIZE, LOG_FILE_COUNT);
+            FileHandler f = new FileHandler(LOG_DIR + fileName, LOG_SIZE, LOG_FILE_COUNT);
             f.setEncoding(LOG_ENCODING);
             f.setFormatter(new SimpleFormatter());
             return f;
         } catch (IOException e) {
-            throw new RuntimeException("Error initializing traces logger", e); //NON-NLS
+            throw new RuntimeException("Error initializing " + fileName + " file handler", e); //NON-NLS
         }
     }
 
-    private static FileHandler initNormal() {
-        try {
-            FileHandler f = new FileHandler(LOG_DIR + messagesLog, LOG_SIZE, LOG_FILE_COUNT);
-            f.setEncoding(LOG_ENCODING);
-            f.setFormatter(new SimpleFormatter());
-            return f;
-        } catch (IOException e) {
-            throw new RuntimeException("Error initializing normal logger", e); //NON-NLS
-        }
-    }
-
-    private static java.util.logging.Logger initActionsLogger() {
-        try {
-            FileHandler f = new FileHandler(LOG_DIR + actionsLog, LOG_SIZE, LOG_FILE_COUNT);
-            f.setEncoding(LOG_ENCODING);
-            f.setFormatter(new SimpleFormatter());
-            java.util.logging.Logger _actionsLogger = java.util.logging.Logger.getLogger("Actions"); //NON-NLS
-            _actionsLogger.setUseParentHandlers(false);
-            _actionsLogger.addHandler(f);
-            _actionsLogger.addHandler(console);
-            return _actionsLogger;
-        } catch (IOException e) {
-            throw new RuntimeException("Error initializing actions logger", e); //NON-NLS
-        }
-    }
-
-    //</editor-fold>
-    private Logger(java.util.logging.Logger log) {
-        super(log.getName(), log.getResourceBundleName());
-        //do forward to messages, so that IDE window shows them
-        if (Version.getBuildType() == Version.Type.DEVELOPMENT) {
-            addHandler(console);
-        }
-        setUseParentHandlers(false); //do not forward to parent logger, sharing static handlers anyway
-        //addHandler(new AutopsyExceptionHandler());
-        addHandler(normal);
-        addHandler(traces);
-    }
-
-    /**
-     * Log an action to autopsy_actions.log
-     *
-     * @param actionClass class where user triggered action occurs
-     */
-    public static void noteAction(Class<?> actionClass) {
-        actionsLogger.log(Level.INFO, "Action performed: {0}", actionClass.getName()); //NON-NLS
-    }
-
     /**
      * Factory method to retrieve a org.sleuthkit.autopsy.coreutils.Logger
-     * instance The logger logs by default to autopsy.log and
-     * autopsy_traces.log. Add/remove handlers if the desired behavior should be
-     * different.
+     * instance derived from java.util.logging.Logger. Hides the base class
+     * factory method.
      *
-     * @param name ID for the logger or empty string for a root logger
+     * @param name A name for the logger. This should be a dot-separated name
+     * and should normally be based on the package name or class name.
      * @return org.sleuthkit.autopsy.coreutils.Logger instance
      */
     public static Logger getLogger(String name) {
-        Logger l = new Logger(java.util.logging.Logger.getLogger(name));
-        return l;
+        return new Logger(java.util.logging.Logger.getLogger(name));
     }
 
     /**
      * Factory method to retrieve a org.sleuthkit.autopsy.coreutils.Logger
-     * instance
+     * instance derived from java.util.logging.Logger. Hides the base class
+     * factory method.
      *
-     * @param name ID for the logger or empty string for a root logger
-     * @param resourceBundleName bundle name associated with the logger
+     * @param name A name for the logger. This should be a dot-separated name
+     * and should normally be based on the package name or class name.
+     * @param resourceBundleName - name of ResourceBundle to be used for
+     * localizing messages for this logger. May be null if none of the messages
+     * require localization.
      * @return org.sleuthkit.autopsy.coreutils.Logger instance
      */
     public static Logger getLogger(String name, String resourceBundleName) {
-        return new Logger(Logger.getLogger(name, resourceBundleName));
+        return new Logger(java.util.logging.Logger.getLogger(name));
+    }
+
+    private Logger(java.util.logging.Logger log) {
+        super(log.getName(), log.getResourceBundleName());
+        if (Version.getBuildType() == Version.Type.DEVELOPMENT) {
+            addHandler(console);
+        }
+        setUseParentHandlers(false);
+        addHandler(userFriendlyLogFile);
+        addHandler(developersLogFile);
     }
 
     @Override
     public void log(Level level, String message, Throwable thrown) {
-        super.log(level, "{0}\nException:  {1}", new Object[]{message, thrown.toString()}); //NON-NLS
-        removeHandler(normal);
+        logUserFriendlyOnly(level, message, thrown);
+        removeHandler(userFriendlyLogFile);
         super.log(level, message, thrown);
-        addHandler(normal);
+        addHandler(userFriendlyLogFile);
     }
 
+    @Override
+    public void logp(Level level, String sourceClass, String sourceMethod, String message, Throwable thrown) {
+        logUserFriendlyOnly(level, message, thrown);
+        removeHandler(userFriendlyLogFile);
+        super.logp(level, sourceClass, sourceMethod, message, thrown);
+        addHandler(userFriendlyLogFile);
+    }
+
+    @Override
+    public void logrb(Level level, String sourceClass, String sourceMethod, String bundleName, String message, Throwable thrown) {
+        logUserFriendlyOnly(level, message, thrown);
+        removeHandler(userFriendlyLogFile);
+        super.logrb(level, sourceClass, sourceMethod, bundleName, message, thrown);
+        addHandler(userFriendlyLogFile);
+    }
+
+    private void logUserFriendlyOnly(Level level, String message, Throwable thrown) {
+        removeHandler(developersLogFile);
+        super.log(level, "{0}\nException:  {1}", new Object[]{message, thrown.toString()}); //NON-NLS
+        addHandler(developersLogFile);        
+    }
+    
     @Override
     public void throwing(String sourceClass, String sourceMethod, Throwable thrown) {
-        removeHandler(normal);
+        removeHandler(userFriendlyLogFile);
         super.throwing(sourceClass, sourceMethod, thrown);
-        addHandler(normal);
+        addHandler(userFriendlyLogFile);
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/ChangeViewAction.java b/Core/src/org/sleuthkit/autopsy/directorytree/ChangeViewAction.java
index 751948690f..59730b9133 100644
--- a/Core/src/org/sleuthkit/autopsy/directorytree/ChangeViewAction.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/ChangeViewAction.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011 Basis Technology Corp.
+ * Copyright 2011-2014 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,7 +28,6 @@ import org.openide.util.actions.Presenter;
 import org.sleuthkit.autopsy.corecomponents.DataContentTopComponent;
 import org.sleuthkit.autopsy.corecomponents.DataContentViewerHex;
 import org.sleuthkit.autopsy.corecomponents.DataContentViewerString;
-import org.sleuthkit.autopsy.coreutils.Logger;
 
 /**
  * The actions to change between the "Hex View" and "String View".
@@ -57,8 +56,6 @@ import org.sleuthkit.autopsy.coreutils.Logger;
      */
     @Override
     public void actionPerformed(ActionEvent e) {
-        Logger.noteAction(this.getClass());
-
         DataContentTopComponent dctc = DataContentTopComponent.findInstance();
         int totalTabs = dctc.getTabPanels().getTabCount();
 
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/CollapseAction.java b/Core/src/org/sleuthkit/autopsy/directorytree/CollapseAction.java
index 9d27a8a20d..87bad119d2 100644
--- a/Core/src/org/sleuthkit/autopsy/directorytree/CollapseAction.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/CollapseAction.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011 Basis Technology Corp.
+ * Copyright 2011-2014 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,7 +24,6 @@ import org.openide.explorer.ExplorerManager;
 import org.openide.explorer.view.BeanTreeView;
 import org.openide.nodes.Children;
 import org.openide.nodes.Node;
-import org.sleuthkit.autopsy.coreutils.Logger;
 
 /**
  *
@@ -38,8 +37,6 @@ class CollapseAction extends AbstractAction {
 
     @Override
     public void actionPerformed(ActionEvent e) {
-        Logger.noteAction(this.getClass());
-
         ExplorerManager em = DirectoryTreeTopComponent.findInstance().getExplorerManager();
         Node[] selectedNode = em.getSelectedNodes();
 
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/ExplorerNodeActionVisitor.java b/Core/src/org/sleuthkit/autopsy/directorytree/ExplorerNodeActionVisitor.java
index d4bdbc0425..e3ce4831ac 100755
--- a/Core/src/org/sleuthkit/autopsy/directorytree/ExplorerNodeActionVisitor.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/ExplorerNodeActionVisitor.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011 - 2013 Basis Technology Corp.
+ * Copyright 2011-2014 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -54,7 +54,7 @@ public class ExplorerNodeActionVisitor extends ContentVisitor.Default<List<? ext
     private static ExplorerNodeActionVisitor instance = new ExplorerNodeActionVisitor();
 
     public static List<Action> getActions(Content c) {
-        List<Action> actions = new ArrayList<Action>();
+        List<Action> actions = new ArrayList<>();
 
         actions.addAll(c.accept(instance));
         //TODO: fix this
@@ -81,7 +81,7 @@ public class ExplorerNodeActionVisitor extends ContentVisitor.Default<List<? ext
 
     @Override
     public List<? extends Action> visit(final Image img) {
-        List<Action> lst = new ArrayList<Action>();
+        List<Action> lst = new ArrayList<>();
         lst.add(new ImageDetails(
                 NbBundle.getMessage(this.getClass(), "ExplorerNodeActionVisitor.action.imgDetails.title"), img));
         //TODO lst.add(new ExtractAction("Extract Image", img));
@@ -98,7 +98,7 @@ public class ExplorerNodeActionVisitor extends ContentVisitor.Default<List<? ext
 
     @Override
     public List<? extends Action> visit(final Volume vol) {
-        List<AbstractAction> lst = new ArrayList<AbstractAction>();
+        List<AbstractAction> lst = new ArrayList<>();
         lst.add(new VolumeDetails(
                 NbBundle.getMessage(this.getClass(), "ExplorerNodeActionVisitor.action.volumeDetails.title"), vol));
         lst.add(new ExtractUnallocAction(
@@ -171,12 +171,9 @@ public class ExplorerNodeActionVisitor extends ContentVisitor.Default<List<? ext
 
         @Override
         public void actionPerformed(ActionEvent e) {
-            Logger.noteAction(ExplorerNodeActionVisitor.class);
-
             final JFrame frame = new JFrame(title);
             final JDialog popUpWindow = new JDialog(frame, title, true); // to make the popUp Window to be modal
 
-
             Dimension screenDimension = Toolkit.getDefaultToolkit().getScreenSize();
 
             // set the popUp window / JFrame
@@ -239,8 +236,6 @@ public class ExplorerNodeActionVisitor extends ContentVisitor.Default<List<? ext
 
         @Override
         public void actionPerformed(ActionEvent e) {
-            Logger.noteAction(ExplorerNodeActionVisitor.class);
-
             final JFrame frame = new JFrame(title);
             final JDialog popUpWindow = new JDialog(frame, title, true); // to make the popUp Window to be modal
             // if we select the Image Details menu
@@ -315,8 +310,6 @@ public class ExplorerNodeActionVisitor extends ContentVisitor.Default<List<? ext
         public void actionPerformed(ActionEvent e) {
             Dimension screenDimension = Toolkit.getDefaultToolkit().getScreenSize();
 
-            Logger.noteAction(ExplorerNodeActionVisitor.class);
-
             final JFrame frame = new JFrame(title);
             final JDialog popUpWindow = new JDialog(frame, title, true); // to make the popUp Window to be modal
 
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/ExternalViewerAction.java b/Core/src/org/sleuthkit/autopsy/directorytree/ExternalViewerAction.java
index 1f8062523b..3a177d9f88 100644
--- a/Core/src/org/sleuthkit/autopsy/directorytree/ExternalViewerAction.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/ExternalViewerAction.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011 Basis Technology Corp.
+ * Copyright 2011-2014 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -29,7 +29,6 @@ import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.datamodel.ContentUtils;
 
-
 /**
  * Extracts a File object to a temporary file in the case directory, and then
  * tries to open it in the user's system with the default associated
@@ -70,8 +69,6 @@ public class ExternalViewerAction extends AbstractAction {
 
     @Override
     public void actionPerformed(ActionEvent e) {
-        Logger.noteAction(this.getClass());
-
         // Get the temp folder path of the case
         String tempPath = Case.getCurrentCase().getTempDirectory();
         tempPath = tempPath + File.separator + this.fileObject.getName();
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/NewWindowViewAction.java b/Core/src/org/sleuthkit/autopsy/directorytree/NewWindowViewAction.java
index 8a76e0a5e7..6bbcfb781a 100644
--- a/Core/src/org/sleuthkit/autopsy/directorytree/NewWindowViewAction.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/NewWindowViewAction.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011 Basis Technology Corp.
+ * Copyright 2011-2014 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -47,8 +47,6 @@ public class NewWindowViewAction extends AbstractAction{
 
     @Override
     public void actionPerformed(ActionEvent e) {
-        Logger.noteAction(this.getClass());
-        
         String name = "DataContent"; //NON-NLS
         String s = contentNode.getLookup().lookup(String.class);
         if (s != null) {

From f8419c56e5b72eb720eff3337d009894aec90626 Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Wed, 7 May 2014 16:09:58 -0400
Subject: [PATCH 21/24] Add non-validating load doc method to XSDUtil

---
 .../sleuthkit/autopsy/coreutils/XMLUtil.java  | 153 +++++++++---------
 .../ingest/IngestPipelinesConfiguration.java  |   2 +-
 .../fileextmismatch/FileExtMismatchXML.java   |   4 +-
 .../autopsy/hashdatabase/HashDbManager.java   |   2 +-
 .../keywordsearch/KeywordSearchListsXML.java  |   2 +-
 5 files changed, 84 insertions(+), 79 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/XMLUtil.java b/Core/src/org/sleuthkit/autopsy/coreutils/XMLUtil.java
index 5b87e0ce42..3d95d8e529 100644
--- a/Core/src/org/sleuthkit/autopsy/coreutils/XMLUtil.java
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/XMLUtil.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2012 Basis Technology Corp.
+ * Copyright 2012-2014 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -45,114 +45,120 @@ import javax.xml.validation.Validator;
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
 
-/** 
+/**
  * XML Utilities
- * 
+ *
  * This class provides basic utilities for working with XML files, such as
- *  -Validating XML files against a given schema
- *  -Saving documents to disk
- *  -Loading documents from disk
- * 
+ * -Validating XML files against a given schema -Saving documents to disk
+ * -Loading documents from disk
  */
-
 public class XMLUtil {
+
     /**
      * Utility to validate XML files against pre-defined schema files.
-     * 
-     *  The schema files are extracted automatically when this function is called, the XML being validated is not.
-     *  Be sure the XML file is already extracted otherwise it will return false.
+     *
+     * The schema files are extracted automatically when this function is
+     * called, the XML being validated is not. Be sure the XML file is already
+     * extracted otherwise it will return false.
+     *
      * @param xmlfile The XML file to validate, in DOMSource format
      * @param clazz class frm package to extract schema file from
-     * @param schemaFile The file name of the schema to validate against, must exist as a resource in the same package as where this function is being called.
-     * 
-     * For example usages, please see KeywordSearchListsXML, HashDbXML, or IngestModuleLoader.
-     * 
+     * @param schemaFile The file name of the schema to validate against, must
+     * exist as a resource in the same package as where this function is being
+     * called.
+     *
+     * For example usages, please see KeywordSearchListsXML, HashDbXML, or
+     * IngestModuleLoader.
+     *
      */
     public static <T> boolean xmlIsValid(DOMSource xmlfile, Class<T> clazz, String schemaFile) {
-      try{
-        PlatformUtil.extractResourceToUserConfigDir(clazz, schemaFile, false);
-        File schemaLoc = new File(PlatformUtil.getUserConfigDirectory() + File.separator + schemaFile);
-        SchemaFactory schm = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
-        try{
-        Schema schema = schm.newSchema(schemaLoc);
-        Validator validator = schema.newValidator();
-        DOMResult result = new DOMResult();
-        validator.validate(xmlfile, result);
-        return true;
-        }
-        catch(SAXException e){
-            Logger.getLogger(clazz.getName()).log(Level.WARNING, "Unable to validate XML file.", e); //NON-NLS
-            return false;
-        }
-      }
-      catch(IOException e){
-           Logger.getLogger(clazz.getName()).log(Level.WARNING, "Unable to load XML file [" + xmlfile.toString() + "] of type ["+schemaFile+"]", e); //NON-NLS
+        try {
+            PlatformUtil.extractResourceToUserConfigDir(clazz, schemaFile, false);
+            File schemaLoc = new File(PlatformUtil.getUserConfigDirectory() + File.separator + schemaFile);
+            SchemaFactory schm = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+            try {
+                Schema schema = schm.newSchema(schemaLoc);
+                Validator validator = schema.newValidator();
+                DOMResult result = new DOMResult();
+                validator.validate(xmlfile, result);
+                return true;
+            } catch (SAXException e) {
+                Logger.getLogger(clazz.getName()).log(Level.WARNING, "Unable to validate XML file.", e); //NON-NLS
+                return false;
+            }
+        } catch (IOException e) {
+            Logger.getLogger(clazz.getName()).log(Level.WARNING, "Unable to load XML file [" + xmlfile.toString() + "] of type [" + schemaFile + "]", e); //NON-NLS
             return false;
         }
     }
-    
+
     /**
      * Evaluates XML files against an XSD.
-     * 
-     *  The schema files are extracted automatically when this function is called, the XML being validated is not.
-     *  Be sure the XML file is already extracted otherwise it will return false.
+     *
+     * The schema files are extracted automatically when this function is
+     * called, the XML being validated is not. Be sure the XML file is already
+     * extracted otherwise it will return false.
+     *
      * @param doc The XML DOM to validate
      * @param clazz class from package to extract schema from
-     * @param type The file name of the schema to validate against, must exist as a resource in the same package as where this function is being called
-     * 
-     * For example usages, please see KeywordSearchListsXML, HashDbXML, or IngestModuleLoader.
-     * 
+     * @param type The file name of the schema to validate against, must exist
+     * as a resource in the same package as where this function is being called
+     *
+     * For example usages, please see KeywordSearchListsXML, HashDbXML, or
+     * IngestModuleLoader.
+     *
      */
-    public static <T> boolean xmlIsValid(Document doc, Class<T> clazz, String type){
-           DOMSource dms = new DOMSource(doc);
-           return xmlIsValid(dms, clazz, type);
+    public static <T> boolean xmlIsValid(Document doc, Class<T> clazz, String type) {
+        DOMSource dms = new DOMSource(doc);
+        return xmlIsValid(dms, clazz, type);
     }
-    
-    
-    
-    /** 
+
+    /**
      * Loads XML files from disk
-     * 
+     *
      * @param clazz the class this method is invoked from
      * @param xmlPath the full path to the file to load
-     * @param xsdPath the full path to the file to validate against
-     * 
      */
-    public static <T> Document loadDoc(Class<T> clazz, String xmlPath, String xsdPath) {
-        DocumentBuilderFactory builderFactory =
-                DocumentBuilderFactory.newInstance();
+    public static <T> Document loadDoc(Class<T> clazz, String xmlPath) {
+        DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
         Document ret = null;
-
         try {
             DocumentBuilder builder = builderFactory.newDocumentBuilder();
-            ret = builder.parse(
-                    new FileInputStream(xmlPath));
+            ret = builder.parse(new FileInputStream(xmlPath));
         } catch (ParserConfigurationException e) {
             Logger.getLogger(clazz.getName()).log(Level.SEVERE, "Error loading XML file: can't initialize parser.", e); //NON-NLS
-
         } catch (SAXException e) {
             Logger.getLogger(clazz.getName()).log(Level.SEVERE, "Error loading XML file: can't parse XML.", e); //NON-NLS
-
         } catch (IOException e) {
             //error reading file
             Logger.getLogger(clazz.getName()).log(Level.SEVERE, "Error loading XML file: can't read file.", e); //NON-NLS
-
         }
-        if (!XMLUtil.xmlIsValid(ret, clazz, xsdPath)) {
-            Logger.getLogger(clazz.getName()).log(Level.SEVERE, "Error loading XML file: could not validate against [" + xsdPath + "], results may not be accurate"); //NON-NLS
-        }
-
         return ret;
     }
-    
-    /** 
+
+    /**
+     * Loads XML files from disk
+     *
+     * @param clazz the class this method is invoked from
+     * @param xmlPath the full path to the file to load
+     * @param xsdPath the full path to the file to validate against
+     */
+    public static <T> Document loadDoc(Class<T> clazz, String xmlPath, String xsdPath) {
+        DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
+        Document ret = loadDoc(clazz, xmlPath);
+        if (!XMLUtil.xmlIsValid(ret, clazz, xsdPath)) {
+            Logger.getLogger(clazz.getName()).log(Level.WARNING, "Error loading XML file: could not validate against [{0}], results may not be accurate", xsdPath); //NON-NLS
+        }
+        return ret;
+    }
+
+    /**
      * Saves XML files to disk
-     * 
+     *
      * @param clazz the class this method is invoked from
      * @param xmlPath the full path to save the XML to
      * @param encoding to encoding, such as "UTF-8", to encode the file with
      * @param doc the document to save
-     * 
      */
     public static <T> boolean saveDoc(Class<T> clazz, String xmlPath, String encoding, final Document doc) {
         TransformerFactory xf = TransformerFactory.newInstance();
@@ -166,11 +172,11 @@ public class XMLUtil {
             xformer.setOutputProperty(OutputKeys.STANDALONE, "yes"); //NON-NLS
             xformer.setOutputProperty(OutputKeys.VERSION, "1.0");
             File file = new File(xmlPath);
-            FileOutputStream stream = new FileOutputStream(file);
-            Result out = new StreamResult(new OutputStreamWriter(stream, encoding));
-            xformer.transform(new DOMSource(doc), out);
-            stream.flush();
-            stream.close();
+            try (FileOutputStream stream = new FileOutputStream(file)) {
+                Result out = new StreamResult(new OutputStreamWriter(stream, encoding));
+                xformer.transform(new DOMSource(doc), out);
+                stream.flush();
+            }
             success = true;
 
         } catch (UnsupportedEncodingException e) {
@@ -186,5 +192,4 @@ public class XMLUtil {
         }
         return success;
     }
-    
 }
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestPipelinesConfiguration.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestPipelinesConfiguration.java
index 5e9a7dce4c..d829a7e300 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestPipelinesConfiguration.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestPipelinesConfiguration.java
@@ -89,7 +89,7 @@ final class IngestPipelinesConfiguration {
             PlatformUtil.extractResourceToUserConfigDir(IngestPipelinesConfiguration.class, PIPELINES_CONFIG_FILE, overWrite);
 
             String configFilePath = PlatformUtil.getUserConfigDirectory() + File.separator + PIPELINES_CONFIG_FILE;
-            Document doc = XMLUtil.loadDoc(IngestPipelinesConfiguration.class, configFilePath, PIPELINES_CONFIG_FILE_XSD);
+            Document doc = XMLUtil.loadDoc(IngestPipelinesConfiguration.class, configFilePath);
             if (doc == null) {
                 return;
             }
diff --git a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchXML.java b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchXML.java
index 558e78990f..1a955a1872 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchXML.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchXML.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011 - 2013 Basis Technology Corp.
+ * Copyright 2011-2014 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -89,7 +89,7 @@ class FileExtMismatchXML {
         
         try
         {
-            final Document doc = XMLUtil.loadDoc(FileExtMismatchXML.class, filePath, XSDFILE);
+            final Document doc = XMLUtil.loadDoc(FileExtMismatchXML.class, filePath);
             if (doc == null) {
                 return null;
             }
diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbManager.java b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbManager.java
index 19250cd4a3..7aa31414be 100755
--- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbManager.java
+++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbManager.java
@@ -554,7 +554,7 @@ public class HashDbManager implements PropertyChangeListener {
         boolean updatedSchema = false;
 
         // Open the XML document that implements the configuration file.
-        final Document doc = XMLUtil.loadDoc(HashDbManager.class, configFilePath, XSD_FILE_NAME);
+        final Document doc = XMLUtil.loadDoc(HashDbManager.class, configFilePath);
         if (doc == null) {
             return false;
         }
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsXML.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsXML.java
index 42e3650270..3be121acaa 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsXML.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsXML.java
@@ -147,7 +147,7 @@ final class KeywordSearchListsXML extends KeywordSearchListsAbstract {
      */
     @Override
     public boolean load() {
-        final Document doc = XMLUtil.loadDoc(KeywordSearchListsXML.class, filePath, XSDFILE);
+        final Document doc = XMLUtil.loadDoc(KeywordSearchListsXML.class, filePath);
         if (doc == null) {
             return false;
         }

From 19a40c9afbc01a073a41fa1450edd3aa5990673e Mon Sep 17 00:00:00 2001
From: Nick Davis <nick.davis@narfindustries.com>
Date: Wed, 7 May 2014 18:58:06 -0400
Subject: [PATCH 22/24] Marked string as NON-NLS

---
 Core/src/org/sleuthkit/autopsy/datamodel/FileTypeChildren.java | 2 +-
 c:casesSamll2Againautopsy.db                                   | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100755 c:casesSamll2Againautopsy.db

diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeChildren.java b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeChildren.java
index 463efc547b..29c1306a23 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeChildren.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeChildren.java
@@ -80,7 +80,7 @@ public class FileTypeChildren extends ChildFactory<Content> {
         if (UserPreferences.hideKnownFilesInViewsTree()) {
             query.append(" AND (known IS NULL OR known != ").append(TskData.FileKnown.KNOWN.getFileKnownValue()).append(")"); //NON-NLS
         }
-        query.append(" AND (0");
+        query.append(" AND (0"); //NON-NLS
         for(String s : filter.getFilter()){
             query.append(" OR name LIKE '%").append(s).append("'"); //NON-NLS
         }
diff --git a/c:casesSamll2Againautopsy.db b/c:casesSamll2Againautopsy.db
deleted file mode 100755
index e69de29bb2..0000000000

From 30cf8e6fa03cdcb5e7759c8c15c66e095e1f6082 Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Thu, 8 May 2014 11:07:30 -0400
Subject: [PATCH 23/24] Remove inadvertantly controlled file

---
 c:casesSamll2Againautopsy.db | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100755 c:casesSamll2Againautopsy.db

diff --git a/c:casesSamll2Againautopsy.db b/c:casesSamll2Againautopsy.db
deleted file mode 100755
index e69de29bb2..0000000000

From 2708079f82f8a9f780518be681ccd4944182251d Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Thu, 8 May 2014 11:24:26 -0400
Subject: [PATCH 24/24] Convert string buffer from instance to locla variable
 in AbstractFileStringExtract

---
 .../keywordsearch/AbstractFileStringExtract.java     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringExtract.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringExtract.java
index 65ef4c31a1..1f6614ba28 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringExtract.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringExtract.java
@@ -44,12 +44,11 @@ class AbstractFileStringExtract implements AbstractFileExtract {
     private static final int BOM_LEN = 0;  //disabled prepending of BOM
     private static final Charset INDEX_CHARSET = Server.DEFAULT_INDEXED_TEXT_CHARSET;
     private static final SCRIPT DEFAULT_SCRIPT = SCRIPT.LATIN_2;
-    private final byte[] stringChunkBuf = new byte[(int) MAX_STRING_CHUNK_SIZE];
     private KeywordSearchIngestModule module;
     private AbstractFile sourceFile;
     private int numChunks = 0;
-    private final List<SCRIPT> extractScripts = new ArrayList<SCRIPT>();
-    private Map<String, String> extractOptions = new HashMap<String, String>();   
+    private final List<SCRIPT> extractScripts = new ArrayList<>();
+    private Map<String, String> extractOptions = new HashMap<>();   
 
     //disabled prepending of BOM
     //static {
@@ -73,7 +72,7 @@ class AbstractFileStringExtract implements AbstractFileExtract {
 
     @Override
     public List<SCRIPT> getScripts() {
-        return new ArrayList<SCRIPT>(extractScripts);
+        return new ArrayList<>(extractScripts);
     }
 
     @Override
@@ -114,7 +113,7 @@ class AbstractFileStringExtract implements AbstractFileExtract {
             return true;
         }
 
-        InputStream stringStream = null;
+        InputStream stringStream;
         //check which extract stream to use
         if (extractScripts.size() == 1 && extractScripts.get(0).equals(SCRIPT.LATIN_1)) {
             //optimal for english, english only
@@ -129,7 +128,8 @@ class AbstractFileStringExtract implements AbstractFileExtract {
             success = true;
             //break input stream into chunks 
 
-            long readSize = 0;
+            final byte[] stringChunkBuf = new byte[(int) MAX_STRING_CHUNK_SIZE];
+            long readSize;
             while ((readSize = stringStream.read(stringChunkBuf, BOM_LEN, (int) MAX_STRING_CHUNK_SIZE - BOM_LEN)) != -1) {
                 //FileOutputStream debug = new FileOutputStream("c:\\temp\\" + sourceFile.getName() + Integer.toString(this.numChunks+1));
                 //debug.write(stringChunkBuf, 0, (int)readSize);