From 2db0e6a602210b74151abc211eadabaa401e6cf9 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Mon, 5 Nov 2018 10:23:50 -0500
Subject: [PATCH] Changed layer.xml so that report is instanciated

---
 Core/src/org/sleuthkit/autopsy/core/layer.xml            | 5 +++++
 Core/src/org/sleuthkit/autopsy/report/Bundle.properties  | 1 +
 Core/src/org/sleuthkit/autopsy/report/ReportCaseUco.java | 4 ++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/core/layer.xml b/Core/src/org/sleuthkit/autopsy/core/layer.xml
index 8bdde0f317..d87c169930 100644
--- a/Core/src/org/sleuthkit/autopsy/core/layer.xml
+++ b/Core/src/org/sleuthkit/autopsy/core/layer.xml
@@ -337,6 +337,11 @@
             <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.modules.stix.STIXReportModule.getDefault"/>
             <attr name="position" intvalue="910"/>
         </file>
+        <file name="org-sleuthkit-autopsy-report-ReportCaseUco.instance">
+            <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.GeneralReportModule"/>
+            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.ReportCaseUco.getDefault"/>
+            <attr name="position" intvalue="911"/>
+        </file>       
         <!--<folder name="JavaHelp">
             <file name="casemodule-helpset.xml" url="casemodule-helpset.xml">
                 <attr name="position" intvalue="3075"/>
diff --git a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties
index fc46085825..3f2048b72c 100644
--- a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties
@@ -45,6 +45,7 @@ ReportBodyFile.progress.processing=Now processing {0}...
 ReportBodyFile.getName.text=TSK Body File
 ReportBodyFile.getDesc.text=Body file format report with MAC times for every file. This format can be used for a timeline view.
 ReportBodyFile.getFilePath.text=BodyFile.txt
+ReportCaseUco.progress.initializing=Creating directories...
 ReportCaseUco.progress.querying=Querying files...
 ReportCaseUco.ingestWarning.text=Warning, this report was run before ingest services completed\!
 ReportCaseUco.progress.loading=Loading files...
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportCaseUco.java b/Core/src/org/sleuthkit/autopsy/report/ReportCaseUco.java
index c8aa328983..e9ab19b43a 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportCaseUco.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportCaseUco.java
@@ -32,7 +32,6 @@ import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonGenerator;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import org.openide.util.Exceptions;
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
@@ -89,7 +88,7 @@ class ReportCaseUco implements GeneralReportModule {
         }
         progressPanel.setIndeterminate(false);
         progressPanel.start();
-        progressPanel.updateStatusLabel(NbBundle.getMessage(this.getClass(), "ReportCaseUco.progress.querying"));
+        progressPanel.updateStatusLabel(NbBundle.getMessage(this.getClass(), "ReportCaseUco.progress.initializing"));
         
         // Create the JSON generator
         jsonGeneratorFactory = new JsonFactory();
@@ -110,6 +109,7 @@ class ReportCaseUco implements GeneralReportModule {
         try {
             masterCatalog = jsonGeneratorFactory.createGenerator(reportFile, JsonEncoding.UTF8);
             
+            progressPanel.updateStatusLabel(NbBundle.getMessage(this.getClass(), "ReportCaseUco.progress.querying"));
             // exclude non-fs files/dirs and . and .. files
             final String query = "select obj_id, name, size, ctime, crtime, atime, mtime, md5, parent_path, mime_type, extension from tsk_files where type = " + TskData.TSK_DB_FILES_TYPE_ENUM.FS.getFileType() //NON-NLS
                     + " AND name != '.' AND name != '..'"; //NON-NLS