From 8c50c9b23df5b6b878f391a9a31da8909570c409 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Tue, 7 May 2019 11:29:30 -0400
Subject: [PATCH 001/192] First cut at storing commands and passing them around

---
 .../commandlineingest/CommandLineCommand.java | 48 +++++++++++++++
 .../CommandLineIngestManager.java             |  3 +
 .../CommandLineOptionProcessor.java           | 60 +++++++++++++++----
 3 files changed, 98 insertions(+), 13 deletions(-)
 create mode 100755 Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java
new file mode 100755
index 0000000000..e72d444189
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java
@@ -0,0 +1,48 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2019-2019 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.commandlineingest;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Class that contains list of input parameters passed in via command line.
+ */
+class CommandLineCommand {
+    
+    /**
+     * An enumeration of command types.
+     */
+    static enum CommandType {        
+        CREATE_CASE,
+        ADD_DATA_SOURCE,
+        RUN_INGEST;
+    }
+    
+    CommandType type;
+    Map<String, String> commands = new HashMap<>();
+    
+    CommandLineCommand(CommandType type) {
+        this.type = type;
+    }
+    
+    void addInputValue(String inputName, String inputValue) {
+        commands.put(inputName, inputValue);
+    }
+}
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
index bbe14c0020..e788c929e2 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
@@ -108,6 +108,7 @@ public class CommandLineIngestManager {
                 LOGGER.log(Level.INFO, "Autopsy is running from command line"); //NON-NLS
                 String dataSourcePath = "";
                 String baseCaseName = "";
+                List<CommandLineCommand> commands;
 
                 // first look up all OptionProcessors and get input data from CommandLineOptionProcessor
                 Collection<? extends OptionProcessor> optionProcessors = Lookup.getDefault().lookupAll(OptionProcessor.class);
@@ -119,6 +120,8 @@ public class CommandLineIngestManager {
                         // check if we are running from command line
                         dataSourcePath = ((CommandLineOptionProcessor) processor).getPathToDataSource();
                         baseCaseName = ((CommandLineOptionProcessor) processor).getBaseCaseName();
+                        
+                        commands = ((CommandLineOptionProcessor) processor).getCommands();
                     }
                 }
 
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
index 8b94961fa6..f7eb4e9492 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
@@ -19,7 +19,9 @@
 package org.sleuthkit.autopsy.commandlineingest;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.logging.Level;
@@ -37,18 +39,22 @@ import org.openide.util.lookup.ServiceProvider;
 public class CommandLineOptionProcessor extends OptionProcessor {
 
     private static final Logger logger = Logger.getLogger(CommandLineOptionProcessor.class.getName());
-    private final Option pathToDataSourceOption = Option.optionalArgument('l', "inputPath");
-    private final Option caseNameOption = Option.optionalArgument('2', "caseName");
+    private final Option caseNameOption = Option.optionalArgument('1', "caseName");
+    private final Option caseBaseDirOption = Option.optionalArgument('2', "caseBaseDir");
+    private final Option dataSourcePathOption = Option.optionalArgument('4', "dataSourcePath");    
     private final Option runFromCommandLineOption = Option.optionalArgument('3', "runFromCommandLine");
     private String pathToDataSource;
     private String baseCaseName;
     private boolean runFromCommandLine = false;
+    
+    private List<CommandLineCommand> commands = new ArrayList<>();
 
     @Override
     protected Set<Option> getOptions() {
         Set<Option> set = new HashSet<>();
-        set.add(pathToDataSourceOption);
         set.add(caseNameOption);
+        set.add(caseBaseDirOption);
+        set.add(dataSourcePathOption);
         set.add(runFromCommandLineOption);
         return set;
     }
@@ -57,25 +63,30 @@ public class CommandLineOptionProcessor extends OptionProcessor {
     protected void process(Env env, Map<Option, String[]> values) throws CommandException {
         logger.log(Level.INFO, "Processing Autopsy command line options"); //NON-NLS
         System.out.println("Processing Autopsy command line options");
-        if (values.containsKey(pathToDataSourceOption) && values.containsKey(caseNameOption) && values.containsKey(runFromCommandLineOption)) {
+        if (values.containsKey(caseNameOption) || values.containsKey(caseBaseDirOption) || values.containsKey(dataSourcePathOption) || values.containsKey(runFromCommandLineOption)) {
             // parse input parameters
-            String inputPath;
+            String inputPath = "C:\\TEST\\Inputs\\Small\\small2.img";
             String inputCaseName;
+            String caseBaseDir;
             String modeString;
-            if (values.size() < 3) {
+            String[] argDirs;
+            if (values.size() < 1) { // ELTODO
                 logger.log(Level.SEVERE, "Insufficient number of input arguments to run command line ingest");
                 System.out.println("Insufficient number of input arguments to run command line ingest");
                 this.runFromCommandLine = false;
                 return;
             } else {
-                String[] argDirs = values.get(pathToDataSourceOption);
-                if (argDirs.length < 1) {
-                    logger.log(Level.SEVERE, "Missing argument 'inputPath'");
-                    System.out.println("Missing argument 'inputPath'");
-                    this.runFromCommandLine = false;
-                    return;
+                if (values.containsKey(dataSourcePathOption)) {
+                    argDirs = values.get(dataSourcePathOption);
+                    if (argDirs.length < 1) {
+                        logger.log(Level.SEVERE, "Missing argument 'dataSourcePath'");
+                        System.out.println("Missing argument 'dataSourcePath'");
+                        this.runFromCommandLine = false;
+                        return;
+
+                    }
+                    inputPath = argDirs[0];
                 }
-                inputPath = argDirs[0];
 
                 argDirs = values.get(caseNameOption);
                 if (argDirs.length < 1) {
@@ -86,6 +97,15 @@ public class CommandLineOptionProcessor extends OptionProcessor {
                 }
                 inputCaseName = argDirs[0];
                 
+                argDirs = values.get(caseBaseDirOption);
+                if (argDirs.length < 1) {
+                    logger.log(Level.SEVERE, "Missing argument 'caseBaseDir'");
+                    System.out.println("Missing argument 'caseBaseDir'");
+                    this.runFromCommandLine = false;
+                    return;
+                }
+                caseBaseDir = argDirs[0];                
+                
                 argDirs = values.get(runFromCommandLineOption);
                 if (argDirs.length < 1) {
                     logger.log(Level.SEVERE, "Missing argument 'runFromCommandLine'");
@@ -133,6 +153,11 @@ public class CommandLineOptionProcessor extends OptionProcessor {
             System.out.println("Input file = " + this.pathToDataSource);
             System.out.println("Case name = " + this.baseCaseName);
             System.out.println("runFromCommandLine = " + this.runFromCommandLine);
+            
+            CommandLineCommand newCommand = new CommandLineCommand(CommandLineCommand.CommandType.CREATE_CASE);
+            newCommand.addInputValue("caseName", inputCaseName);
+            newCommand.addInputValue("caseBaseDir", caseBaseDir);
+            commands.add(newCommand);
         } else {
             System.out.println("Missing input arguments to run command line ingest");
             logger.log(Level.SEVERE, "Missing input arguments to run command line ingest");
@@ -165,4 +190,13 @@ public class CommandLineOptionProcessor extends OptionProcessor {
     public boolean isRunFromCommandLine() {
         return runFromCommandLine;
     }    
+
+    /**
+     * Returns list of all commands passed in via command line.
+     * 
+     * @return list of input commands
+     */
+    List<CommandLineCommand> getCommands() {
+        return commands;
+    }
 }

From e0c13c42898489c831ad9b04691c56b78febe72a Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Tue, 7 May 2019 16:54:20 -0400
Subject: [PATCH 002/192] More work on using CL commands

---
 .../commandlineingest/CommandLineCommand.java |  32 +++-
 .../CommandLineIngestManager.java             | 126 ++++++-------
 .../CommandLineOptionProcessor.java           | 178 +++++++-----------
 3 files changed, 151 insertions(+), 185 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java
index e72d444189..3e3505cdff 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java
@@ -25,7 +25,7 @@ import java.util.Map;
  * Class that contains list of input parameters passed in via command line.
  */
 class CommandLineCommand {
-    
+ 
     /**
      * An enumeration of command types.
      */
@@ -35,14 +35,38 @@ class CommandLineCommand {
         RUN_INGEST;
     }
     
-    CommandType type;
-    Map<String, String> commands = new HashMap<>();
+    /**
+     * An enumeration of input types.
+     */
+    static enum InputType {        
+        CASE_NAME,
+        CASES_BASE_DIR_PATH,
+        CASE_FOLDER_DIR_PATH,
+        DATA_SOURCE_DIR_PATH;
+    }
+    
+    private CommandType type;
+    private Map<String, String> inputs = new HashMap<>();
     
     CommandLineCommand(CommandType type) {
         this.type = type;
     }
     
     void addInputValue(String inputName, String inputValue) {
-        commands.put(inputName, inputValue);
+        inputs.put(inputName, inputValue);
     }
+    
+    /**
+     * @return the inputs
+     */
+    public Map<String, String> getInputs() {
+        return inputs;
+    }
+
+    /**
+     * @return the type
+     */
+    public CommandType getType() {
+        return type;
+    }    
 }
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
index e788c929e2..fa505e0534 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
@@ -28,6 +28,7 @@ import java.util.List;
 import java.util.UUID;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.Map;
 import java.util.logging.Level;
 import org.netbeans.spi.sendopts.OptionProcessor;
 import org.openide.LifecycleManager;
@@ -65,7 +66,7 @@ import org.sleuthkit.datamodel.Content;
 public class CommandLineIngestManager {
 
     private static final Logger LOGGER = Logger.getLogger(CommandLineIngestManager.class.getName());
-    private Path rootOutputDirectory;
+    private Case caseForJob = null;
 
     public CommandLineIngestManager() {
     }
@@ -106,9 +107,7 @@ public class CommandLineIngestManager {
             try {
                 // read command line inputs
                 LOGGER.log(Level.INFO, "Autopsy is running from command line"); //NON-NLS
-                String dataSourcePath = "";
-                String baseCaseName = "";
-                List<CommandLineCommand> commands;
+                List<CommandLineCommand> commands = null;
 
                 // first look up all OptionProcessors and get input data from CommandLineOptionProcessor
                 Collection<? extends OptionProcessor> optionProcessors = Lookup.getDefault().lookupAll(OptionProcessor.class);
@@ -117,75 +116,45 @@ public class CommandLineIngestManager {
                     // find CommandLineOptionProcessor
                     OptionProcessor processor = optionsIterator.next();
                     if (processor instanceof CommandLineOptionProcessor) {
-                        // check if we are running from command line
-                        dataSourcePath = ((CommandLineOptionProcessor) processor).getPathToDataSource();
-                        baseCaseName = ((CommandLineOptionProcessor) processor).getBaseCaseName();
-                        
+                        // check if we are running from command line                       
                         commands = ((CommandLineOptionProcessor) processor).getCommands();
                     }
                 }
 
-                LOGGER.log(Level.INFO, "Data source path = {0}", dataSourcePath); //NON-NLS
-                LOGGER.log(Level.INFO, "Case name = {0}", baseCaseName); //NON-NLS
-                System.out.println("Data source path = " + dataSourcePath);
-                System.out.println("Case name = " + baseCaseName);
-
-                // verify inputs
-                if (dataSourcePath.isEmpty()) {
-                    LOGGER.log(Level.SEVERE, "Data source path not specified");
-                    System.out.println("Data source path not specified");
+                if (commands == null || commands.isEmpty()) {
+                    LOGGER.log(Level.SEVERE, "No command line commands specified");
+                    System.out.println("No command line commands specified");
                     return;
                 }
-
-                if (baseCaseName.isEmpty()) {
-                    LOGGER.log(Level.SEVERE, "Case name not specified");
-                    System.out.println("Case name not specified");
-                    return;
-                }
-
-                if (!(new File(dataSourcePath).exists())) {
-                    LOGGER.log(Level.SEVERE, "Data source file not found {0}", dataSourcePath);
-                    System.out.println("Data source file not found " + dataSourcePath);
-                    return;
-                }
-
-                // read options panel configuration
-                String rootOutputDir = UserPreferences.getCommandLineModeResultsFolder();
-                LOGGER.log(Level.INFO, "Output directory = {0}", rootOutputDir); //NON-NLS
-                System.out.println("Output directory = " + rootOutputDir);
-
-                if (rootOutputDir.isEmpty()) {
-                    LOGGER.log(Level.SEVERE, "Output directory not specified, please configure Command Line Options Panel (in Tools -> Options)");
-                    System.out.println("Output directory not specified, please configure Command Line Options Panel (in Tools -> Options)");
-                    return;
-                }
-
-                if (!(new File(rootOutputDir).exists())) {
-                    LOGGER.log(Level.SEVERE, "The output directory doesn't exist {0}", rootOutputDir);
-                    System.out.println("The output directory doesn't exist " + rootOutputDir);
-                    return;
-                }
-                rootOutputDirectory = Paths.get(rootOutputDir);
-
-                // open case
-                Case caseForJob;
+                
                 try {
-                    caseForJob = openCase(baseCaseName);
-                } catch (CaseActionException ex) {
-                    LOGGER.log(Level.SEVERE, "Error creating or opening case " + baseCaseName, ex);
-                    System.out.println("Error creating or opening case " + baseCaseName);
-                    return;
-                }
+                    // Commands are already stored in order in which they should be executed                
+                    for (CommandLineCommand command : commands) {
+                        CommandLineCommand.CommandType type = command.getType();
+                        switch (type) {
+                            case CREATE_CASE:
+                                try {
+                                    openCase(command);
+                                } catch (CaseActionException ex) {
+                                    String baseCaseName = command.getInputs().get(CommandLineCommand.InputType.CASE_NAME.name());
+                                    LOGGER.log(Level.SEVERE, "Error creating or opening case " + baseCaseName, ex);
+                                    System.out.println("Error creating or opening case " + baseCaseName);
+                                    // Do not process any other commands
+                                    return;
+                                }
+                                break;
+                            case ADD_DATA_SOURCE:
+                                break;
+                            case RUN_INGEST:
+                                break;
+                            default:
+                                break;
+                        }
+                    }
 
-                if (caseForJob == null) {
-                    LOGGER.log(Level.SEVERE, "Error creating or opening case {0}", baseCaseName);
-                    System.out.println("Error creating or opening case " + baseCaseName);
-                    return;
-                }
-
-                AutoIngestDataSource dataSource = new AutoIngestDataSource("", Paths.get(dataSourcePath));
-                try {
+                    /* EL: will need this code for next stories
                     // run data source processor
+                    AutoIngestDataSource dataSource = new AutoIngestDataSource("", Paths.get(dataSourcePath));
                     runDataSourceProcessor(caseForJob, dataSource);
 
                     // run ingest manager
@@ -199,6 +168,7 @@ public class CommandLineIngestManager {
                 } catch (InterruptedException | AutoIngestDataSourceProcessor.AutoIngestDataSourceProcessorException | AnalysisStartupException ex) {
                     LOGGER.log(Level.SEVERE, "Unable to ingest data source " + dataSourcePath + ". Exiting...", ex);
                     System.out.println("Unable to ingest data source " + dataSourcePath + ". Exiting...");
+                    */
                 } catch (Throwable ex) {
                     /*
                     * Unexpected runtime exceptions firewall. This task is designed to
@@ -206,8 +176,8 @@ public class CommandLineIngestManager {
                     * calling get() on the task's Future<Void>, so this ensures that
                     * such errors get logged.
                      */
-                    LOGGER.log(Level.SEVERE, "Unexpected error while ingesting data source " + dataSourcePath, ex);
-                    System.out.println("Unexpected error while ingesting data source " + dataSourcePath + ". Exiting...");
+                    LOGGER.log(Level.SEVERE, "Unexpected error", ex);
+                    System.out.println("Unexpected error. Exiting...");
 
                 } finally {
                     try {
@@ -239,17 +209,28 @@ public class CommandLineIngestManager {
             return content.getId();
         }
 
-        private Case openCase(String baseCaseName) throws CaseActionException {
+        /**
+         * Creates a new case using arguments passed in from command line
+         * CREATE_CASE command.
+         *
+         * @param command command line CREATE_CASE command
+         * @throws CaseActionException
+         */
+        private void openCase(CommandLineCommand command) throws CaseActionException {
 
-            LOGGER.log(Level.INFO, "Opening case {0}", baseCaseName);
+            Map<String, String> inputs = command.getInputs();
 
-            Path caseDirectoryPath = findCaseDirectory(rootOutputDirectory, baseCaseName);
+            String baseCaseName = inputs.get(CommandLineCommand.InputType.CASE_NAME.name());
+            String rootOutputDirectory = inputs.get(CommandLineCommand.InputType.CASES_BASE_DIR_PATH.name());
+            LOGGER.log(Level.INFO, "Opening case {0} in directory {1}", new Object[]{baseCaseName, rootOutputDirectory});
+
+            Path caseDirectoryPath = findCaseDirectory(Paths.get(rootOutputDirectory), baseCaseName);
             if (null != caseDirectoryPath) {
                 // found an existing case directory for same case name. the input case name must be unique. Exit.
                 LOGGER.log(Level.SEVERE, "Case {0} already exists. Case name must be unique. Exiting", baseCaseName);
                 throw new CaseActionException("Case " + baseCaseName + " already exists. Case name must be unique. Exiting");
             } else {
-                caseDirectoryPath = createCaseFolderPath(rootOutputDirectory, baseCaseName);
+                caseDirectoryPath = createCaseFolderPath(Paths.get(rootOutputDirectory), baseCaseName);
 
                 // Create the case directory
                 Case.createCaseDirectory(caseDirectoryPath.toString(), Case.CaseType.SINGLE_USER_CASE);
@@ -258,9 +239,8 @@ public class CommandLineIngestManager {
                 Case.createAsCurrentCase(Case.CaseType.SINGLE_USER_CASE, caseDirectoryPath.toString(), caseDetails);
             }
 
-            Case caseForJob = Case.getCurrentCase();
+            caseForJob = Case.getCurrentCase();
             LOGGER.log(Level.INFO, "Opened case {0}", caseForJob.getName());
-            return caseForJob;
         }
 
         /**
@@ -298,7 +278,7 @@ public class CommandLineIngestManager {
                 LOGGER.log(Level.SEVERE, "Unsupported data source {0}", dataSource.getPath());  // NON-NLS
                 return;
             }
-            
+
             DataSourceProcessorProgressMonitor progressMonitor = new DoNothingDSPProgressMonitor();
             synchronized (ingestLock) {
                 // Try each DSP in decreasing order of confidence
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
index f7eb4e9492..4c86fbe510 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
@@ -41,21 +41,19 @@ public class CommandLineOptionProcessor extends OptionProcessor {
     private static final Logger logger = Logger.getLogger(CommandLineOptionProcessor.class.getName());
     private final Option caseNameOption = Option.optionalArgument('1', "caseName");
     private final Option caseBaseDirOption = Option.optionalArgument('2', "caseBaseDir");
-    private final Option dataSourcePathOption = Option.optionalArgument('4', "dataSourcePath");    
-    private final Option runFromCommandLineOption = Option.optionalArgument('3', "runFromCommandLine");
-    private String pathToDataSource;
-    private String baseCaseName;
+    private final Option createCaseCommandOption = Option.optionalArgument('3', "createCase");
+    private final Option dataSourcePathOption = Option.optionalArgument('4', "dataSourcePath");
     private boolean runFromCommandLine = false;
-    
+
     private List<CommandLineCommand> commands = new ArrayList<>();
 
     @Override
     protected Set<Option> getOptions() {
         Set<Option> set = new HashSet<>();
+        set.add(createCaseCommandOption);
         set.add(caseNameOption);
         set.add(caseBaseDirOption);
         set.add(dataSourcePathOption);
-        set.add(runFromCommandLineOption);
         return set;
     }
 
@@ -63,125 +61,89 @@ public class CommandLineOptionProcessor extends OptionProcessor {
     protected void process(Env env, Map<Option, String[]> values) throws CommandException {
         logger.log(Level.INFO, "Processing Autopsy command line options"); //NON-NLS
         System.out.println("Processing Autopsy command line options");
-        if (values.containsKey(caseNameOption) || values.containsKey(caseBaseDirOption) || values.containsKey(dataSourcePathOption) || values.containsKey(runFromCommandLineOption)) {
-            // parse input parameters
-            String inputPath = "C:\\TEST\\Inputs\\Small\\small2.img";
-            String inputCaseName;
-            String caseBaseDir;
-            String modeString;
-            String[] argDirs;
-            if (values.size() < 1) { // ELTODO
-                logger.log(Level.SEVERE, "Insufficient number of input arguments to run command line ingest");
-                System.out.println("Insufficient number of input arguments to run command line ingest");
-                this.runFromCommandLine = false;
+        runFromCommandLine = false;
+
+        // input arguments must contain at least one command
+        if (!values.containsKey(createCaseCommandOption) /* || OtherCommands */) {
+            // not running from command line
+            logger.log(Level.INFO, "No command line commands passed in as inputs. Not running from command line."); //NON-NLS
+            System.out.println("No command line commands passed in as inputs. Not running from command line.");
+            return;
+        }
+
+        // parse input parameters
+        String[] argDirs;
+        String inputCaseName = "";
+        if (values.containsKey(caseNameOption)) {
+            argDirs = values.get(caseNameOption);
+            if (argDirs.length < 1) {
+                logger.log(Level.SEVERE, "Missing argument 'caseName'");
+                System.out.println("Missing argument 'caseName'");
                 return;
-            } else {
-                if (values.containsKey(dataSourcePathOption)) {
-                    argDirs = values.get(dataSourcePathOption);
-                    if (argDirs.length < 1) {
-                        logger.log(Level.SEVERE, "Missing argument 'dataSourcePath'");
-                        System.out.println("Missing argument 'dataSourcePath'");
-                        this.runFromCommandLine = false;
-                        return;
-
-                    }
-                    inputPath = argDirs[0];
-                }
-
-                argDirs = values.get(caseNameOption);
-                if (argDirs.length < 1) {
-                    logger.log(Level.SEVERE, "Missing argument 'caseName'");
-                    System.out.println("Missing argument 'caseName'");
-                    this.runFromCommandLine = false;
-                    return;
-                }
-                inputCaseName = argDirs[0];
-                
-                argDirs = values.get(caseBaseDirOption);
-                if (argDirs.length < 1) {
-                    logger.log(Level.SEVERE, "Missing argument 'caseBaseDir'");
-                    System.out.println("Missing argument 'caseBaseDir'");
-                    this.runFromCommandLine = false;
-                    return;
-                }
-                caseBaseDir = argDirs[0];                
-                
-                argDirs = values.get(runFromCommandLineOption);
-                if (argDirs.length < 1) {
-                    logger.log(Level.SEVERE, "Missing argument 'runFromCommandLine'");
-                    System.out.println("Missing argument 'runFromCommandLine'");
-                    this.runFromCommandLine = false;
-                    return;
-                }
-                modeString = argDirs[0];
-
-                // verify inputs
-                if (modeString == null || modeString.isEmpty()) {
-                    this.runFromCommandLine = false;
-                    System.out.println("runFromCommandLine argument is empty");
-                    return;
-                }
-
-                if (modeString.equalsIgnoreCase("true")) {
-                    this.runFromCommandLine = true;
-                }
-
-                System.out.println("runFromCommandLine = " + this.runFromCommandLine);                
             }
+            inputCaseName = argDirs[0];
+        }
+
+        String caseBaseDir = "";
+        if (values.containsKey(caseBaseDirOption)) {
+            argDirs = values.get(caseBaseDirOption);
+            if (argDirs.length < 1) {
+                logger.log(Level.SEVERE, "Missing argument 'caseBaseDir'");
+                System.out.println("Missing argument 'caseBaseDir'");
+                return;
+            }
+            caseBaseDir = argDirs[0];
+        }
+
+        String inputPath = "";
+        if (values.containsKey(dataSourcePathOption)) {
+
+            argDirs = values.get(dataSourcePathOption);
+            if (argDirs.length < 1) {
+                logger.log(Level.SEVERE, "Missing argument 'dataSourcePath'");
+                System.out.println("Missing argument 'dataSourcePath'");
+                return;
+
+            }
+            inputPath = argDirs[0];
 
             // verify inputs
             if (inputPath == null || inputPath.isEmpty() || !(new File(inputPath).exists())) {
                 logger.log(Level.SEVERE, "Input file {0} doesn''t exist", inputPath);
                 System.out.println("Input file " + inputPath + " doesn't exist");
-                this.runFromCommandLine = false;
                 return;
             }
+        }
+
+        // Create commands in order in which they should be executed:
+        // First create the "CREATE_CASE" command, if present
+        if (values.containsKey(createCaseCommandOption)) {
 
             if (inputCaseName == null || inputCaseName.isEmpty()) {
-                logger.log(Level.SEVERE, "Case name argument is empty");
-                System.out.println("Case name argument is empty");
-                this.runFromCommandLine = false;
+                logger.log(Level.SEVERE, "'caseName' argument is empty");
+                System.out.println("'caseName' argument is empty");
+                runFromCommandLine = false;
+                return;
+            }
+
+            if (caseBaseDir == null || caseBaseDir.isEmpty() || !(new File(caseBaseDir).exists())) {
+                logger.log(Level.SEVERE, "'caseBaseDir' directory doesn't exist");
+                System.out.println("'caseBaseDir' directory doesn't exist");
+                runFromCommandLine = false;
                 return;
             }
 
-            // save the inputs
-            this.pathToDataSource = inputPath;
-            this.baseCaseName = inputCaseName;
-            logger.log(Level.INFO, "Input file = {0}", this.pathToDataSource); //NON-NLS
-            logger.log(Level.INFO, "Case name = {0}", this.baseCaseName); //NON-NLS
-            logger.log(Level.INFO, "runFromCommandLine = {0}", this.runFromCommandLine); //NON-NLS
-            System.out.println("Input file = " + this.pathToDataSource);
-            System.out.println("Case name = " + this.baseCaseName);
-            System.out.println("runFromCommandLine = " + this.runFromCommandLine);
-            
             CommandLineCommand newCommand = new CommandLineCommand(CommandLineCommand.CommandType.CREATE_CASE);
-            newCommand.addInputValue("caseName", inputCaseName);
-            newCommand.addInputValue("caseBaseDir", caseBaseDir);
+            newCommand.addInputValue(CommandLineCommand.InputType.CASE_NAME.name(), inputCaseName);
+            newCommand.addInputValue(CommandLineCommand.InputType.CASES_BASE_DIR_PATH.name(), caseBaseDir);
             commands.add(newCommand);
-        } else {
-            System.out.println("Missing input arguments to run command line ingest");
-            logger.log(Level.SEVERE, "Missing input arguments to run command line ingest");
+            runFromCommandLine = true;
         }
+
+        // Add ADD_DATA_SOURCE command, if present
+        // Add RUN_INGEST command, if present
     }
 
-    /**
-     * Returns user specified path to data source
-     *
-     * @return the inputPath
-     */
-    String getPathToDataSource() {
-        return pathToDataSource;
-    }
-
-    /**
-     * Returns user specified case name
-     *
-     * @return the inputCaseName
-     */
-    String getBaseCaseName() {
-        return baseCaseName;
-    }
-    
     /**
      * Returns whether Autopsy should be running in command line mode or not.
      *
@@ -189,11 +151,11 @@ public class CommandLineOptionProcessor extends OptionProcessor {
      */
     public boolean isRunFromCommandLine() {
         return runFromCommandLine;
-    }    
+    }
 
     /**
      * Returns list of all commands passed in via command line.
-     * 
+     *
      * @return list of input commands
      */
     List<CommandLineCommand> getCommands() {

From 18965ab6777943f719d29a837805302324c80080 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Tue, 7 May 2019 17:20:13 -0400
Subject: [PATCH 003/192] Changes to CommandLineIngestSettingsPanel to no
 longer specify case root directory

---
 .../commandlineingest/Bundle.properties       |  10 +-
 .../Bundle.properties-MERGED                  |   1 +
 .../CommandLineIngestManager.java             |   2 +
 .../CommandLineIngestSettingsPanel.form       |  83 +-----
 .../CommandLineIngestSettingsPanel.java       | 264 +-----------------
 ...mandLineIngestSettingsPanelController.java |   4 +-
 6 files changed, 24 insertions(+), 340 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/Bundle.properties b/Core/src/org/sleuthkit/autopsy/commandlineingest/Bundle.properties
index 8675363370..d7807fc24f 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/Bundle.properties
@@ -2,16 +2,8 @@ OpenIDE-Module-Name=CommandLineAutopsy
 OptionsCategory_Keywords_Command_Line_Ingest_Settings=Command Line Ingest Settings
 OptionsCategory_Keywords_General=Options
 OptionsCategory_Name_Command_Line_Ingest=Command Line Ingest
-CommandLineIngestSettingsPanel.ResultsDirectoryUnspecified=Output folder must be set
-CommandLineIngestSettingsPanel.PathInvalid=Path is not valid
-CommandLineIngestSettingsPanel.CannotAccess=Cannot access
-CommandLineIngestSettingsPanel.CheckPermissions=Check permissions.
-CommandLineIngestSettingsPanel.jLabelSelectOutputFolder.text=Select output folder:
-CommandLineIngestSettingsPanel.jLabelInvalidResultsFolder.text=jLabelInvalidOutputFolder
-CommandLineIngestSettingsPanel.outputPathTextField.toolTipText=Output folder for command line processing, i.e., the location where case folder will be created by command line processing mode.
-CommandLineIngestSettingsPanel.outputPathTextField.text=
-CommandLineIngestSettingsPanel.browseOutputFolderButton.text=Browse
 CommandLineIngestSettingsPanel.bnEditIngestSettings.toolTipText=Ingest job settings for the command line processing mode context.
 CommandLineIngestSettingsPanel.bnEditIngestSettings.text=Ingest Module Settings
 CommandLinePanel.jLabel1.text=Ingest is running from command line
 CommandLineStartupWindow.title.text=Running in Command Line Mode
+CommandLineIngestSettingsPanel.jLabelBaselineConfig.text=Configure Baseline Configuration for Command Line Ingest:
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/commandlineingest/Bundle.properties-MERGED
index 8675363370..1753301d01 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/Bundle.properties-MERGED
@@ -15,3 +15,4 @@ CommandLineIngestSettingsPanel.bnEditIngestSettings.toolTipText=Ingest job setti
 CommandLineIngestSettingsPanel.bnEditIngestSettings.text=Ingest Module Settings
 CommandLinePanel.jLabel1.text=Ingest is running from command line
 CommandLineStartupWindow.title.text=Running in Command Line Mode
+CommandLineIngestSettingsPanel.jLabelBaselineCOnfig.text=Configure Baseline Configuration for Command Line Ingest:
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
index fa505e0534..5285eeb95b 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
@@ -134,6 +134,8 @@ public class CommandLineIngestManager {
                         switch (type) {
                             case CREATE_CASE:
                                 try {
+                                    LOGGER.log(Level.INFO, "Processing create case command");
+                                    System.out.println("Processing create case command");
                                     openCase(command);
                                 } catch (CaseActionException ex) {
                                     String baseCaseName = command.getInputs().get(CommandLineCommand.InputType.CASE_NAME.name());
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.form b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.form
index 2333564f89..cce9c639b9 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.form
@@ -45,41 +45,24 @@
           <Layout>
             <DimensionLayout dim="0">
               <Group type="103" groupAlignment="0" attributes="0">
-                  <Group type="102" alignment="0" attributes="0">
-                      <EmptySpace min="-2" max="-2" attributes="0"/>
+                  <Group type="102" attributes="0">
+                      <EmptySpace max="-2" attributes="0"/>
                       <Group type="103" groupAlignment="0" attributes="0">
-                          <Group type="102" attributes="0">
-                              <Component id="outputPathTextField" min="-2" pref="630" max="-2" attributes="0"/>
-                              <EmptySpace max="-2" attributes="0"/>
-                              <Component id="browseOutputFolderButton" min="-2" max="-2" attributes="0"/>
-                          </Group>
                           <Component id="bnEditIngestSettings" alignment="0" min="-2" pref="155" max="-2" attributes="0"/>
-                          <Group type="102" alignment="0" attributes="0">
-                              <Component id="jLabelSelectOutputFolder" min="-2" max="-2" attributes="0"/>
-                              <EmptySpace type="separate" max="-2" attributes="0"/>
-                              <Component id="jLabelInvalidResultsFolder" min="-2" pref="544" max="-2" attributes="0"/>
-                          </Group>
+                          <Component id="jLabelBaselineConfig" alignment="0" min="-2" max="-2" attributes="0"/>
                       </Group>
-                      <EmptySpace pref="355" max="32767" attributes="0"/>
+                      <EmptySpace pref="1362" max="32767" attributes="0"/>
                   </Group>
               </Group>
             </DimensionLayout>
             <DimensionLayout dim="1">
               <Group type="103" groupAlignment="0" attributes="0">
                   <Group type="102" alignment="0" attributes="0">
-                      <EmptySpace min="-2" pref="40" max="-2" attributes="0"/>
-                      <Group type="103" groupAlignment="3" attributes="0">
-                          <Component id="jLabelSelectOutputFolder" alignment="3" min="-2" pref="21" max="-2" attributes="0"/>
-                          <Component id="jLabelInvalidResultsFolder" alignment="3" min="-2" max="-2" attributes="0"/>
-                      </Group>
-                      <EmptySpace min="-2" pref="1" max="-2" attributes="0"/>
-                      <Group type="103" groupAlignment="3" attributes="0">
-                          <Component id="browseOutputFolderButton" alignment="3" min="-2" max="-2" attributes="0"/>
-                          <Component id="outputPathTextField" alignment="3" min="-2" max="-2" attributes="0"/>
-                      </Group>
-                      <EmptySpace min="-2" pref="25" max="-2" attributes="0"/>
+                      <EmptySpace min="-2" pref="27" max="-2" attributes="0"/>
+                      <Component id="jLabelBaselineConfig" min="-2" max="-2" attributes="0"/>
+                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
                       <Component id="bnEditIngestSettings" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace pref="389" max="32767" attributes="0"/>
+                      <EmptySpace pref="442" max="32767" attributes="0"/>
                   </Group>
               </Group>
             </DimensionLayout>
@@ -101,58 +84,12 @@
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="bnEditIngestSettingsActionPerformed"/>
               </Events>
             </Component>
-            <Component class="javax.swing.JButton" name="browseOutputFolderButton">
+            <Component class="javax.swing.JLabel" name="jLabelBaselineConfig">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="viking/commandline/Bundle.properties" key="CommandLineIngestSettingsPanel.browseOutputFolderButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="org/sleuthkit/autopsy/commandlineingest/Bundle.properties" key="CommandLineIngestSettingsPanel.jLabelBaselineConfig.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
-              <AccessibilityProperties>
-                <Property name="AccessibleContext.accessibleName" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/commandlineingest/Bundle.properties" key="CommandLineIngestSettingsPanel.browseOutputFolderButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-                </Property>
-              </AccessibilityProperties>
-              <Events>
-                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="browseOutputFolderButtonActionPerformed"/>
-              </Events>
-            </Component>
-            <Component class="javax.swing.JTextField" name="outputPathTextField">
-              <Properties>
-                <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="viking/commandline/Bundle.properties" key="CommandLineIngestSettingsPanel.outputPathTextField.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="viking/commandline/Bundle.properties" key="CommandLineIngestSettingsPanel.outputPathTextField.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-                </Property>
-              </Properties>
-            </Component>
-            <Component class="javax.swing.JLabel" name="jLabelInvalidResultsFolder">
-              <Properties>
-                <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-                  <Color blue="0" green="0" red="ff" type="rgb"/>
-                </Property>
-                <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="viking/commandline/Bundle.properties" key="CommandLineIngestSettingsPanel.jLabelInvalidResultsFolder.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-                </Property>
-              </Properties>
-              <AccessibilityProperties>
-                <Property name="AccessibleContext.accessibleName" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/commandlineingest/Bundle.properties" key="CommandLineIngestSettingsPanel.jLabelInvalidResultsFolder.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-                </Property>
-              </AccessibilityProperties>
-            </Component>
-            <Component class="javax.swing.JLabel" name="jLabelSelectOutputFolder">
-              <Properties>
-                <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="viking/commandline/Bundle.properties" key="CommandLineIngestSettingsPanel.jLabelSelectOutputFolder.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-                </Property>
-                <Property name="verticalAlignment" type="int" value="3"/>
-              </Properties>
-              <AccessibilityProperties>
-                <Property name="AccessibleContext.accessibleName" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/commandlineingest/Bundle.properties" key="CommandLineIngestSettingsPanel.jLabelSelectOutputFolder.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-                </Property>
-              </AccessibilityProperties>
             </Component>
           </SubComponents>
         </Container>
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.java
index 5d3a0787ce..f17f2fcc21 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.java
@@ -20,18 +20,10 @@ package org.sleuthkit.autopsy.commandlineingest;
 
 import java.awt.BorderLayout;
 import java.awt.Cursor;
-import java.io.File;
-import java.nio.file.Files;
 import java.util.List;
-import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.ingest.IngestJobSettings;
 import org.sleuthkit.autopsy.ingest.IngestJobSettingsPanel;
-import java.nio.file.Paths;
-import org.sleuthkit.autopsy.coreutils.FileUtil;
 import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.coreutils.Logger;
 
@@ -42,7 +34,6 @@ import org.sleuthkit.autopsy.coreutils.Logger;
 public class CommandLineIngestSettingsPanel extends javax.swing.JPanel {
 
     private final CommandLineIngestSettingsPanelController controller;
-    private final JFileChooser fc = new JFileChooser();
     private static final long serialVersionUID = 1L;
     private static final Logger logger = Logger.getLogger(CommandLineIngestSettingsPanel.class.getName());
 
@@ -54,169 +45,6 @@ public class CommandLineIngestSettingsPanel extends javax.swing.JPanel {
     public CommandLineIngestSettingsPanel(CommandLineIngestSettingsPanelController theController) {
         controller = theController;
         initComponents();
-
-        load(true);
-        outputPathTextField.getDocument().addDocumentListener(new MyDocumentListener());
-        jLabelInvalidResultsFolder.setText("");
-    }
-
-    private class MyDocumentListener implements DocumentListener {
-
-        @Override
-        public void changedUpdate(DocumentEvent e) {
-            valid();
-            controller.changed();
-        }
-
-        @Override
-        public void removeUpdate(DocumentEvent e) {
-            valid();
-            controller.changed();
-        }
-
-        @Override
-        public void insertUpdate(DocumentEvent e) {
-            valid();
-            controller.changed();
-        }
-    };
-
-    /**
-     * Load mode from persistent storage.
-     *
-     * @param inStartup True if we're doing the initial population of the UI
-     */
-    final void load(boolean inStartup) {
-
-        String results = org.sleuthkit.autopsy.commandlineingest.UserPreferences.getCommandLineModeResultsFolder();
-        if (results != null) {
-            outputPathTextField.setText(results);
-        } else {
-            outputPathTextField.setText("");
-        }
-
-        valid();
-    }
-
-    /**
-     * Save mode to persistent storage.
-     */
-    void store() {
-        String resultsFolderPath = getNormalizedFolderPath(outputPathTextField.getText().trim());
-        org.sleuthkit.autopsy.commandlineingest.UserPreferences.setCommandLineModeResultsFolder(resultsFolderPath);
-    }
-
-    /**
-     * Validate current panel settings.
-     */
-    boolean valid() {
-
-        if (validateResultsPath()) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Normalizes a path to make sure there are no "space" characters at the end
-     *
-     * @param path Path to a directory
-     *
-     * @return Path without "space" characters at the end
-     */
-    String normalizePath(String path) {
-
-        while (path.length() > 0) {
-            if (path.charAt(path.length() - 1) == ' ') {
-                path = path.substring(0, path.length() - 1);
-            } else {
-                break;
-            }
-        }
-        return path;
-    }
-
-    /**
-     * Validates that a path is valid and points to a folder.
-     *
-     * @param path A path to be validated
-     *
-     * @return boolean returns true if valid and points to a folder, false
-     *         otherwise
-     */
-    boolean isFolderPathValid(String path) {
-        try {
-            File file = new File(normalizePath(path));
-
-            // check if it's a symbolic link
-            if (Files.isSymbolicLink(file.toPath())) {
-                return true;
-            }
-
-            // local folder
-            if (file.exists() && file.isDirectory()) {
-                return true;
-            }
-        } catch (Exception ex) {
-            // Files.isSymbolicLink (and other "files" methods) throw exceptions on seemingly innocent inputs.
-            // For example, it will throw an exception when either " " is last character in path or
-            // a path starting with ":". 
-            // We can just ignore these exceptions as they occur in process of user typing in the path.
-            return false;
-        }
-        return false;
-    }
-
-    /**
-     * Returns a path that was normalized by file system.
-     *
-     * @param path A path to be normalized. Normalization occurs inside a call
-     *             to new File().
-     *
-     * @return String returns normalized OS path
-     */
-    String getNormalizedFolderPath(String path) {
-        // removes "/", "\", and " " characters at the end of path string.
-        // normalizePath() removes spaces at the end of path and a call to "new File()" 
-        // internally formats the path string to remove "/" and "\" characters at the end of path.
-        File file = new File(normalizePath(path));
-        return file.getPath();
-    }
-
-    /**
-     * Validate results path. Display warnings if invalid.
-     */
-    boolean validateResultsPath() {
-
-        String outputPath = outputPathTextField.getText().trim();
-
-        if (outputPath.isEmpty()) {
-            jLabelInvalidResultsFolder.setVisible(true);
-            jLabelInvalidResultsFolder.setText(NbBundle.getMessage(CommandLineIngestSettingsPanel.class, "CommandLineIngestSettingsPanel.ResultsDirectoryUnspecified"));
-            /*
-            NOTE: JIRA-4850: Returning false disables OK and Apply buttons for the entire
-            Tools->Options bar until the path is set. It was decided to only validate 
-            the path if the path is set.
-            */
-            return true;
-        }
-
-        if (!isFolderPathValid(outputPath)) {
-            jLabelInvalidResultsFolder.setVisible(true);
-            jLabelInvalidResultsFolder.setText(NbBundle.getMessage(CommandLineIngestSettingsPanel.class, "CommandLineIngestSettingsPanel.PathInvalid"));
-            return false;
-        }
-
-        if (false == permissionsAppropriate(outputPath)) {
-            jLabelInvalidResultsFolder.setVisible(true);
-            jLabelInvalidResultsFolder.setText(NbBundle.getMessage(CommandLineIngestSettingsPanel.class, "CommandLineIngestSettingsPanel.CannotAccess")
-                    + " " + outputPath + "   "
-                    + NbBundle.getMessage(CommandLineIngestSettingsPanel.class, "CommandLineIngestSettingsPanel.CheckPermissions"));
-            return false;
-        }
-
-        jLabelInvalidResultsFolder.setVisible(false);
-        return true;
     }
 
     private void displayIngestJobSettingsPanel() {
@@ -261,10 +89,7 @@ public class CommandLineIngestSettingsPanel extends javax.swing.JPanel {
         nodeScrollPane = new javax.swing.JScrollPane();
         nodePanel = new javax.swing.JPanel();
         bnEditIngestSettings = new javax.swing.JButton();
-        browseOutputFolderButton = new javax.swing.JButton();
-        outputPathTextField = new javax.swing.JTextField();
-        jLabelInvalidResultsFolder = new javax.swing.JLabel();
-        jLabelSelectOutputFolder = new javax.swing.JLabel();
+        jLabelBaselineConfig = new javax.swing.JLabel();
 
         nodeScrollPane.setMinimumSize(new java.awt.Dimension(0, 0));
 
@@ -279,21 +104,7 @@ public class CommandLineIngestSettingsPanel extends javax.swing.JPanel {
             }
         });
 
-        org.openide.awt.Mnemonics.setLocalizedText(browseOutputFolderButton, org.openide.util.NbBundle.getMessage(CommandLineIngestSettingsPanel.class, "CommandLineIngestSettingsPanel.browseOutputFolderButton.text")); // NOI18N
-        browseOutputFolderButton.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                browseOutputFolderButtonActionPerformed(evt);
-            }
-        });
-
-        outputPathTextField.setText(org.openide.util.NbBundle.getMessage(CommandLineIngestSettingsPanel.class, "CommandLineIngestSettingsPanel.outputPathTextField.text")); // NOI18N
-        outputPathTextField.setToolTipText(org.openide.util.NbBundle.getMessage(CommandLineIngestSettingsPanel.class, "CommandLineIngestSettingsPanel.outputPathTextField.toolTipText")); // NOI18N
-
-        jLabelInvalidResultsFolder.setForeground(new java.awt.Color(255, 0, 0));
-        org.openide.awt.Mnemonics.setLocalizedText(jLabelInvalidResultsFolder, org.openide.util.NbBundle.getMessage(CommandLineIngestSettingsPanel.class, "CommandLineIngestSettingsPanel.jLabelInvalidResultsFolder.text")); // NOI18N
-
-        org.openide.awt.Mnemonics.setLocalizedText(jLabelSelectOutputFolder, org.openide.util.NbBundle.getMessage(CommandLineIngestSettingsPanel.class, "CommandLineIngestSettingsPanel.jLabelSelectOutputFolder.text")); // NOI18N
-        jLabelSelectOutputFolder.setVerticalAlignment(javax.swing.SwingConstants.BOTTOM);
+        org.openide.awt.Mnemonics.setLocalizedText(jLabelBaselineConfig, org.openide.util.NbBundle.getMessage(CommandLineIngestSettingsPanel.class, "CommandLineIngestSettingsPanel.jLabelBaselineConfig.text")); // NOI18N
 
         javax.swing.GroupLayout nodePanelLayout = new javax.swing.GroupLayout(nodePanel);
         nodePanel.setLayout(nodePanelLayout);
@@ -302,37 +113,20 @@ public class CommandLineIngestSettingsPanel extends javax.swing.JPanel {
             .addGroup(nodePanelLayout.createSequentialGroup()
                 .addContainerGap()
                 .addGroup(nodePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addGroup(nodePanelLayout.createSequentialGroup()
-                        .addComponent(outputPathTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 630, javax.swing.GroupLayout.PREFERRED_SIZE)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(browseOutputFolderButton))
                     .addComponent(bnEditIngestSettings, javax.swing.GroupLayout.PREFERRED_SIZE, 155, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addGroup(nodePanelLayout.createSequentialGroup()
-                        .addComponent(jLabelSelectOutputFolder)
-                        .addGap(18, 18, 18)
-                        .addComponent(jLabelInvalidResultsFolder, javax.swing.GroupLayout.PREFERRED_SIZE, 544, javax.swing.GroupLayout.PREFERRED_SIZE)))
-                .addContainerGap(355, Short.MAX_VALUE))
+                    .addComponent(jLabelBaselineConfig))
+                .addContainerGap(1362, Short.MAX_VALUE))
         );
         nodePanelLayout.setVerticalGroup(
             nodePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(nodePanelLayout.createSequentialGroup()
-                .addGap(40, 40, 40)
-                .addGroup(nodePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(jLabelSelectOutputFolder, javax.swing.GroupLayout.PREFERRED_SIZE, 21, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(jLabelInvalidResultsFolder))
-                .addGap(1, 1, 1)
-                .addGroup(nodePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(browseOutputFolderButton)
-                    .addComponent(outputPathTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addGap(25, 25, 25)
+                .addGap(27, 27, 27)
+                .addComponent(jLabelBaselineConfig)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                 .addComponent(bnEditIngestSettings)
-                .addContainerGap(389, Short.MAX_VALUE))
+                .addContainerGap(442, Short.MAX_VALUE))
         );
 
-        browseOutputFolderButton.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(CommandLineIngestSettingsPanel.class, "CommandLineIngestSettingsPanel.browseOutputFolderButton.text")); // NOI18N
-        jLabelInvalidResultsFolder.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(CommandLineIngestSettingsPanel.class, "CommandLineIngestSettingsPanel.jLabelInvalidResultsFolder.text")); // NOI18N
-        jLabelSelectOutputFolder.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(CommandLineIngestSettingsPanel.class, "CommandLineIngestSettingsPanel.jLabelSelectOutputFolder.text")); // NOI18N
-
         nodeScrollPane.setViewportView(nodePanel);
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
@@ -347,54 +141,14 @@ public class CommandLineIngestSettingsPanel extends javax.swing.JPanel {
         );
     }// </editor-fold>//GEN-END:initComponents
 
-    private void browseOutputFolderButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_browseOutputFolderButtonActionPerformed
-        String oldText = outputPathTextField.getText().trim();
-        // set the current directory of the FileChooser if the oldText is valid
-        File currentDir = new File(oldText);
-        if (currentDir.exists()) {
-            fc.setCurrentDirectory(currentDir);
-        }
-
-        fc.setDialogTitle("Select case output folder:");
-        fc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
-
-        int retval = fc.showOpenDialog(this);
-        if (retval == JFileChooser.APPROVE_OPTION) {
-            String path = fc.getSelectedFile().getPath();
-            outputPathTextField.setText(path);
-            valid();
-            controller.changed();
-        }
-    }//GEN-LAST:event_browseOutputFolderButtonActionPerformed
-
     private void bnEditIngestSettingsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnEditIngestSettingsActionPerformed
         displayIngestJobSettingsPanel();
     }//GEN-LAST:event_bnEditIngestSettingsActionPerformed
 
-    boolean permissionsAppropriate(String path) {
-        return FileUtil.hasReadWriteAccess(Paths.get(path));
-    }
-
-    private void resetUI() {
-        load(true);
-        controller.changed();
-    }
-
-    void setEnabledState(boolean enabled) {
-        bnEditIngestSettings.setEnabled(enabled);
-        browseOutputFolderButton.setEnabled(enabled);
-        jLabelInvalidResultsFolder.setEnabled(enabled);
-        jLabelSelectOutputFolder.setEnabled(enabled);
-        outputPathTextField.setEnabled(enabled);
-    }
-
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JButton bnEditIngestSettings;
-    private javax.swing.JButton browseOutputFolderButton;
-    private javax.swing.JLabel jLabelInvalidResultsFolder;
-    private javax.swing.JLabel jLabelSelectOutputFolder;
+    private javax.swing.JLabel jLabelBaselineConfig;
     private javax.swing.JPanel nodePanel;
     private javax.swing.JScrollPane nodeScrollPane;
-    private javax.swing.JTextField outputPathTextField;
     // End of variables declaration//GEN-END:variables
 }
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanelController.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanelController.java
index 7856cdf6e0..a6b019160a 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanelController.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanelController.java
@@ -43,13 +43,11 @@ public final class CommandLineIngestSettingsPanelController extends OptionsPanel
 
     @Override
     public void update() {
-        getPanel().load(false);
         changed = false;
     }
 
     @Override
     public void applyChanges() {
-        getPanel().store();
         changed = false;
     }
 
@@ -59,7 +57,7 @@ public final class CommandLineIngestSettingsPanelController extends OptionsPanel
 
     @Override
     public boolean isValid() {
-        return getPanel().valid();
+        return true;
     }
 
     @Override

From 93d97da373ae75a4707ea6c23f1517428bce0dcc Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Tue, 7 May 2019 17:20:26 -0400
Subject: [PATCH 004/192] Changes to CommandLineIngestSettingsPanel to no
 longer specify case root directory

---
 .../commandlineingest/Bundle.properties-MERGED        | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/commandlineingest/Bundle.properties-MERGED
index 1753301d01..d7807fc24f 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/Bundle.properties-MERGED
@@ -2,17 +2,8 @@ OpenIDE-Module-Name=CommandLineAutopsy
 OptionsCategory_Keywords_Command_Line_Ingest_Settings=Command Line Ingest Settings
 OptionsCategory_Keywords_General=Options
 OptionsCategory_Name_Command_Line_Ingest=Command Line Ingest
-CommandLineIngestSettingsPanel.ResultsDirectoryUnspecified=Output folder must be set
-CommandLineIngestSettingsPanel.PathInvalid=Path is not valid
-CommandLineIngestSettingsPanel.CannotAccess=Cannot access
-CommandLineIngestSettingsPanel.CheckPermissions=Check permissions.
-CommandLineIngestSettingsPanel.jLabelSelectOutputFolder.text=Select output folder:
-CommandLineIngestSettingsPanel.jLabelInvalidResultsFolder.text=jLabelInvalidOutputFolder
-CommandLineIngestSettingsPanel.outputPathTextField.toolTipText=Output folder for command line processing, i.e., the location where case folder will be created by command line processing mode.
-CommandLineIngestSettingsPanel.outputPathTextField.text=
-CommandLineIngestSettingsPanel.browseOutputFolderButton.text=Browse
 CommandLineIngestSettingsPanel.bnEditIngestSettings.toolTipText=Ingest job settings for the command line processing mode context.
 CommandLineIngestSettingsPanel.bnEditIngestSettings.text=Ingest Module Settings
 CommandLinePanel.jLabel1.text=Ingest is running from command line
 CommandLineStartupWindow.title.text=Running in Command Line Mode
-CommandLineIngestSettingsPanel.jLabelBaselineCOnfig.text=Configure Baseline Configuration for Command Line Ingest:
+CommandLineIngestSettingsPanel.jLabelBaselineConfig.text=Configure Baseline Configuration for Command Line Ingest:

From 8ded4219488fc200076f5616e648500073ef095b Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Wed, 8 May 2019 17:24:48 -0400
Subject: [PATCH 005/192] Polishing things

---
 .../commandlineingest/CommandLineIngestManager.java    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
index 5285eeb95b..bd5ffaf341 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
@@ -53,9 +53,9 @@ import org.sleuthkit.autopsy.ingest.IngestJobSettings;
 import org.sleuthkit.autopsy.ingest.IngestJobStartResult;
 import org.sleuthkit.autopsy.ingest.IngestManager;
 import org.sleuthkit.autopsy.ingest.IngestModuleError;
-import org.sleuthkit.autopsy.report.ReportProgressPanel;
-import org.sleuthkit.autopsy.report.caseuco.CaseUcoFormatExporter;
-import org.sleuthkit.autopsy.report.caseuco.ReportCaseUco;
+//import org.sleuthkit.autopsy.report.ReportProgressPanel;
+//import org.sleuthkit.autopsy.report.caseuco.CaseUcoFormatExporter;
+//import org.sleuthkit.autopsy.report.caseuco.ReportCaseUco;
 import org.sleuthkit.datamodel.Content;
 
 /**
@@ -101,6 +101,10 @@ public class CommandLineIngestManager {
             }
         }
 
+        /**
+         * Requests the list of command line commands from command line options
+         * processor and executes the commands one by one.
+         */
         public void run() {
             LOGGER.log(Level.INFO, "Job processing task started");
 

From d8bef74f81679a1610a95dc64801e748c47ebc38 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Thu, 9 May 2019 19:07:07 -0400
Subject: [PATCH 006/192] Addressed Codacy warnings

---
 .../autopsy/commandlineingest/CommandLineCommand.java         | 4 ++--
 .../autopsy/commandlineingest/CommandLineOptionProcessor.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java
index 3e3505cdff..66814b2f55 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java
@@ -45,8 +45,8 @@ class CommandLineCommand {
         DATA_SOURCE_DIR_PATH;
     }
     
-    private CommandType type;
-    private Map<String, String> inputs = new HashMap<>();
+    private final CommandType type;
+    private final Map<String, String> inputs = new HashMap<>();
     
     CommandLineCommand(CommandType type) {
         this.type = type;
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
index 4c86fbe510..70e0f9a434 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
@@ -45,7 +45,7 @@ public class CommandLineOptionProcessor extends OptionProcessor {
     private final Option dataSourcePathOption = Option.optionalArgument('4', "dataSourcePath");
     private boolean runFromCommandLine = false;
 
-    private List<CommandLineCommand> commands = new ArrayList<>();
+    private final List<CommandLineCommand> commands = new ArrayList<>();
 
     @Override
     protected Set<Option> getOptions() {

From 88c60aadfa95ecbe32b702aa061dd04f99446f96 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Tue, 14 May 2019 11:12:25 -0400
Subject: [PATCH 007/192] Modifying options processor to accept and process new
 input parameters

---
 .../commandlineingest/CommandLineCommand.java |  4 +-
 .../CommandLineOptionProcessor.java           | 91 +++++++++++++++----
 2 files changed, 77 insertions(+), 18 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java
index 66814b2f55..5ad7584b7f 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java
@@ -41,8 +41,8 @@ class CommandLineCommand {
     static enum InputType {        
         CASE_NAME,
         CASES_BASE_DIR_PATH,
-        CASE_FOLDER_DIR_PATH,
-        DATA_SOURCE_DIR_PATH;
+        CASE_FOLDER_PATH,
+        DATA_SOURCE_PATH;
     }
     
     private final CommandType type;
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
index 70e0f9a434..0cabea061e 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
@@ -39,10 +39,12 @@ import org.openide.util.lookup.ServiceProvider;
 public class CommandLineOptionProcessor extends OptionProcessor {
 
     private static final Logger logger = Logger.getLogger(CommandLineOptionProcessor.class.getName());
-    private final Option caseNameOption = Option.optionalArgument('1', "caseName");
-    private final Option caseBaseDirOption = Option.optionalArgument('2', "caseBaseDir");
-    private final Option createCaseCommandOption = Option.optionalArgument('3', "createCase");
-    private final Option dataSourcePathOption = Option.optionalArgument('4', "dataSourcePath");
+    private final Option caseNameOption = Option.requiredArgument('n', "caseName");
+    private final Option caseBaseDirOption = Option.requiredArgument('o', "caseBaseDir");
+    private final Option createCaseCommandOption = Option.withoutArgument('c', "createCase");
+    private final Option dataSourcePathOption = Option.requiredArgument('s', "dataSourcePath");
+    private final Option addDataSourceCommandOption = Option.withoutArgument('a', "addDataSource");
+    private final Option caseDirOption = Option.requiredArgument('d', "caseDir");
     private boolean runFromCommandLine = false;
 
     private final List<CommandLineCommand> commands = new ArrayList<>();
@@ -54,6 +56,8 @@ public class CommandLineOptionProcessor extends OptionProcessor {
         set.add(caseNameOption);
         set.add(caseBaseDirOption);
         set.add(dataSourcePathOption);
+        set.add(addDataSourceCommandOption);
+        set.add(caseDirOption);
         return set;
     }
 
@@ -64,7 +68,7 @@ public class CommandLineOptionProcessor extends OptionProcessor {
         runFromCommandLine = false;
 
         // input arguments must contain at least one command
-        if (!values.containsKey(createCaseCommandOption) /* || OtherCommands */) {
+        if (!values.containsKey(createCaseCommandOption) || values.containsKey(addDataSourceCommandOption) /* || OtherCommands */) {
             // not running from command line
             logger.log(Level.INFO, "No command line commands passed in as inputs. Not running from command line."); //NON-NLS
             System.out.println("No command line commands passed in as inputs. Not running from command line.");
@@ -82,6 +86,12 @@ public class CommandLineOptionProcessor extends OptionProcessor {
                 return;
             }
             inputCaseName = argDirs[0];
+            
+            if (inputCaseName == null || inputCaseName.isEmpty()) {
+                logger.log(Level.SEVERE, "'caseName' argument is empty");
+                System.out.println("'caseName' argument is empty");
+                return;
+            }            
         }
 
         String caseBaseDir = "";
@@ -93,9 +103,15 @@ public class CommandLineOptionProcessor extends OptionProcessor {
                 return;
             }
             caseBaseDir = argDirs[0];
+            
+            if (caseBaseDir == null || caseBaseDir.isEmpty() || !(new File(caseBaseDir).exists()) || !(new File(caseBaseDir).isDirectory())) {
+                logger.log(Level.SEVERE, "'caseBaseDir' directory doesn't exist or is not a directory");
+                System.out.println("'caseBaseDir' directory doesn't exist or is not a directory");
+                return;
+            } 
         }
 
-        String inputPath = "";
+        String dataSourcePath = "";
         if (values.containsKey(dataSourcePathOption)) {
 
             argDirs = values.get(dataSourcePathOption);
@@ -105,30 +121,50 @@ public class CommandLineOptionProcessor extends OptionProcessor {
                 return;
 
             }
-            inputPath = argDirs[0];
+            dataSourcePath = argDirs[0];
 
             // verify inputs
-            if (inputPath == null || inputPath.isEmpty() || !(new File(inputPath).exists())) {
-                logger.log(Level.SEVERE, "Input file {0} doesn''t exist", inputPath);
-                System.out.println("Input file " + inputPath + " doesn't exist");
+            if (dataSourcePath == null || dataSourcePath.isEmpty() || !(new File(dataSourcePath).exists())) {
+                logger.log(Level.SEVERE, "Input data source file {0} doesn''t exist", dataSourcePath);
+                System.out.println("Input data source file " + dataSourcePath + " doesn't exist");
                 return;
             }
         }
+        
+        String caseDir = "";
+        if (values.containsKey(caseDirOption)) {
+
+            argDirs = values.get(caseDirOption);
+            if (argDirs.length < 1) {
+                logger.log(Level.SEVERE, "Missing argument 'caseDirOption'");
+                System.out.println("Missing argument 'caseDirOption'");
+                return;
+
+            }
+            caseDir = argDirs[0];
+
+            // verify inputs
+            if (caseDir == null || caseDir.isEmpty() || !(new File(caseDir).exists()) || !(new File(caseDir).isDirectory())) {
+                logger.log(Level.SEVERE, "Case directory {0} doesn''t exist or is not a directory", caseDir);
+                System.out.println("Case directory " + caseDir + " doesn't exist or is not a directory");
+                return;
+            }
+        }        
 
         // Create commands in order in which they should be executed:
         // First create the "CREATE_CASE" command, if present
         if (values.containsKey(createCaseCommandOption)) {
 
-            if (inputCaseName == null || inputCaseName.isEmpty()) {
-                logger.log(Level.SEVERE, "'caseName' argument is empty");
-                System.out.println("'caseName' argument is empty");
+            if (dataSourcePath.isEmpty()) {
+                logger.log(Level.SEVERE, "'dataSourcePath' argument is empty");
+                System.out.println("'dataSourcePath' argument is empty");
                 runFromCommandLine = false;
                 return;
             }
 
-            if (caseBaseDir == null || caseBaseDir.isEmpty() || !(new File(caseBaseDir).exists())) {
-                logger.log(Level.SEVERE, "'caseBaseDir' directory doesn't exist");
-                System.out.println("'caseBaseDir' directory doesn't exist");
+            if (caseDir.isEmpty()) {
+                logger.log(Level.SEVERE, "'caseDir' argument is empty");
+                System.out.println("'caseDir' argument is empty");
                 runFromCommandLine = false;
                 return;
             }
@@ -141,6 +177,29 @@ public class CommandLineOptionProcessor extends OptionProcessor {
         }
 
         // Add ADD_DATA_SOURCE command, if present
+        if (values.containsKey(addDataSourceCommandOption)) {
+
+            if (dataSourcePath.isEmpty()) {
+                logger.log(Level.SEVERE, "'dataSourcePath' argument is empty");
+                System.out.println("'dataSourcePath' argument is empty");
+                runFromCommandLine = false;
+                return;
+            }
+
+            if (caseDir.isEmpty()) {
+                logger.log(Level.SEVERE, "'caseDir' argument is empty");
+                System.out.println("'caseDir' argument is empty");
+                runFromCommandLine = false;
+                return;
+            }
+
+            CommandLineCommand newCommand = new CommandLineCommand(CommandLineCommand.CommandType.ADD_DATA_SOURCE);
+            newCommand.addInputValue(CommandLineCommand.InputType.DATA_SOURCE_PATH.name(), dataSourcePath);
+            newCommand.addInputValue(CommandLineCommand.InputType.CASE_FOLDER_PATH.name(), caseDir);
+            commands.add(newCommand);
+            runFromCommandLine = true;
+        }
+
         // Add RUN_INGEST command, if present
     }
 

From 050f90b73b5795b6690bcea87d70787669ff4556 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Tue, 14 May 2019 11:15:07 -0400
Subject: [PATCH 008/192] First cut at adding data source

---
 .../CommandLineIngestManager.java             | 70 +++++++++++++++++++
 1 file changed, 70 insertions(+)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
index bd5ffaf341..9d1950cbed 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
@@ -37,6 +37,7 @@ import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.CaseActionException;
 import org.sleuthkit.autopsy.casemodule.CaseDetails;
 import org.sleuthkit.autopsy.casemodule.CaseMetadata;
+import static org.sleuthkit.autopsy.casemodule.CaseMetadata.getFileExtension;
 import org.sleuthkit.autopsy.core.RuntimeProperties;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessorCallback;
 import static org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessorCallback.DataSourceProcessorResult.CRITICAL_ERRORS;
@@ -150,6 +151,27 @@ public class CommandLineIngestManager {
                                 }
                                 break;
                             case ADD_DATA_SOURCE:
+                                try {
+                                    LOGGER.log(Level.INFO, "Processing 'add data source' command");
+                                    System.out.println("Processing 'add data source' command");
+                                    Map<String, String> inputs = command.getInputs();
+
+                                    // open the case, if it hasn't been already opened by CREATE_CASE command
+                                    if (caseForJob == null) {
+                                        String caseDirPath = inputs.get(CommandLineCommand.InputType.CASE_FOLDER_PATH.name());
+                                        openCase(caseDirPath);
+                                    }
+
+                                    String dataSourcePath = inputs.get(CommandLineCommand.InputType.DATA_SOURCE_PATH.name());
+                                    dataSource = new AutoIngestDataSource("", Paths.get(dataSourcePath));
+                                    runDataSourceProcessor(caseForJob, dataSource);
+                                } catch (InterruptedException | AutoIngestDataSourceProcessor.AutoIngestDataSourceProcessorException | CaseActionException ex) {
+                                    String dataSourcePath = command.getInputs().get(CommandLineCommand.InputType.DATA_SOURCE_PATH.name());
+                                    LOGGER.log(Level.SEVERE, "Error adding data source " + dataSourcePath, ex);
+                                    System.out.println("Error adding data source " + dataSourcePath);
+                                    // Do not process any other commands
+                                    return;
+                                }
                                 break;
                             case RUN_INGEST:
                                 break;
@@ -249,6 +271,54 @@ public class CommandLineIngestManager {
             LOGGER.log(Level.INFO, "Opened case {0}", caseForJob.getName());
         }
 
+        /**
+         * Opens existing case.
+         *
+         * @param caseFolderPath full path to case directory
+         * @throws CaseActionException
+         */
+        private void openCase(String caseFolderPath) throws CaseActionException {
+            
+            LOGGER.log(Level.INFO, "Opening case in directory {0}", caseFolderPath);
+
+            String metadataFilePath = findAutFile(caseFolderPath);
+            Case.openAsCurrentCase(metadataFilePath);
+
+            caseForJob = Case.getCurrentCase();
+            LOGGER.log(Level.INFO, "Opened case {0}", caseForJob.getName());
+        }
+        
+        /**
+         * Finds the path to the .aut file for the specified case directory.
+         *
+         * @param caseDirectory the directory to check for a .aut file
+         *
+         * @return the path to the first .aut file found in the directory
+         *
+         * @throws CaseActionException if there was an issue finding a .aut file
+         */
+        private String findAutFile(String caseDirectory) throws CaseActionException {
+            File caseFolder = Paths.get(caseDirectory).toFile();
+            if (caseFolder.exists()) {
+                /*
+                 * Search for '*.aut' files.
+                 */
+                File[] fileArray = caseFolder.listFiles();
+                if (fileArray == null) {
+                    throw new CaseActionException("No files found in case directory");
+                }
+                String autFilePath = null;
+                for (File file : fileArray) {
+                    String name = file.getName().toLowerCase();
+                    if (autFilePath == null && name.endsWith(getFileExtension())) {
+                        return file.getAbsolutePath();
+                    }
+                }
+                throw new CaseActionException("No .aut files found in case directory");
+            }
+            throw new CaseActionException("Case directory was not found");
+        } 
+        
         /**
          * Passes the data source for the current job through a data source
          * processor that adds it to the case database.

From 23cbe9d6ad22a669d0b589e932424035de1f73e5 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Tue, 14 May 2019 11:17:03 -0400
Subject: [PATCH 009/192] Bug fixes

---
 .../autopsy/commandlineingest/CommandLineIngestManager.java      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
index 9d1950cbed..41dc2e6ec5 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
@@ -68,6 +68,7 @@ public class CommandLineIngestManager {
 
     private static final Logger LOGGER = Logger.getLogger(CommandLineIngestManager.class.getName());
     private Case caseForJob = null;
+    private AutoIngestDataSource dataSource = null;
 
     public CommandLineIngestManager() {
     }

From 5066373434ae6e73594c2b7af8e454518f9d457d Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Tue, 14 May 2019 12:13:04 -0400
Subject: [PATCH 010/192] Bug fixes

---
 .../commandlineingest/CommandLineOptionProcessor.java  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
index 0cabea061e..de05fb7c8e 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
@@ -156,15 +156,15 @@ public class CommandLineOptionProcessor extends OptionProcessor {
         if (values.containsKey(createCaseCommandOption)) {
 
             if (dataSourcePath.isEmpty()) {
-                logger.log(Level.SEVERE, "'dataSourcePath' argument is empty");
-                System.out.println("'dataSourcePath' argument is empty");
+                logger.log(Level.SEVERE, "'caseName' argument is empty");
+                System.out.println("'caseName' argument is empty");
                 runFromCommandLine = false;
                 return;
             }
 
-            if (caseDir.isEmpty()) {
-                logger.log(Level.SEVERE, "'caseDir' argument is empty");
-                System.out.println("'caseDir' argument is empty");
+            if (caseBaseDir.isEmpty()) {
+                logger.log(Level.SEVERE, "'caseBaseDir' argument is empty");
+                System.out.println("'caseBaseDir' argument is empty");
                 runFromCommandLine = false;
                 return;
             }

From d757203e1eac2d716ea8797b72d79bbaa32d5434 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Tue, 14 May 2019 12:16:16 -0400
Subject: [PATCH 011/192] Bug fixes

---
 .../autopsy/commandlineingest/CommandLineOptionProcessor.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
index de05fb7c8e..d67fa721ef 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
@@ -68,7 +68,7 @@ public class CommandLineOptionProcessor extends OptionProcessor {
         runFromCommandLine = false;
 
         // input arguments must contain at least one command
-        if (!values.containsKey(createCaseCommandOption) || values.containsKey(addDataSourceCommandOption) /* || OtherCommands */) {
+        if (!(values.containsKey(createCaseCommandOption) || values.containsKey(addDataSourceCommandOption) /* || OtherCommands */)) {
             // not running from command line
             logger.log(Level.INFO, "No command line commands passed in as inputs. Not running from command line."); //NON-NLS
             System.out.println("No command line commands passed in as inputs. Not running from command line.");

From 70ed6c2c644f2ce60543b0b7a8bca5035d51b02f Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Tue, 14 May 2019 13:06:23 -0400
Subject: [PATCH 012/192] Bug fixes

---
 .../autopsy/commandlineingest/CommandLineOptionProcessor.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
index d67fa721ef..f1ee9b668c 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
@@ -155,7 +155,7 @@ public class CommandLineOptionProcessor extends OptionProcessor {
         // First create the "CREATE_CASE" command, if present
         if (values.containsKey(createCaseCommandOption)) {
 
-            if (dataSourcePath.isEmpty()) {
+            if (inputCaseName.isEmpty()) {
                 logger.log(Level.SEVERE, "'caseName' argument is empty");
                 System.out.println("'caseName' argument is empty");
                 runFromCommandLine = false;

From a9ae6ca5a98b1c8723d18fb2433d092151e863c8 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Wed, 15 May 2019 12:31:02 -0400
Subject: [PATCH 013/192] Minor

---
 .../autopsy/commandlineingest/CommandLineCommand.java         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java
index 5ad7584b7f..14dc5e34fd 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java
@@ -59,14 +59,14 @@ class CommandLineCommand {
     /**
      * @return the inputs
      */
-    public Map<String, String> getInputs() {
+    Map<String, String> getInputs() {
         return inputs;
     }
 
     /**
      * @return the type
      */
-    public CommandType getType() {
+    CommandType getType() {
         return type;
     }    
 }

From 7bdf053f593120607c9398269c51f7213b15ed7b Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Thu, 16 May 2019 12:46:33 -0400
Subject: [PATCH 014/192] Support to process new input arguments

---
 .../CommandLineOptionProcessor.java           | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
index f1ee9b668c..6b034eb2e8 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
@@ -45,6 +45,7 @@ public class CommandLineOptionProcessor extends OptionProcessor {
     private final Option dataSourcePathOption = Option.requiredArgument('s', "dataSourcePath");
     private final Option addDataSourceCommandOption = Option.withoutArgument('a', "addDataSource");
     private final Option caseDirOption = Option.requiredArgument('d', "caseDir");
+    private final Option runIngestCommandOption = Option.withoutArgument('i', "runIngest");
     private boolean runFromCommandLine = false;
 
     private final List<CommandLineCommand> commands = new ArrayList<>();
@@ -58,6 +59,7 @@ public class CommandLineOptionProcessor extends OptionProcessor {
         set.add(dataSourcePathOption);
         set.add(addDataSourceCommandOption);
         set.add(caseDirOption);
+        set.add(runIngestCommandOption);
         return set;
     }
 
@@ -68,7 +70,7 @@ public class CommandLineOptionProcessor extends OptionProcessor {
         runFromCommandLine = false;
 
         // input arguments must contain at least one command
-        if (!(values.containsKey(createCaseCommandOption) || values.containsKey(addDataSourceCommandOption) /* || OtherCommands */)) {
+        if (!(values.containsKey(createCaseCommandOption) || values.containsKey(addDataSourceCommandOption)  || values.containsKey(runIngestCommandOption))) {
             // not running from command line
             logger.log(Level.INFO, "No command line commands passed in as inputs. Not running from command line."); //NON-NLS
             System.out.println("No command line commands passed in as inputs. Not running from command line.");
@@ -201,6 +203,28 @@ public class CommandLineOptionProcessor extends OptionProcessor {
         }
 
         // Add RUN_INGEST command, if present
+        if (values.containsKey(runIngestCommandOption)) {
+
+            if (dataSourcePath.isEmpty()) {
+                logger.log(Level.SEVERE, "'dataSourcePath' argument is empty");
+                System.out.println("'dataSourcePath' argument is empty");
+                runFromCommandLine = false;
+                return;
+            }
+
+            if (caseDir.isEmpty()) {
+                logger.log(Level.SEVERE, "'caseDir' argument is empty");
+                System.out.println("'caseDir' argument is empty");
+                runFromCommandLine = false;
+                return;
+            }
+
+            CommandLineCommand newCommand = new CommandLineCommand(CommandLineCommand.CommandType.RUN_INGEST);
+            newCommand.addInputValue(CommandLineCommand.InputType.DATA_SOURCE_PATH.name(), dataSourcePath);
+            newCommand.addInputValue(CommandLineCommand.InputType.CASE_FOLDER_PATH.name(), caseDir);
+            commands.add(newCommand);
+            runFromCommandLine = true;
+        }  
     }
 
     /**

From ba237452c2c932ff9ac79e14c9ce967241fab1b1 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Thu, 16 May 2019 12:49:35 -0400
Subject: [PATCH 015/192] First cut at supporting the command

---
 .../CommandLineIngestManager.java             | 59 +++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
index 41dc2e6ec5..c5cf99f12e 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
@@ -24,6 +24,8 @@ import java.io.File;
 import java.io.FilenameFilter;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.sql.SQLException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 import java.util.Collection;
@@ -38,9 +40,11 @@ import org.sleuthkit.autopsy.casemodule.CaseActionException;
 import org.sleuthkit.autopsy.casemodule.CaseDetails;
 import org.sleuthkit.autopsy.casemodule.CaseMetadata;
 import static org.sleuthkit.autopsy.casemodule.CaseMetadata.getFileExtension;
+import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
 import org.sleuthkit.autopsy.core.RuntimeProperties;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessorCallback;
 import static org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessorCallback.DataSourceProcessorResult.CRITICAL_ERRORS;
+import static org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessorCallback.DataSourceProcessorResult.NO_ERRORS;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessorProgressMonitor;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.TimeStampUtils;
@@ -58,6 +62,7 @@ import org.sleuthkit.autopsy.ingest.IngestModuleError;
 //import org.sleuthkit.autopsy.report.caseuco.CaseUcoFormatExporter;
 //import org.sleuthkit.autopsy.report.caseuco.ReportCaseUco;
 import org.sleuthkit.datamodel.Content;
+import org.sleuthkit.datamodel.TskCoreException;
 
 /**
  * Allows Autopsy to be invoked with a command line arguments. Causes Autopsy to
@@ -175,6 +180,60 @@ public class CommandLineIngestManager {
                                 }
                                 break;
                             case RUN_INGEST:
+                                try {
+                                    LOGGER.log(Level.INFO, "Processing 'run ingest' command");
+                                    System.out.println("Processing 'run ingest' command");
+                                    Map<String, String> inputs = command.getInputs();
+                                    
+                                    // open the case, if it hasn't been already opened by CREATE_CASE or ADD_DATA_SOURCE commands
+                                    if (caseForJob == null) {
+                                        String caseDirPath = inputs.get(CommandLineCommand.InputType.CASE_FOLDER_PATH.name());
+                                        openCase(caseDirPath);
+                                    }
+                                    
+                                    // populate the AutoIngestDataSource structure, if that hasn't been done by ADD_DATA_SOURCE command
+                                    if (dataSource == null) {
+                                        // create a new AutoIngestDataSource
+                                        String dataSourcePath = inputs.get(CommandLineCommand.InputType.DATA_SOURCE_PATH.name());
+                                        
+                                        // query case database for data source object ID
+                                        Long dataSourceObjId;
+                                        try {
+                                            dataSourceObjId = getDataSourceIdFromDatabase(dataSourcePath);
+                                        } catch (NoCurrentCaseException | TskCoreException | SQLException ex) {
+                                            LOGGER.log(Level.SEVERE, "Error querying case database for data source " + dataSourcePath, ex);
+                                            System.out.println("Error querying case database for data source " + dataSourcePath);
+                                            // Do not process any other commands
+                                            return;
+                                        }
+                                        
+                                        if (dataSourceObjId == null) {
+                                            LOGGER.log(Level.SEVERE, "Unable to find data source {0} in case database", dataSourcePath);
+                                            System.out.println("Unable to find data source " + dataSourcePath + " in case database");
+                                            // Do not process any other commands
+                                            return;                                            
+                                        }
+                                        
+                                        // get Content object for the data source
+                                        Content content = Case.getCurrentCaseThrows().getSleuthkitCase().getContentById(dataSourceObjId);
+                                        
+                                        // populate the AutoIngestDataSource structure
+                                        dataSource = new AutoIngestDataSource("", Paths.get(dataSourcePath));
+                                        List<Content> contentList = new ArrayList<>();
+                                        contentList.add(content);
+                                        List<String> errorList = new ArrayList<>();
+                                        dataSource.setDataSourceProcessorOutput(NO_ERRORS, errorList, contentList);
+                                    }
+                                    
+                                    // run ingest
+                                    analyze(dataSource);
+                                } catch (InterruptedException | CaseActionException ex) {
+                                    String dataSourcePath = command.getInputs().get(CommandLineCommand.InputType.DATA_SOURCE_PATH.name());
+                                    LOGGER.log(Level.SEVERE, "Error running ingest on data source " + dataSourcePath, ex);
+                                    System.out.println("Error running ingest on data source " + dataSourcePath);
+                                    // Do not process any other commands
+                                    return;
+                                }
                                 break;
                             default:
                                 break;

From 6149780f0d7ea1f6fc80a75011cd14ff90ba3768 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Thu, 16 May 2019 12:50:50 -0400
Subject: [PATCH 016/192] More work

---
 .../CommandLineIngestManager.java             | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
index c5cf99f12e..985e53509e 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
@@ -48,6 +48,7 @@ import static org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessorC
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessorProgressMonitor;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.TimeStampUtils;
+import org.sleuthkit.autopsy.datamodel.utils.DataSourceLoader;
 import org.sleuthkit.autopsy.datasourceprocessors.AutoIngestDataSourceProcessor;
 import org.sleuthkit.autopsy.datasourceprocessors.AutoIngestDataSource;
 import org.sleuthkit.autopsy.datasourceprocessors.AddDataSourceCallback;
@@ -296,7 +297,30 @@ public class CommandLineIngestManager {
             Content content = dataSource.getContent().get(0);
             return content.getId();
         }
+        
+        /**
+         * Provides object ID of the data source by querying all existing data sources 
+         * from case database.
+         * 
+         * @param dataSourcePath full path to data source
+         * @return object id of the data source, NULL if data source was not found
+         * @throws NoCurrentCaseException
+         * @throws TskCoreException
+         * @throws SQLException 
+         */
+        private Long getDataSourceIdFromDatabase(String dataSourcePath) throws NoCurrentCaseException, TskCoreException, SQLException {
+            // look up all data sources in the current case
+            Map<Long, String> dataSourceMap = new DataSourceLoader().getFullPathDataSourceMap();
 
+            // get data source ID for the input data source
+            for (Map.Entry<Long, String> entry : dataSourceMap.entrySet()) {
+                if (entry.getValue().equalsIgnoreCase(dataSourcePath)) {
+                    return entry.getKey();
+                }
+            }            
+            return null;
+        }
+        
         /**
          * Creates a new case using arguments passed in from command line
          * CREATE_CASE command.

From 89ae1a56bc9417bd5f8f30d530219b979af0fbec Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Thu, 16 May 2019 12:57:20 -0400
Subject: [PATCH 017/192] Getting existing data source IDs from database

---
 .../CommandLineIngestManager.java             |  7 --
 .../datamodel/utils/DataSourceLoader.java     | 64 +++++++++++++++++--
 2 files changed, 57 insertions(+), 14 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
index 985e53509e..084489c9e2 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
@@ -242,13 +242,6 @@ public class CommandLineIngestManager {
                     }
 
                     /* EL: will need this code for next stories
-                    // run data source processor
-                    AutoIngestDataSource dataSource = new AutoIngestDataSource("", Paths.get(dataSourcePath));
-                    runDataSourceProcessor(caseForJob, dataSource);
-
-                    // run ingest manager
-                    analyze(dataSource);
-
                     // generate CASE-UCO report
                     Long selectedDataSourceId = getDataSourceId(dataSource);
                     Path reportFolderPath = Paths.get(caseForJob.getReportDirectory(), "CASE-UCO", "Data_Source_ID_" + selectedDataSourceId.toString() + "_" + TimeStampUtils.createTimeStamp(), ReportCaseUco.getReportFileName()); //NON_NLS
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/utils/DataSourceLoader.java b/Core/src/org/sleuthkit/autopsy/datamodel/utils/DataSourceLoader.java
index f435efd9bd..ea8bf1ece1 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/utils/DataSourceLoader.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/utils/DataSourceLoader.java
@@ -42,6 +42,16 @@ public class DataSourceLoader {
 
     private static final String SELECT_DATA_SOURCES_IMAGE = "select obj_id, name from tsk_image_names where obj_id in (SELECT obj_id FROM tsk_objects WHERE obj_id in (select obj_id from data_source_info))";
 
+    /**
+     * Query case database for a list of all existing logical data sources and
+     * their object IDs. Method can return either full path to data sources or
+     * just data source file names.
+     *
+     * @param tskDb SleuthkitCase database handle
+     * @param dataSourceMap map to which to add data sources
+     * @throws TskCoreException
+     * @throws SQLException
+     */
     private void loadLogicalSources(SleuthkitCase tskDb, Map<Long, String> dataSouceMap) throws TskCoreException, SQLException {
         //try block releases resources - exceptions are handled in done()
         try (
@@ -55,7 +65,19 @@ public class DataSourceLoader {
         }
     }
 
-    private void loadImageSources(SleuthkitCase tskDb, Map<Long, String> dataSourceMap) throws SQLException, TskCoreException {
+    /**
+     * Query case database for a list of all existing image data sources and
+     * their object IDs. Method can return either full path to data sources or
+     * just data source file names.
+     *
+     * @param tskDb SleuthkitCase database handle
+     * @param dataSourceMap map to which to add data sources
+     * @param fullPath true if full path to data source is needed, false
+     * otherwise
+     * @throws SQLException
+     * @throws TskCoreException
+     */
+    private void loadImageSources(SleuthkitCase tskDb, Map<Long, String> dataSourceMap, boolean fullPath) throws SQLException, TskCoreException {
         //try block releases resources - exceptions are handled in done()
         try (
                 SleuthkitCase.CaseDbQuery query = tskDb.executeQuery(SELECT_DATA_SOURCES_IMAGE);
@@ -65,18 +87,23 @@ public class DataSourceLoader {
                 Long objectId = resultSet.getLong(1);
                 if (!dataSourceMap.containsKey(objectId)) {
                     String dataSourceName = resultSet.getString(2);
-                    File image = new File(dataSourceName);
-                    String dataSourceNameTrimmed = image.getName();
-                    dataSourceMap.put(objectId, dataSourceNameTrimmed);
+                    if (fullPath) {
+                        dataSourceMap.put(objectId, dataSourceName);
+                    } else {
+                        File image = new File(dataSourceName);
+                        String dataSourceNameTrimmed = image.getName();
+                        dataSourceMap.put(objectId, dataSourceNameTrimmed);
+                    }
                 }
             }
         }
     }
 
     /**
-     * Get a map of data source Ids to their string names for the current case.
+     * Get a map of data source Ids to their string names (data source file name
+     * only) for the current case.
      *
-     * @return Map of Long (id) to String (name)
+     * @return Map of Long (id) to String (data source file name only)
      *
      * @throws NoCurrentCaseException
      * @throws TskCoreException
@@ -90,7 +117,30 @@ public class DataSourceLoader {
 
         loadLogicalSources(tskDb, dataSouceMap);
 
-        loadImageSources(tskDb, dataSouceMap);
+        loadImageSources(tskDb, dataSouceMap, false);
+
+        return dataSouceMap;
+    }
+
+    /**
+     * Get a map of data source Ids to their string names (full path) for the
+     * current case.
+     *
+     * @return Map of Long (id) to String (full path to data source)
+     *
+     * @throws NoCurrentCaseException
+     * @throws TskCoreException
+     * @throws SQLException
+     */
+    public Map<Long, String> getFullPathDataSourceMap() throws NoCurrentCaseException, TskCoreException, SQLException {
+        Map<Long, String> dataSouceMap = new HashMap<>();
+
+        Case currentCase = Case.getCurrentCaseThrows();
+        SleuthkitCase tskDb = currentCase.getSleuthkitCase();
+
+        loadLogicalSources(tskDb, dataSouceMap);
+
+        loadImageSources(tskDb, dataSouceMap, true);
 
         return dataSouceMap;
     }

From 53f82a85c447bd2bb1ce146851bb4033fe435117 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Mon, 20 May 2019 14:56:59 -0400
Subject: [PATCH 018/192] Minor

---
 .../autopsy/commandlineingest/CommandLineIngestManager.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
index 084489c9e2..57e279d6bb 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
@@ -26,6 +26,7 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
 import java.util.Collection;
@@ -170,7 +171,7 @@ public class CommandLineIngestManager {
                                     }
 
                                     String dataSourcePath = inputs.get(CommandLineCommand.InputType.DATA_SOURCE_PATH.name());
-                                    dataSource = new AutoIngestDataSource("", Paths.get(dataSourcePath));
+                                    dataSource = new AutoIngestDataSource(dataSourcePath /*ELTODO ""*/, Paths.get(dataSourcePath));
                                     runDataSourceProcessor(caseForJob, dataSource);
                                 } catch (InterruptedException | AutoIngestDataSourceProcessor.AutoIngestDataSourceProcessorException | CaseActionException ex) {
                                     String dataSourcePath = command.getInputs().get(CommandLineCommand.InputType.DATA_SOURCE_PATH.name());
@@ -220,8 +221,7 @@ public class CommandLineIngestManager {
                                         
                                         // populate the AutoIngestDataSource structure
                                         dataSource = new AutoIngestDataSource("", Paths.get(dataSourcePath));
-                                        List<Content> contentList = new ArrayList<>();
-                                        contentList.add(content);
+                                        List<Content> contentList = Arrays.asList(new Content[]{content});
                                         List<String> errorList = new ArrayList<>();
                                         dataSource.setDataSourceProcessorOutput(NO_ERRORS, errorList, contentList);
                                     }

From ea17bbf0a414cacf60e4722ed52c2ff95869ac89 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Tue, 21 May 2019 12:43:47 -0400
Subject: [PATCH 019/192] Changes to accomodate new design

---
 .../commandlineingest/CommandLineCommand.java |  3 +-
 .../CommandLineIngestManager.java             | 62 ++-----------------
 .../CommandLineOptionProcessor.java           | 62 +++++++++++++++----
 .../datamodel/utils/DataSourceLoader.java     | 41 ++----------
 4 files changed, 63 insertions(+), 105 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java
index 14dc5e34fd..cce11058c9 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java
@@ -42,7 +42,8 @@ class CommandLineCommand {
         CASE_NAME,
         CASES_BASE_DIR_PATH,
         CASE_FOLDER_PATH,
-        DATA_SOURCE_PATH;
+        DATA_SOURCE_PATH,
+        DATA_SOURCE_ID;
     }
     
     private final CommandType type;
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
index 57e279d6bb..73f1ad4014 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
@@ -60,9 +60,6 @@ import org.sleuthkit.autopsy.ingest.IngestJobSettings;
 import org.sleuthkit.autopsy.ingest.IngestJobStartResult;
 import org.sleuthkit.autopsy.ingest.IngestManager;
 import org.sleuthkit.autopsy.ingest.IngestModuleError;
-//import org.sleuthkit.autopsy.report.ReportProgressPanel;
-//import org.sleuthkit.autopsy.report.caseuco.CaseUcoFormatExporter;
-//import org.sleuthkit.autopsy.report.caseuco.ReportCaseUco;
 import org.sleuthkit.datamodel.Content;
 import org.sleuthkit.datamodel.TskCoreException;
 
@@ -195,32 +192,15 @@ public class CommandLineIngestManager {
                                     
                                     // populate the AutoIngestDataSource structure, if that hasn't been done by ADD_DATA_SOURCE command
                                     if (dataSource == null) {
-                                        // create a new AutoIngestDataSource
-                                        String dataSourcePath = inputs.get(CommandLineCommand.InputType.DATA_SOURCE_PATH.name());
-                                        
-                                        // query case database for data source object ID
-                                        Long dataSourceObjId;
-                                        try {
-                                            dataSourceObjId = getDataSourceIdFromDatabase(dataSourcePath);
-                                        } catch (NoCurrentCaseException | TskCoreException | SQLException ex) {
-                                            LOGGER.log(Level.SEVERE, "Error querying case database for data source " + dataSourcePath, ex);
-                                            System.out.println("Error querying case database for data source " + dataSourcePath);
-                                            // Do not process any other commands
-                                            return;
-                                        }
-                                        
-                                        if (dataSourceObjId == null) {
-                                            LOGGER.log(Level.SEVERE, "Unable to find data source {0} in case database", dataSourcePath);
-                                            System.out.println("Unable to find data source " + dataSourcePath + " in case database");
-                                            // Do not process any other commands
-                                            return;                                            
-                                        }
+
+                                        String dataSourceId = inputs.get(CommandLineCommand.InputType.DATA_SOURCE_ID.name());
+                                        Long dataSourceObjId = Long.getLong(dataSourceId);
                                         
                                         // get Content object for the data source
                                         Content content = Case.getCurrentCaseThrows().getSleuthkitCase().getContentById(dataSourceObjId);
                                         
                                         // populate the AutoIngestDataSource structure
-                                        dataSource = new AutoIngestDataSource("", Paths.get(dataSourcePath));
+                                        dataSource = new AutoIngestDataSource("", Paths.get(content.getName()));
                                         List<Content> contentList = Arrays.asList(new Content[]{content});
                                         List<String> errorList = new ArrayList<>();
                                         dataSource.setDataSourceProcessorOutput(NO_ERRORS, errorList, contentList);
@@ -240,17 +220,6 @@ public class CommandLineIngestManager {
                                 break;
                         }
                     }
-
-                    /* EL: will need this code for next stories
-                    // generate CASE-UCO report
-                    Long selectedDataSourceId = getDataSourceId(dataSource);
-                    Path reportFolderPath = Paths.get(caseForJob.getReportDirectory(), "CASE-UCO", "Data_Source_ID_" + selectedDataSourceId.toString() + "_" + TimeStampUtils.createTimeStamp(), ReportCaseUco.getReportFileName()); //NON_NLS
-                    ReportProgressPanel progressPanel = new ReportProgressPanel("CASE_UCO", rootOutputDir); // dummy progress panel
-                    CaseUcoFormatExporter.generateReport(selectedDataSourceId, reportFolderPath.toString(), progressPanel);
-                } catch (InterruptedException | AutoIngestDataSourceProcessor.AutoIngestDataSourceProcessorException | AnalysisStartupException ex) {
-                    LOGGER.log(Level.SEVERE, "Unable to ingest data source " + dataSourcePath + ". Exiting...", ex);
-                    System.out.println("Unable to ingest data source " + dataSourcePath + ". Exiting...");
-                    */
                 } catch (Throwable ex) {
                     /*
                     * Unexpected runtime exceptions firewall. This task is designed to
@@ -291,29 +260,6 @@ public class CommandLineIngestManager {
             return content.getId();
         }
         
-        /**
-         * Provides object ID of the data source by querying all existing data sources 
-         * from case database.
-         * 
-         * @param dataSourcePath full path to data source
-         * @return object id of the data source, NULL if data source was not found
-         * @throws NoCurrentCaseException
-         * @throws TskCoreException
-         * @throws SQLException 
-         */
-        private Long getDataSourceIdFromDatabase(String dataSourcePath) throws NoCurrentCaseException, TskCoreException, SQLException {
-            // look up all data sources in the current case
-            Map<Long, String> dataSourceMap = new DataSourceLoader().getFullPathDataSourceMap();
-
-            // get data source ID for the input data source
-            for (Map.Entry<Long, String> entry : dataSourceMap.entrySet()) {
-                if (entry.getValue().equalsIgnoreCase(dataSourcePath)) {
-                    return entry.getKey();
-                }
-            }            
-            return null;
-        }
-        
         /**
          * Creates a new case using arguments passed in from command line
          * CREATE_CASE command.
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
index 6b034eb2e8..9607778c5d 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
@@ -43,9 +43,10 @@ public class CommandLineOptionProcessor extends OptionProcessor {
     private final Option caseBaseDirOption = Option.requiredArgument('o', "caseBaseDir");
     private final Option createCaseCommandOption = Option.withoutArgument('c', "createCase");
     private final Option dataSourcePathOption = Option.requiredArgument('s', "dataSourcePath");
+    private final Option dataSourceObjectIdOption = Option.requiredArgument('i', "dataSourceObjectId");    
     private final Option addDataSourceCommandOption = Option.withoutArgument('a', "addDataSource");
     private final Option caseDirOption = Option.requiredArgument('d', "caseDir");
-    private final Option runIngestCommandOption = Option.withoutArgument('i', "runIngest");
+    private final Option runIngestCommandOption = Option.withoutArgument('r', "runIngest");
     private boolean runFromCommandLine = false;
 
     private final List<CommandLineCommand> commands = new ArrayList<>();
@@ -58,6 +59,7 @@ public class CommandLineOptionProcessor extends OptionProcessor {
         set.add(caseBaseDirOption);
         set.add(dataSourcePathOption);
         set.add(addDataSourceCommandOption);
+        set.add(dataSourceObjectIdOption);
         set.add(caseDirOption);
         set.add(runIngestCommandOption);
         return set;
@@ -106,11 +108,17 @@ public class CommandLineOptionProcessor extends OptionProcessor {
             }
             caseBaseDir = argDirs[0];
             
-            if (caseBaseDir == null || caseBaseDir.isEmpty() || !(new File(caseBaseDir).exists()) || !(new File(caseBaseDir).isDirectory())) {
-                logger.log(Level.SEVERE, "'caseBaseDir' directory doesn't exist or is not a directory");
-                System.out.println("'caseBaseDir' directory doesn't exist or is not a directory");
+            if (caseBaseDir == null || caseBaseDir.isEmpty()) {
+                logger.log(Level.SEVERE, "Missing argument 'caseBaseDir'");
+                System.out.println("Missing argument 'caseBaseDir'");
                 return;
             } 
+            
+            if (!(new File(caseBaseDir).exists()) || !(new File(caseBaseDir).isDirectory())) {
+                logger.log(Level.SEVERE, "''caseBaseDir'' {0} directory doesn''t exist or is not a directory", caseBaseDir);
+                System.out.println("'caseBaseDir' directory doesn't exist or is not a directory: " + caseBaseDir);
+                return;
+            }             
         }
 
         String dataSourcePath = "";
@@ -127,12 +135,38 @@ public class CommandLineOptionProcessor extends OptionProcessor {
 
             // verify inputs
             if (dataSourcePath == null || dataSourcePath.isEmpty() || !(new File(dataSourcePath).exists())) {
+                logger.log(Level.SEVERE, "Missing argument 'dataSourcePath'");
+                System.out.println("Missing argument 'dataSourcePath'");
+                return;
+            }
+            
+            if (!(new File(dataSourcePath).exists())) {
                 logger.log(Level.SEVERE, "Input data source file {0} doesn''t exist", dataSourcePath);
                 System.out.println("Input data source file " + dataSourcePath + " doesn't exist");
                 return;
             }
         }
         
+        String dataSourceId = "";
+        if (values.containsKey(dataSourceObjectIdOption)) {
+
+            argDirs = values.get(dataSourceObjectIdOption);
+            if (argDirs.length < 1) {
+                logger.log(Level.SEVERE, "Missing argument 'dataSourceObjectIdOption'");
+                System.out.println("Missing argument 'dataSourceObjectIdOption'");
+                return;
+
+            }
+            dataSourceId = argDirs[0];
+
+            // verify inputs
+            if (dataSourceId == null || dataSourceId.isEmpty()) {
+                logger.log(Level.SEVERE, "Input data source id is empty");
+                System.out.println("Input data source id is empty");
+                return;
+            } 
+        }        
+        
         String caseDir = "";
         if (values.containsKey(caseDirOption)) {
 
@@ -146,11 +180,17 @@ public class CommandLineOptionProcessor extends OptionProcessor {
             caseDir = argDirs[0];
 
             // verify inputs
-            if (caseDir == null || caseDir.isEmpty() || !(new File(caseDir).exists()) || !(new File(caseDir).isDirectory())) {
+            if (caseDir == null || caseDir.isEmpty()) {
+                logger.log(Level.SEVERE, "Missing argument 'caseDirOption'");
+                System.out.println("Missing argument 'caseDirOption'");
+                return;
+            }
+            
+            if (!(new File(caseDir).exists()) || !(new File(caseDir).isDirectory())) {
                 logger.log(Level.SEVERE, "Case directory {0} doesn''t exist or is not a directory", caseDir);
                 System.out.println("Case directory " + caseDir + " doesn't exist or is not a directory");
                 return;
-            }
+            }            
         }        
 
         // Create commands in order in which they should be executed:
@@ -205,9 +245,9 @@ public class CommandLineOptionProcessor extends OptionProcessor {
         // Add RUN_INGEST command, if present
         if (values.containsKey(runIngestCommandOption)) {
 
-            if (dataSourcePath.isEmpty()) {
-                logger.log(Level.SEVERE, "'dataSourcePath' argument is empty");
-                System.out.println("'dataSourcePath' argument is empty");
+            if (dataSourceId.isEmpty()) {
+                logger.log(Level.SEVERE, "'dataSourceId' argument is empty");
+                System.out.println("'dataSourceId' argument is empty");
                 runFromCommandLine = false;
                 return;
             }
@@ -220,11 +260,11 @@ public class CommandLineOptionProcessor extends OptionProcessor {
             }
 
             CommandLineCommand newCommand = new CommandLineCommand(CommandLineCommand.CommandType.RUN_INGEST);
-            newCommand.addInputValue(CommandLineCommand.InputType.DATA_SOURCE_PATH.name(), dataSourcePath);
+            newCommand.addInputValue(CommandLineCommand.InputType.DATA_SOURCE_ID.name(), dataSourceId);
             newCommand.addInputValue(CommandLineCommand.InputType.CASE_FOLDER_PATH.name(), caseDir);
             commands.add(newCommand);
             runFromCommandLine = true;
-        }  
+        }
     }
 
     /**
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/utils/DataSourceLoader.java b/Core/src/org/sleuthkit/autopsy/datamodel/utils/DataSourceLoader.java
index ea8bf1ece1..3ebc1993a4 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/utils/DataSourceLoader.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/utils/DataSourceLoader.java
@@ -67,17 +67,15 @@ public class DataSourceLoader {
 
     /**
      * Query case database for a list of all existing image data sources and
-     * their object IDs. Method can return either full path to data sources or
-     * just data source file names.
+     * their object IDs. 
      *
      * @param tskDb SleuthkitCase database handle
      * @param dataSourceMap map to which to add data sources
-     * @param fullPath true if full path to data source is needed, false
      * otherwise
      * @throws SQLException
      * @throws TskCoreException
      */
-    private void loadImageSources(SleuthkitCase tskDb, Map<Long, String> dataSourceMap, boolean fullPath) throws SQLException, TskCoreException {
+    private void loadImageSources(SleuthkitCase tskDb, Map<Long, String> dataSourceMap) throws SQLException, TskCoreException {
         //try block releases resources - exceptions are handled in done()
         try (
                 SleuthkitCase.CaseDbQuery query = tskDb.executeQuery(SELECT_DATA_SOURCES_IMAGE);
@@ -87,13 +85,9 @@ public class DataSourceLoader {
                 Long objectId = resultSet.getLong(1);
                 if (!dataSourceMap.containsKey(objectId)) {
                     String dataSourceName = resultSet.getString(2);
-                    if (fullPath) {
-                        dataSourceMap.put(objectId, dataSourceName);
-                    } else {
-                        File image = new File(dataSourceName);
-                        String dataSourceNameTrimmed = image.getName();
-                        dataSourceMap.put(objectId, dataSourceNameTrimmed);
-                    }
+                    File image = new File(dataSourceName);
+                    String dataSourceNameTrimmed = image.getName();
+                    dataSourceMap.put(objectId, dataSourceNameTrimmed);
                 }
             }
         }
@@ -117,30 +111,7 @@ public class DataSourceLoader {
 
         loadLogicalSources(tskDb, dataSouceMap);
 
-        loadImageSources(tskDb, dataSouceMap, false);
-
-        return dataSouceMap;
-    }
-
-    /**
-     * Get a map of data source Ids to their string names (full path) for the
-     * current case.
-     *
-     * @return Map of Long (id) to String (full path to data source)
-     *
-     * @throws NoCurrentCaseException
-     * @throws TskCoreException
-     * @throws SQLException
-     */
-    public Map<Long, String> getFullPathDataSourceMap() throws NoCurrentCaseException, TskCoreException, SQLException {
-        Map<Long, String> dataSouceMap = new HashMap<>();
-
-        Case currentCase = Case.getCurrentCaseThrows();
-        SleuthkitCase tskDb = currentCase.getSleuthkitCase();
-
-        loadLogicalSources(tskDb, dataSouceMap);
-
-        loadImageSources(tskDb, dataSouceMap, true);
+        loadImageSources(tskDb, dataSouceMap);
 
         return dataSouceMap;
     }

From 68bf48158830794e9cb5362a1e1c32d3f4b3e861 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Tue, 21 May 2019 14:14:01 -0400
Subject: [PATCH 020/192] Changes to support specifying data source by ID

---
 .../CommandLineIngestManager.java             | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
index 73f1ad4014..fe7d7b480b 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
@@ -168,7 +168,7 @@ public class CommandLineIngestManager {
                                     }
 
                                     String dataSourcePath = inputs.get(CommandLineCommand.InputType.DATA_SOURCE_PATH.name());
-                                    dataSource = new AutoIngestDataSource(dataSourcePath /*ELTODO ""*/, Paths.get(dataSourcePath));
+                                    dataSource = new AutoIngestDataSource("", Paths.get(dataSourcePath));
                                     runDataSourceProcessor(caseForJob, dataSource);
                                 } catch (InterruptedException | AutoIngestDataSourceProcessor.AutoIngestDataSourceProcessorException | CaseActionException ex) {
                                     String dataSourcePath = command.getInputs().get(CommandLineCommand.InputType.DATA_SOURCE_PATH.name());
@@ -194,10 +194,25 @@ public class CommandLineIngestManager {
                                     if (dataSource == null) {
 
                                         String dataSourceId = inputs.get(CommandLineCommand.InputType.DATA_SOURCE_ID.name());
-                                        Long dataSourceObjId = Long.getLong(dataSourceId);
+                                        Long dataSourceObjId = Long.valueOf(dataSourceId);
                                         
                                         // get Content object for the data source
-                                        Content content = Case.getCurrentCaseThrows().getSleuthkitCase().getContentById(dataSourceObjId);
+                                        Content content = null;
+                                        try {
+                                            content = Case.getCurrentCaseThrows().getSleuthkitCase().getContentById(dataSourceObjId);
+                                        } catch (TskCoreException ex) {
+                                            LOGGER.log(Level.SEVERE, "Exception while trying to find data source with object ID " + dataSourceId, ex);
+                                            System.out.println("Exception while trying to find data source with object ID " + dataSourceId);
+                                            // Do not process any other commands
+                                            return;
+                                        }
+                                        
+                                        if (content == null) {
+                                            LOGGER.log(Level.SEVERE, "Unable to find data source with object ID {0}", dataSourceId);
+                                            System.out.println("Unable to find data source with object ID " + dataSourceId);
+                                            // Do not process any other commands
+                                            return;                                            
+                                        }
                                         
                                         // populate the AutoIngestDataSource structure
                                         dataSource = new AutoIngestDataSource("", Paths.get(content.getName()));

From 26809f7ec713ed00c61c3785f52dc74b7fc31ec2 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Tue, 21 May 2019 14:44:43 -0400
Subject: [PATCH 021/192] Updated javadocs

---
 .../sleuthkit/autopsy/datamodel/utils/DataSourceLoader.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/utils/DataSourceLoader.java b/Core/src/org/sleuthkit/autopsy/datamodel/utils/DataSourceLoader.java
index 3ebc1993a4..0038c62e3e 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/utils/DataSourceLoader.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/utils/DataSourceLoader.java
@@ -44,8 +44,7 @@ public class DataSourceLoader {
 
     /**
      * Query case database for a list of all existing logical data sources and
-     * their object IDs. Method can return either full path to data sources or
-     * just data source file names.
+     * their object IDs. 
      *
      * @param tskDb SleuthkitCase database handle
      * @param dataSourceMap map to which to add data sources

From cfc8b2462e8bc26e8561c622bc776dc767acb69c Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Tue, 21 May 2019 16:05:38 -0400
Subject: [PATCH 022/192] Processing various input combinations

---
 .../CommandLineOptionProcessor.java           | 75 +++++++++++--------
 1 file changed, 42 insertions(+), 33 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
index 9607778c5d..ac4bd5d837 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
@@ -43,7 +43,7 @@ public class CommandLineOptionProcessor extends OptionProcessor {
     private final Option caseBaseDirOption = Option.requiredArgument('o', "caseBaseDir");
     private final Option createCaseCommandOption = Option.withoutArgument('c', "createCase");
     private final Option dataSourcePathOption = Option.requiredArgument('s', "dataSourcePath");
-    private final Option dataSourceObjectIdOption = Option.requiredArgument('i', "dataSourceObjectId");    
+    private final Option dataSourceObjectIdOption = Option.requiredArgument('i', "dataSourceObjectId");
     private final Option addDataSourceCommandOption = Option.withoutArgument('a', "addDataSource");
     private final Option caseDirOption = Option.requiredArgument('d', "caseDir");
     private final Option runIngestCommandOption = Option.withoutArgument('r', "runIngest");
@@ -72,7 +72,7 @@ public class CommandLineOptionProcessor extends OptionProcessor {
         runFromCommandLine = false;
 
         // input arguments must contain at least one command
-        if (!(values.containsKey(createCaseCommandOption) || values.containsKey(addDataSourceCommandOption)  || values.containsKey(runIngestCommandOption))) {
+        if (!(values.containsKey(createCaseCommandOption) || values.containsKey(addDataSourceCommandOption) || values.containsKey(runIngestCommandOption))) {
             // not running from command line
             logger.log(Level.INFO, "No command line commands passed in as inputs. Not running from command line."); //NON-NLS
             System.out.println("No command line commands passed in as inputs. Not running from command line.");
@@ -90,12 +90,12 @@ public class CommandLineOptionProcessor extends OptionProcessor {
                 return;
             }
             inputCaseName = argDirs[0];
-            
+
             if (inputCaseName == null || inputCaseName.isEmpty()) {
                 logger.log(Level.SEVERE, "'caseName' argument is empty");
                 System.out.println("'caseName' argument is empty");
                 return;
-            }            
+            }
         }
 
         String caseBaseDir = "";
@@ -107,18 +107,18 @@ public class CommandLineOptionProcessor extends OptionProcessor {
                 return;
             }
             caseBaseDir = argDirs[0];
-            
+
             if (caseBaseDir == null || caseBaseDir.isEmpty()) {
                 logger.log(Level.SEVERE, "Missing argument 'caseBaseDir'");
                 System.out.println("Missing argument 'caseBaseDir'");
                 return;
-            } 
-            
+            }
+
             if (!(new File(caseBaseDir).exists()) || !(new File(caseBaseDir).isDirectory())) {
                 logger.log(Level.SEVERE, "''caseBaseDir'' {0} directory doesn''t exist or is not a directory", caseBaseDir);
                 System.out.println("'caseBaseDir' directory doesn't exist or is not a directory: " + caseBaseDir);
                 return;
-            }             
+            }
         }
 
         String dataSourcePath = "";
@@ -139,14 +139,14 @@ public class CommandLineOptionProcessor extends OptionProcessor {
                 System.out.println("Missing argument 'dataSourcePath'");
                 return;
             }
-            
+
             if (!(new File(dataSourcePath).exists())) {
                 logger.log(Level.SEVERE, "Input data source file {0} doesn''t exist", dataSourcePath);
                 System.out.println("Input data source file " + dataSourcePath + " doesn't exist");
                 return;
             }
         }
-        
+
         String dataSourceId = "";
         if (values.containsKey(dataSourceObjectIdOption)) {
 
@@ -164,9 +164,9 @@ public class CommandLineOptionProcessor extends OptionProcessor {
                 logger.log(Level.SEVERE, "Input data source id is empty");
                 System.out.println("Input data source id is empty");
                 return;
-            } 
-        }        
-        
+            }
+        }
+
         String caseDir = "";
         if (values.containsKey(caseDirOption)) {
 
@@ -185,18 +185,19 @@ public class CommandLineOptionProcessor extends OptionProcessor {
                 System.out.println("Missing argument 'caseDirOption'");
                 return;
             }
-            
+
             if (!(new File(caseDir).exists()) || !(new File(caseDir).isDirectory())) {
                 logger.log(Level.SEVERE, "Case directory {0} doesn''t exist or is not a directory", caseDir);
                 System.out.println("Case directory " + caseDir + " doesn't exist or is not a directory");
                 return;
-            }            
-        }        
+            }
+        }
 
         // Create commands in order in which they should be executed:
         // First create the "CREATE_CASE" command, if present
         if (values.containsKey(createCaseCommandOption)) {
 
+            // 'caseName' must always be specified for "CREATE_CASE" command
             if (inputCaseName.isEmpty()) {
                 logger.log(Level.SEVERE, "'caseName' argument is empty");
                 System.out.println("'caseName' argument is empty");
@@ -204,6 +205,7 @@ public class CommandLineOptionProcessor extends OptionProcessor {
                 return;
             }
 
+            // 'caseBaseDir' must always be specified for "CREATE_CASE" command
             if (caseBaseDir.isEmpty()) {
                 logger.log(Level.SEVERE, "'caseBaseDir' argument is empty");
                 System.out.println("'caseBaseDir' argument is empty");
@@ -221,6 +223,16 @@ public class CommandLineOptionProcessor extends OptionProcessor {
         // Add ADD_DATA_SOURCE command, if present
         if (values.containsKey(addDataSourceCommandOption)) {
 
+            // 'caseDir' must only be specified if the case is not being created during the current run
+            if (!values.containsKey(createCaseCommandOption) && caseDir.isEmpty()) {
+                // new case is not being created during this run, so 'caseDir' should have been specified
+                logger.log(Level.SEVERE, "'caseDir' argument is empty");
+                System.out.println("'caseDir' argument is empty");
+                runFromCommandLine = false;
+                return;
+            }
+
+            // 'dataSourcePath' must always be specified for "ADD_DATA_SOURCE" command
             if (dataSourcePath.isEmpty()) {
                 logger.log(Level.SEVERE, "'dataSourcePath' argument is empty");
                 System.out.println("'dataSourcePath' argument is empty");
@@ -228,16 +240,9 @@ public class CommandLineOptionProcessor extends OptionProcessor {
                 return;
             }
 
-            if (caseDir.isEmpty()) {
-                logger.log(Level.SEVERE, "'caseDir' argument is empty");
-                System.out.println("'caseDir' argument is empty");
-                runFromCommandLine = false;
-                return;
-            }
-
             CommandLineCommand newCommand = new CommandLineCommand(CommandLineCommand.CommandType.ADD_DATA_SOURCE);
-            newCommand.addInputValue(CommandLineCommand.InputType.DATA_SOURCE_PATH.name(), dataSourcePath);
             newCommand.addInputValue(CommandLineCommand.InputType.CASE_FOLDER_PATH.name(), caseDir);
+            newCommand.addInputValue(CommandLineCommand.InputType.DATA_SOURCE_PATH.name(), dataSourcePath);
             commands.add(newCommand);
             runFromCommandLine = true;
         }
@@ -245,23 +250,27 @@ public class CommandLineOptionProcessor extends OptionProcessor {
         // Add RUN_INGEST command, if present
         if (values.containsKey(runIngestCommandOption)) {
 
-            if (dataSourceId.isEmpty()) {
-                logger.log(Level.SEVERE, "'dataSourceId' argument is empty");
-                System.out.println("'dataSourceId' argument is empty");
-                runFromCommandLine = false;
-                return;
-            }
-
-            if (caseDir.isEmpty()) {
+            // 'caseDir' must only be specified if the case is not being created during the current run
+            if (!values.containsKey(createCaseCommandOption) && caseDir.isEmpty()) {
+                // new case is not being created during this run, so 'caseDir' should have been specified
                 logger.log(Level.SEVERE, "'caseDir' argument is empty");
                 System.out.println("'caseDir' argument is empty");
                 runFromCommandLine = false;
                 return;
             }
 
+            // if new data source is being added during this run, then 'dataSourceId' is not specified
+            if (!values.containsKey(addDataSourceCommandOption) && dataSourceId.isEmpty()) {
+                // data source is not being added during this run, so 'dataSourceId' should have been specified
+                logger.log(Level.SEVERE, "'dataSourceId' argument is empty");
+                System.out.println("'dataSourceId' argument is empty");
+                runFromCommandLine = false;
+                return;
+            }
+
             CommandLineCommand newCommand = new CommandLineCommand(CommandLineCommand.CommandType.RUN_INGEST);
-            newCommand.addInputValue(CommandLineCommand.InputType.DATA_SOURCE_ID.name(), dataSourceId);
             newCommand.addInputValue(CommandLineCommand.InputType.CASE_FOLDER_PATH.name(), caseDir);
+            newCommand.addInputValue(CommandLineCommand.InputType.DATA_SOURCE_ID.name(), dataSourceId);
             commands.add(newCommand);
             runFromCommandLine = true;
         }

From c0cf88f6632dd691bd4c8bca5b02df9a20c60e7c Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Wed, 22 May 2019 16:12:07 -0400
Subject: [PATCH 023/192] Minor fixes

---
 .../autopsy/commandlineingest/CommandLineIngestManager.java  | 4 ++--
 .../commandlineingest/CommandLineOptionProcessor.java        | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
index fe7d7b480b..05f400f5d2 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
@@ -144,8 +144,8 @@ public class CommandLineIngestManager {
                         switch (type) {
                             case CREATE_CASE:
                                 try {
-                                    LOGGER.log(Level.INFO, "Processing create case command");
-                                    System.out.println("Processing create case command");
+                                    LOGGER.log(Level.INFO, "Processing 'create case' command");
+                                    System.out.println("Processing 'create case' command");
                                     openCase(command);
                                 } catch (CaseActionException ex) {
                                     String baseCaseName = command.getInputs().get(CommandLineCommand.InputType.CASE_NAME.name());
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
index ac4bd5d837..a9cb7b4e67 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
@@ -129,12 +129,11 @@ public class CommandLineOptionProcessor extends OptionProcessor {
                 logger.log(Level.SEVERE, "Missing argument 'dataSourcePath'");
                 System.out.println("Missing argument 'dataSourcePath'");
                 return;
-
             }
             dataSourcePath = argDirs[0];
 
             // verify inputs
-            if (dataSourcePath == null || dataSourcePath.isEmpty() || !(new File(dataSourcePath).exists())) {
+            if (dataSourcePath == null || dataSourcePath.isEmpty()) {
                 logger.log(Level.SEVERE, "Missing argument 'dataSourcePath'");
                 System.out.println("Missing argument 'dataSourcePath'");
                 return;
@@ -155,7 +154,6 @@ public class CommandLineOptionProcessor extends OptionProcessor {
                 logger.log(Level.SEVERE, "Missing argument 'dataSourceObjectIdOption'");
                 System.out.println("Missing argument 'dataSourceObjectIdOption'");
                 return;
-
             }
             dataSourceId = argDirs[0];
 
@@ -175,7 +173,6 @@ public class CommandLineOptionProcessor extends OptionProcessor {
                 logger.log(Level.SEVERE, "Missing argument 'caseDirOption'");
                 System.out.println("Missing argument 'caseDirOption'");
                 return;
-
             }
             caseDir = argDirs[0];
 

From 3fc9414ad832afd3d8cb9d2854414050a7622147 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Wed, 22 May 2019 16:13:27 -0400
Subject: [PATCH 024/192] Removed erroneous stdout logging

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

diff --git a/Core/src/org/sleuthkit/autopsy/ingest/RunIngestSubMenu.java b/Core/src/org/sleuthkit/autopsy/ingest/RunIngestSubMenu.java
index c03abd577b..a3fd407507 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/RunIngestSubMenu.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/RunIngestSubMenu.java
@@ -50,10 +50,10 @@ final class RunIngestSubMenu extends JMenuItem implements DynamicMenuContent {
 
         try {
             dataSources = Case.getCurrentCaseThrows().getDataSources();
-        } catch (IllegalStateException ex) {
+        } catch (IllegalStateException | NoCurrentCaseException ex) {
             // No open Cases, create a disabled empty menu
             return getEmpty();
-        } catch (TskCoreException | NoCurrentCaseException e) {
+        } catch (TskCoreException e) {
             System.out.println("Exception getting images: " + e.getMessage()); //NON-NLS
         }
         JComponent[] comps = new JComponent[dataSources.size()];

From ea76b7e3a6578eec03255b01cda4a2914bd71fc8 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Wed, 22 May 2019 17:43:55 -0400
Subject: [PATCH 025/192] Removed unused imports

---
 .../autopsy/commandlineingest/CommandLineIngestManager.java    | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
index 05f400f5d2..af8d03b1ae 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
@@ -24,7 +24,6 @@ import java.io.File;
 import java.io.FilenameFilter;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -41,7 +40,6 @@ import org.sleuthkit.autopsy.casemodule.CaseActionException;
 import org.sleuthkit.autopsy.casemodule.CaseDetails;
 import org.sleuthkit.autopsy.casemodule.CaseMetadata;
 import static org.sleuthkit.autopsy.casemodule.CaseMetadata.getFileExtension;
-import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
 import org.sleuthkit.autopsy.core.RuntimeProperties;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessorCallback;
 import static org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessorCallback.DataSourceProcessorResult.CRITICAL_ERRORS;
@@ -49,7 +47,6 @@ import static org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessorC
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessorProgressMonitor;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.TimeStampUtils;
-import org.sleuthkit.autopsy.datamodel.utils.DataSourceLoader;
 import org.sleuthkit.autopsy.datasourceprocessors.AutoIngestDataSourceProcessor;
 import org.sleuthkit.autopsy.datasourceprocessors.AutoIngestDataSource;
 import org.sleuthkit.autopsy.datasourceprocessors.AddDataSourceCallback;

From dfa3b12632e659c4a0451f02492159ddd23b9983 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Fri, 24 May 2019 13:32:11 -0400
Subject: [PATCH 026/192] Added support to save 'create case' JSON output

---
 .../CommandLineIngestManager.java             | 21 ++++--
 .../CommandLineOptionProcessor.java           | 38 +++++-----
 .../commandlineingest/OutputGenerator.java    | 69 +++++++++++++++++++
 3 files changed, 102 insertions(+), 26 deletions(-)
 create mode 100755 Core/src/org/sleuthkit/autopsy/commandlineingest/OutputGenerator.java

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
index af8d03b1ae..f027b8d59d 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
@@ -130,7 +130,7 @@ public class CommandLineIngestManager {
 
                 if (commands == null || commands.isEmpty()) {
                     LOGGER.log(Level.SEVERE, "No command line commands specified");
-                    System.out.println("No command line commands specified");
+                    System.err.println("No command line commands specified");
                     return;
                 }
                 
@@ -144,10 +144,13 @@ public class CommandLineIngestManager {
                                     LOGGER.log(Level.INFO, "Processing 'create case' command");
                                     System.out.println("Processing 'create case' command");
                                     openCase(command);
+                                    
+                                    String outputDirPath = "C:\\TEST\\DELETE";
+                                    OutputGenerator.saveCreateCaseOutput(caseForJob, outputDirPath);
                                 } catch (CaseActionException ex) {
                                     String baseCaseName = command.getInputs().get(CommandLineCommand.InputType.CASE_NAME.name());
                                     LOGGER.log(Level.SEVERE, "Error creating or opening case " + baseCaseName, ex);
-                                    System.out.println("Error creating or opening case " + baseCaseName);
+                                    System.err.println("Error creating or opening case " + baseCaseName);
                                     // Do not process any other commands
                                     return;
                                 }
@@ -167,10 +170,12 @@ public class CommandLineIngestManager {
                                     String dataSourcePath = inputs.get(CommandLineCommand.InputType.DATA_SOURCE_PATH.name());
                                     dataSource = new AutoIngestDataSource("", Paths.get(dataSourcePath));
                                     runDataSourceProcessor(caseForJob, dataSource);
+                                    
+                                    // ELTODO saveAddDataSourceOutput(dataSource);
                                 } catch (InterruptedException | AutoIngestDataSourceProcessor.AutoIngestDataSourceProcessorException | CaseActionException ex) {
                                     String dataSourcePath = command.getInputs().get(CommandLineCommand.InputType.DATA_SOURCE_PATH.name());
                                     LOGGER.log(Level.SEVERE, "Error adding data source " + dataSourcePath, ex);
-                                    System.out.println("Error adding data source " + dataSourcePath);
+                                    System.err.println("Error adding data source " + dataSourcePath);
                                     // Do not process any other commands
                                     return;
                                 }
@@ -199,7 +204,7 @@ public class CommandLineIngestManager {
                                             content = Case.getCurrentCaseThrows().getSleuthkitCase().getContentById(dataSourceObjId);
                                         } catch (TskCoreException ex) {
                                             LOGGER.log(Level.SEVERE, "Exception while trying to find data source with object ID " + dataSourceId, ex);
-                                            System.out.println("Exception while trying to find data source with object ID " + dataSourceId);
+                                            System.err.println("Exception while trying to find data source with object ID " + dataSourceId);
                                             // Do not process any other commands
                                             return;
                                         }
@@ -220,10 +225,12 @@ public class CommandLineIngestManager {
                                     
                                     // run ingest
                                     analyze(dataSource);
+                                    
+                                    // ELTODO saveRunIngestOutput();
                                 } catch (InterruptedException | CaseActionException ex) {
                                     String dataSourcePath = command.getInputs().get(CommandLineCommand.InputType.DATA_SOURCE_PATH.name());
                                     LOGGER.log(Level.SEVERE, "Error running ingest on data source " + dataSourcePath, ex);
-                                    System.out.println("Error running ingest on data source " + dataSourcePath);
+                                    System.err.println("Error running ingest on data source " + dataSourcePath);
                                     // Do not process any other commands
                                     return;
                                 }
@@ -240,14 +247,14 @@ public class CommandLineIngestManager {
                     * such errors get logged.
                      */
                     LOGGER.log(Level.SEVERE, "Unexpected error", ex);
-                    System.out.println("Unexpected error. Exiting...");
+                    System.err.println("Unexpected error. Exiting...");
 
                 } finally {
                     try {
                         Case.closeCurrentCase();
                     } catch (CaseActionException ex) {
                         LOGGER.log(Level.WARNING, "Exception while closing case", ex);
-                        System.out.println("Exception while closing case");
+                        System.err.println("Exception while closing case");
                     }
                 }
 
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
index a9cb7b4e67..b3b266c64e 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
@@ -75,7 +75,7 @@ public class CommandLineOptionProcessor extends OptionProcessor {
         if (!(values.containsKey(createCaseCommandOption) || values.containsKey(addDataSourceCommandOption) || values.containsKey(runIngestCommandOption))) {
             // not running from command line
             logger.log(Level.INFO, "No command line commands passed in as inputs. Not running from command line."); //NON-NLS
-            System.out.println("No command line commands passed in as inputs. Not running from command line.");
+            System.err.println("No command line commands passed in as inputs. Not running from command line.");
             return;
         }
 
@@ -86,14 +86,14 @@ public class CommandLineOptionProcessor extends OptionProcessor {
             argDirs = values.get(caseNameOption);
             if (argDirs.length < 1) {
                 logger.log(Level.SEVERE, "Missing argument 'caseName'");
-                System.out.println("Missing argument 'caseName'");
+                System.err.println("Missing argument 'caseName'");
                 return;
             }
             inputCaseName = argDirs[0];
 
             if (inputCaseName == null || inputCaseName.isEmpty()) {
                 logger.log(Level.SEVERE, "'caseName' argument is empty");
-                System.out.println("'caseName' argument is empty");
+                System.err.println("'caseName' argument is empty");
                 return;
             }
         }
@@ -103,20 +103,20 @@ public class CommandLineOptionProcessor extends OptionProcessor {
             argDirs = values.get(caseBaseDirOption);
             if (argDirs.length < 1) {
                 logger.log(Level.SEVERE, "Missing argument 'caseBaseDir'");
-                System.out.println("Missing argument 'caseBaseDir'");
+                System.err.println("Missing argument 'caseBaseDir'");
                 return;
             }
             caseBaseDir = argDirs[0];
 
             if (caseBaseDir == null || caseBaseDir.isEmpty()) {
                 logger.log(Level.SEVERE, "Missing argument 'caseBaseDir'");
-                System.out.println("Missing argument 'caseBaseDir'");
+                System.err.println("Missing argument 'caseBaseDir'");
                 return;
             }
 
             if (!(new File(caseBaseDir).exists()) || !(new File(caseBaseDir).isDirectory())) {
                 logger.log(Level.SEVERE, "''caseBaseDir'' {0} directory doesn''t exist or is not a directory", caseBaseDir);
-                System.out.println("'caseBaseDir' directory doesn't exist or is not a directory: " + caseBaseDir);
+                System.err.println("'caseBaseDir' directory doesn't exist or is not a directory: " + caseBaseDir);
                 return;
             }
         }
@@ -127,7 +127,7 @@ public class CommandLineOptionProcessor extends OptionProcessor {
             argDirs = values.get(dataSourcePathOption);
             if (argDirs.length < 1) {
                 logger.log(Level.SEVERE, "Missing argument 'dataSourcePath'");
-                System.out.println("Missing argument 'dataSourcePath'");
+                System.err.println("Missing argument 'dataSourcePath'");
                 return;
             }
             dataSourcePath = argDirs[0];
@@ -135,13 +135,13 @@ public class CommandLineOptionProcessor extends OptionProcessor {
             // verify inputs
             if (dataSourcePath == null || dataSourcePath.isEmpty()) {
                 logger.log(Level.SEVERE, "Missing argument 'dataSourcePath'");
-                System.out.println("Missing argument 'dataSourcePath'");
+                System.err.println("Missing argument 'dataSourcePath'");
                 return;
             }
 
             if (!(new File(dataSourcePath).exists())) {
                 logger.log(Level.SEVERE, "Input data source file {0} doesn''t exist", dataSourcePath);
-                System.out.println("Input data source file " + dataSourcePath + " doesn't exist");
+                System.err.println("Input data source file " + dataSourcePath + " doesn't exist");
                 return;
             }
         }
@@ -152,7 +152,7 @@ public class CommandLineOptionProcessor extends OptionProcessor {
             argDirs = values.get(dataSourceObjectIdOption);
             if (argDirs.length < 1) {
                 logger.log(Level.SEVERE, "Missing argument 'dataSourceObjectIdOption'");
-                System.out.println("Missing argument 'dataSourceObjectIdOption'");
+                System.err.println("Missing argument 'dataSourceObjectIdOption'");
                 return;
             }
             dataSourceId = argDirs[0];
@@ -160,7 +160,7 @@ public class CommandLineOptionProcessor extends OptionProcessor {
             // verify inputs
             if (dataSourceId == null || dataSourceId.isEmpty()) {
                 logger.log(Level.SEVERE, "Input data source id is empty");
-                System.out.println("Input data source id is empty");
+                System.err.println("Input data source id is empty");
                 return;
             }
         }
@@ -171,7 +171,7 @@ public class CommandLineOptionProcessor extends OptionProcessor {
             argDirs = values.get(caseDirOption);
             if (argDirs.length < 1) {
                 logger.log(Level.SEVERE, "Missing argument 'caseDirOption'");
-                System.out.println("Missing argument 'caseDirOption'");
+                System.err.println("Missing argument 'caseDirOption'");
                 return;
             }
             caseDir = argDirs[0];
@@ -179,13 +179,13 @@ public class CommandLineOptionProcessor extends OptionProcessor {
             // verify inputs
             if (caseDir == null || caseDir.isEmpty()) {
                 logger.log(Level.SEVERE, "Missing argument 'caseDirOption'");
-                System.out.println("Missing argument 'caseDirOption'");
+                System.err.println("Missing argument 'caseDirOption'");
                 return;
             }
 
             if (!(new File(caseDir).exists()) || !(new File(caseDir).isDirectory())) {
                 logger.log(Level.SEVERE, "Case directory {0} doesn''t exist or is not a directory", caseDir);
-                System.out.println("Case directory " + caseDir + " doesn't exist or is not a directory");
+                System.err.println("Case directory " + caseDir + " doesn't exist or is not a directory");
                 return;
             }
         }
@@ -205,7 +205,7 @@ public class CommandLineOptionProcessor extends OptionProcessor {
             // 'caseBaseDir' must always be specified for "CREATE_CASE" command
             if (caseBaseDir.isEmpty()) {
                 logger.log(Level.SEVERE, "'caseBaseDir' argument is empty");
-                System.out.println("'caseBaseDir' argument is empty");
+                System.err.println("'caseBaseDir' argument is empty");
                 runFromCommandLine = false;
                 return;
             }
@@ -224,7 +224,7 @@ public class CommandLineOptionProcessor extends OptionProcessor {
             if (!values.containsKey(createCaseCommandOption) && caseDir.isEmpty()) {
                 // new case is not being created during this run, so 'caseDir' should have been specified
                 logger.log(Level.SEVERE, "'caseDir' argument is empty");
-                System.out.println("'caseDir' argument is empty");
+                System.err.println("'caseDir' argument is empty");
                 runFromCommandLine = false;
                 return;
             }
@@ -232,7 +232,7 @@ public class CommandLineOptionProcessor extends OptionProcessor {
             // 'dataSourcePath' must always be specified for "ADD_DATA_SOURCE" command
             if (dataSourcePath.isEmpty()) {
                 logger.log(Level.SEVERE, "'dataSourcePath' argument is empty");
-                System.out.println("'dataSourcePath' argument is empty");
+                System.err.println("'dataSourcePath' argument is empty");
                 runFromCommandLine = false;
                 return;
             }
@@ -251,7 +251,7 @@ public class CommandLineOptionProcessor extends OptionProcessor {
             if (!values.containsKey(createCaseCommandOption) && caseDir.isEmpty()) {
                 // new case is not being created during this run, so 'caseDir' should have been specified
                 logger.log(Level.SEVERE, "'caseDir' argument is empty");
-                System.out.println("'caseDir' argument is empty");
+                System.err.println("'caseDir' argument is empty");
                 runFromCommandLine = false;
                 return;
             }
@@ -260,7 +260,7 @@ public class CommandLineOptionProcessor extends OptionProcessor {
             if (!values.containsKey(addDataSourceCommandOption) && dataSourceId.isEmpty()) {
                 // data source is not being added during this run, so 'dataSourceId' should have been specified
                 logger.log(Level.SEVERE, "'dataSourceId' argument is empty");
-                System.out.println("'dataSourceId' argument is empty");
+                System.err.println("'dataSourceId' argument is empty");
                 runFromCommandLine = false;
                 return;
             }
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/OutputGenerator.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/OutputGenerator.java
new file mode 100755
index 0000000000..9ecb1d331e
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/OutputGenerator.java
@@ -0,0 +1,69 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.sleuthkit.autopsy.commandlineingest;
+
+import com.fasterxml.jackson.core.JsonEncoding;
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.util.DefaultIndenter;
+import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.logging.Level;
+import org.sleuthkit.autopsy.casemodule.Case;
+import org.sleuthkit.autopsy.coreutils.Logger;
+import org.sleuthkit.autopsy.coreutils.TimeStampUtils;
+
+/**
+ * Generates JSON output 
+ */
+class OutputGenerator {
+    private static final Logger logger = Logger.getLogger(OutputGenerator.class.getName());
+
+    private OutputGenerator() {
+    }
+    
+    static void saveCreateCaseOutput(Case caseForJob, String outputDirPath) {
+        // Create the JSON generator
+        JsonFactory jsonGeneratorFactory = new JsonFactory();
+        String reportOutputPath = outputDirPath + File.separator + "createCase_" + TimeStampUtils.createTimeStamp() + ".json";
+        java.io.File reportFile = Paths.get(reportOutputPath).toFile();
+        try {
+            Files.createDirectories(Paths.get(reportFile.getParent()));
+        } catch (IOException ex) {
+            logger.log(Level.SEVERE, "Unable to create output file " + reportFile.toString() + " for 'Create Case' command", ex); //NON-NLS
+            System.err.println("Unable to create output file " + reportFile.toString() + " for 'Create Case' command"); //NON-NLS
+            return;
+        }
+        
+        JsonGenerator jsonGenerator = null;        
+        try {
+            jsonGenerator = jsonGeneratorFactory.createGenerator(reportFile, JsonEncoding.UTF8);
+            // instert \n after each field for more readable formatting
+            jsonGenerator.setPrettyPrinter(new DefaultPrettyPrinter().withObjectIndenter(new DefaultIndenter("  ", "\n")));
+            
+            // save command output
+            jsonGenerator.writeStartObject();
+            jsonGenerator.writeStringField("@caseDir", caseForJob.getCaseDirectory());
+            jsonGenerator.writeEndObject();            
+        } catch (IOException ex) {
+            logger.log(Level.SEVERE, "Failed to create JSON output for 'Create Case' command", ex); //NON-NLS
+            System.err.println("Failed to create JSON output for 'Create Case' command"); //NON-NLS
+        } finally {
+            if (jsonGenerator != null) {
+                try {
+                    jsonGenerator.close();
+                } catch (IOException ex) {
+                    logger.log(Level.WARNING, "Failed to close JSON output file for 'Create Case' command", ex); //NON-NLS
+                    System.err.println("Failed to close JSON output file for 'Create Case' command"); //NON-NLS
+                }
+            }
+        }
+        
+    }
+}

From d1e981ed1167bb5779d5ecd087c3a0a7bb279269 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Fri, 24 May 2019 14:05:03 -0400
Subject: [PATCH 027/192] Added support to save 'add data source' JSON output

---
 .../CommandLineIngestManager.java             | 15 +---
 .../commandlineingest/OutputGenerator.java    | 74 ++++++++++++++++++-
 2 files changed, 72 insertions(+), 17 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
index f027b8d59d..ba6fb6f3d7 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
@@ -171,7 +171,8 @@ public class CommandLineIngestManager {
                                     dataSource = new AutoIngestDataSource("", Paths.get(dataSourcePath));
                                     runDataSourceProcessor(caseForJob, dataSource);
                                     
-                                    // ELTODO saveAddDataSourceOutput(dataSource);
+                                    String outputDirPath = "C:\\TEST\\DELETE";
+                                    OutputGenerator.saveAddDataSourceOutput(dataSource, outputDirPath);
                                 } catch (InterruptedException | AutoIngestDataSourceProcessor.AutoIngestDataSourceProcessorException | CaseActionException ex) {
                                     String dataSourcePath = command.getInputs().get(CommandLineCommand.InputType.DATA_SOURCE_PATH.name());
                                     LOGGER.log(Level.SEVERE, "Error adding data source " + dataSourcePath, ex);
@@ -266,18 +267,6 @@ public class CommandLineIngestManager {
                 stop();
             }
         }
-
-        /**
-         * Provides object ID of the data source by reading it from Content
-         * object.
-         *
-         * @param dataSource DataSource object
-         * @return object ID
-         */
-        private Long getDataSourceId(AutoIngestDataSource dataSource) {
-            Content content = dataSource.getContent().get(0);
-            return content.getId();
-        }
         
         /**
          * Creates a new case using arguments passed in from command line
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/OutputGenerator.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/OutputGenerator.java
index 9ecb1d331e..1a13a8644c 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/OutputGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/OutputGenerator.java
@@ -1,7 +1,20 @@
 /*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2019-2019 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.commandlineingest;
 
@@ -14,10 +27,14 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.util.List;
 import java.util.logging.Level;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.TimeStampUtils;
+import org.sleuthkit.autopsy.datasourceprocessors.AutoIngestDataSource;
+import org.sleuthkit.datamodel.Content;
+import org.sleuthkit.datamodel.TskCoreException;
 
 /**
  * Generates JSON output 
@@ -29,7 +46,6 @@ class OutputGenerator {
     }
     
     static void saveCreateCaseOutput(Case caseForJob, String outputDirPath) {
-        // Create the JSON generator
         JsonFactory jsonGeneratorFactory = new JsonFactory();
         String reportOutputPath = outputDirPath + File.separator + "createCase_" + TimeStampUtils.createTimeStamp() + ".json";
         java.io.File reportFile = Paths.get(reportOutputPath).toFile();
@@ -63,7 +79,57 @@ class OutputGenerator {
                     System.err.println("Failed to close JSON output file for 'Create Case' command"); //NON-NLS
                 }
             }
+        }        
+    }
+    
+    static void saveAddDataSourceOutput(AutoIngestDataSource dataSource, String outputDirPath) {
+        
+        List<Content> contentObjects = dataSource.getContent();
+        if (contentObjects == null || contentObjects.isEmpty()) {
+            logger.log(Level.SEVERE, "No content objects for 'Add Data Source' command"); //NON-NLS
+            System.err.println("No content objects for 'Add Data Source' command"); //NON-NLS
+            return;            
         }
         
+        JsonFactory jsonGeneratorFactory = new JsonFactory();
+        String reportOutputPath = outputDirPath + File.separator + "addDataSource_" + TimeStampUtils.createTimeStamp() + ".json";
+        java.io.File reportFile = Paths.get(reportOutputPath).toFile();
+        try {
+            Files.createDirectories(Paths.get(reportFile.getParent()));
+        } catch (IOException ex) {
+            logger.log(Level.SEVERE, "Unable to create output file " + reportFile.toString() + " for 'Add Data Source' command", ex); //NON-NLS
+            System.err.println("Unable to create output file " + reportFile.toString() + " for 'Add Data Source' command"); //NON-NLS
+            return;
+        }
+        
+        JsonGenerator jsonGenerator = null;        
+        try {
+            jsonGenerator = jsonGeneratorFactory.createGenerator(reportFile, JsonEncoding.UTF8);
+            // instert \n after each field for more readable formatting
+            jsonGenerator.setPrettyPrinter(new DefaultPrettyPrinter().withObjectIndenter(new DefaultIndenter("  ", "\n")));
+            
+            // save command output
+            for (Content content : contentObjects) {
+                jsonGenerator.writeStartObject();
+                jsonGenerator.writeStringField("@dataSourcePath", content.getUniquePath());
+                jsonGenerator.writeStringField("@dataSourceObjectId", String.valueOf(content.getId()));
+                jsonGenerator.writeEndObject();
+            }
+        } catch (IOException ex) {
+            logger.log(Level.SEVERE, "Failed to create JSON output for 'Add Data Source' command", ex); //NON-NLS
+            System.err.println("Failed to create JSON output for 'Add Data Source' command"); //NON-NLS
+        } catch (TskCoreException ex) {
+            logger.log(Level.SEVERE, "Failed to get data source info for 'Add Data Source' command output", ex); //NON-NLS
+            System.err.println("Failed to get data source info for 'Add Data Source' command output"); //NON-NLS
+        } finally {
+            if (jsonGenerator != null) {
+                try {
+                    jsonGenerator.close();
+                } catch (IOException ex) {
+                    logger.log(Level.WARNING, "Failed to close JSON output file for 'Add Data Source' command", ex); //NON-NLS
+                    System.err.println("Failed to close JSON output file for 'Add Data Source' command"); //NON-NLS
+                }
+            }
+        }        
     }
 }

From c2c3745c51b1e85827ec614665c72fe1ec9fc143 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Tue, 28 May 2019 13:38:39 -0400
Subject: [PATCH 028/192] Trying to get local file paths to work

---
 .../CommandLineIngestManager.java              |  2 +-
 .../commandlineingest/OutputGenerator.java     | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
index ba6fb6f3d7..91ee833eb3 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
@@ -172,7 +172,7 @@ public class CommandLineIngestManager {
                                     runDataSourceProcessor(caseForJob, dataSource);
                                     
                                     String outputDirPath = "C:\\TEST\\DELETE";
-                                    OutputGenerator.saveAddDataSourceOutput(dataSource, outputDirPath);
+                                    OutputGenerator.saveAddDataSourceOutput(caseForJob, dataSource, outputDirPath);
                                 } catch (InterruptedException | AutoIngestDataSourceProcessor.AutoIngestDataSourceProcessorException | CaseActionException ex) {
                                     String dataSourcePath = command.getInputs().get(CommandLineCommand.InputType.DATA_SOURCE_PATH.name());
                                     LOGGER.log(Level.SEVERE, "Error adding data source " + dataSourcePath, ex);
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/OutputGenerator.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/OutputGenerator.java
index 1a13a8644c..25fb51774d 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/OutputGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/OutputGenerator.java
@@ -33,6 +33,7 @@ import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.TimeStampUtils;
 import org.sleuthkit.autopsy.datasourceprocessors.AutoIngestDataSource;
+import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.Content;
 import org.sleuthkit.datamodel.TskCoreException;
 
@@ -82,7 +83,7 @@ class OutputGenerator {
         }        
     }
     
-    static void saveAddDataSourceOutput(AutoIngestDataSource dataSource, String outputDirPath) {
+    static void saveAddDataSourceOutput(Case caseForJob, AutoIngestDataSource dataSource, String outputDirPath) {
         
         List<Content> contentObjects = dataSource.getContent();
         if (contentObjects == null || contentObjects.isEmpty()) {
@@ -110,8 +111,19 @@ class OutputGenerator {
             
             // save command output
             for (Content content : contentObjects) {
+                AbstractFile file = caseForJob.getSleuthkitCase().getAbstractFileById(content.getId());
+                if (file == null) {
+                    // ELTODO change log text
+                    logger.log(Level.SEVERE, "Failed to create JSON output for 'Add Data Source' command"); //NON-NLS
+                    System.err.println("Failed to create JSON output for 'Add Data Source' command"); //NON-NLS
+                    // ELTODO do we continue or exit??
+                    continue;
+                }
+                
+                // if this is logical data source, then get local path
+                String localPath = file.getLocalAbsPath();
                 jsonGenerator.writeStartObject();
-                jsonGenerator.writeStringField("@dataSourcePath", content.getUniquePath());
+                jsonGenerator.writeStringField("@dataSourcePath", localPath /*content.getUniquePath()*/);
                 jsonGenerator.writeStringField("@dataSourceObjectId", String.valueOf(content.getId()));
                 jsonGenerator.writeEndObject();
             }
@@ -130,6 +142,6 @@ class OutputGenerator {
                     System.err.println("Failed to close JSON output file for 'Add Data Source' command"); //NON-NLS
                 }
             }
-        }        
+        }
     }
 }

From 6a66a61b65ea4c290b5a13f6481178ecff0b4bfc Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Wed, 29 May 2019 14:03:30 -0400
Subject: [PATCH 029/192] First cut at 'list all data sources command'

---
 .../commandlineingest/CommandLineCommand.java |  3 ++-
 .../CommandLineOptionProcessor.java           | 22 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java
index cce11058c9..97bdc093fa 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java
@@ -32,7 +32,8 @@ class CommandLineCommand {
     static enum CommandType {        
         CREATE_CASE,
         ADD_DATA_SOURCE,
-        RUN_INGEST;
+        RUN_INGEST,
+        LIST_ALL_DATA_SOURCES;
     }
     
     /**
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
index b3b266c64e..839df91fae 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
@@ -47,6 +47,7 @@ public class CommandLineOptionProcessor extends OptionProcessor {
     private final Option addDataSourceCommandOption = Option.withoutArgument('a', "addDataSource");
     private final Option caseDirOption = Option.requiredArgument('d', "caseDir");
     private final Option runIngestCommandOption = Option.withoutArgument('r', "runIngest");
+    private final Option getAllDataSourcesCommandOption = Option.withoutArgument('r', "getAllDataSources");
     private boolean runFromCommandLine = false;
 
     private final List<CommandLineCommand> commands = new ArrayList<>();
@@ -62,6 +63,7 @@ public class CommandLineOptionProcessor extends OptionProcessor {
         set.add(dataSourceObjectIdOption);
         set.add(caseDirOption);
         set.add(runIngestCommandOption);
+        set.add(getAllDataSourcesCommandOption);
         return set;
     }
 
@@ -72,7 +74,8 @@ public class CommandLineOptionProcessor extends OptionProcessor {
         runFromCommandLine = false;
 
         // input arguments must contain at least one command
-        if (!(values.containsKey(createCaseCommandOption) || values.containsKey(addDataSourceCommandOption) || values.containsKey(runIngestCommandOption))) {
+        if (!(values.containsKey(createCaseCommandOption) || values.containsKey(addDataSourceCommandOption) 
+                || values.containsKey(runIngestCommandOption) || values.containsKey(getAllDataSourcesCommandOption))) {
             // not running from command line
             logger.log(Level.INFO, "No command line commands passed in as inputs. Not running from command line."); //NON-NLS
             System.err.println("No command line commands passed in as inputs. Not running from command line.");
@@ -271,6 +274,23 @@ public class CommandLineOptionProcessor extends OptionProcessor {
             commands.add(newCommand);
             runFromCommandLine = true;
         }
+        
+        // Add "LIST_ALL_DATA_SOURCES" command, if present
+        if (values.containsKey(getAllDataSourcesCommandOption)) {
+
+            // 'caseDir' must always be specified for "LIST_ALL_DATA_SOURCES" command
+            if (caseDir.isEmpty()) {
+                logger.log(Level.SEVERE, "'caseDir' argument is empty");
+                System.err.println("'caseDir' argument is empty");
+                runFromCommandLine = false;
+                return;
+            }
+
+            CommandLineCommand newCommand = new CommandLineCommand(CommandLineCommand.CommandType.LIST_ALL_DATA_SOURCES);
+            newCommand.addInputValue(CommandLineCommand.InputType.CASE_FOLDER_PATH.name(), caseDir);
+            commands.add(newCommand);
+            runFromCommandLine = true;
+        }        
     }
 
     /**

From e117614b679dac75312e7d0fe3099b11f3bab364 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Thu, 30 May 2019 11:59:07 -0400
Subject: [PATCH 030/192] First cuts

---
 .../commandlineingest/CommandLineCommand.java |  3 +-
 .../CommandLineOptionProcessor.java           | 32 +++++++++++++++++--
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java
index 97bdc093fa..b0592619d6 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java
@@ -44,7 +44,8 @@ class CommandLineCommand {
         CASES_BASE_DIR_PATH,
         CASE_FOLDER_PATH,
         DATA_SOURCE_PATH,
-        DATA_SOURCE_ID;
+        DATA_SOURCE_ID,
+        INGEST_CONTEXT_NAME;
     }
     
     private final CommandType type;
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
index 839df91fae..6922956cf8 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
@@ -47,7 +47,8 @@ public class CommandLineOptionProcessor extends OptionProcessor {
     private final Option addDataSourceCommandOption = Option.withoutArgument('a', "addDataSource");
     private final Option caseDirOption = Option.requiredArgument('d', "caseDir");
     private final Option runIngestCommandOption = Option.withoutArgument('r', "runIngest");
-    private final Option getAllDataSourcesCommandOption = Option.withoutArgument('r', "getAllDataSources");
+    private final Option getAllDataSourcesCommandOption = Option.withoutArgument('g', "getAllDataSources");
+    private final Option configFilePathOption = Option.withoutArgument('p', "configFilePath");
     private boolean runFromCommandLine = false;
 
     private final List<CommandLineCommand> commands = new ArrayList<>();
@@ -64,6 +65,7 @@ public class CommandLineOptionProcessor extends OptionProcessor {
         set.add(caseDirOption);
         set.add(runIngestCommandOption);
         set.add(getAllDataSourcesCommandOption);
+        set.add(configFilePathOption);
         return set;
     }
 
@@ -192,6 +194,31 @@ public class CommandLineOptionProcessor extends OptionProcessor {
                 return;
             }
         }
+                
+        String configFilePath = "";
+        if (values.containsKey(configFilePathOption)) {
+
+            argDirs = values.get(configFilePathOption);
+            if (argDirs.length < 1) {
+                logger.log(Level.SEVERE, "Missing argument 'configFilePath'");
+                System.err.println("Missing argument 'configFilePath'");
+                return;
+            }
+            configFilePath = argDirs[0];
+
+            // verify inputs
+            if (configFilePath == null || configFilePath.isEmpty()) {
+                logger.log(Level.SEVERE, "Missing argument 'configFilePath'");
+                System.err.println("Missing argument 'configFilePath'");
+                return;
+            }
+
+            if (!(new File(configFilePath).exists())) {
+                logger.log(Level.SEVERE, "Configuration file {0} doesn''t exist", configFilePath);
+                System.err.println("Configuration file " + configFilePath + " doesn't exist");
+                return;
+            }
+        }        
 
         // Create commands in order in which they should be executed:
         // First create the "CREATE_CASE" command, if present
@@ -267,10 +294,11 @@ public class CommandLineOptionProcessor extends OptionProcessor {
                 runFromCommandLine = false;
                 return;
             }
-
+            
             CommandLineCommand newCommand = new CommandLineCommand(CommandLineCommand.CommandType.RUN_INGEST);
             newCommand.addInputValue(CommandLineCommand.InputType.CASE_FOLDER_PATH.name(), caseDir);
             newCommand.addInputValue(CommandLineCommand.InputType.DATA_SOURCE_ID.name(), dataSourceId);
+            newCommand.addInputValue(CommandLineCommand.InputType.INGEST_CONTEXT_NAME.name(), configFilePath);
             commands.add(newCommand);
             runFromCommandLine = true;
         }

From 7a940267d589f05edd88c0cdaf450f3fbdd9f8a4 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Thu, 30 May 2019 16:45:25 -0400
Subject: [PATCH 031/192] Added support for saving 'Add DS' command output

---
 .../commandlineingest/OutputGenerator.java    | 85 +++++++++++++------
 1 file changed, 59 insertions(+), 26 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/OutputGenerator.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/OutputGenerator.java
index 25fb51774d..b0e596a5db 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/OutputGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/OutputGenerator.java
@@ -27,25 +27,29 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.List;
 import java.util.logging.Level;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.TimeStampUtils;
 import org.sleuthkit.autopsy.datasourceprocessors.AutoIngestDataSource;
-import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.Content;
+import org.sleuthkit.datamodel.Image;
+import org.sleuthkit.datamodel.SleuthkitCase;
 import org.sleuthkit.datamodel.TskCoreException;
 
 /**
- * Generates JSON output 
+ * Generates JSON output
  */
 class OutputGenerator {
+
     private static final Logger logger = Logger.getLogger(OutputGenerator.class.getName());
 
     private OutputGenerator() {
     }
-    
+
     static void saveCreateCaseOutput(Case caseForJob, String outputDirPath) {
         JsonFactory jsonGeneratorFactory = new JsonFactory();
         String reportOutputPath = outputDirPath + File.separator + "createCase_" + TimeStampUtils.createTimeStamp() + ".json";
@@ -57,17 +61,17 @@ class OutputGenerator {
             System.err.println("Unable to create output file " + reportFile.toString() + " for 'Create Case' command"); //NON-NLS
             return;
         }
-        
-        JsonGenerator jsonGenerator = null;        
+
+        JsonGenerator jsonGenerator = null;
         try {
             jsonGenerator = jsonGeneratorFactory.createGenerator(reportFile, JsonEncoding.UTF8);
             // instert \n after each field for more readable formatting
             jsonGenerator.setPrettyPrinter(new DefaultPrettyPrinter().withObjectIndenter(new DefaultIndenter("  ", "\n")));
-            
+
             // save command output
             jsonGenerator.writeStartObject();
             jsonGenerator.writeStringField("@caseDir", caseForJob.getCaseDirectory());
-            jsonGenerator.writeEndObject();            
+            jsonGenerator.writeEndObject();
         } catch (IOException ex) {
             logger.log(Level.SEVERE, "Failed to create JSON output for 'Create Case' command", ex); //NON-NLS
             System.err.println("Failed to create JSON output for 'Create Case' command"); //NON-NLS
@@ -80,18 +84,18 @@ class OutputGenerator {
                     System.err.println("Failed to close JSON output file for 'Create Case' command"); //NON-NLS
                 }
             }
-        }        
+        }
     }
-    
+
     static void saveAddDataSourceOutput(Case caseForJob, AutoIngestDataSource dataSource, String outputDirPath) {
-        
+
         List<Content> contentObjects = dataSource.getContent();
         if (contentObjects == null || contentObjects.isEmpty()) {
             logger.log(Level.SEVERE, "No content objects for 'Add Data Source' command"); //NON-NLS
             System.err.println("No content objects for 'Add Data Source' command"); //NON-NLS
-            return;            
+            return;
         }
-        
+
         JsonFactory jsonGeneratorFactory = new JsonFactory();
         String reportOutputPath = outputDirPath + File.separator + "addDataSource_" + TimeStampUtils.createTimeStamp() + ".json";
         java.io.File reportFile = Paths.get(reportOutputPath).toFile();
@@ -102,28 +106,31 @@ class OutputGenerator {
             System.err.println("Unable to create output file " + reportFile.toString() + " for 'Add Data Source' command"); //NON-NLS
             return;
         }
-        
-        JsonGenerator jsonGenerator = null;        
+
+        JsonGenerator jsonGenerator = null;
         try {
             jsonGenerator = jsonGeneratorFactory.createGenerator(reportFile, JsonEncoding.UTF8);
             // instert \n after each field for more readable formatting
             jsonGenerator.setPrettyPrinter(new DefaultPrettyPrinter().withObjectIndenter(new DefaultIndenter("  ", "\n")));
-            
+
             // save command output
             for (Content content : contentObjects) {
-                AbstractFile file = caseForJob.getSleuthkitCase().getAbstractFileById(content.getId());
-                if (file == null) {
-                    // ELTODO change log text
-                    logger.log(Level.SEVERE, "Failed to create JSON output for 'Add Data Source' command"); //NON-NLS
-                    System.err.println("Failed to create JSON output for 'Add Data Source' command"); //NON-NLS
-                    // ELTODO do we continue or exit??
-                    continue;
+                String dataSourceName;
+                if (content.getDataSource() instanceof Image) {
+                    // image data source. Need to get display name
+                    dataSourceName = getImageDisplayName(caseForJob, content.getId());
+                    if (dataSourceName == null) {
+                        // soma data sources do not have "display_name" set, use data source name instead
+                        dataSourceName = content.getName();
+                    }
+                } else {
+                    // logical data source
+                    dataSourceName = content.getName();
                 }
-                
-                // if this is logical data source, then get local path
-                String localPath = file.getLocalAbsPath();
+
+                // save the JSON output
                 jsonGenerator.writeStartObject();
-                jsonGenerator.writeStringField("@dataSourcePath", localPath /*content.getUniquePath()*/);
+                jsonGenerator.writeStringField("@dataSourceName", dataSourceName);
                 jsonGenerator.writeStringField("@dataSourceObjectId", String.valueOf(content.getId()));
                 jsonGenerator.writeEndObject();
             }
@@ -133,6 +140,9 @@ class OutputGenerator {
         } catch (TskCoreException ex) {
             logger.log(Level.SEVERE, "Failed to get data source info for 'Add Data Source' command output", ex); //NON-NLS
             System.err.println("Failed to get data source info for 'Add Data Source' command output"); //NON-NLS
+        } catch (SQLException ex) {
+            logger.log(Level.SEVERE, "Failed to get data source display name for 'Add Data Source' command output", ex); //NON-NLS
+            System.err.println("Failed to get data source display name for 'Add Data Source' command output"); //NON-NLS
         } finally {
             if (jsonGenerator != null) {
                 try {
@@ -144,4 +154,27 @@ class OutputGenerator {
             }
         }
     }
+
+    /**
+     * Gets display_name from tsk_image_info table for Image data sources
+     *
+     * @param caseForJob Case object
+     * @param dataSourceId object ID of the data source
+     * @return
+     * @throws TskCoreException
+     * @throws SQLException
+     */
+    private static String getImageDisplayName(Case caseForJob, Long dataSourceId) throws TskCoreException, SQLException {
+        String getImageDataSourceQuery = "select display_name from tsk_image_info where obj_id = " + dataSourceId;
+        try (SleuthkitCase.CaseDbQuery queryResult = caseForJob.getSleuthkitCase().executeQuery(getImageDataSourceQuery)) {
+            ResultSet resultSet = queryResult.getResultSet();
+            // check if we got a result
+            while (resultSet.next()) {
+                // we got a result so the data source was an image data source
+                return resultSet.getString(1);
+            }
+        }
+
+        return null;
+    }
 }

From 1f7be6ddf020269dbbdca397c325196cc3873954 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Fri, 31 May 2019 09:32:39 -0400
Subject: [PATCH 032/192] Changes to DataSourceLoader

---
 .../datamodel/utils/DataSourceLoader.java     | 35 +++++++++++--------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/utils/DataSourceLoader.java b/Core/src/org/sleuthkit/autopsy/datamodel/utils/DataSourceLoader.java
index 0038c62e3e..0e3bba288f 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/utils/DataSourceLoader.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/utils/DataSourceLoader.java
@@ -44,14 +44,17 @@ public class DataSourceLoader {
 
     /**
      * Query case database for a list of all existing logical data sources and
-     * their object IDs. 
+     * their object IDs.
      *
      * @param tskDb SleuthkitCase database handle
-     * @param dataSourceMap map to which to add data sources
+     *
+     * @return Map of Long (id) to String (data source file name only)
      * @throws TskCoreException
      * @throws SQLException
      */
-    private void loadLogicalSources(SleuthkitCase tskDb, Map<Long, String> dataSouceMap) throws TskCoreException, SQLException {
+    public Map<Long, String> getLogicalDataSources(SleuthkitCase tskDb) throws TskCoreException, SQLException {
+
+        Map<Long, String> dataSourceMap = new HashMap<>();
         //try block releases resources - exceptions are handled in done()
         try (
                 SleuthkitCase.CaseDbQuery query = tskDb.executeQuery(SELECT_DATA_SOURCES_LOGICAL);
@@ -59,22 +62,25 @@ public class DataSourceLoader {
             while (resultSet.next()) {
                 Long objectId = resultSet.getLong(1);
                 String dataSourceName = resultSet.getString(2);
-                dataSouceMap.put(objectId, dataSourceName);
+                dataSourceMap.put(objectId, dataSourceName);
             }
         }
+        return dataSourceMap;
     }
 
     /**
      * Query case database for a list of all existing image data sources and
-     * their object IDs. 
+     * their object IDs.
      *
      * @param tskDb SleuthkitCase database handle
-     * @param dataSourceMap map to which to add data sources
-     * otherwise
+     *
+     * @return Map of Long (id) to String (data source file name only)
      * @throws SQLException
      * @throws TskCoreException
      */
-    private void loadImageSources(SleuthkitCase tskDb, Map<Long, String> dataSourceMap) throws SQLException, TskCoreException {
+    public Map<Long, String> getImageDataSources(SleuthkitCase tskDb) throws SQLException, TskCoreException {
+
+        Map<Long, String> dataSourceMap = new HashMap<>();
         //try block releases resources - exceptions are handled in done()
         try (
                 SleuthkitCase.CaseDbQuery query = tskDb.executeQuery(SELECT_DATA_SOURCES_IMAGE);
@@ -90,11 +96,12 @@ public class DataSourceLoader {
                 }
             }
         }
+        return dataSourceMap;
     }
 
     /**
-     * Get a map of data source Ids to their string names (data source file name
-     * only) for the current case.
+     * Get a map of all data source Ids to their string names (data source file
+     * name only) for the current case.
      *
      * @return Map of Long (id) to String (data source file name only)
      *
@@ -103,15 +110,15 @@ public class DataSourceLoader {
      * @throws SQLException
      */
     public Map<Long, String> getDataSourceMap() throws NoCurrentCaseException, TskCoreException, SQLException {
-        Map<Long, String> dataSouceMap = new HashMap<>();
+        Map<Long, String> dataSourceMap = new HashMap<>();
 
         Case currentCase = Case.getCurrentCaseThrows();
         SleuthkitCase tskDb = currentCase.getSleuthkitCase();
 
-        loadLogicalSources(tskDb, dataSouceMap);
+        dataSourceMap.putAll(getLogicalDataSources(tskDb));
 
-        loadImageSources(tskDb, dataSouceMap);
+        dataSourceMap.putAll(getImageDataSources(tskDb));
 
-        return dataSouceMap;
+        return dataSourceMap;
     }
 }

From 3e6f37fbd9d04b1c54d746b9e854b155c2c11bea Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Fri, 31 May 2019 09:51:26 -0400
Subject: [PATCH 033/192] Made DataSourceLoader methods static

---
 .../CommonAttributePanel.java                 |  3 +--
 .../datamodel/utils/DataSourceLoader.java     |  6 +++---
 .../caseuco/ReportCaseUcoConfigPanel.java     |  4 +---
 .../InterCaseTestUtils.java                   | 20 ++++---------------
 .../IntraCaseTestUtils.java                   | 10 +---------
 5 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/commonpropertiessearch/CommonAttributePanel.java b/Core/src/org/sleuthkit/autopsy/commonpropertiessearch/CommonAttributePanel.java
index a9c9ba1762..73765acab8 100644
--- a/Core/src/org/sleuthkit/autopsy/commonpropertiessearch/CommonAttributePanel.java
+++ b/Core/src/org/sleuthkit/autopsy/commonpropertiessearch/CommonAttributePanel.java
@@ -491,8 +491,7 @@ final class CommonAttributePanel extends javax.swing.JDialog implements Observer
 
             @Override
             protected Map<Long, String> doInBackground() throws NoCurrentCaseException, TskCoreException, SQLException {
-                DataSourceLoader loader = new DataSourceLoader();
-                return loader.getDataSourceMap();
+                return DataSourceLoader.getAllDataSources();
             }
 
             @Override
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/utils/DataSourceLoader.java b/Core/src/org/sleuthkit/autopsy/datamodel/utils/DataSourceLoader.java
index 0e3bba288f..e87af1650b 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/utils/DataSourceLoader.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/utils/DataSourceLoader.java
@@ -52,7 +52,7 @@ public class DataSourceLoader {
      * @throws TskCoreException
      * @throws SQLException
      */
-    public Map<Long, String> getLogicalDataSources(SleuthkitCase tskDb) throws TskCoreException, SQLException {
+    public static Map<Long, String> getLogicalDataSources(SleuthkitCase tskDb) throws TskCoreException, SQLException {
 
         Map<Long, String> dataSourceMap = new HashMap<>();
         //try block releases resources - exceptions are handled in done()
@@ -78,7 +78,7 @@ public class DataSourceLoader {
      * @throws SQLException
      * @throws TskCoreException
      */
-    public Map<Long, String> getImageDataSources(SleuthkitCase tskDb) throws SQLException, TskCoreException {
+    public static Map<Long, String> getImageDataSources(SleuthkitCase tskDb) throws SQLException, TskCoreException {
 
         Map<Long, String> dataSourceMap = new HashMap<>();
         //try block releases resources - exceptions are handled in done()
@@ -109,7 +109,7 @@ public class DataSourceLoader {
      * @throws TskCoreException
      * @throws SQLException
      */
-    public Map<Long, String> getDataSourceMap() throws NoCurrentCaseException, TskCoreException, SQLException {
+    public static Map<Long, String> getAllDataSources() throws NoCurrentCaseException, TskCoreException, SQLException {
         Map<Long, String> dataSourceMap = new HashMap<>();
 
         Case currentCase = Case.getCurrentCaseThrows();
diff --git a/Core/src/org/sleuthkit/autopsy/report/caseuco/ReportCaseUcoConfigPanel.java b/Core/src/org/sleuthkit/autopsy/report/caseuco/ReportCaseUcoConfigPanel.java
index e95db4ba46..e317425163 100755
--- a/Core/src/org/sleuthkit/autopsy/report/caseuco/ReportCaseUcoConfigPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/caseuco/ReportCaseUcoConfigPanel.java
@@ -39,15 +39,13 @@ final class ReportCaseUcoConfigPanel extends javax.swing.JPanel {
     static final long NO_DATA_SOURCE_SELECTED = -1;
     private ComboBoxModel<String> dataSourcesList = new DataSourceComboBoxModel();
     private final Map<Long, String> dataSourceMap;
-    private final DataSourceLoader dataSourceLoader;
 
     /**
      * Creates new form ReportCaseUcoConfigPanel
      */
     ReportCaseUcoConfigPanel() throws NoCurrentCaseException, TskCoreException, SQLException {
         initComponents();
-        this.dataSourceLoader = new DataSourceLoader();
-        this.dataSourceMap = dataSourceLoader.getDataSourceMap();
+        this.dataSourceMap = DataSourceLoader.getAllDataSources();
         
         String[] dataSourcesNames = new String[dataSourceMap.size()];
         if (dataSourcesNames.length > 0) {
diff --git a/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonpropertiessearch/InterCaseTestUtils.java b/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonpropertiessearch/InterCaseTestUtils.java
index 85d5ad3593..c3d69c30f6 100644
--- a/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonpropertiessearch/InterCaseTestUtils.java
+++ b/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonpropertiessearch/InterCaseTestUtils.java
@@ -46,21 +46,13 @@ import org.sleuthkit.autopsy.testutils.CaseUtils;
 import org.sleuthkit.autopsy.testutils.IngestUtils;
 import org.sleuthkit.datamodel.TskCoreException;
 import junit.framework.Assert;
-import org.sleuthkit.autopsy.casemodule.CaseActionException;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
 import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationAttributeInstance;
 import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationCase;
 import org.sleuthkit.autopsy.centralrepository.datamodel.EamDb;
-import org.sleuthkit.autopsy.commonpropertiessearch.AbstractCommonAttributeInstance;
-import org.sleuthkit.autopsy.commonpropertiessearch.CaseDBCommonAttributeInstanceNode;
-import org.sleuthkit.autopsy.commonpropertiessearch.CentralRepoCommonAttributeInstance;
-import org.sleuthkit.autopsy.commonpropertiessearch.CentralRepoCommonAttributeInstanceNode;
-import org.sleuthkit.autopsy.commonpropertiessearch.CommonAttributeCountSearchResults;
-import org.sleuthkit.autopsy.datamodel.utils.DataSourceLoader;
-import org.sleuthkit.autopsy.commonpropertiessearch.CommonAttributeValue;
-import org.sleuthkit.autopsy.commonpropertiessearch.CommonAttributeValueList;
 import org.sleuthkit.autopsy.coreutils.TimeStampUtils;
 import org.sleuthkit.autopsy.datamodel.DisplayableItemNode;
+import org.sleuthkit.autopsy.datamodel.utils.DataSourceLoader;
 import org.sleuthkit.autopsy.modules.dataSourceIntegrity.DataSourceIntegrityModuleFactory;
 import org.sleuthkit.autopsy.modules.embeddedfileextractor.EmbeddedFileExtractorModuleFactory;
 import org.sleuthkit.autopsy.modules.exif.ExifParserModuleFactory;
@@ -152,8 +144,6 @@ class InterCaseTestUtils {
     private final IngestJobSettings hashAndNoFileType;
     private final IngestJobSettings kitchenShink;
 
-    private final DataSourceLoader dataSourceLoader;
-
     CorrelationAttributeInstance.Type FILE_TYPE;
     CorrelationAttributeInstance.Type DOMAIN_TYPE;
     CorrelationAttributeInstance.Type USB_ID_TYPE;
@@ -229,8 +219,6 @@ class InterCaseTestUtils {
 
         this.kitchenShink = new IngestJobSettings(InterCaseTestUtils.class.getCanonicalName(), IngestType.ALL_MODULES, kitchenSink);
 
-        this.dataSourceLoader = new DataSourceLoader();
-
         try {
             Collection<CorrelationAttributeInstance.Type> types = CorrelationAttributeInstance.getDefaultCorrelationTypes();
 
@@ -266,10 +254,10 @@ class InterCaseTestUtils {
             }
         }
     }
-
+    
     Map<Long, String> getDataSourceMap() throws NoCurrentCaseException, TskCoreException, SQLException {
-        return this.dataSourceLoader.getDataSourceMap();
-    }
+        return DataSourceLoader.getAllDataSources();
+    }    
 
     Map<String, Integer> getCaseMap() throws EamDbException {
 
diff --git a/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonpropertiessearch/IntraCaseTestUtils.java b/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonpropertiessearch/IntraCaseTestUtils.java
index 49ff17229c..c784c63121 100644
--- a/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonpropertiessearch/IntraCaseTestUtils.java
+++ b/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonpropertiessearch/IntraCaseTestUtils.java
@@ -32,11 +32,7 @@ import junit.framework.Assert;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.ImageDSProcessor;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
-import org.sleuthkit.autopsy.commonpropertiessearch.AbstractCommonAttributeInstance;
-import org.sleuthkit.autopsy.commonpropertiessearch.CommonAttributeCountSearchResults;
 import org.sleuthkit.autopsy.datamodel.utils.DataSourceLoader;
-import org.sleuthkit.autopsy.commonpropertiessearch.CommonAttributeValue;
-import org.sleuthkit.autopsy.commonpropertiessearch.CommonAttributeValueList;
 import org.sleuthkit.autopsy.coreutils.TimeStampUtils;
 import org.sleuthkit.autopsy.testutils.CaseUtils;
 import org.sleuthkit.autopsy.testutils.IngestUtils;
@@ -79,8 +75,6 @@ class IntraCaseTestUtils {
     static final String SET3 = "CommonFiles_img3_v1.vhd";
     static final String SET4 = "CommonFiles_img4_v1.vhd";
 
-    private final DataSourceLoader dataSourceLoader;
-
     private final String caseName;
 
     IntraCaseTestUtils(NbTestCase nbTestCase, String caseName) {
@@ -89,8 +83,6 @@ class IntraCaseTestUtils {
         this.imagePath3 = Paths.get(nbTestCase.getDataDir().toString(), SET3);
         this.imagePath4 = Paths.get(nbTestCase.getDataDir().toString(), SET4);
 
-        this.dataSourceLoader = new DataSourceLoader();
-
         this.caseName = caseName;
     }
 
@@ -126,7 +118,7 @@ class IntraCaseTestUtils {
     }
 
     Map<Long, String> getDataSourceMap() throws NoCurrentCaseException, TskCoreException, SQLException {
-        return this.dataSourceLoader.getDataSourceMap();
+        return DataSourceLoader.getAllDataSources();
     }
 
     void tearDown() {

From 67e6d6981364f1deaf4a2a945d779bba2d825299 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Fri, 31 May 2019 11:02:26 -0400
Subject: [PATCH 034/192] Added support for 'List all data sources' command

---
 .../CommandLineIngestManager.java             |  22 +++-
 .../CommandLineOptionProcessor.java           |   8 +-
 .../commandlineingest/OutputGenerator.java    | 106 +++++++++++++++++-
 3 files changed, 125 insertions(+), 11 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
index 91ee833eb3..7279e05b7a 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
@@ -226,8 +226,6 @@ public class CommandLineIngestManager {
                                     
                                     // run ingest
                                     analyze(dataSource);
-                                    
-                                    // ELTODO saveRunIngestOutput();
                                 } catch (InterruptedException | CaseActionException ex) {
                                     String dataSourcePath = command.getInputs().get(CommandLineCommand.InputType.DATA_SOURCE_PATH.name());
                                     LOGGER.log(Level.SEVERE, "Error running ingest on data source " + dataSourcePath, ex);
@@ -236,6 +234,26 @@ public class CommandLineIngestManager {
                                     return;
                                 }
                                 break;
+                                
+                            case LIST_ALL_DATA_SOURCES:
+                                try {
+                                    LOGGER.log(Level.INFO, "Processing 'List All Data Sources' command");
+                                    System.out.println("Processing 'List All Data Sources' command");
+                                    Map<String, String> inputs = command.getInputs();
+                                    
+                                    String caseDirPath = inputs.get(CommandLineCommand.InputType.CASE_FOLDER_PATH.name());
+                                    openCase(caseDirPath);
+                                    
+                                    String outputDirPath = "C:\\TEST\\DELETE";
+                                    OutputGenerator.listAllDataSources(caseForJob, outputDirPath);
+                                } catch (CaseActionException ex) {
+                                    String caseDirPath = command.getInputs().get(CommandLineCommand.InputType.CASE_FOLDER_PATH.name());
+                                    LOGGER.log(Level.SEVERE, "Error opening case in case directory: " + caseDirPath, ex);
+                                    System.err.println("Error opening case in case directory: " + caseDirPath);
+                                    // Do not process any other commands
+                                    return;
+                                }
+                                break;
                             default:
                                 break;
                         }
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
index 839df91fae..4ea662b342 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
@@ -47,7 +47,7 @@ public class CommandLineOptionProcessor extends OptionProcessor {
     private final Option addDataSourceCommandOption = Option.withoutArgument('a', "addDataSource");
     private final Option caseDirOption = Option.requiredArgument('d', "caseDir");
     private final Option runIngestCommandOption = Option.withoutArgument('r', "runIngest");
-    private final Option getAllDataSourcesCommandOption = Option.withoutArgument('r', "getAllDataSources");
+    private final Option getAllDataSourcesCommandOption = Option.withoutArgument('l', "listAllDataSources");
     private boolean runFromCommandLine = false;
 
     private final List<CommandLineCommand> commands = new ArrayList<>();
@@ -74,7 +74,7 @@ public class CommandLineOptionProcessor extends OptionProcessor {
         runFromCommandLine = false;
 
         // input arguments must contain at least one command
-        if (!(values.containsKey(createCaseCommandOption) || values.containsKey(addDataSourceCommandOption) 
+        if (!(values.containsKey(createCaseCommandOption) || values.containsKey(addDataSourceCommandOption)
                 || values.containsKey(runIngestCommandOption) || values.containsKey(getAllDataSourcesCommandOption))) {
             // not running from command line
             logger.log(Level.INFO, "No command line commands passed in as inputs. Not running from command line."); //NON-NLS
@@ -274,7 +274,7 @@ public class CommandLineOptionProcessor extends OptionProcessor {
             commands.add(newCommand);
             runFromCommandLine = true;
         }
-        
+
         // Add "LIST_ALL_DATA_SOURCES" command, if present
         if (values.containsKey(getAllDataSourcesCommandOption)) {
 
@@ -290,7 +290,7 @@ public class CommandLineOptionProcessor extends OptionProcessor {
             newCommand.addInputValue(CommandLineCommand.InputType.CASE_FOLDER_PATH.name(), caseDir);
             commands.add(newCommand);
             runFromCommandLine = true;
-        }        
+        }
     }
 
     /**
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/OutputGenerator.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/OutputGenerator.java
index b0e596a5db..ed34132bef 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/OutputGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/OutputGenerator.java
@@ -30,10 +30,12 @@ import java.nio.file.Paths;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.List;
+import java.util.Map;
 import java.util.logging.Level;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.TimeStampUtils;
+import org.sleuthkit.autopsy.datamodel.utils.DataSourceLoader;
 import org.sleuthkit.autopsy.datasourceprocessors.AutoIngestDataSource;
 import org.sleuthkit.datamodel.Content;
 import org.sleuthkit.datamodel.Image;
@@ -50,6 +52,13 @@ class OutputGenerator {
     private OutputGenerator() {
     }
 
+    /**
+     * Saves output of "Create Case" command to JSON output file.
+     *
+     * @param caseForJob Case object
+     * @param outputDirPath Full path to a directory where JSON output should be
+     * saved
+     */
     static void saveCreateCaseOutput(Case caseForJob, String outputDirPath) {
         JsonFactory jsonGeneratorFactory = new JsonFactory();
         String reportOutputPath = outputDirPath + File.separator + "createCase_" + TimeStampUtils.createTimeStamp() + ".json";
@@ -87,6 +96,14 @@ class OutputGenerator {
         }
     }
 
+    /**
+     * Saves output of "Add data source" command to JSON output file.
+     *
+     * @param caseForJob Case object
+     * @param outputDirPath Full path to a directory where JSON output should be
+     * saved
+     * @param dataSource AutoIngestDataSource object for the data source
+     */
     static void saveAddDataSourceOutput(Case caseForJob, AutoIngestDataSource dataSource, String outputDirPath) {
 
         List<Content> contentObjects = dataSource.getContent();
@@ -120,7 +137,7 @@ class OutputGenerator {
                     // image data source. Need to get display name
                     dataSourceName = getImageDisplayName(caseForJob, content.getId());
                     if (dataSourceName == null) {
-                        // soma data sources do not have "display_name" set, use data source name instead
+                        // some image data sources do not have "display_name" set, use data source name instead
                         dataSourceName = content.getName();
                     }
                 } else {
@@ -129,10 +146,7 @@ class OutputGenerator {
                 }
 
                 // save the JSON output
-                jsonGenerator.writeStartObject();
-                jsonGenerator.writeStringField("@dataSourceName", dataSourceName);
-                jsonGenerator.writeStringField("@dataSourceObjectId", String.valueOf(content.getId()));
-                jsonGenerator.writeEndObject();
+                saveDataSourceInfoToFile(jsonGenerator, dataSourceName, content.getId());
             }
         } catch (IOException ex) {
             logger.log(Level.SEVERE, "Failed to create JSON output for 'Add Data Source' command", ex); //NON-NLS
@@ -155,6 +169,88 @@ class OutputGenerator {
         }
     }
 
+    /**
+     * Gets the list of all data sources in a case and then saves their info to
+     * JSON output file.
+     *
+     * @param caseForJob Case object
+     * @param outputDirPath Full path to a directory where JSON output should be
+     * saved
+     */
+    static void listAllDataSources(Case caseForJob, String outputDirPath) {
+        JsonFactory jsonGeneratorFactory = new JsonFactory();
+        String reportOutputPath = outputDirPath + File.separator + "listAllDataSources_" + TimeStampUtils.createTimeStamp() + ".json";
+        java.io.File reportFile = Paths.get(reportOutputPath).toFile();
+        try {
+            Files.createDirectories(Paths.get(reportFile.getParent()));
+        } catch (IOException ex) {
+            logger.log(Level.SEVERE, "Unable to create output file " + reportFile.toString() + " for 'List All Data Sources' command", ex); //NON-NLS
+            System.err.println("Unable to create output file " + reportFile.toString() + " for 'List All Data Sources' command"); //NON-NLS
+            return;
+        }
+
+        JsonGenerator jsonGenerator = null;
+        try {
+            jsonGenerator = jsonGeneratorFactory.createGenerator(reportFile, JsonEncoding.UTF8);
+            // instert \n after each field for more readable formatting
+            jsonGenerator.setPrettyPrinter(new DefaultPrettyPrinter().withObjectIndenter(new DefaultIndenter("  ", "\n")));
+
+            // list all image data sources
+            Map<Long, String> imageDataSources = DataSourceLoader.getImageDataSources(caseForJob.getSleuthkitCase());
+            for (Map.Entry<Long, String> entry : imageDataSources.entrySet()) {
+                String dataSourceName;
+                Long dataSourceObjOd = entry.getKey();
+                dataSourceName = getImageDisplayName(caseForJob, dataSourceObjOd);
+                if (dataSourceName == null) {
+                    // some image data sources do not have "display_name" set, use data source name instead
+                    dataSourceName = entry.getValue();
+                }
+                saveDataSourceInfoToFile(jsonGenerator, dataSourceName, dataSourceObjOd);
+            }
+
+            // list all logical data sources
+            Map<Long, String> logicalDataSources = DataSourceLoader.getLogicalDataSources(caseForJob.getSleuthkitCase());
+            for (Map.Entry<Long, String> entry : logicalDataSources.entrySet()) {
+                String dataSourceName = entry.getValue();
+                Long dataSourceObjOd = entry.getKey();
+                saveDataSourceInfoToFile(jsonGenerator, dataSourceName, dataSourceObjOd);
+            }
+        } catch (IOException ex) {
+            logger.log(Level.SEVERE, "Failed to create JSON output for 'List All Data Sources' command", ex); //NON-NLS
+            System.err.println("Failed to create JSON output for 'List All Data Sources' command"); //NON-NLS
+        } catch (TskCoreException ex) {
+            logger.log(Level.SEVERE, "Failed to get data source info for 'List All Data Sources' command output", ex); //NON-NLS
+            System.err.println("Failed to get data source info for 'List All Data Sources' command output"); //NON-NLS
+        } catch (SQLException ex) {
+            logger.log(Level.SEVERE, "Failed to get data source display name for 'List All Data Sources' command output", ex); //NON-NLS
+            System.err.println("Failed to get data source display name for 'List All Data Sources' command output"); //NON-NLS
+        } finally {
+            if (jsonGenerator != null) {
+                try {
+                    jsonGenerator.close();
+                } catch (IOException ex) {
+                    logger.log(Level.WARNING, "Failed to close JSON output file for 'List All Data Sources' command", ex); //NON-NLS
+                    System.err.println("Failed to close JSON output file for 'List All Data Sources' command"); //NON-NLS
+                }
+            }
+        }
+    }
+
+    /**
+     * Saves data source info in JSON output file
+     *
+     * @param jsonGenerator Fully initialized JsonGenerator object
+     * @param dataSourceName Name of the data source
+     * @param dataSourceObjId Object Id of the data source
+     * @throws IOException
+     */
+    private static void saveDataSourceInfoToFile(JsonGenerator jsonGenerator, String dataSourceName, long dataSourceObjId) throws IOException {
+        jsonGenerator.writeStartObject();
+        jsonGenerator.writeStringField("@dataSourceName", dataSourceName);
+        jsonGenerator.writeStringField("@dataSourceObjectId", String.valueOf(dataSourceObjId));
+        jsonGenerator.writeEndObject();
+    }
+
     /**
      * Gets display_name from tsk_image_info table for Image data sources
      *

From 036ee761b186a03d98c5244e5e332d1dfc785ad1 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Fri, 31 May 2019 12:06:54 -0400
Subject: [PATCH 035/192] Saving output in case directory + bug fix

---
 .../CommandLineIngestManager.java             | 57 +++++++++++--------
 .../CommandLineOptionProcessor.java           | 13 +++--
 2 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
index 7279e05b7a..bdd40b79a1 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
@@ -70,6 +70,7 @@ public class CommandLineIngestManager {
     private static final Logger LOGGER = Logger.getLogger(CommandLineIngestManager.class.getName());
     private Case caseForJob = null;
     private AutoIngestDataSource dataSource = null;
+    private static final String LOG_DIR_NAME = "Command Output";
 
     public CommandLineIngestManager() {
     }
@@ -133,7 +134,7 @@ public class CommandLineIngestManager {
                     System.err.println("No command line commands specified");
                     return;
                 }
-                
+
                 try {
                     // Commands are already stored in order in which they should be executed                
                     for (CommandLineCommand command : commands) {
@@ -144,8 +145,8 @@ public class CommandLineIngestManager {
                                     LOGGER.log(Level.INFO, "Processing 'create case' command");
                                     System.out.println("Processing 'create case' command");
                                     openCase(command);
-                                    
-                                    String outputDirPath = "C:\\TEST\\DELETE";
+
+                                    String outputDirPath = getOutputDirPath(caseForJob);
                                     OutputGenerator.saveCreateCaseOutput(caseForJob, outputDirPath);
                                 } catch (CaseActionException ex) {
                                     String baseCaseName = command.getInputs().get(CommandLineCommand.InputType.CASE_NAME.name());
@@ -170,8 +171,8 @@ public class CommandLineIngestManager {
                                     String dataSourcePath = inputs.get(CommandLineCommand.InputType.DATA_SOURCE_PATH.name());
                                     dataSource = new AutoIngestDataSource("", Paths.get(dataSourcePath));
                                     runDataSourceProcessor(caseForJob, dataSource);
-                                    
-                                    String outputDirPath = "C:\\TEST\\DELETE";
+
+                                    String outputDirPath = getOutputDirPath(caseForJob);
                                     OutputGenerator.saveAddDataSourceOutput(caseForJob, dataSource, outputDirPath);
                                 } catch (InterruptedException | AutoIngestDataSourceProcessor.AutoIngestDataSourceProcessorException | CaseActionException ex) {
                                     String dataSourcePath = command.getInputs().get(CommandLineCommand.InputType.DATA_SOURCE_PATH.name());
@@ -186,19 +187,19 @@ public class CommandLineIngestManager {
                                     LOGGER.log(Level.INFO, "Processing 'run ingest' command");
                                     System.out.println("Processing 'run ingest' command");
                                     Map<String, String> inputs = command.getInputs();
-                                    
+
                                     // open the case, if it hasn't been already opened by CREATE_CASE or ADD_DATA_SOURCE commands
                                     if (caseForJob == null) {
                                         String caseDirPath = inputs.get(CommandLineCommand.InputType.CASE_FOLDER_PATH.name());
                                         openCase(caseDirPath);
                                     }
-                                    
+
                                     // populate the AutoIngestDataSource structure, if that hasn't been done by ADD_DATA_SOURCE command
                                     if (dataSource == null) {
 
                                         String dataSourceId = inputs.get(CommandLineCommand.InputType.DATA_SOURCE_ID.name());
                                         Long dataSourceObjId = Long.valueOf(dataSourceId);
-                                        
+
                                         // get Content object for the data source
                                         Content content = null;
                                         try {
@@ -209,21 +210,21 @@ public class CommandLineIngestManager {
                                             // Do not process any other commands
                                             return;
                                         }
-                                        
+
                                         if (content == null) {
                                             LOGGER.log(Level.SEVERE, "Unable to find data source with object ID {0}", dataSourceId);
                                             System.out.println("Unable to find data source with object ID " + dataSourceId);
                                             // Do not process any other commands
-                                            return;                                            
+                                            return;
                                         }
-                                        
+
                                         // populate the AutoIngestDataSource structure
                                         dataSource = new AutoIngestDataSource("", Paths.get(content.getName()));
                                         List<Content> contentList = Arrays.asList(new Content[]{content});
                                         List<String> errorList = new ArrayList<>();
                                         dataSource.setDataSourceProcessorOutput(NO_ERRORS, errorList, contentList);
                                     }
-                                    
+
                                     // run ingest
                                     analyze(dataSource);
                                 } catch (InterruptedException | CaseActionException ex) {
@@ -234,17 +235,17 @@ public class CommandLineIngestManager {
                                     return;
                                 }
                                 break;
-                                
+
                             case LIST_ALL_DATA_SOURCES:
                                 try {
                                     LOGGER.log(Level.INFO, "Processing 'List All Data Sources' command");
                                     System.out.println("Processing 'List All Data Sources' command");
                                     Map<String, String> inputs = command.getInputs();
-                                    
+
                                     String caseDirPath = inputs.get(CommandLineCommand.InputType.CASE_FOLDER_PATH.name());
                                     openCase(caseDirPath);
-                                    
-                                    String outputDirPath = "C:\\TEST\\DELETE";
+
+                                    String outputDirPath = getOutputDirPath(caseForJob);
                                     OutputGenerator.listAllDataSources(caseForJob, outputDirPath);
                                 } catch (CaseActionException ex) {
                                     String caseDirPath = command.getInputs().get(CommandLineCommand.InputType.CASE_FOLDER_PATH.name());
@@ -285,7 +286,7 @@ public class CommandLineIngestManager {
                 stop();
             }
         }
-        
+
         /**
          * Creates a new case using arguments passed in from command line
          * CREATE_CASE command.
@@ -327,7 +328,7 @@ public class CommandLineIngestManager {
          * @throws CaseActionException
          */
         private void openCase(String caseFolderPath) throws CaseActionException {
-            
+
             LOGGER.log(Level.INFO, "Opening case in directory {0}", caseFolderPath);
 
             String metadataFilePath = findAutFile(caseFolderPath);
@@ -336,7 +337,7 @@ public class CommandLineIngestManager {
             caseForJob = Case.getCurrentCase();
             LOGGER.log(Level.INFO, "Opened case {0}", caseForJob.getName());
         }
-        
+
         /**
          * Finds the path to the .aut file for the specified case directory.
          *
@@ -366,8 +367,8 @@ public class CommandLineIngestManager {
                 throw new CaseActionException("No .aut files found in case directory");
             }
             throw new CaseActionException("Case directory was not found");
-        } 
-        
+        }
+
         /**
          * Passes the data source for the current job through a data source
          * processor that adds it to the case database.
@@ -559,7 +560,7 @@ public class CommandLineIngestManager {
          *
          * @return A case folder path with a time stamp suffix.
          */
-        Path createCaseFolderPath(Path caseFoldersPath, String caseName) {
+        private Path createCaseFolderPath(Path caseFoldersPath, String caseName) {
             String folderName = caseName + "_" + TimeStampUtils.createTimeStamp();
             return Paths.get(caseFoldersPath.toString(), folderName);
         }
@@ -574,7 +575,7 @@ public class CommandLineIngestManager {
          *
          * @return The path of the case folder, or null if it is not found.
          */
-        Path findCaseDirectory(Path folderToSearch, String caseName) {
+        private Path findCaseDirectory(Path folderToSearch, String caseName) {
             File searchFolder = new File(folderToSearch.toString());
             if (!searchFolder.isDirectory()) {
                 return null;
@@ -592,6 +593,16 @@ public class CommandLineIngestManager {
             return caseFolderPath;
         }
 
+        /**
+         * Returns full path to directory where command outputs should be saved.
+         *
+         * @param caseForJob Case object
+         * @return Full path to directory where command outputs should be saved
+         */
+        private String getOutputDirPath(Case caseForJob) {
+            return caseForJob.getCaseDirectory() + File.separator + LOG_DIR_NAME;
+        }
+
         /**
          * An ingest job event listener that allows the job processing task to
          * block until the analysis of a data source by the data source level
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
index 4ea662b342..529e6b1ec6 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
@@ -47,7 +47,7 @@ public class CommandLineOptionProcessor extends OptionProcessor {
     private final Option addDataSourceCommandOption = Option.withoutArgument('a', "addDataSource");
     private final Option caseDirOption = Option.requiredArgument('d', "caseDir");
     private final Option runIngestCommandOption = Option.withoutArgument('r', "runIngest");
-    private final Option getAllDataSourcesCommandOption = Option.withoutArgument('l', "listAllDataSources");
+    private final Option listAllDataSourcesCommandOption = Option.withoutArgument('l', "listAllDataSources");
     private boolean runFromCommandLine = false;
 
     private final List<CommandLineCommand> commands = new ArrayList<>();
@@ -63,7 +63,7 @@ public class CommandLineOptionProcessor extends OptionProcessor {
         set.add(dataSourceObjectIdOption);
         set.add(caseDirOption);
         set.add(runIngestCommandOption);
-        set.add(getAllDataSourcesCommandOption);
+        set.add(listAllDataSourcesCommandOption);
         return set;
     }
 
@@ -75,7 +75,7 @@ public class CommandLineOptionProcessor extends OptionProcessor {
 
         // input arguments must contain at least one command
         if (!(values.containsKey(createCaseCommandOption) || values.containsKey(addDataSourceCommandOption)
-                || values.containsKey(runIngestCommandOption) || values.containsKey(getAllDataSourcesCommandOption))) {
+                || values.containsKey(runIngestCommandOption) || values.containsKey(listAllDataSourcesCommandOption))) {
             // not running from command line
             logger.log(Level.INFO, "No command line commands passed in as inputs. Not running from command line."); //NON-NLS
             System.err.println("No command line commands passed in as inputs. Not running from command line.");
@@ -276,10 +276,11 @@ public class CommandLineOptionProcessor extends OptionProcessor {
         }
 
         // Add "LIST_ALL_DATA_SOURCES" command, if present
-        if (values.containsKey(getAllDataSourcesCommandOption)) {
+        if (values.containsKey(listAllDataSourcesCommandOption)) {
 
-            // 'caseDir' must always be specified for "LIST_ALL_DATA_SOURCES" command
-            if (caseDir.isEmpty()) {
+            // 'caseDir' must only be specified if the case is not being created during the current run
+            if (!values.containsKey(createCaseCommandOption) && caseDir.isEmpty()) {
+                // new case is not being created during this run, so 'caseDir' should have been specified
                 logger.log(Level.SEVERE, "'caseDir' argument is empty");
                 System.err.println("'caseDir' argument is empty");
                 runFromCommandLine = false;

From 25284d47329f1d87b1764500b9c1520e836a1f66 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Fri, 31 May 2019 12:34:45 -0400
Subject: [PATCH 036/192] Changes to getting logical file display name

---
 .../commandlineingest/CommandLineIngestManager.java  | 12 ++++++------
 .../autopsy/commandlineingest/OutputGenerator.java   |  8 ++++++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
index bdd40b79a1..87c084f0c1 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
@@ -142,8 +142,8 @@ public class CommandLineIngestManager {
                         switch (type) {
                             case CREATE_CASE:
                                 try {
-                                    LOGGER.log(Level.INFO, "Processing 'create case' command");
-                                    System.out.println("Processing 'create case' command");
+                                    LOGGER.log(Level.INFO, "Processing 'Create Case' command");
+                                    System.out.println("Processing 'Create Case' command");
                                     openCase(command);
 
                                     String outputDirPath = getOutputDirPath(caseForJob);
@@ -158,8 +158,8 @@ public class CommandLineIngestManager {
                                 break;
                             case ADD_DATA_SOURCE:
                                 try {
-                                    LOGGER.log(Level.INFO, "Processing 'add data source' command");
-                                    System.out.println("Processing 'add data source' command");
+                                    LOGGER.log(Level.INFO, "Processing 'Add Data Source' command");
+                                    System.out.println("Processing 'Add Data Source' command");
                                     Map<String, String> inputs = command.getInputs();
 
                                     // open the case, if it hasn't been already opened by CREATE_CASE command
@@ -184,8 +184,8 @@ public class CommandLineIngestManager {
                                 break;
                             case RUN_INGEST:
                                 try {
-                                    LOGGER.log(Level.INFO, "Processing 'run ingest' command");
-                                    System.out.println("Processing 'run ingest' command");
+                                    LOGGER.log(Level.INFO, "Processing 'Run Ingest' command");
+                                    System.out.println("Processing 'Run Ingest' command");
                                     Map<String, String> inputs = command.getInputs();
 
                                     // open the case, if it hasn't been already opened by CREATE_CASE or ADD_DATA_SOURCE commands
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/OutputGenerator.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/OutputGenerator.java
index ed34132bef..1bd7ebe1ca 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/OutputGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/OutputGenerator.java
@@ -37,6 +37,7 @@ import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.TimeStampUtils;
 import org.sleuthkit.autopsy.datamodel.utils.DataSourceLoader;
 import org.sleuthkit.autopsy.datasourceprocessors.AutoIngestDataSource;
+import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.Content;
 import org.sleuthkit.datamodel.Image;
 import org.sleuthkit.datamodel.SleuthkitCase;
@@ -141,8 +142,11 @@ class OutputGenerator {
                         dataSourceName = content.getName();
                     }
                 } else {
-                    // logical data source
-                    dataSourceName = content.getName();
+                    // logical data source. The only way I found that works for all types of logical 
+                    // data sources is to get AbstractFile from database and use it's name. 
+                    // Content.getName() works for most but not all scenarios.
+                    AbstractFile file = caseForJob.getSleuthkitCase().getAbstractFileById(content.getId());
+                    dataSourceName = file.getName(); 
                 }
 
                 // save the JSON output

From 0d34a380bbcac67bdf7500ed5952a1a47ed9327f Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Mon, 3 Jun 2019 14:08:27 -0400
Subject: [PATCH 037/192] Bug fix

---
 .../commandlineingest/CommandLineIngestManager.java        | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
index 87c084f0c1..adb50d4e61 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
@@ -242,8 +242,11 @@ public class CommandLineIngestManager {
                                     System.out.println("Processing 'List All Data Sources' command");
                                     Map<String, String> inputs = command.getInputs();
 
-                                    String caseDirPath = inputs.get(CommandLineCommand.InputType.CASE_FOLDER_PATH.name());
-                                    openCase(caseDirPath);
+                                    // open the case, if it hasn't been already opened by previous command
+                                    if (caseForJob == null) {
+                                        String caseDirPath = inputs.get(CommandLineCommand.InputType.CASE_FOLDER_PATH.name());
+                                        openCase(caseDirPath);
+                                    }
 
                                     String outputDirPath = getOutputDirPath(caseForJob);
                                     OutputGenerator.listAllDataSources(caseForJob, outputDirPath);

From a2b6c3c02de61730c27599018960f90e308e9515 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Tue, 4 Jun 2019 12:15:21 -0400
Subject: [PATCH 038/192] Added support for custom ingest profiles

---
 .../commandlineingest/CommandLineCommand.java |  2 +-
 .../CommandLineIngestManager.java             | 89 ++++++++++++++++++-
 .../CommandLineOptionProcessor.java           | 30 +++----
 3 files changed, 98 insertions(+), 23 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java
index b0592619d6..22b4f034a2 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java
@@ -45,7 +45,7 @@ class CommandLineCommand {
         CASE_FOLDER_PATH,
         DATA_SOURCE_PATH,
         DATA_SOURCE_ID,
-        INGEST_CONTEXT_NAME;
+        INGEST_PROFILE_NAME;
     }
     
     private final CommandType type;
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
index adb50d4e61..b32892577a 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
@@ -57,6 +57,9 @@ import org.sleuthkit.autopsy.ingest.IngestJobSettings;
 import org.sleuthkit.autopsy.ingest.IngestJobStartResult;
 import org.sleuthkit.autopsy.ingest.IngestManager;
 import org.sleuthkit.autopsy.ingest.IngestModuleError;
+import org.sleuthkit.autopsy.ingest.IngestProfiles;
+import org.sleuthkit.autopsy.modules.interestingitems.FilesSet;
+import org.sleuthkit.autopsy.modules.interestingitems.FilesSetsManager;
 import org.sleuthkit.datamodel.Content;
 import org.sleuthkit.datamodel.TskCoreException;
 
@@ -226,7 +229,8 @@ public class CommandLineIngestManager {
                                     }
 
                                     // run ingest
-                                    analyze(dataSource);
+                                    String ingestProfile = inputs.get(CommandLineCommand.InputType.INGEST_PROFILE_NAME.name());
+                                    analyze(dataSource, ingestProfile);
                                 } catch (InterruptedException | CaseActionException ex) {
                                     String dataSourcePath = command.getInputs().get(CommandLineCommand.InputType.DATA_SOURCE_PATH.name());
                                     LOGGER.log(Level.SEVERE, "Error running ingest on data source " + dataSourcePath, ex);
@@ -482,9 +486,12 @@ public class CommandLineIngestManager {
         /**
          * Analyzes the data source content returned by the data source
          * processor using the configured set of data source level and file
-         * level analysis modules.
+         * level analysis modules. If an ingest profile is specified, load that
+         * profile (profile = ingest context + ingest filter) for ingest.
+         * Otherwise use baseline configuration.
          *
          * @param dataSource The data source to analyze.
+         * @param ingestProfileName Name of ingest profile to use (optional)
          *
          * @throws AnalysisStartupException if there is an error analyzing the
          * data source.
@@ -492,14 +499,46 @@ public class CommandLineIngestManager {
          * task is interrupted while blocked, i.e., if auto ingest is shutting
          * down.
          */
-        private void analyze(AutoIngestDataSource dataSource) throws AnalysisStartupException, InterruptedException {
+        private void analyze(AutoIngestDataSource dataSource, String ingestProfileName) throws AnalysisStartupException, InterruptedException {
 
             LOGGER.log(Level.INFO, "Starting ingest modules analysis for {0} ", dataSource.getPath());
+
+            // configure ingest profile and file filter
+            IngestProfiles.IngestProfile selectedProfile = null;
+            FilesSet selectedFileSet = null;
+            if (!ingestProfileName.isEmpty()) {
+                selectedProfile = getSelectedProfile(ingestProfileName);
+                if (selectedProfile == null) {
+                    // unable to find the user specified profile
+                    LOGGER.log(Level.SEVERE, "Unable to find ingest profile: {0}. Ingest cancelled!", ingestProfileName);
+                    System.err.println("Unable to find ingest profile: " + ingestProfileName + ". Ingest cancelled!");
+                    return;
+                }
+
+                // get FileSet filter associated with this profile
+                selectedFileSet = getSelectedFilter(selectedProfile.getFileIngestFilter());
+                if (selectedFileSet == null) {
+                    // unable to find the user specified profile
+                    LOGGER.log(Level.SEVERE, "Unable to find file filter {0} for ingest profile: {1}. Ingest cancelled!", new Object[]{selectedProfile.getFileIngestFilter(), ingestProfileName});
+                    System.err.println("Unable to find file filter " + selectedProfile.getFileIngestFilter() + " for ingest profile: " + ingestProfileName + ". Ingest cancelled!");
+                    return;
+                }
+            }
+
             IngestJobEventListener ingestJobEventListener = new IngestJobEventListener();
             IngestManager.getInstance().addIngestJobEventListener(ingestJobEventListener);
             try {
                 synchronized (ingestLock) {
-                    IngestJobSettings ingestJobSettings = new IngestJobSettings(UserPreferences.getCommandLineModeIngestModuleContextString());
+                    IngestJobSettings ingestJobSettings;
+                    if (selectedProfile == null || selectedFileSet == null) {
+                        // use baseline configuration
+                        ingestJobSettings = new IngestJobSettings(UserPreferences.getCommandLineModeIngestModuleContextString());
+                    } else {
+                        // load the custom ingest 
+                        ingestJobSettings = new IngestJobSettings(selectedProfile.toString());
+                        ingestJobSettings.setFileFilter(selectedFileSet);
+                    }
+
                     List<String> settingsWarnings = ingestJobSettings.getWarnings();
                     if (settingsWarnings.isEmpty()) {
                         IngestJobStartResult ingestJobStartResult = IngestManager.getInstance().beginIngestJob(dataSource.getContent(), ingestJobSettings);
@@ -554,6 +593,48 @@ public class CommandLineIngestManager {
             }
         }
 
+        /**
+         * Gets the specified ingest profile from the list of all existing
+         * ingest profiles.
+         *
+         * @param ingestProfileName Ingest profile name
+         * @return IngestProfile object, or NULL if the profile doesn't exist
+         */
+        private IngestProfiles.IngestProfile getSelectedProfile(String ingestProfileName) {
+
+            IngestProfiles.IngestProfile selectedProfile = null;
+            // lookup the profile by name
+            for (IngestProfiles.IngestProfile profile : IngestProfiles.getIngestProfiles()) {
+                if (profile.toString().equalsIgnoreCase(ingestProfileName)) {
+                    // found the profile
+                    selectedProfile = profile;
+                    break;
+                }
+            }
+            return selectedProfile;
+        }
+
+        /**
+         * Gets the specified file filter from the list of all existing file
+         * filters (custom and standard).
+         *
+         * @param filterName Name of the file filter
+         * @return FilesSet object, or NULL if the filter doesn't exist
+         */
+        private FilesSet getSelectedFilter(String filterName) {
+            try {
+                Map<String, FilesSet> fileIngestFilters = FilesSetsManager.getInstance()
+                        .getCustomFileIngestFilters();
+                for (FilesSet fSet : FilesSetsManager.getStandardFileIngestFilters()) {
+                    fileIngestFilters.put(fSet.getName(), fSet);
+                }
+                return fileIngestFilters.get(filterName);
+            } catch (FilesSetsManager.FilesSetsManagerException ex) {
+                LOGGER.log(Level.SEVERE, "Failed to get file ingest filter: " + filterName, ex); //NON-NLS
+                return null;
+            }
+        }
+
         /**
          * Creates a case folder path. Does not create the folder described by
          * the path.
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
index cbcf5868c7..c5c8754ec2 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
@@ -47,7 +47,7 @@ public class CommandLineOptionProcessor extends OptionProcessor {
     private final Option addDataSourceCommandOption = Option.withoutArgument('a', "addDataSource");
     private final Option caseDirOption = Option.requiredArgument('d', "caseDir");
     private final Option runIngestCommandOption = Option.withoutArgument('r', "runIngest");
-    private final Option configFilePathOption = Option.withoutArgument('p', "configFilePath");
+    private final Option ingestProfileOption = Option.requiredArgument('p', "ingestProfile");
     private final Option listAllDataSourcesCommandOption = Option.withoutArgument('l', "listAllDataSources");
 
     private boolean runFromCommandLine = false;
@@ -65,7 +65,7 @@ public class CommandLineOptionProcessor extends OptionProcessor {
         set.add(dataSourceObjectIdOption);
         set.add(caseDirOption);
         set.add(runIngestCommandOption);
-        set.add(configFilePathOption);
+        set.add(ingestProfileOption);
         set.add(listAllDataSourcesCommandOption);
         return set;
     }
@@ -196,27 +196,21 @@ public class CommandLineOptionProcessor extends OptionProcessor {
             }
         }
                 
-        String configFilePath = "";
-        if (values.containsKey(configFilePathOption)) {
+        String ingestProfile = "";
+        if (values.containsKey(ingestProfileOption)) {
 
-            argDirs = values.get(configFilePathOption);
+            argDirs = values.get(ingestProfileOption);
             if (argDirs.length < 1) {
-                logger.log(Level.SEVERE, "Missing argument 'configFilePath'");
-                System.err.println("Missing argument 'configFilePath'");
+                logger.log(Level.SEVERE, "Missing argument 'ingestProfile'");
+                System.err.println("Missing argument 'ingestProfile'");
                 return;
             }
-            configFilePath = argDirs[0];
+            ingestProfile = argDirs[0];
 
             // verify inputs
-            if (configFilePath == null || configFilePath.isEmpty()) {
-                logger.log(Level.SEVERE, "Missing argument 'configFilePath'");
-                System.err.println("Missing argument 'configFilePath'");
-                return;
-            }
-
-            if (!(new File(configFilePath).exists())) {
-                logger.log(Level.SEVERE, "Configuration file {0} doesn''t exist", configFilePath);
-                System.err.println("Configuration file " + configFilePath + " doesn't exist");
+            if (ingestProfile == null || ingestProfile.isEmpty()) {
+                logger.log(Level.SEVERE, "Missing argument 'ingestProfile'");
+                System.err.println("Missing argument 'ingestProfile'");
                 return;
             }
         }        
@@ -299,7 +293,7 @@ public class CommandLineOptionProcessor extends OptionProcessor {
             CommandLineCommand newCommand = new CommandLineCommand(CommandLineCommand.CommandType.RUN_INGEST);
             newCommand.addInputValue(CommandLineCommand.InputType.CASE_FOLDER_PATH.name(), caseDir);
             newCommand.addInputValue(CommandLineCommand.InputType.DATA_SOURCE_ID.name(), dataSourceId);
-            newCommand.addInputValue(CommandLineCommand.InputType.INGEST_CONTEXT_NAME.name(), configFilePath);
+            newCommand.addInputValue(CommandLineCommand.InputType.INGEST_PROFILE_NAME.name(), ingestProfile);
             commands.add(newCommand);
             runFromCommandLine = true;
         }

From deac6e5cdea669f0a28870f2626ac87abe4d983b Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Tue, 4 Jun 2019 14:12:53 -0400
Subject: [PATCH 039/192] Bug fixes

---
 .../commandlineingest/CommandLineCommand.java | 24 ++++++++++++-------
 .../CommandLineIngestManager.java             | 18 +++++++-------
 .../CommandLineOptionProcessor.java           |  6 ++---
 .../commandlineingest/OutputGenerator.java    |  6 +++--
 4 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java
index 22b4f034a2..f262244417 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java
@@ -25,21 +25,21 @@ import java.util.Map;
  * Class that contains list of input parameters passed in via command line.
  */
 class CommandLineCommand {
- 
+
     /**
      * An enumeration of command types.
      */
-    static enum CommandType {        
+    static enum CommandType {
         CREATE_CASE,
         ADD_DATA_SOURCE,
         RUN_INGEST,
         LIST_ALL_DATA_SOURCES;
     }
-    
+
     /**
      * An enumeration of input types.
      */
-    static enum InputType {        
+    static enum InputType {
         CASE_NAME,
         CASES_BASE_DIR_PATH,
         CASE_FOLDER_PATH,
@@ -47,18 +47,24 @@ class CommandLineCommand {
         DATA_SOURCE_ID,
         INGEST_PROFILE_NAME;
     }
-    
+
     private final CommandType type;
     private final Map<String, String> inputs = new HashMap<>();
-    
+
     CommandLineCommand(CommandType type) {
         this.type = type;
     }
-    
+
+    /**
+     * Adds an parameter to the command.
+     *
+     * @param inputName Input parameter name
+     * @param inputValue Input parameter value
+     */
     void addInputValue(String inputName, String inputValue) {
         inputs.put(inputName, inputValue);
     }
-    
+
     /**
      * @return the inputs
      */
@@ -71,5 +77,5 @@ class CommandLineCommand {
      */
     CommandType getType() {
         return type;
-    }    
+    }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
index b32892577a..eb65945849 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
@@ -147,10 +147,13 @@ public class CommandLineIngestManager {
                                 try {
                                     LOGGER.log(Level.INFO, "Processing 'Create Case' command");
                                     System.out.println("Processing 'Create Case' command");
-                                    openCase(command);
+                                    Map<String, String> inputs = command.getInputs();
+                                    String baseCaseName = inputs.get(CommandLineCommand.InputType.CASE_NAME.name());
+                                    String rootOutputDirectory = inputs.get(CommandLineCommand.InputType.CASES_BASE_DIR_PATH.name());
+                                    openCase(baseCaseName, rootOutputDirectory);
 
                                     String outputDirPath = getOutputDirPath(caseForJob);
-                                    OutputGenerator.saveCreateCaseOutput(caseForJob, outputDirPath);
+                                    OutputGenerator.saveCreateCaseOutput(caseForJob, outputDirPath, baseCaseName);
                                 } catch (CaseActionException ex) {
                                     String baseCaseName = command.getInputs().get(CommandLineCommand.InputType.CASE_NAME.name());
                                     LOGGER.log(Level.SEVERE, "Error creating or opening case " + baseCaseName, ex);
@@ -298,17 +301,14 @@ public class CommandLineIngestManager {
          * Creates a new case using arguments passed in from command line
          * CREATE_CASE command.
          *
-         * @param command command line CREATE_CASE command
+         * @param baseCaseName Case name
+         * @param rootOutputDirectory Full path to directory in which case
+         * output folder will be created
          * @throws CaseActionException
          */
-        private void openCase(CommandLineCommand command) throws CaseActionException {
+        private void openCase(String baseCaseName, String rootOutputDirectory) throws CaseActionException {
 
-            Map<String, String> inputs = command.getInputs();
-
-            String baseCaseName = inputs.get(CommandLineCommand.InputType.CASE_NAME.name());
-            String rootOutputDirectory = inputs.get(CommandLineCommand.InputType.CASES_BASE_DIR_PATH.name());
             LOGGER.log(Level.INFO, "Opening case {0} in directory {1}", new Object[]{baseCaseName, rootOutputDirectory});
-
             Path caseDirectoryPath = findCaseDirectory(Paths.get(rootOutputDirectory), baseCaseName);
             if (null != caseDirectoryPath) {
                 // found an existing case directory for same case name. the input case name must be unique. Exit.
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
index c5c8754ec2..49017406eb 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
@@ -195,7 +195,7 @@ public class CommandLineOptionProcessor extends OptionProcessor {
                 return;
             }
         }
-                
+
         String ingestProfile = "";
         if (values.containsKey(ingestProfileOption)) {
 
@@ -213,7 +213,7 @@ public class CommandLineOptionProcessor extends OptionProcessor {
                 System.err.println("Missing argument 'ingestProfile'");
                 return;
             }
-        }        
+        }
 
         // Create commands in order in which they should be executed:
         // First create the "CREATE_CASE" command, if present
@@ -289,7 +289,7 @@ public class CommandLineOptionProcessor extends OptionProcessor {
                 runFromCommandLine = false;
                 return;
             }
-            
+
             CommandLineCommand newCommand = new CommandLineCommand(CommandLineCommand.CommandType.RUN_INGEST);
             newCommand.addInputValue(CommandLineCommand.InputType.CASE_FOLDER_PATH.name(), caseDir);
             newCommand.addInputValue(CommandLineCommand.InputType.DATA_SOURCE_ID.name(), dataSourceId);
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/OutputGenerator.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/OutputGenerator.java
index 1bd7ebe1ca..adc5cfabaf 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/OutputGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/OutputGenerator.java
@@ -59,8 +59,9 @@ class OutputGenerator {
      * @param caseForJob Case object
      * @param outputDirPath Full path to a directory where JSON output should be
      * saved
+     * @param baseCaseName Case name
      */
-    static void saveCreateCaseOutput(Case caseForJob, String outputDirPath) {
+    static void saveCreateCaseOutput(Case caseForJob, String outputDirPath, String baseCaseName) {
         JsonFactory jsonGeneratorFactory = new JsonFactory();
         String reportOutputPath = outputDirPath + File.separator + "createCase_" + TimeStampUtils.createTimeStamp() + ".json";
         java.io.File reportFile = Paths.get(reportOutputPath).toFile();
@@ -80,6 +81,7 @@ class OutputGenerator {
 
             // save command output
             jsonGenerator.writeStartObject();
+            jsonGenerator.writeStringField("@caseName", baseCaseName);
             jsonGenerator.writeStringField("@caseDir", caseForJob.getCaseDirectory());
             jsonGenerator.writeEndObject();
         } catch (IOException ex) {
@@ -146,7 +148,7 @@ class OutputGenerator {
                     // data sources is to get AbstractFile from database and use it's name. 
                     // Content.getName() works for most but not all scenarios.
                     AbstractFile file = caseForJob.getSleuthkitCase().getAbstractFileById(content.getId());
-                    dataSourceName = file.getName(); 
+                    dataSourceName = file.getName();
                 }
 
                 // save the JSON output

From 0b2cc121758f4c0eb3d57bb91dab1d881023234c Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Thu, 1 Aug 2019 14:25:26 -0400
Subject: [PATCH 040/192] Refactored report module lookup into
 ReportModuleLoader

---
 .../autopsy/report/ReportModuleLoader.java    | 63 +++++++++++++++
 .../autopsy/report/ReportVisualPanel1.java    | 77 ++++++-------------
 2 files changed, 88 insertions(+), 52 deletions(-)
 create mode 100755 Core/src/org/sleuthkit/autopsy/report/ReportModuleLoader.java

diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportModuleLoader.java b/Core/src/org/sleuthkit/autopsy/report/ReportModuleLoader.java
new file mode 100755
index 0000000000..f772761eac
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportModuleLoader.java
@@ -0,0 +1,63 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2019 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.report;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.openide.util.Lookup;
+import org.sleuthkit.autopsy.python.JythonModuleLoader;
+
+/**
+ * Class used to find and instantiate report module singletons. Provides a
+ * single mechanism by which clients that interact with report modules can
+ * obtain them.
+ */
+class ReportModuleLoader {
+
+    static List<GeneralReportModule> getGeneralReportModules() {
+        List<GeneralReportModule> generalModules = new ArrayList<>();
+
+        for (GeneralReportModule module : Lookup.getDefault().lookupAll(GeneralReportModule.class)) {
+            generalModules.add(module);
+        }
+
+        for (GeneralReportModule module : JythonModuleLoader.getGeneralReportModules()) {
+            generalModules.add(module);
+        }
+
+        return generalModules;
+    }
+
+    static List<TableReportModule> getTableReportModules() {
+        List<TableReportModule> tableModules = new ArrayList<>();
+        for (TableReportModule module : Lookup.getDefault().lookupAll(TableReportModule.class)) {
+            tableModules.add(module);
+        }
+        return tableModules;
+    }
+
+    // Initialize the list of ReportModules
+    static List<FileReportModule> getFileReportModules() {
+        List<FileReportModule> fileModules = new ArrayList<>();
+        for (FileReportModule module : Lookup.getDefault().lookupAll(FileReportModule.class)) {
+            fileModules.add(module);
+        }
+        return fileModules;
+    }
+}
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
index 2d12230e65..9c2a028073 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
@@ -21,9 +21,7 @@ package org.sleuthkit.autopsy.report;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.util.ArrayList;
-import java.util.Collections;
 import static java.util.Collections.swap;
-import java.util.Comparator;
 import java.util.List;
 import java.util.logging.Level;
 import javax.swing.JList;
@@ -35,10 +33,8 @@ import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import org.openide.DialogDisplayer;
 import org.openide.NotifyDescriptor;
-import org.openide.util.Lookup;
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
-import org.sleuthkit.autopsy.python.JythonModuleLoader;
 
 /**
  * Display reports modules.
@@ -49,9 +45,9 @@ final class ReportVisualPanel1 extends JPanel implements ListSelectionListener {
     private static final Logger logger = Logger.getLogger(ReportVisualPanel1.class.getName());
     private final ReportWizardPanel1 wizPanel;
     private final List<ReportModule> modules = new ArrayList<>();
-    private final List<GeneralReportModule> generalModules = new ArrayList<>();
-    private final List<TableReportModule> tableModules = new ArrayList<>();
-    private final List<FileReportModule> fileModules = new ArrayList<>();
+    private List<GeneralReportModule> generalModules = new ArrayList<>();
+    private List<TableReportModule> tableModules = new ArrayList<>();
+    private List<FileReportModule> fileModules = new ArrayList<>();
     private PortableCaseReportModule portableCaseModule;
     private Integer selectedIndex;
 
@@ -68,42 +64,36 @@ final class ReportVisualPanel1 extends JPanel implements ListSelectionListener {
 
     // Initialize the list of ReportModules
     private void initModules() {
-        for (TableReportModule module : Lookup.getDefault().lookupAll(TableReportModule.class)) {
-            if (moduleIsValid(module)) {
-                tableModules.add(module);
-                modules.add(module);
-            } else {
+        tableModules = ReportModuleLoader.getTableReportModules();
+        generalModules = ReportModuleLoader.getGeneralReportModules();
+        fileModules = ReportModuleLoader.getFileReportModules();
+        
+        for (TableReportModule module : tableModules) {
+            if (!moduleIsValid(module)) {
                 popupWarning(module);
+                tableModules.remove(module);                
+            }
+        }
+        
+        for (GeneralReportModule module : generalModules) {
+            if (!moduleIsValid(module)) {
+                popupWarning(module);
+                generalModules.remove(module);
             }
         }
 
-        for (GeneralReportModule module : Lookup.getDefault().lookupAll(GeneralReportModule.class)) {
-            if (moduleIsValid(module)) {
-                generalModules.add(module);
-                modules.add(module);
-            } else {
-                popupWarning(module);
-            }
-        }
-
-        for (GeneralReportModule module : JythonModuleLoader.getGeneralReportModules()) {
-            if (moduleIsValid(module)) {
-                generalModules.add(module);
-                modules.add(module);
-            } else {
-                popupWarning(module);
-            }
-        }
-
-        for (FileReportModule module : Lookup.getDefault().lookupAll(FileReportModule.class)) {
-            if (moduleIsValid(module)) {
-                fileModules.add(module);
-                modules.add(module);
-            } else {
+        for (FileReportModule module : fileModules) {
+            if (!moduleIsValid(module)) {
                 popupWarning(module);
+                fileModules.remove(module);                
             }
         }
         
+        // our theory is that the report table modules are more common, so they go on top
+        modules.addAll(tableModules);
+        modules.addAll(fileModules);
+        modules.addAll(generalModules);
+        
         portableCaseModule = new PortableCaseReportModule();
         if (moduleIsValid(portableCaseModule)) {
             modules.add(portableCaseModule);
@@ -111,23 +101,6 @@ final class ReportVisualPanel1 extends JPanel implements ListSelectionListener {
             popupWarning(portableCaseModule);
         }
 
-        Collections.sort(modules, new Comparator<ReportModule>() {
-            @Override
-            public int compare(ReportModule rm1, ReportModule rm2) {
-                // our theory is that the report table modules are more common, so they go on top
-                boolean rm1isTable = (rm1 instanceof TableReportModule);
-                boolean rm2isTable = (rm2 instanceof TableReportModule);
-                if (rm1isTable && !rm2isTable) {
-                    return -1;
-                }
-                if (!rm1isTable && rm2isTable) {
-                    return 1;
-                }
-
-                return rm1.getName().compareTo(rm2.getName());
-            }
-        });
-
         // Results-HTML should always be first in the list of Report Modules.
         int indexOfHTMLReportModule = 0;
         for (ReportModule module : modules) {

From 47ca52f8da6e7b5029d24b231bf6fa2f625a3984 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Tue, 6 Aug 2019 15:04:01 -0400
Subject: [PATCH 041/192] Created ReportProgressPanel API and
 ReportProgressDialog

---
 .../autopsy/report/Bundle.properties          |   8 +-
 .../autopsy/report/Bundle.properties-MERGED   |   8 +-
 .../autopsy/report/Bundle_ja.properties       |   8 +-
 .../autopsy/report/ReportGenerationPanel.java |   7 +-
 .../sleuthkit/autopsy/report/ReportKML.java   |  34 +-
 ...ssPanel.form => ReportProgressDialog.form} |   8 +-
 .../autopsy/report/ReportProgressDialog.java  | 373 ++++++++++++++++++
 .../autopsy/report/ReportProgressPanel.java   | 305 +-------------
 .../autopsy/report/TableReportGenerator.java  |   4 +-
 .../report/caseuco/CaseUcoFormatExporter.java |   2 +-
 10 files changed, 429 insertions(+), 328 deletions(-)
 rename Core/src/org/sleuthkit/autopsy/report/{ReportProgressPanel.form => ReportProgressDialog.form} (90%)
 create mode 100644 Core/src/org/sleuthkit/autopsy/report/ReportProgressDialog.java
 mode change 100644 => 100755 Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java

diff --git a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties
index 45e66b1092..4c7e8868d7 100644
--- a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties
@@ -12,10 +12,6 @@ ReportVisualPanel2.advancedButton.text=Data Types
 ArtifactSelectionDialog.deselectAllButton.text=Deselect All
 ArtifactSelectionDialog.selectAllButton.text=Select All
 ReportGenerationPanel.closeButton.text=Close
-ReportProgressPanel.reportLabel.text=reportLabel
-ReportProgressPanel.pathLabel.text=pathLabel
-ReportProgressPanel.separationLabel.text=:
-ReportProgressPanel.statusMessageLabel.text=processingLabel
 ReportGenerationPanel.titleLabel.text=Report Generation Progress
 ReportVisualPanel2.taggedResultsRadioButton.text=Tagged Results
 ReportVisualPanel2.allResultsRadioButton.text=All Results
@@ -270,3 +266,7 @@ ReportFileTextConfigurationPanel.commaDelimitedButton.text=Comma delimited
 PortableCaseTagsListPanel.descLabel.text=Include the following tags:
 PortableCaseInterestingItemsListPanel.descLabel.text=Include Interesting Items from these sets:
 ReportWizardPortableCaseOptionsVisualPanel.compressCheckbox.toolTipText=
+ReportProgressDialog.separationLabel.text=:
+ReportProgressDialog.pathLabel.text=pathLabel
+ReportProgressDialog.reportLabel.text=reportLabel
+ReportProgressDialog.statusMessageLabel.text=processingLabel
diff --git a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties-MERGED
index 53aa1acfbd..5e50acbea8 100755
--- a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties-MERGED
@@ -72,10 +72,6 @@ ReportVisualPanel2.advancedButton.text=Data Types
 ArtifactSelectionDialog.deselectAllButton.text=Deselect All
 ArtifactSelectionDialog.selectAllButton.text=Select All
 ReportGenerationPanel.closeButton.text=Close
-ReportProgressPanel.reportLabel.text=reportLabel
-ReportProgressPanel.pathLabel.text=pathLabel
-ReportProgressPanel.separationLabel.text=:
-ReportProgressPanel.statusMessageLabel.text=processingLabel
 ReportGenerationPanel.titleLabel.text=Report Generation Progress
 ReportVisualPanel2.taggedResultsRadioButton.text=Tagged Results
 ReportVisualPanel2.allResultsRadioButton.text=All Results
@@ -330,5 +326,9 @@ ReportFileTextConfigurationPanel.commaDelimitedButton.text=Comma delimited
 PortableCaseTagsListPanel.descLabel.text=Include the following tags:
 PortableCaseInterestingItemsListPanel.descLabel.text=Include Interesting Items from these sets:
 ReportWizardPortableCaseOptionsVisualPanel.compressCheckbox.toolTipText=
+ReportProgressDialog.separationLabel.text=:
+ReportProgressDialog.pathLabel.text=pathLabel
+ReportProgressDialog.reportLabel.text=reportLabel
+ReportProgressDialog.statusMessageLabel.text=processingLabel
 ReportWizardPortableCaseOptionsVisualPanel.getName.title=Choose Portable Case settings
 TableReportGenerator.StatusColumn.Header=Review Status
diff --git a/Core/src/org/sleuthkit/autopsy/report/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/report/Bundle_ja.properties
index b4c2844989..6c2db29da2 100644
--- a/Core/src/org/sleuthkit/autopsy/report/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/report/Bundle_ja.properties
@@ -11,10 +11,6 @@ ReportVisualPanel2.advancedButton.text=\u30c7\u30fc\u30bf\u30bf\u30a4\u30d7
 ArtifactSelectionDialog.deselectAllButton.text=\u5168\u3066\u9078\u629e\u89e3\u9664
 ArtifactSelectionDialog.selectAllButton.text=\u5168\u3066\u9078\u629e
 ReportGenerationPanel.closeButton.text=\u9589\u3058\u308b
-ReportProgressPanel.reportLabel.text=\u30ec\u30dd\u30fc\u30c8\u30e9\u30d9\u30eb
-ReportProgressPanel.pathLabel.text=\u30d1\u30b9\u30e9\u30d9\u30eb
-ReportProgressPanel.separationLabel.text=:
-ReportProgressPanel.statusMessageLabel.text=\u30d7\u30ed\u30bb\u30b7\u30f3\u30b0\u30e9\u30d9\u30eb
 ReportGenerationPanel.titleLabel.text=\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u30d7\u30ed\u30b0\u30ec\u30b9
 ReportVisualPanel2.taggedResultsRadioButton.text=\u30bf\u30b0\u3055\u308c\u305f\u7d50\u679c
 ReportVisualPanel2.allResultsRadioButton.text=\u5168\u3066\u306e\u7d50\u679c
@@ -244,3 +240,7 @@ ReportGenerationPanel.confDlg.cancelReport.msg=\u672c\u5f53\u306b\u30ec\u30dd\u3
 ReportProgressPanel.complete.processLb2.text=\u5b8c\u4e86\u3057\u307e\u3057\u305f\u304c\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
 ReportGenerationPanel.cancelButton.actionCommand=\u30ad\u30e3\u30f3\u30bb\u30eb
 ReportGenerationPanel.cancelButton.text=\u30ad\u30e3\u30f3\u30bb\u30eb
+ReportProgressDialog.separationLabel.text=:
+ReportProgressDialog.pathLabel.text=\u30d1\u30b9\u30e9\u30d9\u30eb
+ReportProgressDialog.reportLabel.text=\u30ec\u30dd\u30fc\u30c8\u30e9\u30d9\u30eb
+ReportProgressDialog.statusMessageLabel.text=\u30d7\u30ed\u30bb\u30b7\u30f3\u30b0\u30e9\u30d9\u30eb
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.java b/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.java
index c9bf291314..53c17b3543 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.java
@@ -24,7 +24,6 @@ import java.beans.PropertyChangeEvent;
 import javax.swing.Box;
 import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
-
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.report.ReportProgressPanel.ReportStatus;
 
@@ -39,7 +38,7 @@ class ReportGenerationPanel extends javax.swing.JPanel {
     private final GridBagConstraints constraints;
     private final Component glue;
     private ActionListener actionListener;
-    ReportProgressPanel progressPanel;
+    ReportProgressDialog progressPanel;
 
     /**
      * Constructs a panel that displays a panel used by a report generation
@@ -65,13 +64,13 @@ class ReportGenerationPanel extends javax.swing.JPanel {
      *
      * @return The report generation progress panel.
      */
-    ReportProgressPanel addReport(String reportName, String reportPath) {
+    ReportProgressDialog addReport(String reportName, String reportPath) {
         /*
          * Remove the "glue."
          */
         reportPanel.remove(glue);
 
-        progressPanel = new ReportProgressPanel(reportName, reportPath);
+        progressPanel = new ReportProgressDialog(reportName, reportPath);
         constraints.weighty = 0.0;
         constraints.anchor = GridBagConstraints.NORTH;
         reportPanel.add(progressPanel, constraints);
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportKML.java b/Core/src/org/sleuthkit/autopsy/report/ReportKML.java
index 3a092efc83..6f2f79a4f3 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportKML.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportKML.java
@@ -184,7 +184,7 @@ class ReportKML implements GeneralReportModule {
         document.addContent(gpsSearchesFolder);
         document.addContent(gpsTrackpointsFolder);
 
-        ReportProgressPanel.ReportStatus result = ReportProgressPanel.ReportStatus.COMPLETE;
+        ReportProgressDialog.ReportStatus result = ReportProgressDialog.ReportStatus.COMPLETE;
 
         /**
          * In the following code, nulls are okay, and are handled when we go to
@@ -233,12 +233,12 @@ class ReportKML implements GeneralReportModule {
                     logger.log(Level.WARNING, String.format("Error reading file '%s' (id=%d).", fileName, fileId), ex);
                 } catch (Exception ex) {
                     logger.log(Level.SEVERE, "Could not extract photo information.", ex); //NON-NLS
-                    result = ReportProgressPanel.ReportStatus.ERROR;
+                    result = ReportProgressDialog.ReportStatus.ERROR;
                 }
             }
         } catch (TskCoreException ex) {
             logger.log(Level.SEVERE, "Could not extract photos with EXIF metadata.", ex); //NON-NLS
-            result = ReportProgressPanel.ReportStatus.ERROR;
+            result = ReportProgressDialog.ReportStatus.ERROR;
         }
 
         try {
@@ -254,12 +254,12 @@ class ReportKML implements GeneralReportModule {
                     gpsBookmarksFolder.addContent(makePlacemark(bookmarkName, FeatureColor.BLUE, desc, timestamp, point, formattedCoordinates));
                 } catch (Exception ex) {
                     logger.log(Level.SEVERE, "Could not extract Bookmark information.", ex); //NON-NLS
-                    result = ReportProgressPanel.ReportStatus.ERROR;
+                    result = ReportProgressDialog.ReportStatus.ERROR;
                 }
             }
         } catch (TskCoreException ex) {
             logger.log(Level.SEVERE, "Could not get GPS Bookmarks from database.", ex); //NON-NLS
-            result = ReportProgressPanel.ReportStatus.ERROR;
+            result = ReportProgressDialog.ReportStatus.ERROR;
         }
 
         try {
@@ -275,12 +275,12 @@ class ReportKML implements GeneralReportModule {
                     gpsLastKnownLocationFolder.addContent(makePlacemark("Last Known Location", FeatureColor.PURPLE, desc, timestamp, point, formattedCoordinates)); //NON-NLS
                 } catch (Exception ex) {
                     logger.log(Level.SEVERE, "Could not extract Last Known Location information.", ex); //NON-NLS
-                    result = ReportProgressPanel.ReportStatus.ERROR;
+                    result = ReportProgressDialog.ReportStatus.ERROR;
                 }
             }
         } catch (TskCoreException ex) {
             logger.log(Level.SEVERE, "Could not get GPS Last Known Location from database.", ex); //NON-NLS
-            result = ReportProgressPanel.ReportStatus.ERROR;
+            result = ReportProgressDialog.ReportStatus.ERROR;
         }
 
         try {
@@ -308,12 +308,12 @@ class ReportKML implements GeneralReportModule {
                     gpsRouteFolder.addContent(makePlacemark("End", FeatureColor.GREEN, desc, timestamp, endingPoint, formattedCoordinates)); //NON-NLS
                 } catch (Exception ex) {
                     logger.log(Level.SEVERE, "Could not extract GPS Route information.", ex); //NON-NLS
-                    result = ReportProgressPanel.ReportStatus.ERROR;
+                    result = ReportProgressDialog.ReportStatus.ERROR;
                 }
             }
         } catch (TskCoreException ex) {
             logger.log(Level.SEVERE, "Could not get GPS Routes from database.", ex); //NON-NLS
-            result = ReportProgressPanel.ReportStatus.ERROR;
+            result = ReportProgressDialog.ReportStatus.ERROR;
         }
 
         try {
@@ -336,7 +336,7 @@ class ReportKML implements GeneralReportModule {
             }
         } catch (TskCoreException ex) {
             logger.log(Level.SEVERE, "Could not get GPS Searches from database.", ex); //NON-NLS
-            result = ReportProgressPanel.ReportStatus.ERROR;
+            result = ReportProgressDialog.ReportStatus.ERROR;
         }
 
         try {
@@ -362,12 +362,12 @@ class ReportKML implements GeneralReportModule {
                     gpsTrackpointsFolder.addContent(makePlacemark(trackName, FeatureColor.YELLOW, desc, timestamp, point, formattedCoordinates));
                 } catch (Exception ex) {
                     logger.log(Level.SEVERE, "Could not extract Trackpoint information.", ex); //NON-NLS
-                    result = ReportProgressPanel.ReportStatus.ERROR;
+                    result = ReportProgressDialog.ReportStatus.ERROR;
                 }
             }
         } catch (TskCoreException ex) {
             logger.log(Level.SEVERE, "Could not get GPS Trackpoints from database.", ex); //NON-NLS
-            result = ReportProgressPanel.ReportStatus.ERROR;
+            result = ReportProgressDialog.ReportStatus.ERROR;
         }
 
         // Copy the style sheet
@@ -377,14 +377,14 @@ class ReportKML implements GeneralReportModule {
             FileUtil.copy(input, output);
         } catch (IOException ex) {
             logger.log(Level.SEVERE, "Error placing KML stylesheet. The .KML file will not function properly.", ex); //NON-NLS
-            result = ReportProgressPanel.ReportStatus.ERROR;
+            result = ReportProgressDialog.ReportStatus.ERROR;
         }
 
         try (FileOutputStream writer = new FileOutputStream(kmlFileFullPath)) {
             XMLOutputter outputter = new XMLOutputter(Format.getPrettyFormat());
             outputter.output(kmlDocument, writer);
             String prependedStatus = "";
-            if (result == ReportProgressPanel.ReportStatus.ERROR) {
+            if (result == ReportProgressDialog.ReportStatus.ERROR) {
                 prependedStatus = "Incomplete ";
             }
             Case.getCurrentCaseThrows().addReport(kmlFileFullPath,
@@ -392,14 +392,14 @@ class ReportKML implements GeneralReportModule {
                     prependedStatus + NbBundle.getMessage(this.getClass(), "ReportKML.genReport.reportName"));
         } catch (IOException ex) {
             logger.log(Level.SEVERE, "Could not write the KML file.", ex); //NON-NLS
-            progressPanel.complete(ReportProgressPanel.ReportStatus.ERROR);
+            progressPanel.complete(ReportProgressDialog.ReportStatus.ERROR);
         } catch (TskCoreException ex) {
             String errorMessage = String.format("Error adding %s to case as a report", kmlFileFullPath); //NON-NLS
             logger.log(Level.SEVERE, errorMessage, ex);
-            result = ReportProgressPanel.ReportStatus.ERROR;
+            result = ReportProgressDialog.ReportStatus.ERROR;
         } catch (NoCurrentCaseException ex) {
             logger.log(Level.SEVERE, "Exception while getting open case.", ex);
-            result = ReportProgressPanel.ReportStatus.ERROR;
+            result = ReportProgressDialog.ReportStatus.ERROR;
         }
 
         progressPanel.complete(result);
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.form b/Core/src/org/sleuthkit/autopsy/report/ReportProgressDialog.form
similarity index 90%
rename from Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.form
rename to Core/src/org/sleuthkit/autopsy/report/ReportProgressDialog.form
index 597dd89df4..8979a5d188 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportProgressDialog.form
@@ -79,7 +79,7 @@
           </FontInfo>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportProgressPanel.reportLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportProgressDialog.reportLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
@@ -91,7 +91,7 @@
           </FontInfo>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportProgressPanel.pathLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportProgressDialog.pathLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
         <Property name="verticalAlignment" type="int" value="1"/>
       </Properties>
@@ -104,14 +104,14 @@
           </FontInfo>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportProgressPanel.separationLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportProgressDialog.separationLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JLabel" name="statusMessageLabel">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportProgressPanel.statusMessageLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportProgressDialog.statusMessageLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportProgressDialog.java b/Core/src/org/sleuthkit/autopsy/report/ReportProgressDialog.java
new file mode 100644
index 0000000000..0b4064c69d
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportProgressDialog.java
@@ -0,0 +1,373 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2011-2019 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.report;
+
+import org.openide.util.NbBundle;
+import java.awt.Color;
+import java.awt.Cursor;
+import java.awt.Desktop;
+import java.awt.EventQueue;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.io.File;
+import java.io.IOException;
+import java.util.logging.Level;
+import org.sleuthkit.autopsy.coreutils.Logger;
+
+/**
+ * A panel used by a report generation module to show progress.
+ */
+@SuppressWarnings("PMD.SingularField") // UI widgets cause lots of false positives
+public class ReportProgressDialog extends javax.swing.JPanel implements ReportProgressPanel {
+
+    private static final long serialVersionUID = 1L;
+    private static final Logger logger = Logger.getLogger(ReportProgressDialog.class.getName());
+    private static final Color GREEN = new Color(50, 205, 50);
+    private static final Color RED = new Color(178, 34, 34);
+    private volatile ReportProgressPanel.ReportStatus status;
+    
+    /**
+     * Constructs a panel used by report generation module to show progress.
+     *
+     * @param reportName The name of the report being generated.
+     * @param reportPath The path to the report file.
+     */
+    ReportProgressDialog(String reportName, String reportPath) {
+        initComponents();
+        reportProgressBar.setIndeterminate(true);
+        reportProgressBar.setMaximum(100);
+        reportLabel.setText(reportName);
+        statusMessageLabel.setText(NbBundle.getMessage(this.getClass(), "ReportProgressPanel.progress.queuing"));
+        status = ReportStatus.QUEUING;
+        if (null != reportPath) {
+            pathLabel.setText("<html><u>" + shortenPath(reportPath) + "</u></html>"); //NON-NLS
+            pathLabel.setToolTipText(reportPath);
+            String linkPath = reportPath;
+            pathLabel.addMouseListener(new MouseListener() {
+
+                @Override
+                public void mouseClicked(MouseEvent mouseEvent) {
+                }
+
+                @Override
+                public void mousePressed(MouseEvent mouseEvent) {
+                }
+
+                @Override
+                public void mouseReleased(MouseEvent mouseEvent) {
+                    File file = new File(linkPath);
+                    try {
+                        Desktop.getDesktop().open(file);
+                    } catch (IOException ioex) {
+                        logger.log(Level.SEVERE, "Error opening report file", ioex);
+                    } catch (IllegalArgumentException iaEx) {
+                        logger.log(Level.SEVERE, "Error opening report file", iaEx);
+                        try {
+                            Desktop.getDesktop().open(file.getParentFile());
+                        } catch (IOException ioEx2) {
+                            logger.log(Level.SEVERE, "Error opening report file parent", ioEx2);
+                        }
+                    }
+                }
+
+                @Override
+                public void mouseEntered(MouseEvent e3) {
+                    pathLabel.setForeground(Color.DARK_GRAY);
+                    setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+                }
+
+                @Override
+                public void mouseExited(MouseEvent e4) {
+                    pathLabel.setForeground(Color.BLACK);
+                    setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
+                }
+            });
+        } else {
+            pathLabel.setText(NbBundle.getMessage(this.getClass(), "ReportProgressPanel.initPathLabel.noFile"));
+        }
+    }
+
+    /**
+     * Gets the current status of the generation of the report.
+     *
+     * @return The report generation status as a ReportStatus enum.
+     */
+    @Override
+    public ReportStatus getStatus() {
+        return status;
+    }
+
+    /**
+     * Starts the progress bar component of this panel.
+     */
+    @Override
+    public void start() {
+        EventQueue.invokeLater(() -> {
+            statusMessageLabel.setText(NbBundle.getMessage(this.getClass(), "ReportProgressPanel.start.progress.text"));
+            status = ReportStatus.RUNNING;
+        });
+    }
+
+    /**
+     * Sets the maximum value of the progress bar component of this panel.
+     *
+     * @param max The maximum value.
+     */
+    @Override
+    public void setMaximumProgress(int max) {
+        EventQueue.invokeLater(() -> {
+            if (status != ReportStatus.CANCELED) {
+                reportProgressBar.setMaximum(max);
+            }
+        });
+    }
+
+    /**
+     * Increments the current value of the progress bar component of this panel
+     * by one unit.
+     */
+    @Override
+    public void increment() {
+        EventQueue.invokeLater(() -> {
+            if (status != ReportStatus.CANCELED) {
+                reportProgressBar.setValue(reportProgressBar.getValue() + 1);
+            }
+        });
+    }
+
+    /**
+     * Sets the current value of the progress bar component of this panel.
+     *
+     * @param value The value to be set.
+     */
+    @Override
+    public void setProgress(int value) {
+        EventQueue.invokeLater(() -> {
+            if (status != ReportStatus.CANCELED) {
+                reportProgressBar.setValue(value);
+            }
+        });
+    }
+
+    /**
+     * Changes the the progress bar component of this panel to be determinate or
+     * indeterminate.
+     *
+     * @param indeterminate True if the progress bar should be set to
+     *                      indeterminate.
+     */
+    @Override
+    public void setIndeterminate(boolean indeterminate) {
+        EventQueue.invokeLater(() -> {
+            if (status != ReportStatus.CANCELED) {
+                reportProgressBar.setIndeterminate(indeterminate);
+            }
+        });
+    }
+
+    /**
+     * Changes the status message label component of this panel to show a given
+     * processing status message. For example, updateStatusLabel("Now processing
+     * files...") sets the label text to "Now processing files..."
+     *
+     * @param statusMessage String to use as label text.
+     */
+    @Override
+    public void updateStatusLabel(String statusMessage) {
+        EventQueue.invokeLater(() -> {
+            if (status != ReportStatus.CANCELED) {
+                statusMessageLabel.setText(statusMessage);
+            }
+        });
+    }
+
+    /**
+     * Makes the components of this panel indicate the final status of
+     * generation of the report.
+     *
+     * @param reportStatus The final status, must be COMPLETE or ERROR.
+     */
+    @Override
+    public void complete(ReportStatus reportStatus) {
+        EventQueue.invokeLater(() -> {
+            reportProgressBar.setIndeterminate(false);
+            if (status != ReportStatus.CANCELED) {
+                switch (reportStatus) {
+                    case COMPLETE: {
+                        ReportStatus oldValue = status;
+                        status = ReportStatus.COMPLETE;
+                        statusMessageLabel.setForeground(Color.BLACK);
+                        statusMessageLabel.setText(NbBundle.getMessage(this.getClass(), "ReportProgressPanel.complete.processLbl.text"));
+                        reportProgressBar.setValue(reportProgressBar.getMaximum());
+                        reportProgressBar.setStringPainted(true);
+                        reportProgressBar.setForeground(GREEN);
+                        reportProgressBar.setString("Complete"); //NON-NLS
+                        firePropertyChange(ReportStatus.COMPLETE.toString(), oldValue, status);
+                        break;
+                    }
+                    case ERROR: {
+                        ReportStatus oldValue = status;
+                        status = ReportStatus.ERROR;
+                        statusMessageLabel.setForeground(RED);
+                        statusMessageLabel.setText(NbBundle.getMessage(this.getClass(), "ReportProgressPanel.complete.processLb2.text"));
+                        reportProgressBar.setValue(reportProgressBar.getMaximum());
+                        reportProgressBar.setStringPainted(true);
+                        reportProgressBar.setForeground(RED);
+                        reportProgressBar.setString("Error"); //NON-NLS
+                        firePropertyChange(ReportStatus.COMPLETE.toString(), oldValue, status);
+                        break;
+                    }
+                    default: {
+                        break;
+                    }
+                }
+            }
+        });
+    }
+
+    /**
+     * Makes the components of this panel indicate generation of the report was
+     * cancelled.
+     */
+    void cancel() {
+        switch (status) {
+            case COMPLETE:
+                break;
+            case CANCELED:
+                break;
+            case ERROR:
+                break;
+            default:
+                ReportStatus oldValue = status;
+                status = ReportStatus.CANCELED;
+                reportProgressBar.setIndeterminate(false);
+                reportProgressBar.setValue(0);
+                reportProgressBar.setStringPainted(true);
+                reportProgressBar.setForeground(RED); // Red
+                reportProgressBar.setString("Cancelled"); //NON-NLS
+                firePropertyChange(ReportStatus.CANCELED.toString(), oldValue, status);
+                statusMessageLabel.setForeground(RED);
+                statusMessageLabel.setText(NbBundle.getMessage(this.getClass(), "ReportProgressPanel.cancel.procLbl.text"));
+                break;
+        }
+    }
+
+    /**
+     * Gets a shortened version of a file path.
+     *
+     * @param path The path to shorten.
+     *
+     * @return The shortened path.
+     */
+    private String shortenPath(String path) {
+        if (path.length() > 100) {
+            return path.substring(0, 10 + path.substring(10).indexOf(File.separator) + 1) + "..."
+                    + path.substring((path.length() - 70) + path.substring(path.length() - 70).indexOf(File.separator));
+        } else {
+            return path;
+        }
+    }
+
+    /**
+     * 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
+     * regenerated by the Form Editor.
+     */
+    @SuppressWarnings("unchecked")
+    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+    private void initComponents() {
+
+        reportProgressBar = new javax.swing.JProgressBar();
+        reportLabel = new javax.swing.JLabel();
+        pathLabel = new javax.swing.JLabel();
+        separationLabel = new javax.swing.JLabel();
+        statusMessageLabel = new javax.swing.JLabel();
+
+        setFont(getFont().deriveFont(getFont().getStyle() & ~java.awt.Font.BOLD, 11));
+        setMinimumSize(new java.awt.Dimension(486, 68));
+
+        reportProgressBar.setFont(reportProgressBar.getFont().deriveFont(reportProgressBar.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
+
+        reportLabel.setFont(reportLabel.getFont().deriveFont(reportLabel.getFont().getStyle() | java.awt.Font.BOLD, 11));
+        org.openide.awt.Mnemonics.setLocalizedText(reportLabel, org.openide.util.NbBundle.getMessage(ReportProgressDialog.class, "ReportProgressDialog.reportLabel.text")); // NOI18N
+
+        pathLabel.setFont(pathLabel.getFont().deriveFont(pathLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
+        org.openide.awt.Mnemonics.setLocalizedText(pathLabel, org.openide.util.NbBundle.getMessage(ReportProgressDialog.class, "ReportProgressDialog.pathLabel.text")); // NOI18N
+        pathLabel.setVerticalAlignment(javax.swing.SwingConstants.TOP);
+
+        separationLabel.setFont(separationLabel.getFont().deriveFont(separationLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
+        org.openide.awt.Mnemonics.setLocalizedText(separationLabel, org.openide.util.NbBundle.getMessage(ReportProgressDialog.class, "ReportProgressDialog.separationLabel.text")); // NOI18N
+
+        org.openide.awt.Mnemonics.setLocalizedText(statusMessageLabel, org.openide.util.NbBundle.getMessage(ReportProgressDialog.class, "ReportProgressDialog.statusMessageLabel.text")); // NOI18N
+
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
+        this.setLayout(layout);
+        layout.setHorizontalGroup(
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                .addContainerGap()
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(statusMessageLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(reportProgressBar, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(reportLabel)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(separationLabel)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(pathLabel, javax.swing.GroupLayout.DEFAULT_SIZE, 548, Short.MAX_VALUE)))
+                .addContainerGap())
+        );
+        layout.setVerticalGroup(
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                .addContainerGap()
+                .addComponent(reportProgressBar, javax.swing.GroupLayout.PREFERRED_SIZE, 16, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(reportLabel)
+                    .addComponent(pathLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(separationLabel))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(statusMessageLabel)
+                .addGap(13, 13, 13))
+        );
+    }// </editor-fold>//GEN-END:initComponents
+
+
+    // Variables declaration - do not modify//GEN-BEGIN:variables
+    private javax.swing.JLabel pathLabel;
+    private javax.swing.JLabel reportLabel;
+    private javax.swing.JProgressBar reportProgressBar;
+    private javax.swing.JLabel separationLabel;
+    private javax.swing.JLabel statusMessageLabel;
+    // End of variables declaration//GEN-END:variables
+
+    /**
+     * Makes the components of this panel indicate the generation of the report
+     * is completed.
+     *
+     * @deprecated Use {@link #complete(ReportStatus)}
+     */
+    @Deprecated
+    @Override
+    public void complete() {
+        complete(ReportStatus.COMPLETE);
+    }
+
+}
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java b/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java
old mode 100644
new mode 100755
index 9d3fd1bf41..4e985163f7
--- a/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011-2018 Basis Technology Corp.
+ * Copyright 2011-2019 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,31 +18,13 @@
  */
 package org.sleuthkit.autopsy.report;
 
-import org.openide.util.NbBundle;
-import java.awt.Color;
-import java.awt.Cursor;
-import java.awt.Desktop;
-import java.awt.EventQueue;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.io.File;
-import java.io.IOException;
-import java.util.logging.Level;
-import org.sleuthkit.autopsy.coreutils.Logger;
-
 /**
- * A panel used by a report generation module to show progress.
+ * This interface is necessary in order to not break backwards compatibility 
+ * of GeneralReportModule interface. See JIRA-5354.
  */
-@SuppressWarnings("PMD.SingularField") // UI widgets cause lots of false positives
-public class ReportProgressPanel extends javax.swing.JPanel {
-
-    private static final long serialVersionUID = 1L;
-    private static final Logger logger = Logger.getLogger(ReportProgressPanel.class.getName());
-    private static final Color GREEN = new Color(50, 205, 50);
-    private static final Color RED = new Color(178, 34, 34);
-    private volatile ReportStatus status;
-
-    /**
+public interface ReportProgressPanel {
+    
+     /**
      * Used by a report generation module to communicate report generation
      * status to this panel and its listeners.
      */
@@ -53,125 +35,39 @@ public class ReportProgressPanel extends javax.swing.JPanel {
         COMPLETE,
         CANCELED,
         ERROR
-    }
-
-    /**
-     * Constructs a panel used by report generation module to show progress.
-     *
-     * @param reportName The name of the report being generated.
-     * @param reportPath The path to the report file.
-     */
-    public ReportProgressPanel(String reportName, String reportPath) {
-        initComponents();
-        reportProgressBar.setIndeterminate(true);
-        reportProgressBar.setMaximum(100);
-        reportLabel.setText(reportName);
-        statusMessageLabel.setText(NbBundle.getMessage(this.getClass(), "ReportProgressPanel.progress.queuing"));
-        status = ReportStatus.QUEUING;
-        if (null != reportPath) {
-            pathLabel.setText("<html><u>" + shortenPath(reportPath) + "</u></html>"); //NON-NLS
-            pathLabel.setToolTipText(reportPath);
-            String linkPath = reportPath;
-            pathLabel.addMouseListener(new MouseListener() {
-
-                @Override
-                public void mouseClicked(MouseEvent mouseEvent) {
-                }
-
-                @Override
-                public void mousePressed(MouseEvent mouseEvent) {
-                }
-
-                @Override
-                public void mouseReleased(MouseEvent mouseEvent) {
-                    File file = new File(linkPath);
-                    try {
-                        Desktop.getDesktop().open(file);
-                    } catch (IOException ioex) {
-                        logger.log(Level.SEVERE, "Error opening report file", ioex);
-                    } catch (IllegalArgumentException iaEx) {
-                        logger.log(Level.SEVERE, "Error opening report file", iaEx);
-                        try {
-                            Desktop.getDesktop().open(file.getParentFile());
-                        } catch (IOException ioEx2) {
-                            logger.log(Level.SEVERE, "Error opening report file parent", ioEx2);
-                        }
-                    }
-                }
-
-                @Override
-                public void mouseEntered(MouseEvent e3) {
-                    pathLabel.setForeground(Color.DARK_GRAY);
-                    setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
-                }
-
-                @Override
-                public void mouseExited(MouseEvent e4) {
-                    pathLabel.setForeground(Color.BLACK);
-                    setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
-                }
-            });
-        } else {
-            pathLabel.setText(NbBundle.getMessage(this.getClass(), "ReportProgressPanel.initPathLabel.noFile"));
-        }
-    }
-
+    }   
+    
     /**
      * Gets the current status of the generation of the report.
      *
      * @return The report generation status as a ReportStatus enum.
      */
-    public ReportStatus getStatus() {
-        return status;
-    }
+    public ReportStatus getStatus();
 
     /**
      * Starts the progress bar component of this panel.
      */
-    public void start() {
-        EventQueue.invokeLater(() -> {
-            statusMessageLabel.setText(NbBundle.getMessage(this.getClass(), "ReportProgressPanel.start.progress.text"));
-            status = ReportStatus.RUNNING;
-        });
-    }
+    public void start();
 
     /**
      * Sets the maximum value of the progress bar component of this panel.
      *
      * @param max The maximum value.
      */
-    public void setMaximumProgress(int max) {
-        EventQueue.invokeLater(() -> {
-            if (status != ReportStatus.CANCELED) {
-                reportProgressBar.setMaximum(max);
-            }
-        });
-    }
+    public void setMaximumProgress(int max);
 
     /**
      * Increments the current value of the progress bar component of this panel
      * by one unit.
      */
-    public void increment() {
-        EventQueue.invokeLater(() -> {
-            if (status != ReportStatus.CANCELED) {
-                reportProgressBar.setValue(reportProgressBar.getValue() + 1);
-            }
-        });
-    }
+    public void increment();
 
     /**
      * Sets the current value of the progress bar component of this panel.
      *
      * @param value The value to be set.
      */
-    public void setProgress(int value) {
-        EventQueue.invokeLater(() -> {
-            if (status != ReportStatus.CANCELED) {
-                reportProgressBar.setValue(value);
-            }
-        });
-    }
+    public void setProgress(int value);
 
     /**
      * Changes the the progress bar component of this panel to be determinate or
@@ -180,13 +76,7 @@ public class ReportProgressPanel extends javax.swing.JPanel {
      * @param indeterminate True if the progress bar should be set to
      *                      indeterminate.
      */
-    public void setIndeterminate(boolean indeterminate) {
-        EventQueue.invokeLater(() -> {
-            if (status != ReportStatus.CANCELED) {
-                reportProgressBar.setIndeterminate(indeterminate);
-            }
-        });
-    }
+    public void setIndeterminate(boolean indeterminate);
 
     /**
      * Changes the status message label component of this panel to show a given
@@ -195,13 +85,7 @@ public class ReportProgressPanel extends javax.swing.JPanel {
      *
      * @param statusMessage String to use as label text.
      */
-    public void updateStatusLabel(String statusMessage) {
-        EventQueue.invokeLater(() -> {
-            if (status != ReportStatus.CANCELED) {
-                statusMessageLabel.setText(statusMessage);
-            }
-        });
-    }
+    public void updateStatusLabel(String statusMessage);
 
     /**
      * Makes the components of this panel indicate the final status of
@@ -209,159 +93,7 @@ public class ReportProgressPanel extends javax.swing.JPanel {
      *
      * @param reportStatus The final status, must be COMPLETE or ERROR.
      */
-    public void complete(ReportStatus reportStatus) {
-        EventQueue.invokeLater(() -> {
-            reportProgressBar.setIndeterminate(false);
-            if (status != ReportStatus.CANCELED) {
-                switch (reportStatus) {
-                    case COMPLETE: {
-                        ReportStatus oldValue = status;
-                        status = ReportStatus.COMPLETE;
-                        statusMessageLabel.setForeground(Color.BLACK);
-                        statusMessageLabel.setText(NbBundle.getMessage(this.getClass(), "ReportProgressPanel.complete.processLbl.text"));
-                        reportProgressBar.setValue(reportProgressBar.getMaximum());
-                        reportProgressBar.setStringPainted(true);
-                        reportProgressBar.setForeground(GREEN);
-                        reportProgressBar.setString("Complete"); //NON-NLS
-                        firePropertyChange(ReportStatus.COMPLETE.toString(), oldValue, status);
-                        break;
-                    }
-                    case ERROR: {
-                        ReportStatus oldValue = status;
-                        status = ReportStatus.ERROR;
-                        statusMessageLabel.setForeground(RED);
-                        statusMessageLabel.setText(NbBundle.getMessage(this.getClass(), "ReportProgressPanel.complete.processLb2.text"));
-                        reportProgressBar.setValue(reportProgressBar.getMaximum());
-                        reportProgressBar.setStringPainted(true);
-                        reportProgressBar.setForeground(RED);
-                        reportProgressBar.setString("Error"); //NON-NLS
-                        firePropertyChange(ReportStatus.COMPLETE.toString(), oldValue, status);
-                        break;
-                    }
-                    default: {
-                        break;
-                    }
-                }
-            }
-        });
-    }
-
-    /**
-     * Makes the components of this panel indicate generation of the report was
-     * cancelled.
-     */
-    void cancel() {
-        switch (status) {
-            case COMPLETE:
-                break;
-            case CANCELED:
-                break;
-            case ERROR:
-                break;
-            default:
-                ReportStatus oldValue = status;
-                status = ReportStatus.CANCELED;
-                reportProgressBar.setIndeterminate(false);
-                reportProgressBar.setValue(0);
-                reportProgressBar.setStringPainted(true);
-                reportProgressBar.setForeground(RED); // Red
-                reportProgressBar.setString("Cancelled"); //NON-NLS
-                firePropertyChange(ReportStatus.CANCELED.toString(), oldValue, status);
-                statusMessageLabel.setForeground(RED);
-                statusMessageLabel.setText(NbBundle.getMessage(this.getClass(), "ReportProgressPanel.cancel.procLbl.text"));
-                break;
-        }
-    }
-
-    /**
-     * Gets a shortened version of a file path.
-     *
-     * @param path The path to shorten.
-     *
-     * @return The shortened path.
-     */
-    private String shortenPath(String path) {
-        if (path.length() > 100) {
-            return path.substring(0, 10 + path.substring(10).indexOf(File.separator) + 1) + "..."
-                    + path.substring((path.length() - 70) + path.substring(path.length() - 70).indexOf(File.separator));
-        } else {
-            return path;
-        }
-    }
-
-    /**
-     * 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
-     * regenerated by the Form Editor.
-     */
-    @SuppressWarnings("unchecked")
-    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
-    private void initComponents() {
-
-        reportProgressBar = new javax.swing.JProgressBar();
-        reportLabel = new javax.swing.JLabel();
-        pathLabel = new javax.swing.JLabel();
-        separationLabel = new javax.swing.JLabel();
-        statusMessageLabel = new javax.swing.JLabel();
-
-        setFont(getFont().deriveFont(getFont().getStyle() & ~java.awt.Font.BOLD, 11));
-        setMinimumSize(new java.awt.Dimension(486, 68));
-
-        reportProgressBar.setFont(reportProgressBar.getFont().deriveFont(reportProgressBar.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
-
-        reportLabel.setFont(reportLabel.getFont().deriveFont(reportLabel.getFont().getStyle() | java.awt.Font.BOLD, 11));
-        org.openide.awt.Mnemonics.setLocalizedText(reportLabel, org.openide.util.NbBundle.getMessage(ReportProgressPanel.class, "ReportProgressPanel.reportLabel.text")); // NOI18N
-
-        pathLabel.setFont(pathLabel.getFont().deriveFont(pathLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
-        org.openide.awt.Mnemonics.setLocalizedText(pathLabel, org.openide.util.NbBundle.getMessage(ReportProgressPanel.class, "ReportProgressPanel.pathLabel.text")); // NOI18N
-        pathLabel.setVerticalAlignment(javax.swing.SwingConstants.TOP);
-
-        separationLabel.setFont(separationLabel.getFont().deriveFont(separationLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
-        org.openide.awt.Mnemonics.setLocalizedText(separationLabel, org.openide.util.NbBundle.getMessage(ReportProgressPanel.class, "ReportProgressPanel.separationLabel.text")); // NOI18N
-
-        org.openide.awt.Mnemonics.setLocalizedText(statusMessageLabel, org.openide.util.NbBundle.getMessage(ReportProgressPanel.class, "ReportProgressPanel.statusMessageLabel.text")); // NOI18N
-
-        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
-        this.setLayout(layout);
-        layout.setHorizontalGroup(
-            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(layout.createSequentialGroup()
-                .addContainerGap()
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(statusMessageLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    .addComponent(reportProgressBar, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    .addGroup(layout.createSequentialGroup()
-                        .addComponent(reportLabel)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(separationLabel)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(pathLabel, javax.swing.GroupLayout.DEFAULT_SIZE, 548, Short.MAX_VALUE)))
-                .addContainerGap())
-        );
-        layout.setVerticalGroup(
-            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(layout.createSequentialGroup()
-                .addContainerGap()
-                .addComponent(reportProgressBar, javax.swing.GroupLayout.PREFERRED_SIZE, 16, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(reportLabel)
-                    .addComponent(pathLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    .addComponent(separationLabel))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(statusMessageLabel)
-                .addGap(13, 13, 13))
-        );
-    }// </editor-fold>//GEN-END:initComponents
-
-
-    // Variables declaration - do not modify//GEN-BEGIN:variables
-    private javax.swing.JLabel pathLabel;
-    private javax.swing.JLabel reportLabel;
-    private javax.swing.JProgressBar reportProgressBar;
-    private javax.swing.JLabel separationLabel;
-    private javax.swing.JLabel statusMessageLabel;
-    // End of variables declaration//GEN-END:variables
+    public void complete(ReportStatus reportStatus);
 
     /**
      * Makes the components of this panel indicate the generation of the report
@@ -370,8 +102,5 @@ public class ReportProgressPanel extends javax.swing.JPanel {
      * @deprecated Use {@link #complete(ReportStatus)}
      */
     @Deprecated
-    public void complete() {
-        complete(ReportStatus.COMPLETE);
-    }
-
+    public void complete();    
 }
diff --git a/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
index 8e7ac04d05..d24dc190ec 100644
--- a/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
@@ -726,7 +726,7 @@ class TableReportGenerator {
             String currentList = "";
             while (resultSet.next()) {
                 // Check to see if all the TableReportModules have been canceled
-                if (progressPanel.getStatus() == ReportProgressPanel.ReportStatus.CANCELED) {
+                if (progressPanel.getStatus() == ReportProgressDialog.ReportStatus.CANCELED) {
                     break;
                 }
 
@@ -884,7 +884,7 @@ class TableReportGenerator {
             String currentSet = "";
             while (resultSet.next()) {
                 // Check to see if all the TableReportModules have been canceled
-                if (progressPanel.getStatus() == ReportProgressPanel.ReportStatus.CANCELED) {
+                if (progressPanel.getStatus() == ReportProgressDialog.ReportStatus.CANCELED) {
                     break;
                 }
 
diff --git a/Core/src/org/sleuthkit/autopsy/report/caseuco/CaseUcoFormatExporter.java b/Core/src/org/sleuthkit/autopsy/report/caseuco/CaseUcoFormatExporter.java
index 7c09ef3cb5..96f88a860c 100755
--- a/Core/src/org/sleuthkit/autopsy/report/caseuco/CaseUcoFormatExporter.java
+++ b/Core/src/org/sleuthkit/autopsy/report/caseuco/CaseUcoFormatExporter.java
@@ -58,7 +58,7 @@ public final class CaseUcoFormatExporter {
      * @param selectedDataSourceId Object ID of the data source
      * @param reportOutputPath Full path to directory where to save CASE-UCO
      * report file
-     * @param progressPanel ReportProgressPanel to update progress
+     * @param progressPanel ReportProgressDialog to update progress
      */
     @NbBundle.Messages({
         "ReportCaseUco.noCaseOpen=Unable to open currect case",

From a2b436630f15c2ad0c262093054ac9af9a71c81c Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Tue, 6 Aug 2019 15:07:30 -0400
Subject: [PATCH 042/192] Created ReportProgressPanel API and
 ReportProgressDialog

---
 .../sleuthkit/autopsy/report/ReportKML.java   | 34 +++++++++----------
 .../autopsy/report/TableReportGenerator.java  |  4 +--
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportKML.java b/Core/src/org/sleuthkit/autopsy/report/ReportKML.java
index 6f2f79a4f3..55f5809a7e 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportKML.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportKML.java
@@ -184,7 +184,7 @@ class ReportKML implements GeneralReportModule {
         document.addContent(gpsSearchesFolder);
         document.addContent(gpsTrackpointsFolder);
 
-        ReportProgressDialog.ReportStatus result = ReportProgressDialog.ReportStatus.COMPLETE;
+        ReportProgressDialog.ReportStatus result = ReportProgressPanel.ReportStatus.COMPLETE;
 
         /**
          * In the following code, nulls are okay, and are handled when we go to
@@ -233,12 +233,12 @@ class ReportKML implements GeneralReportModule {
                     logger.log(Level.WARNING, String.format("Error reading file '%s' (id=%d).", fileName, fileId), ex);
                 } catch (Exception ex) {
                     logger.log(Level.SEVERE, "Could not extract photo information.", ex); //NON-NLS
-                    result = ReportProgressDialog.ReportStatus.ERROR;
+                    result = ReportProgressPanel.ReportStatus.ERROR;
                 }
             }
         } catch (TskCoreException ex) {
             logger.log(Level.SEVERE, "Could not extract photos with EXIF metadata.", ex); //NON-NLS
-            result = ReportProgressDialog.ReportStatus.ERROR;
+            result = ReportProgressPanel.ReportStatus.ERROR;
         }
 
         try {
@@ -254,12 +254,12 @@ class ReportKML implements GeneralReportModule {
                     gpsBookmarksFolder.addContent(makePlacemark(bookmarkName, FeatureColor.BLUE, desc, timestamp, point, formattedCoordinates));
                 } catch (Exception ex) {
                     logger.log(Level.SEVERE, "Could not extract Bookmark information.", ex); //NON-NLS
-                    result = ReportProgressDialog.ReportStatus.ERROR;
+                    result = ReportProgressPanel.ReportStatus.ERROR;
                 }
             }
         } catch (TskCoreException ex) {
             logger.log(Level.SEVERE, "Could not get GPS Bookmarks from database.", ex); //NON-NLS
-            result = ReportProgressDialog.ReportStatus.ERROR;
+            result = ReportProgressPanel.ReportStatus.ERROR;
         }
 
         try {
@@ -275,12 +275,12 @@ class ReportKML implements GeneralReportModule {
                     gpsLastKnownLocationFolder.addContent(makePlacemark("Last Known Location", FeatureColor.PURPLE, desc, timestamp, point, formattedCoordinates)); //NON-NLS
                 } catch (Exception ex) {
                     logger.log(Level.SEVERE, "Could not extract Last Known Location information.", ex); //NON-NLS
-                    result = ReportProgressDialog.ReportStatus.ERROR;
+                    result = ReportProgressPanel.ReportStatus.ERROR;
                 }
             }
         } catch (TskCoreException ex) {
             logger.log(Level.SEVERE, "Could not get GPS Last Known Location from database.", ex); //NON-NLS
-            result = ReportProgressDialog.ReportStatus.ERROR;
+            result = ReportProgressPanel.ReportStatus.ERROR;
         }
 
         try {
@@ -308,12 +308,12 @@ class ReportKML implements GeneralReportModule {
                     gpsRouteFolder.addContent(makePlacemark("End", FeatureColor.GREEN, desc, timestamp, endingPoint, formattedCoordinates)); //NON-NLS
                 } catch (Exception ex) {
                     logger.log(Level.SEVERE, "Could not extract GPS Route information.", ex); //NON-NLS
-                    result = ReportProgressDialog.ReportStatus.ERROR;
+                    result = ReportProgressPanel.ReportStatus.ERROR;
                 }
             }
         } catch (TskCoreException ex) {
             logger.log(Level.SEVERE, "Could not get GPS Routes from database.", ex); //NON-NLS
-            result = ReportProgressDialog.ReportStatus.ERROR;
+            result = ReportProgressPanel.ReportStatus.ERROR;
         }
 
         try {
@@ -336,7 +336,7 @@ class ReportKML implements GeneralReportModule {
             }
         } catch (TskCoreException ex) {
             logger.log(Level.SEVERE, "Could not get GPS Searches from database.", ex); //NON-NLS
-            result = ReportProgressDialog.ReportStatus.ERROR;
+            result = ReportProgressPanel.ReportStatus.ERROR;
         }
 
         try {
@@ -362,12 +362,12 @@ class ReportKML implements GeneralReportModule {
                     gpsTrackpointsFolder.addContent(makePlacemark(trackName, FeatureColor.YELLOW, desc, timestamp, point, formattedCoordinates));
                 } catch (Exception ex) {
                     logger.log(Level.SEVERE, "Could not extract Trackpoint information.", ex); //NON-NLS
-                    result = ReportProgressDialog.ReportStatus.ERROR;
+                    result = ReportProgressPanel.ReportStatus.ERROR;
                 }
             }
         } catch (TskCoreException ex) {
             logger.log(Level.SEVERE, "Could not get GPS Trackpoints from database.", ex); //NON-NLS
-            result = ReportProgressDialog.ReportStatus.ERROR;
+            result = ReportProgressPanel.ReportStatus.ERROR;
         }
 
         // Copy the style sheet
@@ -377,14 +377,14 @@ class ReportKML implements GeneralReportModule {
             FileUtil.copy(input, output);
         } catch (IOException ex) {
             logger.log(Level.SEVERE, "Error placing KML stylesheet. The .KML file will not function properly.", ex); //NON-NLS
-            result = ReportProgressDialog.ReportStatus.ERROR;
+            result = ReportProgressPanel.ReportStatus.ERROR;
         }
 
         try (FileOutputStream writer = new FileOutputStream(kmlFileFullPath)) {
             XMLOutputter outputter = new XMLOutputter(Format.getPrettyFormat());
             outputter.output(kmlDocument, writer);
             String prependedStatus = "";
-            if (result == ReportProgressDialog.ReportStatus.ERROR) {
+            if (result == ReportProgressPanel.ReportStatus.ERROR) {
                 prependedStatus = "Incomplete ";
             }
             Case.getCurrentCaseThrows().addReport(kmlFileFullPath,
@@ -392,14 +392,14 @@ class ReportKML implements GeneralReportModule {
                     prependedStatus + NbBundle.getMessage(this.getClass(), "ReportKML.genReport.reportName"));
         } catch (IOException ex) {
             logger.log(Level.SEVERE, "Could not write the KML file.", ex); //NON-NLS
-            progressPanel.complete(ReportProgressDialog.ReportStatus.ERROR);
+            progressPanel.complete(ReportProgressPanel.ReportStatus.ERROR);
         } catch (TskCoreException ex) {
             String errorMessage = String.format("Error adding %s to case as a report", kmlFileFullPath); //NON-NLS
             logger.log(Level.SEVERE, errorMessage, ex);
-            result = ReportProgressDialog.ReportStatus.ERROR;
+            result = ReportProgressPanel.ReportStatus.ERROR;
         } catch (NoCurrentCaseException ex) {
             logger.log(Level.SEVERE, "Exception while getting open case.", ex);
-            result = ReportProgressDialog.ReportStatus.ERROR;
+            result = ReportProgressPanel.ReportStatus.ERROR;
         }
 
         progressPanel.complete(result);
diff --git a/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
index d24dc190ec..8e7ac04d05 100644
--- a/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
@@ -726,7 +726,7 @@ class TableReportGenerator {
             String currentList = "";
             while (resultSet.next()) {
                 // Check to see if all the TableReportModules have been canceled
-                if (progressPanel.getStatus() == ReportProgressDialog.ReportStatus.CANCELED) {
+                if (progressPanel.getStatus() == ReportProgressPanel.ReportStatus.CANCELED) {
                     break;
                 }
 
@@ -884,7 +884,7 @@ class TableReportGenerator {
             String currentSet = "";
             while (resultSet.next()) {
                 // Check to see if all the TableReportModules have been canceled
-                if (progressPanel.getStatus() == ReportProgressDialog.ReportStatus.CANCELED) {
+                if (progressPanel.getStatus() == ReportProgressPanel.ReportStatus.CANCELED) {
                     break;
                 }
 

From deaaa106f760731774bac92fe8df8821a78b7447 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Tue, 6 Aug 2019 15:08:55 -0400
Subject: [PATCH 043/192] Created ReportProgressPanel API and
 ReportProgressDialog

---
 .../sleuthkit/autopsy/report/caseuco/CaseUcoFormatExporter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/caseuco/CaseUcoFormatExporter.java b/Core/src/org/sleuthkit/autopsy/report/caseuco/CaseUcoFormatExporter.java
index 96f88a860c..7c09ef3cb5 100755
--- a/Core/src/org/sleuthkit/autopsy/report/caseuco/CaseUcoFormatExporter.java
+++ b/Core/src/org/sleuthkit/autopsy/report/caseuco/CaseUcoFormatExporter.java
@@ -58,7 +58,7 @@ public final class CaseUcoFormatExporter {
      * @param selectedDataSourceId Object ID of the data source
      * @param reportOutputPath Full path to directory where to save CASE-UCO
      * report file
-     * @param progressPanel ReportProgressDialog to update progress
+     * @param progressPanel ReportProgressPanel to update progress
      */
     @NbBundle.Messages({
         "ReportCaseUco.noCaseOpen=Unable to open currect case",

From 43fa86626dfe77c2cb8bb1d750a1ca4d190f007b Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Tue, 6 Aug 2019 16:19:12 -0400
Subject: [PATCH 044/192] Created ReportProgressPanel API and
 ReportProgressDialog

---
 .../autopsy/report/Bundle.properties          |  18 +-
 .../autopsy/report/Bundle.properties-MERGED   |  18 +-
 .../autopsy/report/ReportProgressDialog.java  |  12 +-
 .../autopsy/report/ReportProgressLogger.java  | 157 ++++++++++++++++++
 4 files changed, 181 insertions(+), 24 deletions(-)
 create mode 100755 Core/src/org/sleuthkit/autopsy/report/ReportProgressLogger.java

diff --git a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties
index 4c7e8868d7..fd94e5fe55 100644
--- a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties
@@ -196,15 +196,15 @@ ReportHTML.writeSum.modulesEnabledHeading=Enabled Modules:
 ReportHTML.writeSum.autopsyVersion=Autopsy Version:
 ReportHTML.writeSum.timezone=Timezone:
 ReportHTML.writeSum.path=Path:
-ReportProgressPanel.progress.queuing=Queuing...
-ReportProgressPanel.initPathLabel.noFile=<html><u>No report file</u></html>
-ReportProgressPanel.start.cancelButton.text=Cancel
-ReportProgressPanel.start.progress.text=Starting report...
-ReportProgressPanel.complete.processLbl.text=Complete
-ReportProgressPanel.complete.processLb2.text=Completed with error
-ReportProgressPanel.complete.cancelButton.text=Complete
-ReportProgressPanel.cancel.cancelButton.toolTipText=Canceled
-ReportProgressPanel.cancel.procLbl.text=Canceled
+ReportProgressDialog.progress.queuing=Queuing...
+ReportProgressDialog.initPathLabel.noFile=<html><u>No report file</u></html>
+ReportProgressDialog.start.cancelButton.text=Cancel
+ReportProgressDialog.start.progress.text=Starting report...
+ReportProgressDialog.complete.processLbl.text=Complete
+ReportProgressDialog.complete.processLb2.text=Completed with error
+ReportProgressDialog.complete.cancelButton.text=Complete
+ReportProgressDialog.cancel.cancelButton.toolTipText=Canceled
+ReportProgressDialog.cancel.procLbl.text=Canceled
 ReportVisualPanel1.getName.text=Select and Configure Report Modules
 ReportVisualPanel2.getName.text=Configure Artifact Reports
 ReportWizardAction.actionName.text=Generate Report
diff --git a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties-MERGED
index 5e50acbea8..ea5d7670a5 100755
--- a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties-MERGED
@@ -256,15 +256,15 @@ ReportHTML.writeSum.modulesEnabledHeading=Enabled Modules:
 ReportHTML.writeSum.autopsyVersion=Autopsy Version:
 ReportHTML.writeSum.timezone=Timezone:
 ReportHTML.writeSum.path=Path:
-ReportProgressPanel.progress.queuing=Queuing...
-ReportProgressPanel.initPathLabel.noFile=<html><u>No report file</u></html>
-ReportProgressPanel.start.cancelButton.text=Cancel
-ReportProgressPanel.start.progress.text=Starting report...
-ReportProgressPanel.complete.processLbl.text=Complete
-ReportProgressPanel.complete.processLb2.text=Completed with error
-ReportProgressPanel.complete.cancelButton.text=Complete
-ReportProgressPanel.cancel.cancelButton.toolTipText=Canceled
-ReportProgressPanel.cancel.procLbl.text=Canceled
+ReportProgressDialog.progress.queuing=Queuing...
+ReportProgressDialog.initPathLabel.noFile=<html><u>No report file</u></html>
+ReportProgressDialog.start.cancelButton.text=Cancel
+ReportProgressDialog.start.progress.text=Starting report...
+ReportProgressDialog.complete.processLbl.text=Complete
+ReportProgressDialog.complete.processLb2.text=Completed with error
+ReportProgressDialog.complete.cancelButton.text=Complete
+ReportProgressDialog.cancel.cancelButton.toolTipText=Canceled
+ReportProgressDialog.cancel.procLbl.text=Canceled
 ReportVisualPanel1.getName.text=Select and Configure Report Modules
 ReportVisualPanel2.getName.text=Configure Artifact Reports
 ReportWizardAction.actionName.text=Generate Report
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportProgressDialog.java b/Core/src/org/sleuthkit/autopsy/report/ReportProgressDialog.java
index 0b4064c69d..ddb32686e9 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportProgressDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportProgressDialog.java
@@ -53,7 +53,7 @@ public class ReportProgressDialog extends javax.swing.JPanel implements ReportPr
         reportProgressBar.setIndeterminate(true);
         reportProgressBar.setMaximum(100);
         reportLabel.setText(reportName);
-        statusMessageLabel.setText(NbBundle.getMessage(this.getClass(), "ReportProgressPanel.progress.queuing"));
+        statusMessageLabel.setText(NbBundle.getMessage(this.getClass(), "ReportProgressDialog.progress.queuing"));
         status = ReportStatus.QUEUING;
         if (null != reportPath) {
             pathLabel.setText("<html><u>" + shortenPath(reportPath) + "</u></html>"); //NON-NLS
@@ -99,7 +99,7 @@ public class ReportProgressDialog extends javax.swing.JPanel implements ReportPr
                 }
             });
         } else {
-            pathLabel.setText(NbBundle.getMessage(this.getClass(), "ReportProgressPanel.initPathLabel.noFile"));
+            pathLabel.setText(NbBundle.getMessage(this.getClass(), "ReportProgressDialog.initPathLabel.noFile"));
         }
     }
 
@@ -119,7 +119,7 @@ public class ReportProgressDialog extends javax.swing.JPanel implements ReportPr
     @Override
     public void start() {
         EventQueue.invokeLater(() -> {
-            statusMessageLabel.setText(NbBundle.getMessage(this.getClass(), "ReportProgressPanel.start.progress.text"));
+            statusMessageLabel.setText(NbBundle.getMessage(this.getClass(), "ReportProgressDialog.start.progress.text"));
             status = ReportStatus.RUNNING;
         });
     }
@@ -213,7 +213,7 @@ public class ReportProgressDialog extends javax.swing.JPanel implements ReportPr
                         ReportStatus oldValue = status;
                         status = ReportStatus.COMPLETE;
                         statusMessageLabel.setForeground(Color.BLACK);
-                        statusMessageLabel.setText(NbBundle.getMessage(this.getClass(), "ReportProgressPanel.complete.processLbl.text"));
+                        statusMessageLabel.setText(NbBundle.getMessage(this.getClass(), "ReportProgressDialog.complete.processLbl.text"));
                         reportProgressBar.setValue(reportProgressBar.getMaximum());
                         reportProgressBar.setStringPainted(true);
                         reportProgressBar.setForeground(GREEN);
@@ -225,7 +225,7 @@ public class ReportProgressDialog extends javax.swing.JPanel implements ReportPr
                         ReportStatus oldValue = status;
                         status = ReportStatus.ERROR;
                         statusMessageLabel.setForeground(RED);
-                        statusMessageLabel.setText(NbBundle.getMessage(this.getClass(), "ReportProgressPanel.complete.processLb2.text"));
+                        statusMessageLabel.setText(NbBundle.getMessage(this.getClass(), "ReportProgressDialog.complete.processLb2.text"));
                         reportProgressBar.setValue(reportProgressBar.getMaximum());
                         reportProgressBar.setStringPainted(true);
                         reportProgressBar.setForeground(RED);
@@ -263,7 +263,7 @@ public class ReportProgressDialog extends javax.swing.JPanel implements ReportPr
                 reportProgressBar.setString("Cancelled"); //NON-NLS
                 firePropertyChange(ReportStatus.CANCELED.toString(), oldValue, status);
                 statusMessageLabel.setForeground(RED);
-                statusMessageLabel.setText(NbBundle.getMessage(this.getClass(), "ReportProgressPanel.cancel.procLbl.text"));
+                statusMessageLabel.setText(NbBundle.getMessage(this.getClass(), "ReportProgressDialog.cancel.procLbl.text"));
                 break;
         }
     }
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportProgressLogger.java b/Core/src/org/sleuthkit/autopsy/report/ReportProgressLogger.java
new file mode 100755
index 0000000000..a6219d45c6
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportProgressLogger.java
@@ -0,0 +1,157 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2019 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.report;
+
+import java.util.logging.Level;
+import org.sleuthkit.autopsy.coreutils.Logger;
+
+/**
+ * Writes progress and status messages to the application log.
+ */
+class ReportProgressLogger implements ReportProgressPanel {
+
+    private static final Logger logger = Logger.getLogger(ReportProgressLogger.class.getName());
+    private volatile ReportProgressPanel.ReportStatus status;
+
+    ReportProgressLogger() {
+        status = ReportStatus.QUEUING;
+    }
+
+    /**
+     * Gets the current status of the generation of the report.
+     *
+     * @return The report generation status as a ReportStatus enum.
+     */
+    @Override
+    public ReportStatus getStatus() {
+        return status;
+    }
+
+    /**
+     * Logs that the report has been started.
+     */
+    @Override
+    public void start() {
+        status = ReportStatus.RUNNING;
+        logger.log(Level.INFO, "Report started");
+    }
+
+    /**
+     * NO-OP.
+     *
+     * @param max The maximum value.
+     */
+    @Override
+    public void setMaximumProgress(int max) {
+    }
+
+    /**
+     * NO-OP.
+     */
+    @Override
+    public void increment() {
+    }
+
+    /**
+     * NO-OP.
+     *
+     * @param value The value to be set.
+     */
+    @Override
+    public void setProgress(int value) {
+    }
+
+    /**
+     * NO-OP.
+     *
+     * @param indeterminate True if the progress bar should be set to
+     * indeterminate.
+     */
+    @Override
+    public void setIndeterminate(boolean indeterminate) {
+    }
+
+    /**
+     * Logs the status message.
+     *
+     * @param statusMessage String to use as label text.
+     */
+    @Override
+    public void updateStatusLabel(String statusMessage) {
+        if (status != ReportStatus.CANCELED) {
+            logger.log(Level.INFO, "Report Progress Logger status update: {0}", statusMessage);
+        }
+    }
+
+    /**
+     * Logs the final status of the report generation.
+     *
+     * @param reportStatus The final status, must be COMPLETE or ERROR.
+     */
+    @Override
+    public void complete(ReportStatus reportStatus) {
+        if (status != ReportStatus.CANCELED) {
+            switch (reportStatus) {
+                case COMPLETE: {
+                    status = ReportStatus.COMPLETE;
+                    logger.log(Level.INFO, "Report completed");
+                    break;
+                }
+                case ERROR: {
+                    status = ReportStatus.ERROR;
+                    logger.log(Level.INFO, "Report completed with errors");
+                    break;
+                }
+                default: {
+                    break;
+                }
+            }
+        }
+    }
+
+    /**
+     * Logs that the generation of the report was cancelled.
+     */
+    void cancel() {
+        switch (status) {
+            case COMPLETE:
+                break;
+            case CANCELED:
+                break;
+            case ERROR:
+                break;
+            default:
+                status = ReportStatus.CANCELED;
+                logger.log(Level.INFO, "Report cancelled");
+                break;
+        }
+    }
+
+    /**
+     * Logs the final status of the report generation.
+     *
+     * @deprecated Use {@link #complete(ReportStatus)}
+     */
+    @Deprecated
+    @Override
+    public void complete() {
+        complete(ReportStatus.COMPLETE);
+    }
+
+}

From b7945d3ecaec3c246f3a412772cb63025ea32269 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Wed, 7 Aug 2019 09:03:37 -0400
Subject: [PATCH 045/192] Code review

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

diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportProgressLogger.java b/Core/src/org/sleuthkit/autopsy/report/ReportProgressLogger.java
index a6219d45c6..d2ef9212b0 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportProgressLogger.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportProgressLogger.java
@@ -95,7 +95,7 @@ class ReportProgressLogger implements ReportProgressPanel {
     @Override
     public void updateStatusLabel(String statusMessage) {
         if (status != ReportStatus.CANCELED) {
-            logger.log(Level.INFO, "Report Progress Logger status update: {0}", statusMessage);
+            logger.log(Level.INFO, "Status update: {0}", statusMessage);
         }
     }
 

From 0c505041056f5e8801f8d7568c2e362edaf1eeca Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Wed, 7 Aug 2019 13:41:22 -0400
Subject: [PATCH 046/192] Minor

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

diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportProgressLogger.java b/Core/src/org/sleuthkit/autopsy/report/ReportProgressLogger.java
index d2ef9212b0..210fdc2815 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportProgressLogger.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportProgressLogger.java
@@ -95,7 +95,7 @@ class ReportProgressLogger implements ReportProgressPanel {
     @Override
     public void updateStatusLabel(String statusMessage) {
         if (status != ReportStatus.CANCELED) {
-            logger.log(Level.INFO, "Status update: {0}", statusMessage);
+            logger.log(Level.INFO, statusMessage);
         }
     }
 

From 1d1f1597b03666f30cf9d7ea4e0da3bf5704b646 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Wed, 7 Aug 2019 14:58:00 -0400
Subject: [PATCH 047/192] Laying out the infrastructure

---
 .../autopsy/report/FileReportSettings.java    | 27 +++++++
 .../autopsy/report/ModuleStatus.java          | 47 +++++++++++
 .../report/NoReportModuleSettings.java        | 44 +++++++++++
 .../autopsy/report/ReportModuleSettings.java  | 39 +++++++++
 .../autopsy/report/ReportProgressLogger.java  |  2 +-
 .../autopsy/report/ReportingConfig.java       | 79 +++++++++++++++++++
 .../autopsy/report/TableReportSettings.java   | 28 +++++++
 7 files changed, 265 insertions(+), 1 deletion(-)
 create mode 100755 Core/src/org/sleuthkit/autopsy/report/FileReportSettings.java
 create mode 100755 Core/src/org/sleuthkit/autopsy/report/ModuleStatus.java
 create mode 100755 Core/src/org/sleuthkit/autopsy/report/NoReportModuleSettings.java
 create mode 100755 Core/src/org/sleuthkit/autopsy/report/ReportModuleSettings.java
 create mode 100755 Core/src/org/sleuthkit/autopsy/report/ReportingConfig.java
 create mode 100755 Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java

diff --git a/Core/src/org/sleuthkit/autopsy/report/FileReportSettings.java b/Core/src/org/sleuthkit/autopsy/report/FileReportSettings.java
new file mode 100755
index 0000000000..5c2bf303db
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/FileReportSettings.java
@@ -0,0 +1,27 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2019 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.report;
+
+/**
+ * Class for persisting the file properties used by FileReportGenerator to drive
+ * report generation by FileReportModules.
+ */
+class FileReportSettings {
+
+}
diff --git a/Core/src/org/sleuthkit/autopsy/report/ModuleStatus.java b/Core/src/org/sleuthkit/autopsy/report/ModuleStatus.java
new file mode 100755
index 0000000000..97ef043b95
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/ModuleStatus.java
@@ -0,0 +1,47 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2019 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.report;
+
+/**
+ * Class for persisting information about ReportModule (e.g. whether the report
+ * module is enabled).
+ */
+class ModuleStatus {
+
+    private ReportModule module;
+    private boolean enabled;
+
+    ModuleStatus(ReportModule module, boolean enabled) {
+        this.module = module;
+        this.enabled = enabled;
+    }
+
+    String getModuleClassName() {
+        // ELTODO verify that this is fully qualified class name of a report module
+        return module.getName();
+    }
+
+    void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    boolean isEnabled() {
+        return this.enabled;
+    }
+}
diff --git a/Core/src/org/sleuthkit/autopsy/report/NoReportModuleSettings.java b/Core/src/org/sleuthkit/autopsy/report/NoReportModuleSettings.java
new file mode 100755
index 0000000000..2528077cb5
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/NoReportModuleSettings.java
@@ -0,0 +1,44 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2019 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.report;
+
+/**
+ * Implementation of the ReportModuleSettings interface for use by report
+ * modules that do not have per report job options.
+ */
+public final class NoReportModuleSettings implements ReportModuleSettings {
+
+    private static final long serialVersionUID = 1L;
+    private final String setting = "None"; //NON-NLS
+
+    @Override
+    public long getVersionNumber() {
+        return serialVersionUID;
+    }
+
+    /**
+     * Gets the string used as a report options placeholder for serialization
+     * purposes.
+     *
+     * @return The string "None"
+     */
+    String getSetting() {
+        return setting;
+    }
+}
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportModuleSettings.java b/Core/src/org/sleuthkit/autopsy/report/ReportModuleSettings.java
new file mode 100755
index 0000000000..d06f05d9f1
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportModuleSettings.java
@@ -0,0 +1,39 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2019 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.report;
+
+import java.io.Serializable;
+
+/**
+ * An interface for defining report module settings. The settings are
+ * serializable to support persistence of settings for different configurations
+ * and between invocations of the application. Report module writers will
+ * implement their own settings classes conforming to this interface.
+ */
+public interface ReportModuleSettings extends Serializable {
+
+    /**
+     * Returns the version number of the settings object. The version number
+     * should be a private final static long per the documentation of the
+     * Serializable interface.
+     *
+     * @return A serialization version number.
+     */
+    long getVersionNumber();
+}
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportProgressLogger.java b/Core/src/org/sleuthkit/autopsy/report/ReportProgressLogger.java
index d2ef9212b0..210fdc2815 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportProgressLogger.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportProgressLogger.java
@@ -95,7 +95,7 @@ class ReportProgressLogger implements ReportProgressPanel {
     @Override
     public void updateStatusLabel(String statusMessage) {
         if (status != ReportStatus.CANCELED) {
-            logger.log(Level.INFO, "Status update: {0}", statusMessage);
+            logger.log(Level.INFO, statusMessage);
         }
     }
 
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportingConfig.java b/Core/src/org/sleuthkit/autopsy/report/ReportingConfig.java
new file mode 100755
index 0000000000..ff2c9e49be
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportingConfig.java
@@ -0,0 +1,79 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2019 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.report;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A bundling of all the settings objects that define a report configuration.
+ */
+class ReportingConfig {
+    
+    private String configName;
+    private List<ModuleStatus> moduleStatuses = new ArrayList<>();
+    private List<ReportModuleSettings> moduleSettings = new ArrayList<>();
+    private TableReportSettings tableReportSettings;
+    private FileReportSettings fileReportSettings;
+
+    ReportingConfig(String configName) {
+        this.configName = configName;
+    }
+
+    void setName(String configName) {
+        this.configName = configName;
+    }
+
+    String getName() {
+        return this.configName;
+    }
+
+    void setModulesStatuses(List<ModuleStatus> moduleStatuses) {
+        this.moduleStatuses = moduleStatuses;
+    }
+
+    List<ModuleStatus> getModuleStatuses() {
+        return this.moduleStatuses;
+    }
+
+    void setModuleSettings(List<ReportModuleSettings> moduleSettings) {
+        this.moduleSettings = moduleSettings;
+    }
+
+    List<ReportModuleSettings> getModuleSettings() {
+        return this.moduleSettings;
+    }
+
+    void setTableReportSettings(TableReportSettings settings) {
+        this.tableReportSettings = settings;
+    }
+
+    TableReportSettings getTableReportSettings() {
+        return this.tableReportSettings;
+    }
+
+    void setFileReportSettings(FileReportSettings settings) {
+        this.fileReportSettings = settings;
+    }
+
+    FileReportSettings getFileReportModuleSettings() {
+        return this.fileReportSettings;
+    }
+
+}
diff --git a/Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java b/Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java
new file mode 100755
index 0000000000..01306cc9f8
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java
@@ -0,0 +1,28 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2019 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.report;
+
+/**
+ * Class for persisting the selection of the tag types and artifact types used
+ * by the TableReportGenerator class to drive report generation by
+ * TableReportModules.
+ */
+class TableReportSettings {
+
+}

From c0740b09fb15ba8cd8a80cf8d6ba84e5a769b67f Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Wed, 7 Aug 2019 15:22:52 -0400
Subject: [PATCH 048/192] Updates to TableReportGenerator

---
 .../autopsy/report/ReportGenerator.java       |  6 +++---
 .../autopsy/report/ReportWizardAction.java    |  2 +-
 .../autopsy/report/TableReportGenerator.java  | 10 ++++++----
 .../autopsy/report/TableReportSettings.java   | 19 +++++++++++++++++++
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
index 45b4182b0e..e77335f83b 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
@@ -142,13 +142,13 @@ class ReportGenerator {
      * @param tagSelections the enabled/disabled state of the tag names to be
      * included in the report
      */
-    void generateTableReport(TableReportModule tableReport, Map<BlackboardArtifact.Type, Boolean> artifactTypeSelections, Map<String, Boolean> tagNameSelections) throws IOException {
-        if (tableReport != null && null != artifactTypeSelections) {
+    void generateTableReport(TableReportModule tableReport, TableReportSettings tableReportSettings) throws IOException {
+        if (tableReport != null && tableReportSettings != null && null != tableReportSettings.getArtifactSelections()) {
             String reportDir = createReportDirectory(tableReport);
             setupProgressPanel(tableReport, reportDir);
             ReportWorker worker = new ReportWorker(() -> {
                 tableReport.startReport(reportDir);
-                TableReportGenerator generator = new TableReportGenerator(artifactTypeSelections, tagNameSelections, progressPanel, tableReport);
+                TableReportGenerator generator = new TableReportGenerator(tableReportSettings, progressPanel, tableReport);
                 generator.execute();
                 tableReport.endReport();
                 // finish progress, wrap up
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
index 16f02086fa..34b8648e6a 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
@@ -75,7 +75,7 @@ public final class ReportWizardAction extends CallableSystemAction implements Pr
             PortableCaseReportModule portableCaseReport = (PortableCaseReportModule) wiz.getProperty("portableCaseModule");  // NON-NLS
             try {
                 if (tableReport != null) {
-                    generator.generateTableReport(tableReport, (Map<BlackboardArtifact.Type, Boolean>) wiz.getProperty("artifactStates"), (Map<String, Boolean>) wiz.getProperty("tagStates")); //NON-NLS
+                    generator.generateTableReport(tableReport, new TableReportSettings((Map<BlackboardArtifact.Type, Boolean>) wiz.getProperty("artifactStates"), (Map<String, Boolean>) wiz.getProperty("tagStates"))); //NON-NLS
                 } else if (generalReport != null) {
                     generator.generateGeneralReport(generalReport);
                 } else if (fileReport != null) {
diff --git a/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
index 8e7ac04d05..267d19458a 100644
--- a/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
@@ -72,22 +72,24 @@ class TableReportGenerator {
 
     private final List<String> errorList;
 
-    TableReportGenerator(Map<BlackboardArtifact.Type, Boolean> artifactTypeSelections, Map<String, Boolean> tagNameSelections, ReportProgressPanel progressPanel, TableReportModule tableReport) {
+    TableReportGenerator(TableReportSettings settings, ReportProgressPanel progressPanel, TableReportModule tableReport) {
 
+        // ELTODO Map<BlackboardArtifact.Type, Boolean> artifactTypeSelections, Map<String, Boolean> tagNameSelections
+        
         this.progressPanel = progressPanel;
         this.tableReport = tableReport;
         this.columnHeaderMap = new HashMap<>();
         errorList = new ArrayList<>();
         // Get the artifact types selected by the user.
-        for (Map.Entry<BlackboardArtifact.Type, Boolean> entry : artifactTypeSelections.entrySet()) {
+        for (Map.Entry<BlackboardArtifact.Type, Boolean> entry : settings.getArtifactSelections().entrySet()) {
             if (entry.getValue()) {
                 artifactTypes.add(entry.getKey());
             }
         }
 
         // Get the tag names selected by the user and make a tag names filter.
-        if (null != tagNameSelections) {
-            for (Map.Entry<String, Boolean> entry : tagNameSelections.entrySet()) {
+        if (null != settings.getTagSelections()) {
+            for (Map.Entry<String, Boolean> entry : settings.getTagSelections().entrySet()) {
                 if (entry.getValue() == true) {
                     tagNamesFilter.add(entry.getKey());
                 }
diff --git a/Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java b/Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java
index 01306cc9f8..2b4b6a6ce6 100755
--- a/Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java
@@ -18,6 +18,10 @@
  */
 package org.sleuthkit.autopsy.report;
 
+import java.util.HashMap;
+import java.util.Map;
+import org.sleuthkit.datamodel.BlackboardArtifact;
+
 /**
  * Class for persisting the selection of the tag types and artifact types used
  * by the TableReportGenerator class to drive report generation by
@@ -25,4 +29,19 @@ package org.sleuthkit.autopsy.report;
  */
 class TableReportSettings {
 
+    private Map<BlackboardArtifact.Type, Boolean> artifactTypeSelections = new HashMap<>();
+    private Map<String, Boolean> tagNameSelections = new HashMap<>();
+
+    TableReportSettings(Map<BlackboardArtifact.Type, Boolean> artifactTypeSelections, Map<String, Boolean> tagNameSelections) {
+        this.artifactTypeSelections = artifactTypeSelections;
+        this.tagNameSelections = tagNameSelections;
+    }
+    
+    Map<BlackboardArtifact.Type, Boolean> getArtifactSelections(){
+        return artifactTypeSelections;
+    }
+    
+    Map<String, Boolean> getTagSelections() {
+        return tagNameSelections;
+    }
 }

From cff0bba977b4653f3b4901e7edc784d91579af70 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Wed, 7 Aug 2019 15:54:45 -0400
Subject: [PATCH 049/192] Created FileReportSettings

---
 .../autopsy/report/FileReportSettings.java     | 18 ++++++++++++++++++
 .../autopsy/report/ReportGenerator.java        | 15 +++++----------
 .../autopsy/report/ReportWizardAction.java     |  2 +-
 .../autopsy/report/TableReportSettings.java    | 14 +++++++++++---
 4 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/FileReportSettings.java b/Core/src/org/sleuthkit/autopsy/report/FileReportSettings.java
index 5c2bf303db..191fb4910f 100755
--- a/Core/src/org/sleuthkit/autopsy/report/FileReportSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/report/FileReportSettings.java
@@ -18,10 +18,28 @@
  */
 package org.sleuthkit.autopsy.report;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * Class for persisting the file properties used by FileReportGenerator to drive
  * report generation by FileReportModules.
  */
 class FileReportSettings {
+    
+    private Map<FileReportDataTypes, Boolean> filePropertiesInfo = new HashMap<>();
 
+    /**
+     * Creates FileReportSettings object.
+     * 
+     * @param info the Information that should be included about each
+     * file in the report.
+     */
+    FileReportSettings(Map<FileReportDataTypes, Boolean> info) {
+        this.filePropertiesInfo = info;
+    }
+    
+    Map<FileReportDataTypes, Boolean> getFileProperties() {
+        return filePropertiesInfo;
+    }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
index e77335f83b..14f9cb60e2 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
@@ -46,7 +46,6 @@ import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
 import org.sleuthkit.autopsy.report.ReportProgressPanel.ReportStatus;
 import org.sleuthkit.datamodel.AbstractFile;
-import org.sleuthkit.datamodel.BlackboardArtifact;
 import org.sleuthkit.datamodel.SleuthkitCase;
 import org.sleuthkit.datamodel.TskCoreException;
 import org.sleuthkit.datamodel.TskData;
@@ -137,10 +136,7 @@ class ReportGenerator {
     /**
      * Run the TableReportModules using a SwingWorker.
      *
-     * @param artifactTypeSelections the enabled/disabled state of the artifact
-     * types to be included in the report
-     * @param tagSelections the enabled/disabled state of the tag names to be
-     * included in the report
+     * @param tableReportSettings settings for the table report
      */
     void generateTableReport(TableReportModule tableReport, TableReportSettings tableReportSettings) throws IOException {
         if (tableReport != null && tableReportSettings != null && null != tableReportSettings.getArtifactSelections()) {
@@ -163,14 +159,13 @@ class ReportGenerator {
     /**
      * Run the FileReportModules using a SwingWorker.
      *
-     * @param enabledInfo the Information that should be included about each
-     * file in the report.
+     * @param fileReportSettings settings for the file report
      */
-    void generateFileListReport(FileReportModule fileReportModule, Map<FileReportDataTypes, Boolean> enabledInfo) throws IOException {
-        if (fileReportModule != null && null != enabledInfo) {
+    void generateFileListReport(FileReportModule fileReportModule, FileReportSettings fileReportSettings) throws IOException {
+        if (fileReportModule != null && fileReportSettings != null && null != fileReportSettings.getFileProperties()) {
             String reportDir = createReportDirectory(fileReportModule);
             List<FileReportDataTypes> enabled = new ArrayList<>();
-            for (Entry<FileReportDataTypes, Boolean> e : enabledInfo.entrySet()) {
+            for (Entry<FileReportDataTypes, Boolean> e : fileReportSettings.getFileProperties().entrySet()) {
                 if (e.getValue()) {
                     enabled.add(e.getKey());
                 }
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
index 34b8648e6a..8fa03fd68b 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
@@ -79,7 +79,7 @@ public final class ReportWizardAction extends CallableSystemAction implements Pr
                 } else if (generalReport != null) {
                     generator.generateGeneralReport(generalReport);
                 } else if (fileReport != null) {
-                    generator.generateFileListReport(fileReport, (Map<FileReportDataTypes, Boolean>) wiz.getProperty("fileReportOptions")); //NON-NLS
+                    generator.generateFileListReport(fileReport, new FileReportSettings((Map<FileReportDataTypes, Boolean>) wiz.getProperty("fileReportOptions"))); //NON-NLS
                 } else if (portableCaseReport != null) {
                     generator.generatePortableCaseReport(portableCaseReport, (PortableCaseReportModule.PortableCaseOptions) wiz.getProperty("portableCaseReportOptions"));
                 }
diff --git a/Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java b/Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java
index 2b4b6a6ce6..534f77c01d 100755
--- a/Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java
@@ -32,15 +32,23 @@ class TableReportSettings {
     private Map<BlackboardArtifact.Type, Boolean> artifactTypeSelections = new HashMap<>();
     private Map<String, Boolean> tagNameSelections = new HashMap<>();
 
+    /**
+     * Creates TableReportSettings object.
+     *
+     * @param artifactTypeSelections the enabled/disabled state of the artifact
+     * types to be included in the report
+     * @param tagNameSelections the enabled/disabled state of the tag names to
+     * be included in the report
+     */
     TableReportSettings(Map<BlackboardArtifact.Type, Boolean> artifactTypeSelections, Map<String, Boolean> tagNameSelections) {
         this.artifactTypeSelections = artifactTypeSelections;
         this.tagNameSelections = tagNameSelections;
     }
-    
-    Map<BlackboardArtifact.Type, Boolean> getArtifactSelections(){
+
+    Map<BlackboardArtifact.Type, Boolean> getArtifactSelections() {
         return artifactTypeSelections;
     }
-    
+
     Map<String, Boolean> getTagSelections() {
         return tagNameSelections;
     }

From d46fc8fe2f5f2464f33177fa6816f0d98c041a88 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Thu, 8 Aug 2019 12:53:06 -0400
Subject: [PATCH 050/192] Added ReportingConfigLoader

---
 .../autopsy/report/FileReportSettings.java    |   4 +-
 .../autopsy/report/ModuleStatus.java          |  19 +++-
 .../autopsy/report/ReportConfigException.java |  47 ++++++++
 .../autopsy/report/ReportingConfig.java       |  11 +-
 .../autopsy/report/ReportingConfigLoader.java | 106 ++++++++++++++++++
 .../autopsy/report/TableReportSettings.java   |   4 +-
 6 files changed, 182 insertions(+), 9 deletions(-)
 create mode 100755 Core/src/org/sleuthkit/autopsy/report/ReportConfigException.java
 create mode 100755 Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java

diff --git a/Core/src/org/sleuthkit/autopsy/report/FileReportSettings.java b/Core/src/org/sleuthkit/autopsy/report/FileReportSettings.java
index 191fb4910f..796b1fd824 100755
--- a/Core/src/org/sleuthkit/autopsy/report/FileReportSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/report/FileReportSettings.java
@@ -18,6 +18,7 @@
  */
 package org.sleuthkit.autopsy.report;
 
+import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -25,8 +26,9 @@ import java.util.Map;
  * Class for persisting the file properties used by FileReportGenerator to drive
  * report generation by FileReportModules.
  */
-class FileReportSettings {
+class FileReportSettings implements Serializable  {
     
+    private static final long serialVersionUID = 1L;
     private Map<FileReportDataTypes, Boolean> filePropertiesInfo = new HashMap<>();
 
     /**
diff --git a/Core/src/org/sleuthkit/autopsy/report/ModuleStatus.java b/Core/src/org/sleuthkit/autopsy/report/ModuleStatus.java
index 97ef043b95..7da33eeac8 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ModuleStatus.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ModuleStatus.java
@@ -18,23 +18,32 @@
  */
 package org.sleuthkit.autopsy.report;
 
+import java.io.Serializable;
+
 /**
  * Class for persisting information about ReportModule (e.g. whether the report
  * module is enabled).
  */
-class ModuleStatus {
+class ModuleStatus implements Serializable {
 
-    private ReportModule module;
+    private static final long serialVersionUID = 1L;
+    private final String moduleName;
     private boolean enabled;
 
+    /**
+     * Creates ModuleStatus object.
+     *
+     * @param module implementation of a ReportModule interface
+     * @param enabled boolean flag whether the module is enabled
+     */
     ModuleStatus(ReportModule module, boolean enabled) {
-        this.module = module;
+        // ELTODO verify that this is fully qualified class name of a report module
+        this.moduleName = module.getClass().getCanonicalName();
         this.enabled = enabled;
     }
 
     String getModuleClassName() {
-        // ELTODO verify that this is fully qualified class name of a report module
-        return module.getName();
+        return moduleName;
     }
 
     void setEnabled(boolean enabled) {
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportConfigException.java b/Core/src/org/sleuthkit/autopsy/report/ReportConfigException.java
new file mode 100755
index 0000000000..23ec6d1849
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportConfigException.java
@@ -0,0 +1,47 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2019 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.report;
+
+/**
+ * Instances of this exception class are thrown when there is an error during
+ * serialization and deserialization of reporting configuration.
+ */
+class ReportConfigException extends Exception {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Constructs a new exception with the specified message.
+     *
+     * @param message The message.
+     */
+    public ReportConfigException(String message) {
+        super(message);
+    }
+
+    /**
+     * Constructs a new exception with the specified message and cause.
+     *
+     * @param message The message.
+     * @param cause The cause.
+     */
+    public ReportConfigException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportingConfig.java b/Core/src/org/sleuthkit/autopsy/report/ReportingConfig.java
index ff2c9e49be..2088c5ca36 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportingConfig.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportingConfig.java
@@ -18,20 +18,27 @@
  */
 package org.sleuthkit.autopsy.report;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * A bundling of all the settings objects that define a report configuration.
  */
-class ReportingConfig {
-    
+class ReportingConfig implements Serializable {
+
+    private static final long serialVersionUID = 1L;
     private String configName;
     private List<ModuleStatus> moduleStatuses = new ArrayList<>();
     private List<ReportModuleSettings> moduleSettings = new ArrayList<>();
     private TableReportSettings tableReportSettings;
     private FileReportSettings fileReportSettings;
 
+    /**
+     * Creates ReportingConfig object.
+     *
+     * @param configName Name of the reporting configuration
+     */
     ReportingConfig(String configName) {
         this.configName = configName;
     }
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java b/Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java
new file mode 100755
index 0000000000..cb4958e2ec
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java
@@ -0,0 +1,106 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2019 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.report;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import org.openide.util.io.NbObjectInputStream;
+import org.openide.util.io.NbObjectOutputStream;
+import org.sleuthkit.autopsy.coreutils.PlatformUtil;
+
+/**
+ * Utility class responsible for managing serialization and deserialization of
+ * all of the settings that make up a reporting configuration in an atomic,
+ * thread safe way.
+ */
+class ReportingConfigLoader {
+
+    private static final String REPORT_CONFIG_FOLDER = "ReportingConfigs"; //NON-NLS
+    private static final String REPORT_CONFIG_FOLDER_PATH = Paths.get(PlatformUtil.getUserConfigDirectory(), ReportingConfigLoader.REPORT_CONFIG_FOLDER).toAbsolutePath().toString();
+
+    /**
+     * Deserialize all of the settings that make up a reporting configuration in
+     * an atomic, thread safe way.
+     *
+     * @param configName Name of the reporting configuration
+     * @return ReportingConfig object if a persisted configuration exists, null
+     * otherwise
+     * @throws ReportConfigException if an error occurred while reading the
+     * configuration
+     */
+    static synchronized ReportingConfig loadConfig(String configName) throws ReportConfigException {
+
+        // construct the file path
+        Path pathToConfigDir = Paths.get(ReportingConfigLoader.REPORT_CONFIG_FOLDER_PATH, configName);
+        File reportDir = pathToConfigDir.toFile();
+
+        // Return null if a reporting configuration for the given name does not exist.
+        if (!reportDir.exists()) {
+            return null;
+        }
+
+        if (!reportDir.isDirectory() || !reportDir.canRead()) {
+            throw new ReportConfigException("Unable to read reporting configuration directory " + pathToConfigDir.toString());
+        }
+
+        // read in the confuguration
+        ReportingConfig config = null;
+        try (NbObjectInputStream in = new NbObjectInputStream(new FileInputStream(pathToConfigDir.toString()))) {
+            config = (ReportingConfig) in.readObject();
+        } catch (IOException | ClassNotFoundException ex) {
+            throw new ReportConfigException("Unable to read reporting configuration " + pathToConfigDir.toString(), ex);
+        }
+
+        return config;
+    }
+
+    /**
+     * Serialize all of the settings that make up a reporting configuration in
+     * an atomic, thread safe way.
+     *
+     * @param config ReportingConfig object to serialize to disk
+     * @throws ReportConfigException if an error occurred while saving the
+     * configuration
+     */
+    static synchronized void saveConfig(ReportingConfig config) throws ReportConfigException {
+
+        // construct the file path
+        Path pathToConfigDir = Paths.get(ReportingConfigLoader.REPORT_CONFIG_FOLDER_PATH, config.getName());
+
+        // create configuration directory 
+        try {
+            Files.createDirectories(pathToConfigDir); // does not throw if directory already exists
+        } catch (IOException | SecurityException ex) {
+            throw new ReportConfigException("Failed to create reporting configuration directory " + pathToConfigDir.toString(), ex);
+        }
+
+        // save the configuration
+        try (NbObjectOutputStream out = new NbObjectOutputStream(new FileOutputStream(pathToConfigDir.toString()))) {
+            out.writeObject(config);
+        } catch (IOException ex) {
+            throw new ReportConfigException("Unable to save reporting configuration " + pathToConfigDir.toString(), ex);
+        }
+    }
+
+}
diff --git a/Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java b/Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java
index 534f77c01d..5316b04a28 100755
--- a/Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java
@@ -18,6 +18,7 @@
  */
 package org.sleuthkit.autopsy.report;
 
+import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 import org.sleuthkit.datamodel.BlackboardArtifact;
@@ -27,8 +28,9 @@ import org.sleuthkit.datamodel.BlackboardArtifact;
  * by the TableReportGenerator class to drive report generation by
  * TableReportModules.
  */
-class TableReportSettings {
+class TableReportSettings implements Serializable  {
 
+    private static final long serialVersionUID = 1L;
     private Map<BlackboardArtifact.Type, Boolean> artifactTypeSelections = new HashMap<>();
     private Map<String, Boolean> tagNameSelections = new HashMap<>();
 

From d2cd43be7500cdbf99cc6adf7df67457135f0b94 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Thu, 8 Aug 2019 14:13:47 -0400
Subject: [PATCH 051/192] Cleanup and fixes

---
 .../autopsy/report/FileReportSettings.java    |  6 ++---
 .../autopsy/report/ModuleStatus.java          |  1 -
 .../autopsy/report/ReportVisualPanel1.java    |  5 ++++-
 .../autopsy/report/ReportingConfigLoader.java | 22 ++++++++++---------
 .../autopsy/report/TableReportGenerator.java  |  2 --
 5 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/FileReportSettings.java b/Core/src/org/sleuthkit/autopsy/report/FileReportSettings.java
index 796b1fd824..c106da5a91 100755
--- a/Core/src/org/sleuthkit/autopsy/report/FileReportSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/report/FileReportSettings.java
@@ -34,11 +34,11 @@ class FileReportSettings implements Serializable  {
     /**
      * Creates FileReportSettings object.
      * 
-     * @param info the Information that should be included about each
+     * @param fileReportInfo the Information that should be included about each
      * file in the report.
      */
-    FileReportSettings(Map<FileReportDataTypes, Boolean> info) {
-        this.filePropertiesInfo = info;
+    FileReportSettings(Map<FileReportDataTypes, Boolean> fileReportInfo) {
+        this.filePropertiesInfo = fileReportInfo;
     }
     
     Map<FileReportDataTypes, Boolean> getFileProperties() {
diff --git a/Core/src/org/sleuthkit/autopsy/report/ModuleStatus.java b/Core/src/org/sleuthkit/autopsy/report/ModuleStatus.java
index 7da33eeac8..d034f9dced 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ModuleStatus.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ModuleStatus.java
@@ -37,7 +37,6 @@ class ModuleStatus implements Serializable {
      * @param enabled boolean flag whether the module is enabled
      */
     ModuleStatus(ReportModule module, boolean enabled) {
-        // ELTODO verify that this is fully qualified class name of a report module
         this.moduleName = module.getClass().getCanonicalName();
         this.enabled = enabled;
     }
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
index 9c2a028073..4b148c930e 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
@@ -22,7 +22,9 @@ import java.awt.BorderLayout;
 import java.awt.Component;
 import java.util.ArrayList;
 import static java.util.Collections.swap;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.logging.Level;
 import javax.swing.JList;
 import javax.swing.JPanel;
@@ -33,6 +35,7 @@ import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import org.openide.DialogDisplayer;
 import org.openide.NotifyDescriptor;
+import org.openide.util.Exceptions;
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 
@@ -110,7 +113,7 @@ final class ReportVisualPanel1 extends JPanel implements ListSelectionListener {
             indexOfHTMLReportModule++;
         }
         swap(modules, indexOfHTMLReportModule, 0);
-
+        
         modulesJList.getSelectionModel().addListSelectionListener(this);
         modulesJList.setCellRenderer(new ModuleCellRenderer());
         modulesJList.setListData(modules.toArray(new ReportModule[modules.size()]));
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java b/Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java
index cb4958e2ec..4811f613fe 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java
@@ -38,6 +38,7 @@ class ReportingConfigLoader {
 
     private static final String REPORT_CONFIG_FOLDER = "ReportingConfigs"; //NON-NLS
     private static final String REPORT_CONFIG_FOLDER_PATH = Paths.get(PlatformUtil.getUserConfigDirectory(), ReportingConfigLoader.REPORT_CONFIG_FOLDER).toAbsolutePath().toString();
+    private static final String REPORT_CONFIG_FILE_NAME = "ReportingConfiguration.properties";
 
     /**
      * Deserialize all of the settings that make up a reporting configuration in
@@ -52,24 +53,24 @@ class ReportingConfigLoader {
     static synchronized ReportingConfig loadConfig(String configName) throws ReportConfigException {
 
         // construct the file path
-        Path pathToConfigDir = Paths.get(ReportingConfigLoader.REPORT_CONFIG_FOLDER_PATH, configName);
-        File reportDir = pathToConfigDir.toFile();
+        Path reportFilePath = Paths.get(ReportingConfigLoader.REPORT_CONFIG_FOLDER_PATH, configName, REPORT_CONFIG_FILE_NAME);
+        File reportFile = reportFilePath.toFile();
 
         // Return null if a reporting configuration for the given name does not exist.
-        if (!reportDir.exists()) {
+        if (!reportFile.exists()) {
             return null;
         }
 
-        if (!reportDir.isDirectory() || !reportDir.canRead()) {
-            throw new ReportConfigException("Unable to read reporting configuration directory " + pathToConfigDir.toString());
+        if (!reportFile.isFile()|| !reportFile.canRead()) {
+            throw new ReportConfigException("Unable to read reporting configuration file " + reportFilePath.toString());
         }
 
         // read in the confuguration
         ReportingConfig config = null;
-        try (NbObjectInputStream in = new NbObjectInputStream(new FileInputStream(pathToConfigDir.toString()))) {
+        try (NbObjectInputStream in = new NbObjectInputStream(new FileInputStream(reportFilePath.toString()))) {
             config = (ReportingConfig) in.readObject();
         } catch (IOException | ClassNotFoundException ex) {
-            throw new ReportConfigException("Unable to read reporting configuration " + pathToConfigDir.toString(), ex);
+            throw new ReportConfigException("Unable to read reporting configuration " + reportFilePath.toString(), ex);
         }
 
         return config;
@@ -85,7 +86,7 @@ class ReportingConfigLoader {
      */
     static synchronized void saveConfig(ReportingConfig config) throws ReportConfigException {
 
-        // construct the file path
+        // construct the configuration directory path
         Path pathToConfigDir = Paths.get(ReportingConfigLoader.REPORT_CONFIG_FOLDER_PATH, config.getName());
 
         // create configuration directory 
@@ -94,9 +95,10 @@ class ReportingConfigLoader {
         } catch (IOException | SecurityException ex) {
             throw new ReportConfigException("Failed to create reporting configuration directory " + pathToConfigDir.toString(), ex);
         }
-
+        
         // save the configuration
-        try (NbObjectOutputStream out = new NbObjectOutputStream(new FileOutputStream(pathToConfigDir.toString()))) {
+        String filePath = pathToConfigDir.toString() + File.separator + REPORT_CONFIG_FILE_NAME;
+        try (NbObjectOutputStream out = new NbObjectOutputStream(new FileOutputStream(filePath))) {
             out.writeObject(config);
         } catch (IOException ex) {
             throw new ReportConfigException("Unable to save reporting configuration " + pathToConfigDir.toString(), ex);
diff --git a/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
index 267d19458a..093a4a5eb3 100644
--- a/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
@@ -74,8 +74,6 @@ class TableReportGenerator {
 
     TableReportGenerator(TableReportSettings settings, ReportProgressPanel progressPanel, TableReportModule tableReport) {
 
-        // ELTODO Map<BlackboardArtifact.Type, Boolean> artifactTypeSelections, Map<String, Boolean> tagNameSelections
-        
         this.progressPanel = progressPanel;
         this.tableReport = tableReport;
         this.columnHeaderMap = new HashMap<>();

From 53b5eac2a7609b373f25e6ab86f1749e965c0122 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Mon, 12 Aug 2019 12:12:26 -0400
Subject: [PATCH 052/192] Code review

---
 .../autopsy/report/FileReportSettings.java    | 15 ++++++++-----
 .../autopsy/report/ModuleStatus.java          |  8 +++----
 .../report/NoReportModuleSettings.java        |  2 +-
 .../autopsy/report/ReportConfigException.java |  4 ++--
 .../autopsy/report/ReportVisualPanel1.java    | 21 ++++++++-----------
 .../autopsy/report/ReportingConfig.java       |  4 ++--
 .../autopsy/report/ReportingConfigLoader.java | 14 ++++++-------
 .../autopsy/report/TableReportSettings.java   |  6 +++---
 8 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/FileReportSettings.java b/Core/src/org/sleuthkit/autopsy/report/FileReportSettings.java
index c106da5a91..e70ef7608f 100755
--- a/Core/src/org/sleuthkit/autopsy/report/FileReportSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/report/FileReportSettings.java
@@ -26,21 +26,26 @@ import java.util.Map;
  * Class for persisting the file properties used by FileReportGenerator to drive
  * report generation by FileReportModules.
  */
-class FileReportSettings implements Serializable  {
-    
+final class FileReportSettings implements Serializable {
+
     private static final long serialVersionUID = 1L;
     private Map<FileReportDataTypes, Boolean> filePropertiesInfo = new HashMap<>();
 
     /**
      * Creates FileReportSettings object.
-     * 
-     * @param fileReportInfo the Information that should be included about each
+     *
+     * @param fileReportInfo The information that should be included about each
      * file in the report.
      */
     FileReportSettings(Map<FileReportDataTypes, Boolean> fileReportInfo) {
         this.filePropertiesInfo = fileReportInfo;
     }
-    
+
+    /**
+     * Gets file report settings.
+     *
+     * @return File report settings
+     */
     Map<FileReportDataTypes, Boolean> getFileProperties() {
         return filePropertiesInfo;
     }
diff --git a/Core/src/org/sleuthkit/autopsy/report/ModuleStatus.java b/Core/src/org/sleuthkit/autopsy/report/ModuleStatus.java
index d034f9dced..9f68088c43 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ModuleStatus.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ModuleStatus.java
@@ -21,10 +21,10 @@ package org.sleuthkit.autopsy.report;
 import java.io.Serializable;
 
 /**
- * Class for persisting information about ReportModule (e.g. whether the report
+ * Class for persisting information about a report module (e.g. whether the report
  * module is enabled).
  */
-class ModuleStatus implements Serializable {
+final class ModuleStatus implements Serializable {
 
     private static final long serialVersionUID = 1L;
     private final String moduleName;
@@ -33,8 +33,8 @@ class ModuleStatus implements Serializable {
     /**
      * Creates ModuleStatus object.
      *
-     * @param module implementation of a ReportModule interface
-     * @param enabled boolean flag whether the module is enabled
+     * @param module Implementation of a ReportModule interface
+     * @param enabled Boolean flag whether the module is enabled
      */
     ModuleStatus(ReportModule module, boolean enabled) {
         this.moduleName = module.getClass().getCanonicalName();
diff --git a/Core/src/org/sleuthkit/autopsy/report/NoReportModuleSettings.java b/Core/src/org/sleuthkit/autopsy/report/NoReportModuleSettings.java
index 2528077cb5..ad5fd9a09f 100755
--- a/Core/src/org/sleuthkit/autopsy/report/NoReportModuleSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/report/NoReportModuleSettings.java
@@ -20,7 +20,7 @@ package org.sleuthkit.autopsy.report;
 
 /**
  * Implementation of the ReportModuleSettings interface for use by report
- * modules that do not have per report job options.
+ * modules that do not have settings.
  */
 public final class NoReportModuleSettings implements ReportModuleSettings {
 
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportConfigException.java b/Core/src/org/sleuthkit/autopsy/report/ReportConfigException.java
index 23ec6d1849..4d97f5b957 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportConfigException.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportConfigException.java
@@ -20,9 +20,9 @@ package org.sleuthkit.autopsy.report;
 
 /**
  * Instances of this exception class are thrown when there is an error during
- * serialization and deserialization of reporting configuration.
+ * serialization and deserialization of a reporting configuration.
  */
-class ReportConfigException extends Exception {
+final class ReportConfigException extends Exception {
 
     private static final long serialVersionUID = 1L;
 
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
index 4b148c930e..6cb00a7011 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
@@ -22,9 +22,7 @@ import java.awt.BorderLayout;
 import java.awt.Component;
 import java.util.ArrayList;
 import static java.util.Collections.swap;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.logging.Level;
 import javax.swing.JList;
 import javax.swing.JPanel;
@@ -35,7 +33,6 @@ import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import org.openide.DialogDisplayer;
 import org.openide.NotifyDescriptor;
-import org.openide.util.Exceptions;
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 
@@ -70,14 +67,14 @@ final class ReportVisualPanel1 extends JPanel implements ListSelectionListener {
         tableModules = ReportModuleLoader.getTableReportModules();
         generalModules = ReportModuleLoader.getGeneralReportModules();
         fileModules = ReportModuleLoader.getFileReportModules();
-        
+
         for (TableReportModule module : tableModules) {
             if (!moduleIsValid(module)) {
                 popupWarning(module);
-                tableModules.remove(module);                
+                tableModules.remove(module);
             }
         }
-        
+
         for (GeneralReportModule module : generalModules) {
             if (!moduleIsValid(module)) {
                 popupWarning(module);
@@ -88,15 +85,15 @@ final class ReportVisualPanel1 extends JPanel implements ListSelectionListener {
         for (FileReportModule module : fileModules) {
             if (!moduleIsValid(module)) {
                 popupWarning(module);
-                fileModules.remove(module);                
+                fileModules.remove(module);
             }
         }
-        
+
         // our theory is that the report table modules are more common, so they go on top
         modules.addAll(tableModules);
         modules.addAll(fileModules);
         modules.addAll(generalModules);
-        
+
         portableCaseModule = new PortableCaseReportModule();
         if (moduleIsValid(portableCaseModule)) {
             modules.add(portableCaseModule);
@@ -113,7 +110,7 @@ final class ReportVisualPanel1 extends JPanel implements ListSelectionListener {
             indexOfHTMLReportModule++;
         }
         swap(modules, indexOfHTMLReportModule, 0);
-        
+
         modulesJList.getSelectionModel().addListSelectionListener(this);
         modulesJList.setCellRenderer(new ModuleCellRenderer());
         modulesJList.setListData(modules.toArray(new ReportModule[modules.size()]));
@@ -181,7 +178,7 @@ final class ReportVisualPanel1 extends JPanel implements ListSelectionListener {
         }
         return null;
     }
-    
+
     /**
      * Get the selection status of the Portable Case report module.
      *
@@ -303,7 +300,7 @@ final class ReportVisualPanel1 extends JPanel implements ListSelectionListener {
         configurationPanel.add(panel, BorderLayout.CENTER);
         configurationPanel.revalidate();
         configurationPanel.repaint();
-        
+
         boolean generalModuleSelected = (module instanceof GeneralReportModule);
 
         wizPanel.setNext(!generalModuleSelected);
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportingConfig.java b/Core/src/org/sleuthkit/autopsy/report/ReportingConfig.java
index 2088c5ca36..c47590b0da 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportingConfig.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportingConfig.java
@@ -25,7 +25,7 @@ import java.util.List;
 /**
  * A bundling of all the settings objects that define a report configuration.
  */
-class ReportingConfig implements Serializable {
+final class ReportingConfig implements Serializable {
 
     private static final long serialVersionUID = 1L;
     private String configName;
@@ -79,7 +79,7 @@ class ReportingConfig implements Serializable {
         this.fileReportSettings = settings;
     }
 
-    FileReportSettings getFileReportModuleSettings() {
+    FileReportSettings getFileReportSettings() {
         return this.fileReportSettings;
     }
 
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java b/Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java
index 4811f613fe..fe647be153 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java
@@ -34,11 +34,11 @@ import org.sleuthkit.autopsy.coreutils.PlatformUtil;
  * all of the settings that make up a reporting configuration in an atomic,
  * thread safe way.
  */
-class ReportingConfigLoader {
+final class ReportingConfigLoader {
 
     private static final String REPORT_CONFIG_FOLDER = "ReportingConfigs"; //NON-NLS
     private static final String REPORT_CONFIG_FOLDER_PATH = Paths.get(PlatformUtil.getUserConfigDirectory(), ReportingConfigLoader.REPORT_CONFIG_FOLDER).toAbsolutePath().toString();
-    private static final String REPORT_CONFIG_FILE_NAME = "ReportingConfiguration.properties";
+    private static final String REPORT_CONFIG_FILE_EXTENSION = ".settings";
 
     /**
      * Deserialize all of the settings that make up a reporting configuration in
@@ -53,7 +53,7 @@ class ReportingConfigLoader {
     static synchronized ReportingConfig loadConfig(String configName) throws ReportConfigException {
 
         // construct the file path
-        Path reportFilePath = Paths.get(ReportingConfigLoader.REPORT_CONFIG_FOLDER_PATH, configName, REPORT_CONFIG_FILE_NAME);
+        Path reportFilePath = Paths.get(ReportingConfigLoader.REPORT_CONFIG_FOLDER_PATH, configName + REPORT_CONFIG_FILE_EXTENSION);
         File reportFile = reportFilePath.toFile();
 
         // Return null if a reporting configuration for the given name does not exist.
@@ -65,7 +65,7 @@ class ReportingConfigLoader {
             throw new ReportConfigException("Unable to read reporting configuration file " + reportFilePath.toString());
         }
 
-        // read in the confuguration
+        // read in the configuration
         ReportingConfig config = null;
         try (NbObjectInputStream in = new NbObjectInputStream(new FileInputStream(reportFilePath.toString()))) {
             config = (ReportingConfig) in.readObject();
@@ -87,7 +87,7 @@ class ReportingConfigLoader {
     static synchronized void saveConfig(ReportingConfig config) throws ReportConfigException {
 
         // construct the configuration directory path
-        Path pathToConfigDir = Paths.get(ReportingConfigLoader.REPORT_CONFIG_FOLDER_PATH, config.getName());
+        Path pathToConfigDir = Paths.get(ReportingConfigLoader.REPORT_CONFIG_FOLDER_PATH);
 
         // create configuration directory 
         try {
@@ -97,11 +97,11 @@ class ReportingConfigLoader {
         }
         
         // save the configuration
-        String filePath = pathToConfigDir.toString() + File.separator + REPORT_CONFIG_FILE_NAME;
+        String filePath = pathToConfigDir.toString() + File.separator + config.getName() + REPORT_CONFIG_FILE_EXTENSION;
         try (NbObjectOutputStream out = new NbObjectOutputStream(new FileOutputStream(filePath))) {
             out.writeObject(config);
         } catch (IOException ex) {
-            throw new ReportConfigException("Unable to save reporting configuration " + pathToConfigDir.toString(), ex);
+            throw new ReportConfigException("Unable to save reporting configuration " + filePath, ex);
         }
     }
 
diff --git a/Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java b/Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java
index 5316b04a28..7817d70b83 100755
--- a/Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java
@@ -28,7 +28,7 @@ import org.sleuthkit.datamodel.BlackboardArtifact;
  * by the TableReportGenerator class to drive report generation by
  * TableReportModules.
  */
-class TableReportSettings implements Serializable  {
+final class TableReportSettings implements Serializable  {
 
     private static final long serialVersionUID = 1L;
     private Map<BlackboardArtifact.Type, Boolean> artifactTypeSelections = new HashMap<>();
@@ -37,9 +37,9 @@ class TableReportSettings implements Serializable  {
     /**
      * Creates TableReportSettings object.
      *
-     * @param artifactTypeSelections the enabled/disabled state of the artifact
+     * @param artifactTypeSelections The enabled/disabled state of the artifact
      * types to be included in the report
-     * @param tagNameSelections the enabled/disabled state of the tag names to
+     * @param tagNameSelections The enabled/disabled state of the tag names to
      * be included in the report
      */
     TableReportSettings(Map<BlackboardArtifact.Type, Boolean> artifactTypeSelections, Map<String, Boolean> tagNameSelections) {

From df1745dc37244e6226b80aa6420d3a7f6adac88b Mon Sep 17 00:00:00 2001
From: Kelly Kelly <kelly@basistech.com>
Date: Tue, 13 Aug 2019 14:00:27 -0400
Subject: [PATCH 053/192] Added ExtractRecycyleBin module to RA

---
 .../recentactivity/Bundle.properties-MERGED   |   9 +-
 .../recentactivity/ExtractRecycleBin.java     | 279 ++++++++++++++++++
 .../recentactivity/RAImageIngestModule.java   |   2 +
 .../autopsy/recentactivity/Util.java          |  18 ++
 4 files changed, 301 insertions(+), 7 deletions(-)
 create mode 100755 RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java

diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED
index 5e11018086..40771a0d41 100755
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED
@@ -2,14 +2,9 @@ cannotBuildXmlParser=Unable to build XML parser:
 cannotLoadSEUQA=Unable to load Search Engine URL Query Analyzer settings file, SEUQAMappings.xml: 
 cannotParseXml=Unable to parse XML file: 
 ChromeCacheExtractor.moduleName=ChromeCacheExtractor
-# {0} - module name
-# {1} - row number
-# {2} - table length
-# {3} - cache path
 ChromeCacheExtractor.progressMsg={0}: Extracting cache entry {1} of {2} entries from {3}
 DataSourceUsage_AndroidMedia=Android Media Card
 DataSourceUsage_FlashDrive=Flash Drive
-# {0} - OS name
 DataSourceUsageAnalyzer.customVolume.label=OS Drive ({0})
 DataSourceUsageAnalyzer.parentModuleName=Recent Activity
 Extract.indexError.message=Failed to index artifact for keyword search.
@@ -51,6 +46,7 @@ ExtractOs.windowsVolume.label=OS Drive (Windows)
 ExtractOs.yellowDogLinuxOs.label=Linux (Yellow Dog)
 ExtractOs.yellowDogLinuxVolume.label=OS Drive (Linux Yellow Dog)
 ExtractOS_progressMessage=Checking for OS
+ExtractRecycleBin_module_name=Recycle Bin
 ExtractSafari_Error_Getting_History=An error occurred while processing Safari history files.
 ExtractSafari_Error_Parsing_Bookmark=An error occured while processing Safari Bookmark files
 ExtractSafari_Error_Parsing_Cookies=An error occured while processing Safari Cookies files
@@ -64,7 +60,7 @@ ExtractZone_progress_Msg=Extracting :Zone.Identifer files
 ExtractZone_Restricted=Restricted Sites Zone
 ExtractZone_Trusted=Trusted Sites Zone
 OpenIDE-Module-Display-Category=Ingest Module
-OpenIDE-Module-Long-Description=Recent Activity ingest module.\n\n\The module extracts useful information about the recent user activity on the disk image being ingested, such as:\n\n- Recently open documents,\n- Web activity (sites visited, stored cookies, book marked sites, search engine queries, file downloads),\n- Recently attached devices,\n- Installed programs.\n\nThe module currently supports Windows only disk images.\nThe plugin is also fully functional when deployed on Windows version of Autopsy.
+OpenIDE-Module-Long-Description=Recent Activity ingest module.\n\nThe module extracts useful information about the recent user activity on the disk image being ingested, such as:\n\n- Recently open documents,\n- Web activity (sites visited, stored cookies, book marked sites, search engine queries, file downloads),\n- Recently attached devices,\n- Installed programs.\n\nThe module currently supports Windows only disk images.\nThe plugin is also fully functional when deployed on Windows version of Autopsy.
 OpenIDE-Module-Name=RecentActivity
 OpenIDE-Module-Short-Description=Recent Activity finder ingest module
 Chrome.moduleName=Chrome
@@ -187,7 +183,6 @@ RecentDocumentsByLnk.parentModuleName.noSpace=RecentActivity
 RecentDocumentsByLnk.parentModuleName=Recent Activity
 RegRipperFullNotFound=Full version RegRipper executable not found.
 RegRipperNotFound=Autopsy RegRipper executable not found.
-# {0} - file name
 SearchEngineURLQueryAnalyzer.init.exception.msg=Unable to find {0}.
 SearchEngineURLQueryAnalyzer.moduleName.text=Search Engine
 SearchEngineURLQueryAnalyzer.engineName.none=NONE
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java
new file mode 100755
index 0000000000..10df98ae4c
--- /dev/null
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java
@@ -0,0 +1,279 @@
+/*
+ *
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2019 Basis Technology Corp.
+ *
+ * Copyright 2012 42six Solutions.
+ * Contact: aebadirad <at> 42six <dot> com
+ * Project Contact/Architect: 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.recentactivity;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.List;
+import java.util.logging.Level;
+import org.openide.util.NbBundle.Messages;
+import org.sleuthkit.autopsy.casemodule.Case;
+import org.sleuthkit.autopsy.casemodule.services.FileManager;
+import org.sleuthkit.autopsy.coreutils.Logger;
+import org.sleuthkit.autopsy.datamodel.ContentUtils;
+import org.sleuthkit.autopsy.ingest.DataSourceIngestModuleProgress;
+import org.sleuthkit.autopsy.ingest.IngestJobContext;
+import org.sleuthkit.datamodel.AbstractFile;
+import org.sleuthkit.datamodel.BlackboardArtifact;
+import org.sleuthkit.datamodel.BlackboardAttribute;
+import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DATETIME_DELETED;
+import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_PATH;
+import org.sleuthkit.datamodel.Content;
+import org.sleuthkit.datamodel.SleuthkitCase;
+import org.sleuthkit.datamodel.TskCoreException;
+import org.sleuthkit.datamodel.TskDataException;
+
+/**
+ * This module is based on the RecycleBin python module from Mark Mackinnon.
+ *
+ * @see
+ * <a href="https://github.com/markmckinnon/Autopsy-Plugins/blob/master/Recycle_Bin/Recycle_Bin.py">Recycle_Bin.py</a>
+ *
+ */
+final class ExtractRecycleBin extends Extract {
+
+    private static final Logger logger = Logger.getLogger(ExtractRecycleBin.class.getName());
+
+    private static final String RECYCLE_BIN_ARTIFACT_NAME = "TSK_RECYCLE_BIN"; //NON-NLS
+
+    private static final int V1_FILE_NAME_OFFSET = 24;
+    private static final int V2_FILE_NAME_OFFSET = 28;
+
+    @Messages({
+        "ExtractRecycleBin_module_name=Recycle Bin"
+    })
+    ExtractRecycleBin() {
+        this.moduleName = Bundle.ExtractRecycleBin_module_name();
+    }
+
+    @Override
+    void process(Content dataSource, IngestJobContext context, DataSourceIngestModuleProgress progressBar) {
+        FileManager fileManager = Case.getCurrentCase().getServices().getFileManager();
+        String tempDirPath = RAImageIngestModule.getRATempPath(Case.getCurrentCase(), "recyclebin"); //NON-NLS
+        SleuthkitCase skCase = Case.getCurrentCase().getSleuthkitCase();
+
+        // At this time it was decided tjat we would not include TSK_RECYCLE_BIN
+        // in the default list of BlackboardArtifact types.
+        try {
+            skCase.addBlackboardArtifactType(RECYCLE_BIN_ARTIFACT_NAME, "Recycle Bin"); //NON-NLS
+        } catch (TskCoreException ex) {
+            logger.log(Level.WARNING, String.format("%s may not have been created.", RECYCLE_BIN_ARTIFACT_NAME), ex);
+        } catch (TskDataException ex) {
+            logger.log(Level.WARNING, String.format("%s may have already been defined for this case", RECYCLE_BIN_ARTIFACT_NAME), ex);
+        }
+
+        BlackboardArtifact.Type recycleBinArtifactType;
+
+        try {
+            recycleBinArtifactType = skCase.getArtifactType(RECYCLE_BIN_ARTIFACT_NAME);
+        } catch (TskCoreException ex) {
+            logger.log(Level.WARNING, String.format("Unable to retrive custom artifact type %s", RECYCLE_BIN_ARTIFACT_NAME), ex); // NON-NLS
+            // If this doesn't work bail.
+            return;
+        }
+
+        List<AbstractFile> iFiles;
+
+        try {
+            iFiles = fileManager.findFiles(dataSource, "$I%"); //NON-NLS            
+        } catch (TskCoreException ex) {
+            logger.log(Level.WARNING, "Unable to find recycle bin I files.", ex); //NON-NLS
+            return;  // No need to continue
+        }
+
+        for (AbstractFile iFile : iFiles) {
+
+            if (context.dataSourceIngestIsCancelled()) {
+                return;
+            }
+
+            String tempFilePath = tempDirPath + File.separator + iFile.getName();
+
+            try {
+                try {
+                    ContentUtils.writeToFile(iFile, new File(tempFilePath));
+                } catch (IOException ex) {
+                    logger.log(Level.WARNING, String.format("Unable to write %s to temp directory. File name: %s", iFile.getName(), tempFilePath), ex); //NON-NLS
+                    // if we cannot make a copy of the $I file for later processing
+                    // move onto the next file
+                    continue;
+                }
+
+                RecycledFileMetaData metaData;
+                try {
+                    metaData = parseIFile(tempFilePath);
+                } catch (IOException ex) {
+                    logger.log(Level.WARNING, String.format("Unable to parse iFile %s", iFile.getName()), ex); //NON-NLS
+                    // Unable to parse the $I file move onto the next file
+                    continue;
+                }
+
+                String rFileName = iFile.getName().replace("$I", "$R"); //NON-NLS
+                List<AbstractFile> rFiles;
+
+                try {
+                    rFiles = fileManager.findFiles(dataSource, rFileName, iFile.getParentPath());
+                } catch (TskCoreException ex) {
+                    logger.log(Level.WARNING, String.format("Unable to find R file (%s) for I file (%s)", rFileName, iFile.getName()), ex); //NON-NLS
+                    // If there are no $R files go on to the next $I file
+                    continue;
+                }
+
+                for (AbstractFile rFile : rFiles) {
+                    if (context.dataSourceIngestIsCancelled()) {
+                        return;
+                    }
+
+                    if (iFile.getParentPath().equals(rFile.getParentPath())) {
+                        try {
+                            BlackboardArtifact bba = rFile.newArtifact(recycleBinArtifactType.getTypeID());
+                            bba.addAttribute(new BlackboardAttribute(TSK_PATH, getName(), metaData.getFileName()));
+                            bba.addAttribute(new BlackboardAttribute(TSK_DATETIME_DELETED, getName(), metaData.getDeletedTimeStamp()));
+
+                            postArtifact(bba);
+                        } catch (TskCoreException ex) {
+                            logger.log(Level.WARNING, String.format("Unable to add attributes to artifact %s", rFile.getName()), ex); //NON-NLS
+                        }
+                    }
+                }
+            } finally {
+                (new File(tempFilePath)).delete();
+            }
+        }
+
+        (new File(tempDirPath)).delete();
+    }
+
+    /**
+     * Parse the $I file.
+     *
+     * File format prior to Windows 10:
+     * <table>
+     * <tr><th>Offset</th><th>Size</th><th>Description</th></tr>
+     * <tr><td>0</td><td>8</td><td>Header</td></tr>
+     * <tr><td>8</td><td>8</td><td>File Size</td></tr>
+     * <tr><td>16</td><td>8</td><td>Deleted Timestamp</td></tr>
+     * <tr><td>24</td><td>520</td><td>File Name</td></tr>
+     * </table>
+     *
+     * File format Windows 10+
+     * <table>
+     * <tr><th>Offset</th><th>Size</th><th>Description</th></tr>
+     * <tr><td>0</td><td>8</td><td>Header</td></tr>
+     * <tr><td>8</td><td>8</td><td>File Size</td></tr>
+     * <tr><td>16</td><td>8</td><td>Deleted TimeStamp</td></tr>
+     * <tr><td>24</td><td>4</td><td>File Name Length</td></tr>
+     * <tr><td>28</td><td>var</td><td>File Name</td></tr>
+     * </table>
+     *
+     * For versions of Windows prior to 10, header = 0x01. Windows 10+ header ==
+     * 0x02
+     *
+     * @param iFilePath
+     *
+     * @throws FileNotFoundException
+     * @throws IOException
+     */
+    RecycledFileMetaData parseIFile(String iFilePath) throws FileNotFoundException, IOException {
+        byte[] allBytes = Files.readAllBytes(Paths.get(iFilePath));
+
+        ByteBuffer byteBuffer = ByteBuffer.wrap(allBytes);
+        byteBuffer.order(ByteOrder.LITTLE_ENDIAN);
+
+        long version = byteBuffer.getLong();
+        long fileSize = byteBuffer.getLong();
+        long timestamp = byteBuffer.getLong();
+  
+        // Convert from windows FILETIME to Unix Epoch seconds
+        timestamp = Util.filetimeToMillis(timestamp) / 1000;
+
+        byte[] stringBytes;
+
+        if (version == 1) {
+            stringBytes = Arrays.copyOfRange(allBytes, V1_FILE_NAME_OFFSET, allBytes.length);
+        } else {
+            int fileNameLength = byteBuffer.getInt();
+            stringBytes = Arrays.copyOfRange(allBytes, V2_FILE_NAME_OFFSET, fileNameLength);
+        }
+
+        String fileName = new String(stringBytes, "UTF-16LE"); //NON-NLS
+
+        return new RecycledFileMetaData(fileSize, timestamp, fileName);
+    }
+
+    /**
+     * Stores the data from the $I files.
+     */
+    final class RecycledFileMetaData {
+
+        private final long fileSize;
+        private final long deletedTimeStamp;
+        private final String fileName;
+
+        /**
+         * Constructs a new instance.
+         *
+         * @param fileSize         Size of the deleted file.
+         * @param deletedTimeStamp Time the file was deleted.
+         * @param fileName         Name of the deleted file.
+         */
+        RecycledFileMetaData(Long fileSize, long deletedTimeStamp, String fileName) {
+            this.fileSize = fileSize;
+            this.deletedTimeStamp = deletedTimeStamp;
+            this.fileName = fileName;
+        }
+
+        /**
+         * Returns the size of the recycled file.
+         * 
+         * @return Size of deleted file
+         */
+        long getFileSize() {
+            return fileSize;
+        }
+
+        /**
+         * Returns the time the file was deleted.
+         * 
+         * @return deleted time in epoch seconds.
+         */
+        long getDeletedTimeStamp() {
+            return deletedTimeStamp;
+        }
+
+        /**
+         * Returns the name of the deleted file.
+         * 
+         * @return String name of the deleted file
+         */
+        String getFileName() {
+            return fileName;
+        }
+    }
+}
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java
index db815e9274..a52b5b65e1 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java
@@ -77,6 +77,7 @@ public final class RAImageIngestModule implements DataSourceIngestModule {
         Extract dataSourceAnalyzer = new DataSourceUsageAnalyzer();
         Extract safari = new ExtractSafari();
         Extract zoneInfo = new ExtractZoneIdentifier();
+        Extract recycleBin = new ExtractRecycleBin();
 
         extractors.add(chrome);
         extractors.add(firefox);
@@ -84,6 +85,7 @@ public final class RAImageIngestModule implements DataSourceIngestModule {
         extractors.add(edge);
         extractors.add(safari);
         extractors.add(recentDocuments);
+        extractors.add(recycleBin);
         extractors.add(SEUQA); // this needs to run after the web browser modules
         extractors.add(registry); // this should run after quicker modules like the browser modules and needs to run before the DataSourceUsageAnalyzer
         extractors.add(osExtract); // this needs to run before the DataSourceUsageAnalyzer
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Util.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Util.java
index a6c6416416..ff95c60ca8 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Util.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Util.java
@@ -51,6 +51,12 @@ import org.sleuthkit.datamodel.TskCoreException;
 class Util {
 
     private static Logger logger = Logger.getLogger(Util.class.getName());
+    
+    /** Difference between Filetime epoch and Unix epoch (in ms). */
+    private static final long FILETIME_EPOCH_DIFF = 11644473600000L;
+
+    /** One millisecond expressed in units of 100s of nanoseconds. */
+    private static final long FILETIME_ONE_MILLISECOND = 10 * 1000;
 
     private Util() {
     }
@@ -176,4 +182,16 @@ class Util {
         }
         return results;
     }
+    
+    /**
+     * Converts a windows FILETIME to java-unix epoch milliseconds
+     * 
+     * @param filetime 100 nanosecond intervals from jan 1, 1601
+     * 
+     * @return java-unix epoch milliseconds
+     */
+    static long filetimeToMillis(final long filetime) {
+        return (filetime / FILETIME_ONE_MILLISECOND) - FILETIME_EPOCH_DIFF;
+    }
+
 }

From fa9db11e0c248fc8c940afa6c936e47bcc241d29 Mon Sep 17 00:00:00 2001
From: Kelly Kelly <kelly@basistech.com>
Date: Tue, 13 Aug 2019 14:26:06 -0400
Subject: [PATCH 054/192] Fixed typo

---
 .../org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java
index 10df98ae4c..fe32281fff 100755
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java
@@ -50,7 +50,7 @@ import org.sleuthkit.datamodel.TskCoreException;
 import org.sleuthkit.datamodel.TskDataException;
 
 /**
- * This module is based on the RecycleBin python module from Mark Mackinnon.
+ * This module is based on the RecycleBin python module from Mark McKinnon.
  *
  * @see
  * <a href="https://github.com/markmckinnon/Autopsy-Plugins/blob/master/Recycle_Bin/Recycle_Bin.py">Recycle_Bin.py</a>

From dc94944f320a2f7e473ee7cbbafa33577e7fd778 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Tue, 13 Aug 2019 17:43:42 -0400
Subject: [PATCH 055/192] Redesigned serialization

---
 ...uleStatus.java => ReportModuleConfig.java} |  42 ++++++-
 .../autopsy/report/ReportVisualPanel1.java    |   2 +-
 .../autopsy/report/ReportingConfig.java       |  19 +--
 .../autopsy/report/ReportingConfigLoader.java | 117 +++++++++++++++---
 4 files changed, 143 insertions(+), 37 deletions(-)
 rename Core/src/org/sleuthkit/autopsy/report/{ModuleStatus.java => ReportModuleConfig.java} (58%)

diff --git a/Core/src/org/sleuthkit/autopsy/report/ModuleStatus.java b/Core/src/org/sleuthkit/autopsy/report/ReportModuleConfig.java
similarity index 58%
rename from Core/src/org/sleuthkit/autopsy/report/ModuleStatus.java
rename to Core/src/org/sleuthkit/autopsy/report/ReportModuleConfig.java
index 9f68088c43..2ec5e7a260 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ModuleStatus.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportModuleConfig.java
@@ -21,13 +21,14 @@ package org.sleuthkit.autopsy.report;
 import java.io.Serializable;
 
 /**
- * Class for persisting information about a report module (e.g. whether the report
- * module is enabled).
+ * Class for persisting information about a report module (e.g. whether the
+ * report module is enabled).
  */
-final class ModuleStatus implements Serializable {
+final class ReportModuleConfig implements Serializable {
 
     private static final long serialVersionUID = 1L;
     private final String moduleName;
+    private transient ReportModuleSettings settings; // these settings get serialized individually
     private boolean enabled;
 
     /**
@@ -36,20 +37,53 @@ final class ModuleStatus implements Serializable {
      * @param module Implementation of a ReportModule interface
      * @param enabled Boolean flag whether the module is enabled
      */
-    ModuleStatus(ReportModule module, boolean enabled) {
+    ReportModuleConfig(ReportModule module, boolean enabled) {
         this.moduleName = module.getClass().getCanonicalName();
         this.enabled = enabled;
     }
 
+    /**
+     * Get full canonical report module name.
+     *
+     * @return Full canonical report module name.
+     */
     String getModuleClassName() {
         return moduleName;
     }
 
+    /**
+     * Set flag whether the report module is enabled.
+     *
+     * @param enabled Flag whether the report module is enabled.
+     */
     void setEnabled(boolean enabled) {
         this.enabled = enabled;
     }
 
+    /**
+     * Is report module enabled.
+     *
+     * @return True if the module is enabled, false otherwise.
+     */
     boolean isEnabled() {
         return this.enabled;
     }
+
+    /**
+     * Get settings object for the report module.
+     *
+     * @return the settings
+     */
+    ReportModuleSettings getModuleSettings() {
+        return settings;
+    }
+
+    /**
+     * Set settings for the report module.
+     *
+     * @param settings the settings to set
+     */
+    void setModuleSettings(ReportModuleSettings settings) {
+        this.settings = settings;
+    }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
index 6cb00a7011..d5c434a198 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
@@ -100,7 +100,7 @@ final class ReportVisualPanel1 extends JPanel implements ListSelectionListener {
         } else {
             popupWarning(portableCaseModule);
         }
-
+        
         // Results-HTML should always be first in the list of Report Modules.
         int indexOfHTMLReportModule = 0;
         for (ReportModule module : modules) {
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportingConfig.java b/Core/src/org/sleuthkit/autopsy/report/ReportingConfig.java
index c47590b0da..07ee700342 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportingConfig.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportingConfig.java
@@ -29,8 +29,7 @@ final class ReportingConfig implements Serializable {
 
     private static final long serialVersionUID = 1L;
     private String configName;
-    private List<ModuleStatus> moduleStatuses = new ArrayList<>();
-    private List<ReportModuleSettings> moduleSettings = new ArrayList<>();
+    private List<ReportModuleConfig> moduleConfigs = new ArrayList<>();
     private TableReportSettings tableReportSettings;
     private FileReportSettings fileReportSettings;
 
@@ -51,20 +50,12 @@ final class ReportingConfig implements Serializable {
         return this.configName;
     }
 
-    void setModulesStatuses(List<ModuleStatus> moduleStatuses) {
-        this.moduleStatuses = moduleStatuses;
+    void setModuleConfigs(List<ReportModuleConfig> moduleConfigs) {
+        this.moduleConfigs = moduleConfigs;
     }
 
-    List<ModuleStatus> getModuleStatuses() {
-        return this.moduleStatuses;
-    }
-
-    void setModuleSettings(List<ReportModuleSettings> moduleSettings) {
-        this.moduleSettings = moduleSettings;
-    }
-
-    List<ReportModuleSettings> getModuleSettings() {
-        return this.moduleSettings;
+    List<ReportModuleConfig> getModuleConfigs() {
+        return this.moduleConfigs;
     }
 
     void setTableReportSettings(TableReportSettings settings) {
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java b/Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java
index fe647be153..4c9b99bbae 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java
@@ -25,8 +25,12 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Iterator;
+import java.util.List;
+import java.util.logging.Level;
 import org.openide.util.io.NbObjectInputStream;
 import org.openide.util.io.NbObjectOutputStream;
+import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.PlatformUtil;
 
 /**
@@ -36,9 +40,13 @@ import org.sleuthkit.autopsy.coreutils.PlatformUtil;
  */
 final class ReportingConfigLoader {
 
+    private static final Logger logger = Logger.getLogger(ReportingConfigLoader.class.getName());
     private static final String REPORT_CONFIG_FOLDER = "ReportingConfigs"; //NON-NLS
     private static final String REPORT_CONFIG_FOLDER_PATH = Paths.get(PlatformUtil.getUserConfigDirectory(), ReportingConfigLoader.REPORT_CONFIG_FOLDER).toAbsolutePath().toString();
-    private static final String REPORT_CONFIG_FILE_EXTENSION = ".settings";
+    private static final String REPORT_SETTINGS_FILE_EXTENSION = ".settings";
+    private static final String TABLE_REPORT_CONFIG_FILE = "TableReportSettings.settings";
+    private static final String FILE_REPORT_CONFIG_FILE = "FileReportSettings.settings";
+    private static final String MODULE_CONFIG_FILE = "ModuleConfigs.settings";
 
     /**
      * Deserialize all of the settings that make up a reporting configuration in
@@ -52,27 +60,68 @@ final class ReportingConfigLoader {
      */
     static synchronized ReportingConfig loadConfig(String configName) throws ReportConfigException {
 
-        // construct the file path
-        Path reportFilePath = Paths.get(ReportingConfigLoader.REPORT_CONFIG_FOLDER_PATH, configName + REPORT_CONFIG_FILE_EXTENSION);
-        File reportFile = reportFilePath.toFile();
+        // construct the configuration directory path
+        Path reportDirPath = Paths.get(ReportingConfigLoader.REPORT_CONFIG_FOLDER_PATH, configName);
+        File reportDirectory = reportDirPath.toFile();
 
         // Return null if a reporting configuration for the given name does not exist.
-        if (!reportFile.exists()) {
+        if (!reportDirectory.exists()) {
             return null;
         }
 
-        if (!reportFile.isFile()|| !reportFile.canRead()) {
-            throw new ReportConfigException("Unable to read reporting configuration file " + reportFilePath.toString());
+        if (!reportDirectory.isDirectory() || !reportDirectory.canRead()) {
+            throw new ReportConfigException("Unable to read reporting configuration directory " + reportDirPath.toString());
         }
 
         // read in the configuration
-        ReportingConfig config = null;
-        try (NbObjectInputStream in = new NbObjectInputStream(new FileInputStream(reportFilePath.toString()))) {
-            config = (ReportingConfig) in.readObject();
+        ReportingConfig config = new ReportingConfig(configName);
+        
+        // read table report settings
+        String filePath = reportDirPath.toString() + File.separator + TABLE_REPORT_CONFIG_FILE;
+        try (NbObjectInputStream in = new NbObjectInputStream(new FileInputStream(filePath))) {
+            config.setTableReportSettings((TableReportSettings) in.readObject());
         } catch (IOException | ClassNotFoundException ex) {
-            throw new ReportConfigException("Unable to read reporting configuration " + reportFilePath.toString(), ex);
+            throw new ReportConfigException("Unable to read table report settings " + filePath, ex);
         }
-
+        
+        // read file report settings
+        filePath = reportDirPath.toString() + File.separator + FILE_REPORT_CONFIG_FILE;
+        try (NbObjectInputStream in = new NbObjectInputStream(new FileInputStream(filePath))) {
+            config.setFileReportSettings((FileReportSettings) in.readObject());
+        } catch (IOException | ClassNotFoundException ex) {
+            throw new ReportConfigException("Unable to read file report settings " + filePath, ex);
+        }
+        
+        // read list of module configuration objects
+        List<ReportModuleConfig> moduleConfigs = null;
+        filePath = reportDirPath.toString() + File.separator + MODULE_CONFIG_FILE;
+        try (NbObjectInputStream in = new NbObjectInputStream(new FileInputStream(filePath))) {
+            moduleConfigs = (List<ReportModuleConfig>) in.readObject();
+        } catch (IOException | ClassNotFoundException ex) {
+            throw new ReportConfigException("Unable to read module configurations list " + filePath, ex);
+        }
+        
+        if (moduleConfigs == null) {
+            throw new ReportConfigException("Failed to read module configurations list " + filePath);
+        }
+        
+        // read each ReportModuleSettings object individually
+        for (Iterator<ReportModuleConfig> iterator = moduleConfigs.iterator(); iterator.hasNext();) {
+            ReportModuleConfig moduleConfig = iterator.next();
+            filePath = reportDirPath.toString() + File.separator + moduleConfig.getModuleClassName() + REPORT_SETTINGS_FILE_EXTENSION;
+            try (NbObjectInputStream in = new NbObjectInputStream(new FileInputStream(filePath))) {
+                moduleConfig.setModuleSettings((ReportModuleSettings) in.readObject());
+            } catch (IOException | ClassNotFoundException ex) {
+                /* NOTE: we do not want to re-throw the exception because we do not 
+                want a single error while reading in a (3rd party) report module 
+                to prevent us from reading the entire reporting configuration.*/
+                logger.log(Level.SEVERE, "Unable to read module settings " + filePath, ex);
+                iterator.remove();
+            }
+        }
+        
+        config.setModuleConfigs(moduleConfigs);
+        
         return config;
     }
 
@@ -87,7 +136,7 @@ final class ReportingConfigLoader {
     static synchronized void saveConfig(ReportingConfig config) throws ReportConfigException {
 
         // construct the configuration directory path
-        Path pathToConfigDir = Paths.get(ReportingConfigLoader.REPORT_CONFIG_FOLDER_PATH);
+        Path pathToConfigDir = Paths.get(ReportingConfigLoader.REPORT_CONFIG_FOLDER_PATH, config.getName());
 
         // create configuration directory 
         try {
@@ -95,13 +144,45 @@ final class ReportingConfigLoader {
         } catch (IOException | SecurityException ex) {
             throw new ReportConfigException("Failed to create reporting configuration directory " + pathToConfigDir.toString(), ex);
         }
-        
-        // save the configuration
-        String filePath = pathToConfigDir.toString() + File.separator + config.getName() + REPORT_CONFIG_FILE_EXTENSION;
+
+        // save table report settings
+        String filePath = pathToConfigDir.toString() + File.separator + TABLE_REPORT_CONFIG_FILE;
         try (NbObjectOutputStream out = new NbObjectOutputStream(new FileOutputStream(filePath))) {
-            out.writeObject(config);
+            out.writeObject(config.getTableReportSettings());
         } catch (IOException ex) {
-            throw new ReportConfigException("Unable to save reporting configuration " + filePath, ex);
+            throw new ReportConfigException("Unable to save table report configuration " + filePath, ex);
+        }
+
+        // save file report settings
+        filePath = pathToConfigDir.toString() + File.separator + FILE_REPORT_CONFIG_FILE;
+        try (NbObjectOutputStream out = new NbObjectOutputStream(new FileOutputStream(filePath))) {
+            out.writeObject(config.getFileReportSettings());
+        } catch (IOException ex) {
+            throw new ReportConfigException("Unable to save file report configuration " + filePath, ex);
+        }
+
+        // save list of module configuration objects
+        filePath = pathToConfigDir.toString() + File.separator + MODULE_CONFIG_FILE;
+        List<ReportModuleConfig> moduleConfigs = config.getModuleConfigs();
+        try (NbObjectOutputStream out = new NbObjectOutputStream(new FileOutputStream(filePath))) {
+            out.writeObject(moduleConfigs);
+        } catch (IOException ex) {
+            throw new ReportConfigException("Unable to save module configurations list " + filePath, ex);
+        }
+
+        // save each ReportModuleSettings object individually
+        /* NOTE: This is done to protect us from errors in reading/writing 3rd 
+        party report module settings. If we were to serialize the entire ReportingConfig 
+        object, then a single error while reading in a 3rd party report module 
+        would prevent us from reading the entire reporting configuration.*/
+        for (ReportModuleConfig moduleConfig : moduleConfigs) {
+            ReportModuleSettings settings = moduleConfig.getModuleSettings();
+            filePath = pathToConfigDir.toString() + File.separator + moduleConfig.getModuleClassName() + REPORT_SETTINGS_FILE_EXTENSION;
+            try (NbObjectOutputStream out = new NbObjectOutputStream(new FileOutputStream(filePath))) {
+                out.writeObject(settings);
+            } catch (IOException ex) {
+                throw new ReportConfigException("Unable to save module settings " + filePath, ex);
+            }
         }
     }
 

From ec4803309523cda4cd30dbf5eb925bfd10f3c485 Mon Sep 17 00:00:00 2001
From: Kelly Kelly <kelly@basistech.com>
Date: Wed, 14 Aug 2019 10:56:11 -0400
Subject: [PATCH 056/192] Added support for usernames

---
 .../recentactivity/ExtractRecycleBin.java     | 65 ++++++++++++++++---
 .../recentactivity/RAImageIngestModule.java   |  2 +-
 2 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java
index fe32281fff..4cbcad3b62 100755
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java
@@ -30,7 +30,9 @@ import java.nio.ByteOrder;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.logging.Level;
 import org.openide.util.NbBundle.Messages;
 import org.sleuthkit.autopsy.casemodule.Case;
@@ -41,11 +43,13 @@ import org.sleuthkit.autopsy.ingest.DataSourceIngestModuleProgress;
 import org.sleuthkit.autopsy.ingest.IngestJobContext;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.BlackboardArtifact;
+import static org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE.TSK_OS_ACCOUNT;
 import org.sleuthkit.datamodel.BlackboardAttribute;
 import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DATETIME_DELETED;
 import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_PATH;
+import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_USER_ID;
+import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_USER_NAME;
 import org.sleuthkit.datamodel.Content;
-import org.sleuthkit.datamodel.SleuthkitCase;
 import org.sleuthkit.datamodel.TskCoreException;
 import org.sleuthkit.datamodel.TskDataException;
 
@@ -76,27 +80,36 @@ final class ExtractRecycleBin extends Extract {
     void process(Content dataSource, IngestJobContext context, DataSourceIngestModuleProgress progressBar) {
         FileManager fileManager = Case.getCurrentCase().getServices().getFileManager();
         String tempDirPath = RAImageIngestModule.getRATempPath(Case.getCurrentCase(), "recyclebin"); //NON-NLS
-        SleuthkitCase skCase = Case.getCurrentCase().getSleuthkitCase();
-
-        // At this time it was decided tjat we would not include TSK_RECYCLE_BIN
+        
+        // At this time it was decided that we would not include TSK_RECYCLE_BIN
         // in the default list of BlackboardArtifact types.
         try {
-            skCase.addBlackboardArtifactType(RECYCLE_BIN_ARTIFACT_NAME, "Recycle Bin"); //NON-NLS
+            tskCase.addBlackboardArtifactType(RECYCLE_BIN_ARTIFACT_NAME, "Recycle Bin"); //NON-NLS
         } catch (TskCoreException ex) {
             logger.log(Level.WARNING, String.format("%s may not have been created.", RECYCLE_BIN_ARTIFACT_NAME), ex);
         } catch (TskDataException ex) {
-            logger.log(Level.WARNING, String.format("%s may have already been defined for this case", RECYCLE_BIN_ARTIFACT_NAME), ex);
+            logger.log(Level.INFO, String.format("%s may have already been defined for this case", RECYCLE_BIN_ARTIFACT_NAME));
         }
 
         BlackboardArtifact.Type recycleBinArtifactType;
 
         try {
-            recycleBinArtifactType = skCase.getArtifactType(RECYCLE_BIN_ARTIFACT_NAME);
+            recycleBinArtifactType = tskCase.getArtifactType(RECYCLE_BIN_ARTIFACT_NAME);
         } catch (TskCoreException ex) {
             logger.log(Level.WARNING, String.format("Unable to retrive custom artifact type %s", RECYCLE_BIN_ARTIFACT_NAME), ex); // NON-NLS
             // If this doesn't work bail.
             return;
         }
+        Map<String, String> userNameMap;
+        
+        try {
+            userNameMap = makeUserNameMap(dataSource);
+        } catch (TskCoreException ex) {
+           logger.log(Level.WARNING, "Unable to create OS Account user name map", ex);
+           // This is not the end of the world we will just continue without 
+           // user names
+           userNameMap = new HashMap<>();
+        }
 
         List<AbstractFile> iFiles;
 
@@ -135,6 +148,9 @@ final class ExtractRecycleBin extends Extract {
                 }
 
                 String rFileName = iFile.getName().replace("$I", "$R"); //NON-NLS
+                String userID = getUserIDFromPath(iFile.getParentPath());
+                String userName = userNameMap.get(userID);
+                
                 List<AbstractFile> rFiles;
 
                 try {
@@ -155,6 +171,7 @@ final class ExtractRecycleBin extends Extract {
                             BlackboardArtifact bba = rFile.newArtifact(recycleBinArtifactType.getTypeID());
                             bba.addAttribute(new BlackboardAttribute(TSK_PATH, getName(), metaData.getFileName()));
                             bba.addAttribute(new BlackboardAttribute(TSK_DATETIME_DELETED, getName(), metaData.getDeletedTimeStamp()));
+                            bba.addAttribute(new BlackboardAttribute(TSK_USER_NAME, getName(), userName != null ? userName : ""));
 
                             postArtifact(bba);
                         } catch (TskCoreException ex) {
@@ -218,14 +235,44 @@ final class ExtractRecycleBin extends Extract {
         if (version == 1) {
             stringBytes = Arrays.copyOfRange(allBytes, V1_FILE_NAME_OFFSET, allBytes.length);
         } else {
-            int fileNameLength = byteBuffer.getInt();
-            stringBytes = Arrays.copyOfRange(allBytes, V2_FILE_NAME_OFFSET, fileNameLength);
+            int fileNameLength = byteBuffer.getInt() * 2; //Twice the bytes for unicode
+            stringBytes = Arrays.copyOfRange(allBytes, V2_FILE_NAME_OFFSET, V2_FILE_NAME_OFFSET + fileNameLength);
         }
 
         String fileName = new String(stringBytes, "UTF-16LE"); //NON-NLS
 
         return new RecycledFileMetaData(fileSize, timestamp, fileName);
     }
+    
+        
+    private Map<String, String> makeUserNameMap(Content dataSource) throws TskCoreException{
+        Map<String, String> userNameMap = new HashMap<>();
+      
+        List<BlackboardArtifact> accounts = blackboard.getArtifacts(TSK_OS_ACCOUNT.getTypeID(), dataSource.getId());
+        
+        for (BlackboardArtifact account: accounts) {
+            BlackboardAttribute nameAttribute = getAttributeForArtifact(account, TSK_USER_NAME);
+            BlackboardAttribute idAttribute = getAttributeForArtifact(account, TSK_USER_ID);
+            
+            String userName = nameAttribute != null ? nameAttribute.getDisplayString() : "";
+            String userID = idAttribute != null ? idAttribute.getDisplayString() : "";
+            
+            if (!userID.isEmpty()) {
+                userNameMap.put(userID, userName);
+            }
+        }
+        
+        return userNameMap;
+    }
+    
+    private String getUserIDFromPath(String iFileParentPath) {
+        int index = iFileParentPath.indexOf("-") - 1;
+        return (iFileParentPath.substring(index)).replace("/", "");
+    }
+    
+    private BlackboardAttribute getAttributeForArtifact(BlackboardArtifact artifact, BlackboardAttribute.ATTRIBUTE_TYPE type) throws TskCoreException{
+       return artifact.getAttribute(new BlackboardAttribute.Type(BlackboardAttribute.ATTRIBUTE_TYPE.fromID(type.getTypeID())));
+    }
 
     /**
      * Stores the data from the $I files.
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java
index a52b5b65e1..444a6d638d 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java
@@ -85,12 +85,12 @@ public final class RAImageIngestModule implements DataSourceIngestModule {
         extractors.add(edge);
         extractors.add(safari);
         extractors.add(recentDocuments);
-        extractors.add(recycleBin);
         extractors.add(SEUQA); // this needs to run after the web browser modules
         extractors.add(registry); // this should run after quicker modules like the browser modules and needs to run before the DataSourceUsageAnalyzer
         extractors.add(osExtract); // this needs to run before the DataSourceUsageAnalyzer
         extractors.add(dataSourceAnalyzer); //this needs to run after ExtractRegistry and ExtractOs
         extractors.add(zoneInfo); // this needs to run after the web browser modules
+        extractors.add(recycleBin); // this needs to run after ExtractRegistry and ExtractOS
 
         browserExtractors.add(chrome);
         browserExtractors.add(firefox);

From ed4a6ec1058920bb52e600741ea11c889d339f53 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Wed, 14 Aug 2019 11:28:29 -0400
Subject: [PATCH 057/192] Added 'all tagged results' radio button, other UI
 changes

---
 .../autopsy/report/Bundle.properties          |  7 +-
 .../autopsy/report/Bundle.properties-MERGED   |  7 +-
 .../autopsy/report/Bundle_ja.properties       |  3 +-
 .../autopsy/report/ReportVisualPanel2.form    | 49 ++++++----
 .../autopsy/report/ReportVisualPanel2.java    | 90 ++++++++++++-------
 .../autopsy/report/ReportWizardPanel2.java    |  2 +-
 6 files changed, 101 insertions(+), 57 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties
index fd94e5fe55..fcdf92c2f3 100644
--- a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties
@@ -8,12 +8,11 @@ DefaultReportConfigurationPanel.infoLabel.text=This report will be configured on
 ReportVisualPanel2.dataLabel.text=Select which data to report on:
 ReportVisualPanel2.deselectAllButton.text=Deselect All
 ReportVisualPanel2.selectAllButton.text=Select All
-ReportVisualPanel2.advancedButton.text=Data Types
+ReportVisualPanel2.advancedButton.text=Result Types
 ArtifactSelectionDialog.deselectAllButton.text=Deselect All
 ArtifactSelectionDialog.selectAllButton.text=Select All
 ReportGenerationPanel.closeButton.text=Close
 ReportGenerationPanel.titleLabel.text=Report Generation Progress
-ReportVisualPanel2.taggedResultsRadioButton.text=Tagged Results
 ReportVisualPanel2.allResultsRadioButton.text=All Results
 ReportWizardFileOptionsVisualPanel.selectAllButton.text=Select All
 ReportWizardFileOptionsVisualPanel.deselectAllButton.text=Deselect All
@@ -206,7 +205,7 @@ ReportProgressDialog.complete.cancelButton.text=Complete
 ReportProgressDialog.cancel.cancelButton.toolTipText=Canceled
 ReportProgressDialog.cancel.procLbl.text=Canceled
 ReportVisualPanel1.getName.text=Select and Configure Report Modules
-ReportVisualPanel2.getName.text=Configure Artifact Reports
+ReportVisualPanel2.getName.text=Configure Report
 ReportWizardAction.actionName.text=Generate Report
 ReportWizardAction.reportWiz.title=Generate Report
 ReportWizardAction.toolBarButton.text=Generate Report
@@ -270,3 +269,5 @@ ReportProgressDialog.separationLabel.text=:
 ReportProgressDialog.pathLabel.text=pathLabel
 ReportProgressDialog.reportLabel.text=reportLabel
 ReportProgressDialog.statusMessageLabel.text=processingLabel
+ReportVisualPanel2.specificTaggedResultsRadioButton.text=Specific Tagged Results
+ReportVisualPanel2.allTaggedResultsRadioButton.text=All Tagged Results
diff --git a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties-MERGED
index ea5d7670a5..f642928717 100755
--- a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties-MERGED
@@ -68,12 +68,11 @@ DefaultReportConfigurationPanel.infoLabel.text=This report will be configured on
 ReportVisualPanel2.dataLabel.text=Select which data to report on:
 ReportVisualPanel2.deselectAllButton.text=Deselect All
 ReportVisualPanel2.selectAllButton.text=Select All
-ReportVisualPanel2.advancedButton.text=Data Types
+ReportVisualPanel2.advancedButton.text=Result Types
 ArtifactSelectionDialog.deselectAllButton.text=Deselect All
 ArtifactSelectionDialog.selectAllButton.text=Select All
 ReportGenerationPanel.closeButton.text=Close
 ReportGenerationPanel.titleLabel.text=Report Generation Progress
-ReportVisualPanel2.taggedResultsRadioButton.text=Tagged Results
 ReportVisualPanel2.allResultsRadioButton.text=All Results
 ReportWizardFileOptionsVisualPanel.selectAllButton.text=Select All
 ReportWizardFileOptionsVisualPanel.deselectAllButton.text=Deselect All
@@ -266,7 +265,7 @@ ReportProgressDialog.complete.cancelButton.text=Complete
 ReportProgressDialog.cancel.cancelButton.toolTipText=Canceled
 ReportProgressDialog.cancel.procLbl.text=Canceled
 ReportVisualPanel1.getName.text=Select and Configure Report Modules
-ReportVisualPanel2.getName.text=Configure Artifact Reports
+ReportVisualPanel2.getName.text=Configure Report
 ReportWizardAction.actionName.text=Generate Report
 ReportWizardAction.reportWiz.title=Generate Report
 ReportWizardAction.toolBarButton.text=Generate Report
@@ -330,5 +329,7 @@ ReportProgressDialog.separationLabel.text=:
 ReportProgressDialog.pathLabel.text=pathLabel
 ReportProgressDialog.reportLabel.text=reportLabel
 ReportProgressDialog.statusMessageLabel.text=processingLabel
+ReportVisualPanel2.specificTaggedResultsRadioButton.text=Specific Tagged Results
+ReportVisualPanel2.allTaggedResultsRadioButton.text=All Tagged Results
 ReportWizardPortableCaseOptionsVisualPanel.getName.title=Choose Portable Case settings
 TableReportGenerator.StatusColumn.Header=Review Status
diff --git a/Core/src/org/sleuthkit/autopsy/report/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/report/Bundle_ja.properties
index 6c2db29da2..35b35fc801 100644
--- a/Core/src/org/sleuthkit/autopsy/report/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/report/Bundle_ja.properties
@@ -12,7 +12,6 @@ ArtifactSelectionDialog.deselectAllButton.text=\u5168\u3066\u9078\u629e\u89e3\u9
 ArtifactSelectionDialog.selectAllButton.text=\u5168\u3066\u9078\u629e
 ReportGenerationPanel.closeButton.text=\u9589\u3058\u308b
 ReportGenerationPanel.titleLabel.text=\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u30d7\u30ed\u30b0\u30ec\u30b9
-ReportVisualPanel2.taggedResultsRadioButton.text=\u30bf\u30b0\u3055\u308c\u305f\u7d50\u679c
 ReportVisualPanel2.allResultsRadioButton.text=\u5168\u3066\u306e\u7d50\u679c
 ReportWizardFileOptionsVisualPanel.selectAllButton.text=\u5168\u3066\u9078\u629e
 ReportWizardFileOptionsVisualPanel.deselectAllButton.text=\u5168\u3066\u9078\u629e\u89e3\u9664
@@ -244,3 +243,5 @@ ReportProgressDialog.separationLabel.text=:
 ReportProgressDialog.pathLabel.text=\u30d1\u30b9\u30e9\u30d9\u30eb
 ReportProgressDialog.reportLabel.text=\u30ec\u30dd\u30fc\u30c8\u30e9\u30d9\u30eb
 ReportProgressDialog.statusMessageLabel.text=\u30d7\u30ed\u30bb\u30b7\u30f3\u30b0\u30e9\u30d9\u30eb
+ReportVisualPanel2.specificTaggedResultsRadioButton.text=\u30bf\u30b0\u3055\u308c\u305f\u7d50\u679c
+ReportVisualPanel2.allTaggedResultsRadioButton.text=\u5168\u3066\u306e\u7d50\u679c
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.form b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.form
index a67060d6f3..1c704cf6cb 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.form
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.form
@@ -25,13 +25,13 @@
   <Layout>
     <DimensionLayout dim="0">
       <Group type="103" groupAlignment="0" attributes="0">
-          <Group type="102" attributes="0">
+          <Group type="102" alignment="0" attributes="0">
               <EmptySpace max="-2" attributes="0"/>
               <Group type="103" groupAlignment="0" attributes="0">
-                  <Group type="102" attributes="0">
-                      <EmptySpace min="-2" pref="21" max="-2" attributes="0"/>
+                  <Group type="102" alignment="0" attributes="0">
+                      <EmptySpace min="-2" pref="27" max="-2" attributes="0"/>
                       <Component id="tagsScrollPane" max="32767" attributes="0"/>
-                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                      <EmptySpace max="-2" attributes="0"/>
                       <Group type="103" groupAlignment="0" max="-2" attributes="0">
                           <Component id="advancedButton" linkSize="1" alignment="1" max="32767" attributes="0"/>
                           <Component id="deselectAllButton" linkSize="1" max="32767" attributes="0"/>
@@ -40,11 +40,12 @@
                   </Group>
                   <Group type="102" attributes="0">
                       <Group type="103" groupAlignment="0" attributes="0">
-                          <Component id="taggedResultsRadioButton" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Component id="allTaggedResultsRadioButton" min="-2" max="-2" attributes="0"/>
                           <Component id="dataLabel" alignment="0" min="-2" max="-2" attributes="0"/>
                           <Component id="allResultsRadioButton" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Component id="specificTaggedResultsRadioButton" alignment="0" min="-2" max="-2" attributes="0"/>
                       </Group>
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                      <EmptySpace min="0" pref="402" max="32767" attributes="0"/>
                   </Group>
               </Group>
               <EmptySpace max="-2" attributes="0"/>
@@ -58,33 +59,34 @@
               <Component id="dataLabel" min="-2" max="-2" attributes="0"/>
               <EmptySpace type="unrelated" max="-2" attributes="0"/>
               <Component id="allResultsRadioButton" min="-2" max="-2" attributes="0"/>
-              <EmptySpace type="unrelated" max="-2" attributes="0"/>
-              <Component id="taggedResultsRadioButton" min="-2" max="-2" attributes="0"/>
-              <EmptySpace min="-2" pref="7" max="-2" attributes="0"/>
-              <Group type="103" groupAlignment="0" attributes="0">
-                  <Group type="102" attributes="0">
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="allTaggedResultsRadioButton" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="specificTaggedResultsRadioButton" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="32767" attributes="0"/>
+              <Group type="103" groupAlignment="0" max="-2" attributes="0">
+                  <Group type="102" alignment="1" attributes="0">
                       <Component id="selectAllButton" min="-2" max="-2" attributes="0"/>
                       <EmptySpace max="-2" attributes="0"/>
                       <Component id="deselectAllButton" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace min="0" pref="70" max="32767" attributes="0"/>
+                      <EmptySpace max="32767" attributes="0"/>
+                      <Component id="advancedButton" min="-2" max="-2" attributes="0"/>
                   </Group>
-                  <Component id="tagsScrollPane" max="32767" attributes="0"/>
+                  <Component id="tagsScrollPane" alignment="1" min="-2" pref="161" max="-2" attributes="0"/>
               </Group>
               <EmptySpace max="-2" attributes="0"/>
-              <Component id="advancedButton" min="-2" max="-2" attributes="0"/>
-              <EmptySpace max="-2" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
   </Layout>
   <SubComponents>
-    <Component class="javax.swing.JRadioButton" name="taggedResultsRadioButton">
+    <Component class="javax.swing.JRadioButton" name="specificTaggedResultsRadioButton">
       <Properties>
         <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
           <ComponentRef name="optionsButtonGroup"/>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportVisualPanel2.taggedResultsRadioButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportVisualPanel2.specificTaggedResultsRadioButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
@@ -160,5 +162,18 @@
         <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="advancedButtonActionPerformed"/>
       </Events>
     </Component>
+    <Component class="javax.swing.JRadioButton" name="allTaggedResultsRadioButton">
+      <Properties>
+        <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
+          <ComponentRef name="optionsButtonGroup"/>
+        </Property>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportVisualPanel2.allTaggedResultsRadioButton.text" 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="allTaggedResultsRadioButtonActionPerformed"/>
+      </Events>
+    </Component>
   </SubComponents>
 </Form>
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java
index 03f3bda809..76771b9b1a 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java
@@ -79,20 +79,30 @@ final class ReportVisualPanel2 extends JPanel {
         this.allResultsRadioButton.addChangeListener(new ChangeListener() {
             @Override
             public void stateChanged(ChangeEvent e) {
-                tagsList.setEnabled(taggedResultsRadioButton.isSelected());
-                selectAllButton.setEnabled(taggedResultsRadioButton.isSelected());
-                deselectAllButton.setEnabled(taggedResultsRadioButton.isSelected());
-                advancedButton.setEnabled(!taggedResultsRadioButton.isSelected());
+                tagsList.setEnabled(specificTaggedResultsRadioButton.isSelected());
+                selectAllButton.setEnabled(specificTaggedResultsRadioButton.isSelected());
+                deselectAllButton.setEnabled(specificTaggedResultsRadioButton.isSelected());
+                advancedButton.setEnabled(!specificTaggedResultsRadioButton.isSelected());
                 updateFinishButton();
             }
         });
-        this.taggedResultsRadioButton.addChangeListener(new ChangeListener() {
+        this.allTaggedResultsRadioButton.addChangeListener(new ChangeListener() {
             @Override
             public void stateChanged(ChangeEvent e) {
-                tagsList.setEnabled(taggedResultsRadioButton.isSelected());
-                selectAllButton.setEnabled(taggedResultsRadioButton.isSelected());
-                deselectAllButton.setEnabled(taggedResultsRadioButton.isSelected());
-                advancedButton.setEnabled(!taggedResultsRadioButton.isSelected());
+                tagsList.setEnabled(specificTaggedResultsRadioButton.isSelected());
+                selectAllButton.setEnabled(specificTaggedResultsRadioButton.isSelected());
+                deselectAllButton.setEnabled(specificTaggedResultsRadioButton.isSelected());
+                advancedButton.setEnabled(!specificTaggedResultsRadioButton.isSelected());
+                updateFinishButton();
+            }
+        });
+        this.specificTaggedResultsRadioButton.addChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                tagsList.setEnabled(specificTaggedResultsRadioButton.isSelected());
+                selectAllButton.setEnabled(specificTaggedResultsRadioButton.isSelected());
+                deselectAllButton.setEnabled(specificTaggedResultsRadioButton.isSelected());
+                advancedButton.setEnabled(!specificTaggedResultsRadioButton.isSelected());
                 updateFinishButton();
             }
         });
@@ -124,7 +134,7 @@ final class ReportVisualPanel2 extends JPanel {
         tagsList.addMouseListener(new MouseAdapter() {
             @Override
             public void mousePressed(MouseEvent evt) {
-                if (!taggedResultsRadioButton.isSelected()) {
+                if (!specificTaggedResultsRadioButton.isSelected()) {
                     return;
                 }
                 int index = tagsList.locationToIndex(evt.getPoint());
@@ -207,7 +217,7 @@ final class ReportVisualPanel2 extends JPanel {
      * component selections.
      */
     private void updateFinishButton() {
-        if (taggedResultsRadioButton.isSelected()) {
+        if (specificTaggedResultsRadioButton.isSelected()) {
             wizPanel.setFinish(areTagsSelected());
         } else {
             wizPanel.setFinish(true);
@@ -215,10 +225,10 @@ final class ReportVisualPanel2 extends JPanel {
     }
 
     /**
-     * @return true if the Tags radio button is selected, false otherwise
+     * @return true if the Specific Tags radio button is selected, false otherwise
      */
-    boolean isTaggedResultsRadioButtonSelected() {
-        return taggedResultsRadioButton.isSelected();
+    boolean isSpecificTaggedResultsRadioButtonSelected() {
+        return specificTaggedResultsRadioButton.isSelected();
     }
 
     /**
@@ -243,7 +253,7 @@ final class ReportVisualPanel2 extends JPanel {
     private void initComponents() {
 
         optionsButtonGroup = new javax.swing.ButtonGroup();
-        taggedResultsRadioButton = new javax.swing.JRadioButton();
+        specificTaggedResultsRadioButton = new javax.swing.JRadioButton();
         allResultsRadioButton = new javax.swing.JRadioButton();
         dataLabel = new javax.swing.JLabel();
         selectAllButton = new javax.swing.JButton();
@@ -251,11 +261,12 @@ final class ReportVisualPanel2 extends JPanel {
         tagsScrollPane = new javax.swing.JScrollPane();
         tagsList = new javax.swing.JList<>();
         advancedButton = new javax.swing.JButton();
+        allTaggedResultsRadioButton = new javax.swing.JRadioButton();
 
         setPreferredSize(new java.awt.Dimension(650, 250));
 
-        optionsButtonGroup.add(taggedResultsRadioButton);
-        org.openide.awt.Mnemonics.setLocalizedText(taggedResultsRadioButton, org.openide.util.NbBundle.getMessage(ReportVisualPanel2.class, "ReportVisualPanel2.taggedResultsRadioButton.text")); // NOI18N
+        optionsButtonGroup.add(specificTaggedResultsRadioButton);
+        org.openide.awt.Mnemonics.setLocalizedText(specificTaggedResultsRadioButton, org.openide.util.NbBundle.getMessage(ReportVisualPanel2.class, "ReportVisualPanel2.specificTaggedResultsRadioButton.text")); // NOI18N
 
         optionsButtonGroup.add(allResultsRadioButton);
         org.openide.awt.Mnemonics.setLocalizedText(allResultsRadioButton, org.openide.util.NbBundle.getMessage(ReportVisualPanel2.class, "ReportVisualPanel2.allResultsRadioButton.text")); // NOI18N
@@ -292,6 +303,14 @@ final class ReportVisualPanel2 extends JPanel {
             }
         });
 
+        optionsButtonGroup.add(allTaggedResultsRadioButton);
+        org.openide.awt.Mnemonics.setLocalizedText(allTaggedResultsRadioButton, org.openide.util.NbBundle.getMessage(ReportVisualPanel2.class, "ReportVisualPanel2.allTaggedResultsRadioButton.text")); // NOI18N
+        allTaggedResultsRadioButton.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                allTaggedResultsRadioButtonActionPerformed(evt);
+            }
+        });
+
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
@@ -300,19 +319,20 @@ final class ReportVisualPanel2 extends JPanel {
                 .addContainerGap()
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addGroup(layout.createSequentialGroup()
-                        .addGap(21, 21, 21)
+                        .addGap(27, 27, 27)
                         .addComponent(tagsScrollPane)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                         .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
                             .addComponent(advancedButton, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                             .addComponent(deselectAllButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                             .addComponent(selectAllButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
                     .addGroup(layout.createSequentialGroup()
                         .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addComponent(taggedResultsRadioButton)
+                            .addComponent(allTaggedResultsRadioButton)
                             .addComponent(dataLabel)
-                            .addComponent(allResultsRadioButton))
-                        .addGap(0, 0, Short.MAX_VALUE)))
+                            .addComponent(allResultsRadioButton)
+                            .addComponent(specificTaggedResultsRadioButton))
+                        .addGap(0, 402, Short.MAX_VALUE)))
                 .addContainerGap())
         );
 
@@ -325,18 +345,19 @@ final class ReportVisualPanel2 extends JPanel {
                 .addComponent(dataLabel)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                 .addComponent(allResultsRadioButton)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                .addComponent(taggedResultsRadioButton)
-                .addGap(7, 7, 7)
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addGroup(layout.createSequentialGroup()
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(allTaggedResultsRadioButton)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(specificTaggedResultsRadioButton)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+                    .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
                         .addComponent(selectAllButton)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                         .addComponent(deselectAllButton)
-                        .addGap(0, 70, Short.MAX_VALUE))
-                    .addComponent(tagsScrollPane))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(advancedButton)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                        .addComponent(advancedButton))
+                    .addComponent(tagsScrollPane, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 161, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addContainerGap())
         );
     }// </editor-fold>//GEN-END:initComponents
@@ -357,14 +378,19 @@ final class ReportVisualPanel2 extends JPanel {
         setAllTaggedResultsSelected(false);
     }//GEN-LAST:event_allResultsRadioButtonActionPerformed
 
+    private void allTaggedResultsRadioButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_allTaggedResultsRadioButtonActionPerformed
+        setAllTaggedResultsSelected(true);
+    }//GEN-LAST:event_allTaggedResultsRadioButtonActionPerformed
+
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JButton advancedButton;
     private javax.swing.JRadioButton allResultsRadioButton;
+    private javax.swing.JRadioButton allTaggedResultsRadioButton;
     private javax.swing.JLabel dataLabel;
     private javax.swing.JButton deselectAllButton;
     private javax.swing.ButtonGroup optionsButtonGroup;
     private javax.swing.JButton selectAllButton;
-    private javax.swing.JRadioButton taggedResultsRadioButton;
+    private javax.swing.JRadioButton specificTaggedResultsRadioButton;
     private javax.swing.JList<String> tagsList;
     private javax.swing.JScrollPane tagsScrollPane;
     // End of variables declaration//GEN-END:variables
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java
index 781ae1ffe8..a8abb0664f 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java
@@ -98,6 +98,6 @@ class ReportWizardPanel2 implements WizardDescriptor.Panel<WizardDescriptor> {
     public void storeSettings(WizardDescriptor wiz) {
         wiz.putProperty("tagStates", getComponent().getTagStates()); //NON-NLS
         wiz.putProperty("artifactStates", getComponent().getArtifactStates()); //NON-NLS
-        wiz.putProperty("isTagsSelected", getComponent().isTaggedResultsRadioButtonSelected()); //NON-NLS
+        wiz.putProperty("isTagsSelected", getComponent().isSpecificTaggedResultsRadioButtonSelected()); //NON-NLS
     }
 }

From 06028be983cae64dad8dc6f6be33ab9b0f98c65e Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Wed, 14 Aug 2019 11:34:58 -0400
Subject: [PATCH 058/192] Changes to ArtifactSelectionDialog

---
 .../sleuthkit/autopsy/report/ArtifactSelectionDialog.form    | 5 ++++-
 .../sleuthkit/autopsy/report/ArtifactSelectionDialog.java    | 3 ++-
 Core/src/org/sleuthkit/autopsy/report/Bundle.properties      | 5 +++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/ArtifactSelectionDialog.form b/Core/src/org/sleuthkit/autopsy/report/ArtifactSelectionDialog.form
index 76a6f6cec7..7afc432836 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ArtifactSelectionDialog.form
+++ b/Core/src/org/sleuthkit/autopsy/report/ArtifactSelectionDialog.form
@@ -36,7 +36,7 @@
                   </Group>
                   <Group type="102" alignment="0" attributes="0">
                       <Component id="titleLabel" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace min="0" pref="221" max="32767" attributes="0"/>
+                      <EmptySpace min="0" pref="195" max="32767" attributes="0"/>
                   </Group>
                   <Group type="102" alignment="1" attributes="0">
                       <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
@@ -107,6 +107,9 @@
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ArtifactSelectionDialog.titleLabel.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/report/Bundle.properties" key="ArtifactSelectionDialog.titleLabel.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JButton" name="selectAllButton">
diff --git a/Core/src/org/sleuthkit/autopsy/report/ArtifactSelectionDialog.java b/Core/src/org/sleuthkit/autopsy/report/ArtifactSelectionDialog.java
index b0655dfa2b..a01853aa37 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ArtifactSelectionDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ArtifactSelectionDialog.java
@@ -159,6 +159,7 @@ public class ArtifactSelectionDialog extends javax.swing.JDialog {
         });
 
         org.openide.awt.Mnemonics.setLocalizedText(titleLabel, org.openide.util.NbBundle.getMessage(ArtifactSelectionDialog.class, "ArtifactSelectionDialog.titleLabel.text")); // NOI18N
+        titleLabel.setToolTipText(org.openide.util.NbBundle.getMessage(ArtifactSelectionDialog.class, "ArtifactSelectionDialog.titleLabel.toolTipText")); // NOI18N
 
         org.openide.awt.Mnemonics.setLocalizedText(selectAllButton, org.openide.util.NbBundle.getMessage(ArtifactSelectionDialog.class, "ArtifactSelectionDialog.selectAllButton.text")); // NOI18N
         selectAllButton.addActionListener(new java.awt.event.ActionListener() {
@@ -189,7 +190,7 @@ public class ArtifactSelectionDialog extends javax.swing.JDialog {
                             .addComponent(selectAllButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
                     .addGroup(layout.createSequentialGroup()
                         .addComponent(titleLabel)
-                        .addGap(0, 221, Short.MAX_VALUE))
+                        .addGap(0, 195, Short.MAX_VALUE))
                     .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
                         .addGap(0, 0, Short.MAX_VALUE)
                         .addComponent(okButton)))
diff --git a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties
index fcdf92c2f3..0a725a2ae1 100644
--- a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties
@@ -1,6 +1,6 @@
 OpenIDE-Module-Name=Report
 CTL_ReportWizardAction=Run Report
-ArtifactSelectionDialog.titleLabel.text=Select which artifacts you would like to report on:
+ArtifactSelectionDialog.titleLabel.text=Select which result types you would like to report on:
 ArtifactSelectionDialog.okButton.text=OK
 ReportVisualPanel1.reportModulesLabel.text=Report Modules:
 ReportVisualPanel1.invalidModuleWarning=Encountered an invalid Report Module ({0})
@@ -17,7 +17,7 @@ ReportVisualPanel2.allResultsRadioButton.text=All Results
 ReportWizardFileOptionsVisualPanel.selectAllButton.text=Select All
 ReportWizardFileOptionsVisualPanel.deselectAllButton.text=Deselect All
 ReportWizardFileOptionsVisualPanel.jLabel1.text=Select items to include in File Report:
-ArtifactSelectionDialog.dlgTitle.text=Advanced Artifact Selection
+ArtifactSelectionDialog.dlgTitle.text=Result Type Selection
 FileReportDataTypes.filename.text=Name
 FileReportDataTypes.fileExt.text=File Extension
 FileReportDataTypes.fileType.text=File Type
@@ -271,3 +271,4 @@ ReportProgressDialog.reportLabel.text=reportLabel
 ReportProgressDialog.statusMessageLabel.text=processingLabel
 ReportVisualPanel2.specificTaggedResultsRadioButton.text=Specific Tagged Results
 ReportVisualPanel2.allTaggedResultsRadioButton.text=All Tagged Results
+ArtifactSelectionDialog.titleLabel.toolTipText=

From 5c670e2a6dd476871b6e0d9a8f25b3b573306404 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Wed, 14 Aug 2019 15:30:29 -0400
Subject: [PATCH 059/192] Minor

---
 .../src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java | 4 ++--
 .../src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java
index 003f92655e..d400497a4f 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java
@@ -33,8 +33,8 @@ class ReportWizardPanel1 implements WizardDescriptor.FinishablePanel<WizardDescr
 
     private WizardDescriptor wiz;
     private ReportVisualPanel1 component;
-    private JButton nextButton;
-    private JButton finishButton;
+    private final JButton nextButton;
+    private final JButton finishButton;
 
     ReportWizardPanel1() {
         nextButton = new JButton(NbBundle.getMessage(this.getClass(), "ReportWizardPanel1.nextButton.text"));
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java
index a8abb0664f..bb5168c50e 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java
@@ -25,13 +25,12 @@ import javax.swing.event.ChangeListener;
 import org.openide.WizardDescriptor;
 import org.openide.util.HelpCtx;
 import org.openide.util.NbBundle;
-import org.openide.util.NbPreferences;
 
 class ReportWizardPanel2 implements WizardDescriptor.Panel<WizardDescriptor> {
 
     private ReportVisualPanel2 component;
-    private JButton finishButton;
-    private JButton nextButton;
+    private final JButton finishButton;
+    private final JButton nextButton;
     private WizardDescriptor wiz;
 
     ReportWizardPanel2() {

From e1599ecb9a6d5bc48359c1d37fa22c7de47458d2 Mon Sep 17 00:00:00 2001
From: Kelly Kelly <kelly@basistech.com>
Date: Thu, 15 Aug 2019 10:03:40 -0400
Subject: [PATCH 060/192] Refactored to hopefully make codacy happy

---
 .../recentactivity/ExtractRecycleBin.java     | 211 ++++++++++++------
 1 file changed, 143 insertions(+), 68 deletions(-)

diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java
index 4cbcad3b62..08641a164e 100755
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java
@@ -78,17 +78,12 @@ final class ExtractRecycleBin extends Extract {
 
     @Override
     void process(Content dataSource, IngestJobContext context, DataSourceIngestModuleProgress progressBar) {
-        FileManager fileManager = Case.getCurrentCase().getServices().getFileManager();
-        String tempDirPath = RAImageIngestModule.getRATempPath(Case.getCurrentCase(), "recyclebin"); //NON-NLS
-        
         // At this time it was decided that we would not include TSK_RECYCLE_BIN
         // in the default list of BlackboardArtifact types.
         try {
-            tskCase.addBlackboardArtifactType(RECYCLE_BIN_ARTIFACT_NAME, "Recycle Bin"); //NON-NLS
+           createRecycleBinArtifactType();
         } catch (TskCoreException ex) {
             logger.log(Level.WARNING, String.format("%s may not have been created.", RECYCLE_BIN_ARTIFACT_NAME), ex);
-        } catch (TskDataException ex) {
-            logger.log(Level.INFO, String.format("%s may have already been defined for this case", RECYCLE_BIN_ARTIFACT_NAME));
         }
 
         BlackboardArtifact.Type recycleBinArtifactType;
@@ -110,7 +105,8 @@ final class ExtractRecycleBin extends Extract {
            // user names
            userNameMap = new HashMap<>();
         }
-
+        
+        FileManager fileManager = Case.getCurrentCase().getServices().getFileManager();
         List<AbstractFile> iFiles;
 
         try {
@@ -119,72 +115,90 @@ final class ExtractRecycleBin extends Extract {
             logger.log(Level.WARNING, "Unable to find recycle bin I files.", ex); //NON-NLS
             return;  // No need to continue
         }
+        
+        String tempRARecycleBinPath = RAImageIngestModule.getRATempPath(Case.getCurrentCase(), "recyclebin"); //NON-NLS
 
         for (AbstractFile iFile : iFiles) {
 
             if (context.dataSourceIngestIsCancelled()) {
                 return;
             }
-
-            String tempFilePath = tempDirPath + File.separator + iFile.getName();
-
-            try {
-                try {
-                    ContentUtils.writeToFile(iFile, new File(tempFilePath));
-                } catch (IOException ex) {
-                    logger.log(Level.WARNING, String.format("Unable to write %s to temp directory. File name: %s", iFile.getName(), tempFilePath), ex); //NON-NLS
-                    // if we cannot make a copy of the $I file for later processing
-                    // move onto the next file
-                    continue;
-                }
-
-                RecycledFileMetaData metaData;
-                try {
-                    metaData = parseIFile(tempFilePath);
-                } catch (IOException ex) {
-                    logger.log(Level.WARNING, String.format("Unable to parse iFile %s", iFile.getName()), ex); //NON-NLS
-                    // Unable to parse the $I file move onto the next file
-                    continue;
-                }
-
-                String rFileName = iFile.getName().replace("$I", "$R"); //NON-NLS
-                String userID = getUserIDFromPath(iFile.getParentPath());
-                String userName = userNameMap.get(userID);
-                
-                List<AbstractFile> rFiles;
-
-                try {
-                    rFiles = fileManager.findFiles(dataSource, rFileName, iFile.getParentPath());
-                } catch (TskCoreException ex) {
-                    logger.log(Level.WARNING, String.format("Unable to find R file (%s) for I file (%s)", rFileName, iFile.getName()), ex); //NON-NLS
-                    // If there are no $R files go on to the next $I file
-                    continue;
-                }
-
-                for (AbstractFile rFile : rFiles) {
-                    if (context.dataSourceIngestIsCancelled()) {
-                        return;
-                    }
-
-                    if (iFile.getParentPath().equals(rFile.getParentPath())) {
-                        try {
-                            BlackboardArtifact bba = rFile.newArtifact(recycleBinArtifactType.getTypeID());
-                            bba.addAttribute(new BlackboardAttribute(TSK_PATH, getName(), metaData.getFileName()));
-                            bba.addAttribute(new BlackboardAttribute(TSK_DATETIME_DELETED, getName(), metaData.getDeletedTimeStamp()));
-                            bba.addAttribute(new BlackboardAttribute(TSK_USER_NAME, getName(), userName != null ? userName : ""));
-
-                            postArtifact(bba);
-                        } catch (TskCoreException ex) {
-                            logger.log(Level.WARNING, String.format("Unable to add attributes to artifact %s", rFile.getName()), ex); //NON-NLS
-                        }
-                    }
-                }
-            } finally {
-                (new File(tempFilePath)).delete();
-            }
+            
+            processIFiles(dataSource, context, recycleBinArtifactType, iFile, userNameMap, tempRARecycleBinPath);
         }
 
-        (new File(tempDirPath)).delete();
+        (new File(tempRARecycleBinPath)).delete();
+    }
+    
+    /**
+     * Process each individual iFile.
+     * 
+     * @param dataSource
+     * @param context
+     * @param recycleBinArtifactType Module created artifact type
+     * @param iFile The AbstractFile to process
+     * @param userNameMap Map of user ids to names
+     * @param tempRARecycleBinPath Temp directory path
+     */
+    private void processIFiles(Content dataSource,  IngestJobContext context,  BlackboardArtifact.Type recycleBinArtifactType, AbstractFile iFile,  Map<String, String> userNameMap, String tempRARecycleBinPath) {
+        String tempFilePath = tempRARecycleBinPath + File.separator + iFile.getName();
+        FileManager fileManager = Case.getCurrentCase().getServices().getFileManager();
+        try {
+            try {
+                ContentUtils.writeToFile(iFile, new File(tempFilePath));
+            } catch (IOException ex) {
+                logger.log(Level.WARNING, String.format("Unable to write %s to temp directory. File name: %s", iFile.getName(), tempFilePath), ex); //NON-NLS
+                // if we cannot make a copy of the $I file for later processing
+                // move onto the next file
+                return;
+            }
+
+            RecycledFileMetaData metaData;
+            try {
+                metaData = parseIFile(tempFilePath);
+            } catch (IOException ex) {
+                logger.log(Level.WARNING, String.format("Unable to parse iFile %s", iFile.getName()), ex); //NON-NLS
+                // Unable to parse the $I file move onto the next file
+                return;
+            }
+
+            String rFileName = iFile.getName().replace("$I", "$R"); //NON-NLS
+            String userID = getUserIDFromPath(iFile.getParentPath());
+            String userName = "";
+            if (!userID.isEmpty()) {
+                userName = userNameMap.get(userID);
+            } else {
+                // If the iFile doesn't have a user ID in its parent 
+                // directory structure then it is not from the recyle bin
+                return;
+            }
+
+            List<AbstractFile> rFiles;
+
+            try {
+                rFiles = fileManager.findFiles(dataSource, rFileName, iFile.getParentPath());
+            } catch (TskCoreException ex) {
+                logger.log(Level.WARNING, String.format("Unable to find R file (%s) for I file (%s)", rFileName, iFile.getName()), ex); //NON-NLS
+                // If there are no $R files go on to the next $I file
+                return;
+            }
+
+            for (AbstractFile rFile : rFiles) {
+                if (context.dataSourceIngestIsCancelled()) {
+                    return;
+                }
+
+                if (iFile.getParentPath().equals(rFile.getParentPath())) {
+                    try {
+                        postArtifact(createArtifact(rFile, recycleBinArtifactType, metaData.getFileName(), userName, metaData.getDeletedTimeStamp()));
+                    } catch (TskCoreException ex) {
+                        logger.log(Level.WARNING, String.format("Unable to add attributes to artifact %s", rFile.getName()), ex); //NON-NLS
+                    }
+                }
+            }
+        } finally {
+            (new File(tempFilePath)).delete();
+        }
     }
 
     /**
@@ -217,7 +231,7 @@ final class ExtractRecycleBin extends Extract {
      * @throws FileNotFoundException
      * @throws IOException
      */
-    RecycledFileMetaData parseIFile(String iFilePath) throws FileNotFoundException, IOException {
+    private RecycledFileMetaData parseIFile(String iFilePath) throws FileNotFoundException, IOException {
         byte[] allBytes = Files.readAllBytes(Paths.get(iFilePath));
 
         ByteBuffer byteBuffer = ByteBuffer.wrap(allBytes);
@@ -244,7 +258,15 @@ final class ExtractRecycleBin extends Extract {
         return new RecycledFileMetaData(fileSize, timestamp, fileName);
     }
     
-        
+    /**
+     * Create a map of userids to usernames from the OS Accounts.
+     * 
+     * @param dataSource
+     * 
+     * @return A Map of userIDs and userNames
+     * 
+     * @throws TskCoreException 
+     */
     private Map<String, String> makeUserNameMap(Content dataSource) throws TskCoreException{
         Map<String, String> userNameMap = new HashMap<>();
       
@@ -265,14 +287,67 @@ final class ExtractRecycleBin extends Extract {
         return userNameMap;
     }
     
+    /**
+     * Helper functions to get the user ID from the iFile parent path. User ids
+     * will be of the form S-<more characters>.
+     * 
+     * @param iFileParentPath String parent path of the iFile
+     * 
+     * @return String user id 
+     */
     private String getUserIDFromPath(String iFileParentPath) {
         int index = iFileParentPath.indexOf("-") - 1;
-        return (iFileParentPath.substring(index)).replace("/", "");
+        if (index >= 0) {
+            return (iFileParentPath.substring(index)).replace("/", "");
+        } else {
+            return "";
+        }
     }
     
+    /**
+     * Gets the attribute for the given type from the given artifact.
+     * 
+     * @param artifact BlackboardArtifact to get the attribute from
+     * @param type The BlackboardAttribute Type to get
+     * 
+     * @return BlackboardAttribute for given artifact and type
+     * 
+     * @throws TskCoreException 
+     */
     private BlackboardAttribute getAttributeForArtifact(BlackboardArtifact artifact, BlackboardAttribute.ATTRIBUTE_TYPE type) throws TskCoreException{
        return artifact.getAttribute(new BlackboardAttribute.Type(BlackboardAttribute.ATTRIBUTE_TYPE.fromID(type.getTypeID())));
     }
+    
+    private void createRecycleBinArtifactType() throws TskCoreException {
+         try {
+            tskCase.addBlackboardArtifactType(RECYCLE_BIN_ARTIFACT_NAME, "Recycle Bin"); //NON-NLS
+        } catch (TskDataException ex) {
+            logger.log(Level.INFO, String.format("%s may have already been defined for this case", RECYCLE_BIN_ARTIFACT_NAME));
+        }
+
+    }
+    
+    /**
+     * Create the new artifact for the give rFile
+     * 
+     * @param rFile AbstractFile to create the artifact for
+     * @param type Type of artifact to create
+     * @param fileName The original path of the deleted file
+     * @param userName The name of the user that deleted the file
+     * @param dateTime The time in epoch seconds that the file was deleted
+     * 
+     * @return Newly created artifact
+     * 
+     * @throws TskCoreException 
+     */
+    private BlackboardArtifact createArtifact(AbstractFile rFile, BlackboardArtifact.Type type, String fileName, String userName, long dateTime) throws TskCoreException{
+        BlackboardArtifact bba = rFile.newArtifact(type.getTypeID());
+        bba.addAttribute(new BlackboardAttribute(TSK_PATH, getName(), fileName));
+        bba.addAttribute(new BlackboardAttribute(TSK_DATETIME_DELETED, getName(), dateTime));
+        bba.addAttribute(new BlackboardAttribute(TSK_USER_NAME, getName(), userName == null || userName.isEmpty() ? "" : userName));
+        
+        return bba;
+    }
 
     /**
      * Stores the data from the $I files.

From 5721f3c7d4a150c1b869bff679573eab5f35f5c6 Mon Sep 17 00:00:00 2001
From: Kelly Kelly <kelly@basistech.com>
Date: Thu, 15 Aug 2019 10:27:09 -0400
Subject: [PATCH 061/192] merged in changes from other branch

---
 .../recentactivity/ExtractRecycleBin.java     | 53 ++++++++++++++-----
 1 file changed, 41 insertions(+), 12 deletions(-)

diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java
index 08641a164e..3a34fd82bb 100755
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java
@@ -29,6 +29,7 @@ import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -107,6 +108,15 @@ final class ExtractRecycleBin extends Extract {
         }
         
         FileManager fileManager = Case.getCurrentCase().getServices().getFileManager();
+
+        Map<String, List<AbstractFile>> rFileMap;
+        try {
+            rFileMap = makeRFileMap(dataSource);
+        } catch (TskCoreException ex) {
+            logger.log(Level.WARNING, String.format("Unable to create $R file map for dataSource: %s", dataSource.getName()), ex);
+            return; // No $R files, no need to continue;
+        }
+
         List<AbstractFile> iFiles;
 
         try {
@@ -124,7 +134,7 @@ final class ExtractRecycleBin extends Extract {
                 return;
             }
             
-            processIFiles(dataSource, context, recycleBinArtifactType, iFile, userNameMap, tempRARecycleBinPath);
+            processIFiles(context, recycleBinArtifactType, iFile, userNameMap, rFileMap, tempRARecycleBinPath);
         }
 
         (new File(tempRARecycleBinPath)).delete();
@@ -140,9 +150,8 @@ final class ExtractRecycleBin extends Extract {
      * @param userNameMap Map of user ids to names
      * @param tempRARecycleBinPath Temp directory path
      */
-    private void processIFiles(Content dataSource,  IngestJobContext context,  BlackboardArtifact.Type recycleBinArtifactType, AbstractFile iFile,  Map<String, String> userNameMap, String tempRARecycleBinPath) {
+    private void processIFiles(IngestJobContext context,  BlackboardArtifact.Type recycleBinArtifactType, AbstractFile iFile,  Map<String, String> userNameMap, Map<String, List<AbstractFile>> rFileMap, String tempRARecycleBinPath) {
         String tempFilePath = tempRARecycleBinPath + File.separator + iFile.getName();
-        FileManager fileManager = Case.getCurrentCase().getServices().getFileManager();
         try {
             try {
                 ContentUtils.writeToFile(iFile, new File(tempFilePath));
@@ -173,15 +182,7 @@ final class ExtractRecycleBin extends Extract {
                 return;
             }
 
-            List<AbstractFile> rFiles;
-
-            try {
-                rFiles = fileManager.findFiles(dataSource, rFileName, iFile.getParentPath());
-            } catch (TskCoreException ex) {
-                logger.log(Level.WARNING, String.format("Unable to find R file (%s) for I file (%s)", rFileName, iFile.getName()), ex); //NON-NLS
-                // If there are no $R files go on to the next $I file
-                return;
-            }
+            List<AbstractFile> rFiles = rFileMap.get(rFileName);
 
             for (AbstractFile rFile : rFiles) {
                 if (context.dataSourceIngestIsCancelled()) {
@@ -287,6 +288,34 @@ final class ExtractRecycleBin extends Extract {
         return userNameMap;
     }
     
+    /**
+     * Get a list of files that start with $R and create a map of the file to 
+     * their name.
+     * 
+     * @param dataSource
+     * @return File map
+     * @throws TskCoreException 
+     */
+    private Map<String, List<AbstractFile>> makeRFileMap(Content dataSource) throws TskCoreException{
+        FileManager fileManager = Case.getCurrentCase().getServices().getFileManager();
+        List<AbstractFile> rFiles = fileManager.findFiles(dataSource, "$R%");
+        Map<String, List<AbstractFile>> fileMap = new HashMap<>();
+        
+        for (AbstractFile rFile: rFiles) {
+            String fileName = rFile.getName();
+            List<AbstractFile> fileList = fileMap.get(fileName);
+            
+            if(fileList == null) {
+                fileList = new ArrayList<>();
+                fileMap.put(fileName, fileList);
+            }
+            
+            fileList.add(rFile);
+        }
+        
+        return fileMap;
+    }
+    
     /**
      * Helper functions to get the user ID from the iFile parent path. User ids
      * will be of the form S-<more characters>.

From 0aeabbb0cd54c1c66c2c90d9fab0dcc1663bfba6 Mon Sep 17 00:00:00 2001
From: Kelly Kelly <kelly@basistech.com>
Date: Thu, 15 Aug 2019 10:30:39 -0400
Subject: [PATCH 062/192] Fixed codacy issues

---
 .../sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java
index 08641a164e..cfa6aa997d 100755
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java
@@ -162,7 +162,6 @@ final class ExtractRecycleBin extends Extract {
                 return;
             }
 
-            String rFileName = iFile.getName().replace("$I", "$R"); //NON-NLS
             String userID = getUserIDFromPath(iFile.getParentPath());
             String userName = "";
             if (!userID.isEmpty()) {
@@ -174,6 +173,8 @@ final class ExtractRecycleBin extends Extract {
             }
 
             List<AbstractFile> rFiles;
+            
+            String rFileName = iFile.getName().replace("$I", "$R"); //NON-NLS
 
             try {
                 rFiles = fileManager.findFiles(dataSource, rFileName, iFile.getParentPath());
@@ -296,7 +297,7 @@ final class ExtractRecycleBin extends Extract {
      * @return String user id 
      */
     private String getUserIDFromPath(String iFileParentPath) {
-        int index = iFileParentPath.indexOf("-") - 1;
+        int index = iFileParentPath.indexOf('-') - 1;
         if (index >= 0) {
             return (iFileParentPath.substring(index)).replace("/", "");
         } else {

From f5b1f7b4c9ed8afdba25174a775a44c10ec48352 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Thu, 15 Aug 2019 12:32:07 -0400
Subject: [PATCH 063/192] Changed ReportingConfig to use a Map, wizard
 configuration changes

---
 .../autopsy/report/Bundle.properties-MERGED   |  5 ++--
 .../autopsy/report/ReportVisualPanel1.java    |  5 +++-
 .../autopsy/report/ReportWizardAction.java    |  5 +++-
 .../report/ReportWizardFileOptionsPanel.java  |  2 +-
 .../autopsy/report/ReportWizardIterator.java  | 28 +++++++++++++++----
 .../autopsy/report/ReportWizardPanel1.java    |  8 ++++--
 .../autopsy/report/ReportWizardPanel2.java    |  2 +-
 .../ReportWizardPortableCaseOptionsPanel.java |  3 +-
 .../autopsy/report/ReportingConfig.java       | 11 +++++---
 .../autopsy/report/ReportingConfigLoader.java | 17 +++++++----
 10 files changed, 62 insertions(+), 24 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties-MERGED
index f642928717..b6dd050066 100755
--- a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties-MERGED
@@ -1,6 +1,6 @@
 OpenIDE-Module-Name=Report
 CTL_ReportWizardAction=Run Report
-ArtifactSelectionDialog.titleLabel.text=Select which artifacts you would like to report on:
+ArtifactSelectionDialog.titleLabel.text=Select which result types you would like to report on:
 ArtifactSelectionDialog.okButton.text=OK
 PortableCaseInterestingItemsListPanel.error.errorLoadingTags=Error loading interesting item set names
 PortableCaseInterestingItemsListPanel.error.errorTitle=Error getting intesting item set names for case
@@ -77,7 +77,7 @@ ReportVisualPanel2.allResultsRadioButton.text=All Results
 ReportWizardFileOptionsVisualPanel.selectAllButton.text=Select All
 ReportWizardFileOptionsVisualPanel.deselectAllButton.text=Deselect All
 ReportWizardFileOptionsVisualPanel.jLabel1.text=Select items to include in File Report:
-ArtifactSelectionDialog.dlgTitle.text=Advanced Artifact Selection
+ArtifactSelectionDialog.dlgTitle.text=Result Type Selection
 FileReportDataTypes.filename.text=Name
 FileReportDataTypes.fileExt.text=File Extension
 FileReportDataTypes.fileType.text=File Type
@@ -331,5 +331,6 @@ ReportProgressDialog.reportLabel.text=reportLabel
 ReportProgressDialog.statusMessageLabel.text=processingLabel
 ReportVisualPanel2.specificTaggedResultsRadioButton.text=Specific Tagged Results
 ReportVisualPanel2.allTaggedResultsRadioButton.text=All Tagged Results
+ArtifactSelectionDialog.titleLabel.toolTipText=
 ReportWizardPortableCaseOptionsVisualPanel.getName.title=Choose Portable Case settings
 TableReportGenerator.StatusColumn.Header=Review Status
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
index d5c434a198..5763198e01 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
@@ -23,6 +23,7 @@ import java.awt.Component;
 import java.util.ArrayList;
 import static java.util.Collections.swap;
 import java.util.List;
+import java.util.Map;
 import java.util.logging.Level;
 import javax.swing.JList;
 import javax.swing.JPanel;
@@ -49,13 +50,15 @@ final class ReportVisualPanel1 extends JPanel implements ListSelectionListener {
     private List<TableReportModule> tableModules = new ArrayList<>();
     private List<FileReportModule> fileModules = new ArrayList<>();
     private PortableCaseReportModule portableCaseModule;
+    private Map<String, ReportModuleConfig> moduleConfigs;
     private Integer selectedIndex;
 
     /**
      * Creates new form ReportVisualPanel1
      */
-    public ReportVisualPanel1(ReportWizardPanel1 wizPanel) {
+    public ReportVisualPanel1(ReportWizardPanel1 wizPanel, Map<String, ReportModuleConfig> moduleConfigs) {
         this.wizPanel = wizPanel;
+        this.moduleConfigs = moduleConfigs;
         initComponents();
         configurationPanel.setLayout(new BorderLayout());
         descriptionTextPane.setEditable(false);
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
index 8fa03fd68b..58882fa4e7 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
@@ -54,6 +54,9 @@ import org.sleuthkit.datamodel.BlackboardArtifact;
     @ActionReference(path = "Toolbars/Case", position = 105)})
 public final class ReportWizardAction extends CallableSystemAction implements Presenter.Toolbar, ActionListener {
 
+    private static final String REPORTING_CONFIGURATION_NAME = "EXAMINER_MODE";
+    private static final boolean DISPLAY_CASE_SPECIFIC_DATA = true;
+    private static final boolean RUN_REPORTS = true;
     private final JButton toolbarButton = new JButton();
     private static final String ACTION_NAME = NbBundle.getMessage(ReportWizardAction.class, "ReportWizardAction.actionName.text");
 
@@ -64,7 +67,7 @@ public final class ReportWizardAction extends CallableSystemAction implements Pr
      */
     @SuppressWarnings("unchecked")
     public static void doReportWizard() {
-        WizardDescriptor wiz = new WizardDescriptor(new ReportWizardIterator());
+        WizardDescriptor wiz = new WizardDescriptor(new ReportWizardIterator(REPORTING_CONFIGURATION_NAME, DISPLAY_CASE_SPECIFIC_DATA, RUN_REPORTS));
         wiz.setTitleFormat(new MessageFormat("{0} {1}"));
         wiz.setTitle(NbBundle.getMessage(ReportWizardAction.class, "ReportWizardAction.reportWiz.title"));
         if (DialogDisplayer.getDefault().notify(wiz) == WizardDescriptor.FINISH_OPTION) {
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsPanel.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsPanel.java
index eec784ff50..a41d2ce3d7 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsPanel.java
@@ -37,7 +37,7 @@ class ReportWizardFileOptionsPanel implements WizardDescriptor.FinishablePanel<W
     private ReportWizardFileOptionsVisualPanel component;
     private JButton finishButton;
 
-    ReportWizardFileOptionsPanel() {
+    ReportWizardFileOptionsPanel(FileReportSettings fileReportSettings) {
         finishButton = new JButton(
                 NbBundle.getMessage(this.getClass(), "ReportWizardFileOptionsPanel.finishButton.text"));
         finishButton.setEnabled(false);
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java
index 5ccd13cc62..50b20caf3d 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java
@@ -22,13 +22,16 @@ import java.awt.Component;
 import java.util.Arrays;
 import java.util.List;
 import java.util.NoSuchElementException;
+import java.util.logging.Level;
 import javax.swing.JComponent;
 import javax.swing.event.ChangeListener;
 import org.openide.WizardDescriptor;
 import org.openide.util.NbPreferences;
+import org.sleuthkit.autopsy.coreutils.Logger;
 
 final class ReportWizardIterator implements WizardDescriptor.Iterator<WizardDescriptor> {
 
+    private static final Logger logger = Logger.getLogger(ReportWizardIterator.class.getName());
     private int index;
 
     private final ReportWizardPanel1 firstPanel;
@@ -55,11 +58,26 @@ final class ReportWizardIterator implements WizardDescriptor.Iterator<WizardDesc
     private final WizardDescriptor.Panel<WizardDescriptor>[] portableCaseConfigPanels;
 
     @SuppressWarnings({"rawtypes", "unchecked"})
-    ReportWizardIterator() {
-        firstPanel = new ReportWizardPanel1();
-        tableConfigPanel = new ReportWizardPanel2();
-        fileConfigPanel = new ReportWizardFileOptionsPanel();
-        portableCaseConfigPanel = new ReportWizardPortableCaseOptionsPanel();
+    ReportWizardIterator(String reportingConfigurationName, boolean displayCaseSpecificData, boolean runReports) {
+        
+        ReportingConfig config = null;
+        try {
+            config = ReportingConfigLoader.loadConfig(reportingConfigurationName);
+        } catch (ReportConfigException ex) {
+            logger.log(Level.SEVERE, "Unable to load reporting configuration " + reportingConfigurationName + ". Using default settings", ex);
+        }
+        
+        if (config != null) {
+            firstPanel = new ReportWizardPanel1(config.getModuleConfigs());
+            tableConfigPanel = new ReportWizardPanel2(config.getTableReportSettings());
+            fileConfigPanel = new ReportWizardFileOptionsPanel(config.getFileReportSettings());
+            portableCaseConfigPanel = new ReportWizardPortableCaseOptionsPanel(config.getModuleConfigs());
+        } else {
+            firstPanel = new ReportWizardPanel1(null);
+            tableConfigPanel = new ReportWizardPanel2(null);
+            fileConfigPanel = new ReportWizardFileOptionsPanel(null);
+            portableCaseConfigPanel = new ReportWizardPortableCaseOptionsPanel(null);            
+        }
 
         allConfigPanels = new WizardDescriptor.Panel[]{firstPanel, tableConfigPanel, fileConfigPanel, portableCaseConfigPanel};
         tableConfigPanels = new WizardDescriptor.Panel[]{firstPanel, tableConfigPanel};
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java
index d400497a4f..d6736ab1f8 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java
@@ -21,6 +21,8 @@ package org.sleuthkit.autopsy.report;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 import java.util.prefs.Preferences;
 import javax.swing.JButton;
 import javax.swing.event.ChangeListener;
@@ -33,10 +35,12 @@ class ReportWizardPanel1 implements WizardDescriptor.FinishablePanel<WizardDescr
 
     private WizardDescriptor wiz;
     private ReportVisualPanel1 component;
+    private Map<String, ReportModuleConfig> moduleConfigs;
     private final JButton nextButton;
     private final JButton finishButton;
 
-    ReportWizardPanel1() {
+    ReportWizardPanel1(Map<String, ReportModuleConfig> moduleConfigs) {
+        this.moduleConfigs = moduleConfigs;
         nextButton = new JButton(NbBundle.getMessage(this.getClass(), "ReportWizardPanel1.nextButton.text"));
         finishButton = new JButton(NbBundle.getMessage(this.getClass(), "ReportWizardPanel1.finishButton.text"));
         finishButton.setEnabled(false);
@@ -60,7 +64,7 @@ class ReportWizardPanel1 implements WizardDescriptor.FinishablePanel<WizardDescr
     @Override
     public ReportVisualPanel1 getComponent() {
         if (component == null) {
-            component = new ReportVisualPanel1(this);
+            component = new ReportVisualPanel1(this, moduleConfigs);
         }
         return component;
     }
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java
index bb5168c50e..3b851ad43a 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java
@@ -33,7 +33,7 @@ class ReportWizardPanel2 implements WizardDescriptor.Panel<WizardDescriptor> {
     private final JButton nextButton;
     private WizardDescriptor wiz;
 
-    ReportWizardPanel2() {
+    ReportWizardPanel2(TableReportSettings tableReportSettings) {
         finishButton = new JButton(NbBundle.getMessage(this.getClass(), "ReportWizardPanel2.finishButton.text"));
 
         nextButton = new JButton(NbBundle.getMessage(this.getClass(), "ReportWizardPanel2.nextButton.text"));
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPortableCaseOptionsPanel.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPortableCaseOptionsPanel.java
index afc36b6887..7367b868f5 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPortableCaseOptionsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPortableCaseOptionsPanel.java
@@ -20,6 +20,7 @@ package org.sleuthkit.autopsy.report;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.util.Map;
 import javax.swing.JButton;
 import javax.swing.event.ChangeListener;
 import org.openide.WizardDescriptor;
@@ -36,7 +37,7 @@ class ReportWizardPortableCaseOptionsPanel implements WizardDescriptor.Finishabl
     private ReportWizardPortableCaseOptionsVisualPanel component;
     private final JButton finishButton;
 
-    ReportWizardPortableCaseOptionsPanel() {
+    ReportWizardPortableCaseOptionsPanel(Map<String, ReportModuleConfig> moduleConfigs) {
         finishButton = new JButton(
                 NbBundle.getMessage(this.getClass(), "ReportWizardFileOptionsPanel.finishButton.text"));
         finishButton.setEnabled(false);
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportingConfig.java b/Core/src/org/sleuthkit/autopsy/report/ReportingConfig.java
index 07ee700342..fb17f919cf 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportingConfig.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportingConfig.java
@@ -19,8 +19,9 @@
 package org.sleuthkit.autopsy.report;
 
 import java.io.Serializable;
-import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * A bundling of all the settings objects that define a report configuration.
@@ -29,7 +30,7 @@ final class ReportingConfig implements Serializable {
 
     private static final long serialVersionUID = 1L;
     private String configName;
-    private List<ReportModuleConfig> moduleConfigs = new ArrayList<>();
+    private Map<String, ReportModuleConfig> moduleConfigs = new HashMap<>();
     private TableReportSettings tableReportSettings;
     private FileReportSettings fileReportSettings;
 
@@ -51,10 +52,12 @@ final class ReportingConfig implements Serializable {
     }
 
     void setModuleConfigs(List<ReportModuleConfig> moduleConfigs) {
-        this.moduleConfigs = moduleConfigs;
+        for (ReportModuleConfig config : moduleConfigs) {
+            this.moduleConfigs.put(config.getModuleClassName(), config);
+        }
     }
 
-    List<ReportModuleConfig> getModuleConfigs() {
+    Map<String, ReportModuleConfig> getModuleConfigs() {
         return this.moduleConfigs;
     }
 
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java b/Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java
index 4c9b99bbae..99d3b7d06a 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java
@@ -25,6 +25,7 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.logging.Level;
@@ -129,14 +130,14 @@ final class ReportingConfigLoader {
      * Serialize all of the settings that make up a reporting configuration in
      * an atomic, thread safe way.
      *
-     * @param config ReportingConfig object to serialize to disk
+     * @param reportConfig ReportingConfig object to serialize to disk
      * @throws ReportConfigException if an error occurred while saving the
      * configuration
      */
-    static synchronized void saveConfig(ReportingConfig config) throws ReportConfigException {
+    static synchronized void saveConfig(ReportingConfig reportConfig) throws ReportConfigException {
 
         // construct the configuration directory path
-        Path pathToConfigDir = Paths.get(ReportingConfigLoader.REPORT_CONFIG_FOLDER_PATH, config.getName());
+        Path pathToConfigDir = Paths.get(ReportingConfigLoader.REPORT_CONFIG_FOLDER_PATH, reportConfig.getName());
 
         // create configuration directory 
         try {
@@ -148,7 +149,7 @@ final class ReportingConfigLoader {
         // save table report settings
         String filePath = pathToConfigDir.toString() + File.separator + TABLE_REPORT_CONFIG_FILE;
         try (NbObjectOutputStream out = new NbObjectOutputStream(new FileOutputStream(filePath))) {
-            out.writeObject(config.getTableReportSettings());
+            out.writeObject(reportConfig.getTableReportSettings());
         } catch (IOException ex) {
             throw new ReportConfigException("Unable to save table report configuration " + filePath, ex);
         }
@@ -156,14 +157,18 @@ final class ReportingConfigLoader {
         // save file report settings
         filePath = pathToConfigDir.toString() + File.separator + FILE_REPORT_CONFIG_FILE;
         try (NbObjectOutputStream out = new NbObjectOutputStream(new FileOutputStream(filePath))) {
-            out.writeObject(config.getFileReportSettings());
+            out.writeObject(reportConfig.getFileReportSettings());
         } catch (IOException ex) {
             throw new ReportConfigException("Unable to save file report configuration " + filePath, ex);
         }
 
         // save list of module configuration objects
         filePath = pathToConfigDir.toString() + File.separator + MODULE_CONFIG_FILE;
-        List<ReportModuleConfig> moduleConfigs = config.getModuleConfigs();
+        List<ReportModuleConfig> moduleConfigs = new ArrayList<>();
+        for (ReportModuleConfig config : reportConfig.getModuleConfigs().values()) {
+            moduleConfigs.add(config);
+        }
+        
         try (NbObjectOutputStream out = new NbObjectOutputStream(new FileOutputStream(filePath))) {
             out.writeObject(moduleConfigs);
         } catch (IOException ex) {

From a1026861e3919e84e4afd008d072dfba32d48348 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Thu, 15 Aug 2019 12:48:21 -0400
Subject: [PATCH 064/192] Setting report module settings in ReportVisualPanel1

---
 .../autopsy/report/ReportVisualPanel1.java    | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
index 5763198e01..32d5dff80f 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
@@ -113,6 +113,26 @@ final class ReportVisualPanel1 extends JPanel implements ListSelectionListener {
             indexOfHTMLReportModule++;
         }
         swap(modules, indexOfHTMLReportModule, 0);
+        
+        // set module configurations
+        for (ReportModule module : modules) {
+            ReportModuleSettings settings;
+            if (moduleConfigs == null) {
+                // ELTODO get default module configuration (API isn't implemented yet)
+                // settings = module.getDefaultConfiguration();
+            } else {
+                // get configuration for this module
+                ReportModuleConfig config = moduleConfigs.get(module.getClass().getCanonicalName());                
+                if (config != null) {
+                    settings = config.getModuleSettings();
+                } else {
+                    // ELTODO get default module configuration (API isn't implemented yet)
+                    // settings = module.getDefaultConfiguration();
+                }
+            }
+            // ELTODO set module configuration (API isn't implemented yet)
+            // module.setConfiguration(settings);
+        }
 
         modulesJList.getSelectionModel().addListSelectionListener(this);
         modulesJList.setCellRenderer(new ModuleCellRenderer());

From b64fcb129b18dfedd711132f06bd105244ce122d Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Thu, 15 Aug 2019 13:59:18 -0400
Subject: [PATCH 065/192] Updates to TableReportSettings

---
 .../autopsy/report/ReportVisualPanel1.java    |  1 +
 .../autopsy/report/ReportVisualPanel2.java    | 22 ++++++++--
 .../autopsy/report/ReportWizardIterator.java  |  6 +--
 .../autopsy/report/ReportWizardPanel2.java    |  9 +++-
 .../autopsy/report/TableReportGenerator.java  | 29 +++++++------
 .../autopsy/report/TableReportSettings.java   | 41 +++++++++++++------
 6 files changed, 74 insertions(+), 34 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
index 32d5dff80f..b4d490cf95 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
@@ -124,6 +124,7 @@ final class ReportVisualPanel1 extends JPanel implements ListSelectionListener {
                 // get configuration for this module
                 ReportModuleConfig config = moduleConfigs.get(module.getClass().getCanonicalName());                
                 if (config != null) {
+                    // there is an existing configuration for this module
                     settings = config.getModuleSettings();
                 } else {
                     // ELTODO get default module configuration (API isn't implemented yet)
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java
index 76771b9b1a..d69e9b9ed3 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java
@@ -61,13 +61,15 @@ final class ReportVisualPanel2 extends JPanel {
     ArtifactSelectionDialog dialog = new ArtifactSelectionDialog((JFrame) WindowManager.getDefault().getMainWindow(), true);
     private Map<BlackboardArtifact.Type, Boolean> artifactStates = new HashMap<>();
     private List<BlackboardArtifact.Type> artifacts = new ArrayList<>();
+    private TableReportSettings tableReportSettings;
+    private final boolean useCaseSpecificData;
     private TagsListModel tagsModel;
     private TagsListRenderer tagsRenderer;
 
     /**
      * Creates new form ReportVisualPanel2
      */
-    public ReportVisualPanel2(ReportWizardPanel2 wizPanel) {
+    public ReportVisualPanel2(ReportWizardPanel2 wizPanel, TableReportSettings tableReportSettings, boolean useCaseSpecificData) {
         initComponents();
         initTags();
         initArtifactTypes();
@@ -76,13 +78,15 @@ final class ReportVisualPanel2 extends JPanel {
         deselectAllButton.setEnabled(false);
         allResultsRadioButton.setSelected(true);
         this.wizPanel = wizPanel;
+        this.tableReportSettings = tableReportSettings;
+        this.useCaseSpecificData = useCaseSpecificData;
         this.allResultsRadioButton.addChangeListener(new ChangeListener() {
             @Override
             public void stateChanged(ChangeEvent e) {
                 tagsList.setEnabled(specificTaggedResultsRadioButton.isSelected());
                 selectAllButton.setEnabled(specificTaggedResultsRadioButton.isSelected());
                 deselectAllButton.setEnabled(specificTaggedResultsRadioButton.isSelected());
-                advancedButton.setEnabled(!specificTaggedResultsRadioButton.isSelected());
+                advancedButton.setEnabled(!specificTaggedResultsRadioButton.isSelected() && useCaseSpecificData);
                 updateFinishButton();
             }
         });
@@ -92,7 +96,7 @@ final class ReportVisualPanel2 extends JPanel {
                 tagsList.setEnabled(specificTaggedResultsRadioButton.isSelected());
                 selectAllButton.setEnabled(specificTaggedResultsRadioButton.isSelected());
                 deselectAllButton.setEnabled(specificTaggedResultsRadioButton.isSelected());
-                advancedButton.setEnabled(!specificTaggedResultsRadioButton.isSelected());
+                advancedButton.setEnabled(!specificTaggedResultsRadioButton.isSelected() && useCaseSpecificData);
                 updateFinishButton();
             }
         });
@@ -102,7 +106,7 @@ final class ReportVisualPanel2 extends JPanel {
                 tagsList.setEnabled(specificTaggedResultsRadioButton.isSelected());
                 selectAllButton.setEnabled(specificTaggedResultsRadioButton.isSelected());
                 deselectAllButton.setEnabled(specificTaggedResultsRadioButton.isSelected());
-                advancedButton.setEnabled(!specificTaggedResultsRadioButton.isSelected());
+                advancedButton.setEnabled(!specificTaggedResultsRadioButton.isSelected() && useCaseSpecificData);
                 updateFinishButton();
             }
         });
@@ -111,6 +115,16 @@ final class ReportVisualPanel2 extends JPanel {
     // Initialize the list of Tags
     private void initTags() {
         List<TagName> tagNamesInUse;
+        if (tableReportSettings == null) {
+            // get default table report settings
+            tableReportSettings = TableReportGenerator.getDefaultTableReportSettings(useCaseSpecificData);
+        }
+        
+        // use specified configuration
+        List<String> tagNames = tableReportSettings.getTagSelections();
+        // ELTODO convert List<String> tagNames to List<TagName> tagNamesInUse
+        // use this list instead of of calling Case.getCurrentCaseThrows().getServices().getTagsManager().getTagNamesInUse();
+
         try {
             tagNamesInUse = Case.getCurrentCaseThrows().getServices().getTagsManager().getTagNamesInUse();
         } catch (TskCoreException | NoCurrentCaseException ex) {
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java
index 50b20caf3d..71c274474c 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java
@@ -58,7 +58,7 @@ final class ReportWizardIterator implements WizardDescriptor.Iterator<WizardDesc
     private final WizardDescriptor.Panel<WizardDescriptor>[] portableCaseConfigPanels;
 
     @SuppressWarnings({"rawtypes", "unchecked"})
-    ReportWizardIterator(String reportingConfigurationName, boolean displayCaseSpecificData, boolean runReports) {
+    ReportWizardIterator(String reportingConfigurationName, boolean useCaseSpecificData, boolean runReports) {
         
         ReportingConfig config = null;
         try {
@@ -69,12 +69,12 @@ final class ReportWizardIterator implements WizardDescriptor.Iterator<WizardDesc
         
         if (config != null) {
             firstPanel = new ReportWizardPanel1(config.getModuleConfigs());
-            tableConfigPanel = new ReportWizardPanel2(config.getTableReportSettings());
+            tableConfigPanel = new ReportWizardPanel2(config.getTableReportSettings(), useCaseSpecificData);
             fileConfigPanel = new ReportWizardFileOptionsPanel(config.getFileReportSettings());
             portableCaseConfigPanel = new ReportWizardPortableCaseOptionsPanel(config.getModuleConfigs());
         } else {
             firstPanel = new ReportWizardPanel1(null);
-            tableConfigPanel = new ReportWizardPanel2(null);
+            tableConfigPanel = new ReportWizardPanel2(null, useCaseSpecificData);
             fileConfigPanel = new ReportWizardFileOptionsPanel(null);
             portableCaseConfigPanel = new ReportWizardPortableCaseOptionsPanel(null);            
         }
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java
index 3b851ad43a..847d2020c8 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java
@@ -32,8 +32,13 @@ class ReportWizardPanel2 implements WizardDescriptor.Panel<WizardDescriptor> {
     private final JButton finishButton;
     private final JButton nextButton;
     private WizardDescriptor wiz;
+    private final TableReportSettings tableReportSettings;
+    private final boolean useCaseSpecificData;
 
-    ReportWizardPanel2(TableReportSettings tableReportSettings) {
+    ReportWizardPanel2(TableReportSettings tableReportSettings, boolean useCaseSpecificData) {
+        this.tableReportSettings = tableReportSettings;
+        this.useCaseSpecificData = useCaseSpecificData;
+        
         finishButton = new JButton(NbBundle.getMessage(this.getClass(), "ReportWizardPanel2.finishButton.text"));
 
         nextButton = new JButton(NbBundle.getMessage(this.getClass(), "ReportWizardPanel2.nextButton.text"));
@@ -57,7 +62,7 @@ class ReportWizardPanel2 implements WizardDescriptor.Panel<WizardDescriptor> {
     @Override
     public ReportVisualPanel2 getComponent() {
         if (component == null) {
-            component = new ReportVisualPanel2(this);
+            component = new ReportVisualPanel2(this, tableReportSettings, useCaseSpecificData);
         }
         return component;
     }
diff --git a/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
index 093a4a5eb3..0e06c50ceb 100644
--- a/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
@@ -61,8 +61,8 @@ import org.sleuthkit.datamodel.TskData;
 
 class TableReportGenerator {
 
-    private final List<BlackboardArtifact.Type> artifactTypes = new ArrayList<>();
-    private final HashSet<String> tagNamesFilter = new HashSet<>();
+    private List<BlackboardArtifact.Type> artifactTypes = new ArrayList<>();
+    private HashSet<String> tagNamesFilter = new HashSet<>();
 
     private final Set<Content> images = new HashSet<>();
     private final ReportProgressPanel progressPanel;
@@ -79,20 +79,23 @@ class TableReportGenerator {
         this.columnHeaderMap = new HashMap<>();
         errorList = new ArrayList<>();
         // Get the artifact types selected by the user.
-        for (Map.Entry<BlackboardArtifact.Type, Boolean> entry : settings.getArtifactSelections().entrySet()) {
-            if (entry.getValue()) {
-                artifactTypes.add(entry.getKey());
-            }
-        }
+        artifactTypes = settings.getArtifactSelections();
 
         // Get the tag names selected by the user and make a tag names filter.
-        if (null != settings.getTagSelections()) {
-            for (Map.Entry<String, Boolean> entry : settings.getTagSelections().entrySet()) {
-                if (entry.getValue() == true) {
-                    tagNamesFilter.add(entry.getKey());
-                }
-            }
+        tagNamesFilter = new HashSet<>(settings.getTagSelections());
+    }
+    
+    static TableReportSettings getDefaultTableReportSettings(boolean useCaseSpecificData) {
+        Map<BlackboardArtifact.Type, Boolean> artifactTypeSelections = new HashMap<>();
+        Map<String, Boolean> tagNameSelections = new HashMap<>();
+        
+        if (useCaseSpecificData) {
+            // get tags and artifact types from current case
+        } else {
+            // get all possible tag names and artifact types
         }
+        
+        return new TableReportSettings(artifactTypeSelections, tagNameSelections);
     }
 
     protected void execute() {
diff --git a/Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java b/Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java
index 7817d70b83..5c9c5f7985 100755
--- a/Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java
@@ -19,7 +19,8 @@
 package org.sleuthkit.autopsy.report;
 
 import java.io.Serializable;
-import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import org.sleuthkit.datamodel.BlackboardArtifact;
 
@@ -28,30 +29,46 @@ import org.sleuthkit.datamodel.BlackboardArtifact;
  * by the TableReportGenerator class to drive report generation by
  * TableReportModules.
  */
-final class TableReportSettings implements Serializable  {
+final class TableReportSettings implements Serializable {
 
     private static final long serialVersionUID = 1L;
-    private Map<BlackboardArtifact.Type, Boolean> artifactTypeSelections = new HashMap<>();
-    private Map<String, Boolean> tagNameSelections = new HashMap<>();
+    private List<BlackboardArtifact.Type> artifactTypes = new ArrayList<>();
+    private List<String> tagNames = new ArrayList<>();
 
     /**
      * Creates TableReportSettings object.
      *
      * @param artifactTypeSelections The enabled/disabled state of the artifact
-     * types to be included in the report
+     * types to be included in the report. Only enabled entries will be kept.
      * @param tagNameSelections The enabled/disabled state of the tag names to
-     * be included in the report
+     * be included in the report. Only enabled entries will be kept.
      */
     TableReportSettings(Map<BlackboardArtifact.Type, Boolean> artifactTypeSelections, Map<String, Boolean> tagNameSelections) {
-        this.artifactTypeSelections = artifactTypeSelections;
-        this.tagNameSelections = tagNameSelections;
+        // Get the artifact types selected by the user
+        for (Map.Entry<BlackboardArtifact.Type, Boolean> entry : artifactTypeSelections.entrySet()) {
+            if (entry.getValue()) {
+                artifactTypes.add(entry.getKey());
+            }
+        }
+
+        // Get the tag names selected by the user
+        for (Map.Entry<String, Boolean> entry : tagNameSelections.entrySet()) {
+            if (entry.getValue() == true) {
+                tagNames.add(entry.getKey());
+            }
+        }
+    }
+    
+    TableReportSettings(List<BlackboardArtifact.Type> artifactTypes, List<String> tagNames) {
+        this.artifactTypes = artifactTypes;
+        this.tagNames = tagNames;
     }
 
-    Map<BlackboardArtifact.Type, Boolean> getArtifactSelections() {
-        return artifactTypeSelections;
+    List<BlackboardArtifact.Type> getArtifactSelections() {
+        return artifactTypes;
     }
 
-    Map<String, Boolean> getTagSelections() {
-        return tagNameSelections;
+    List<String> getTagSelections() {
+        return tagNames;
     }
 }

From 151d5751959b6c75a6b47fd4e586a9783752775a Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Thu, 15 Aug 2019 14:15:32 -0400
Subject: [PATCH 066/192] Minor

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

diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
index 58882fa4e7..648afe759d 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
@@ -54,7 +54,7 @@ import org.sleuthkit.datamodel.BlackboardArtifact;
     @ActionReference(path = "Toolbars/Case", position = 105)})
 public final class ReportWizardAction extends CallableSystemAction implements Presenter.Toolbar, ActionListener {
 
-    private static final String REPORTING_CONFIGURATION_NAME = "EXAMINER_MODE";
+    private static final String REPORTING_CONFIGURATION_NAME = "REPORT_ACTION";
     private static final boolean DISPLAY_CASE_SPECIFIC_DATA = true;
     private static final boolean RUN_REPORTS = true;
     private final JButton toolbarButton = new JButton();

From 04ea75749001952094b36cee0ce8ba3621e161e5 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Fri, 16 Aug 2019 15:06:38 -0400
Subject: [PATCH 067/192] Modifying table report displaying and processing

---
 .../autopsy/report/Bundle_ja.properties       |  2 -
 .../autopsy/report/ReportVisualPanel2.java    | 34 +++++++------
 .../autopsy/report/ReportWizardAction.java    |  4 +-
 .../autopsy/report/ReportWizardIterator.java  |  4 +-
 .../autopsy/report/ReportWizardPanel2.java    |  6 +--
 .../autopsy/report/TableReportGenerator.java  | 49 +++++++++++++------
 .../autopsy/report/TableReportSettings.java   | 16 +++++-
 7 files changed, 73 insertions(+), 42 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/report/Bundle_ja.properties
index 35b35fc801..e64fe2a502 100644
--- a/Core/src/org/sleuthkit/autopsy/report/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/report/Bundle_ja.properties
@@ -243,5 +243,3 @@ ReportProgressDialog.separationLabel.text=:
 ReportProgressDialog.pathLabel.text=\u30d1\u30b9\u30e9\u30d9\u30eb
 ReportProgressDialog.reportLabel.text=\u30ec\u30dd\u30fc\u30c8\u30e9\u30d9\u30eb
 ReportProgressDialog.statusMessageLabel.text=\u30d7\u30ed\u30bb\u30b7\u30f3\u30b0\u30e9\u30d9\u30eb
-ReportVisualPanel2.specificTaggedResultsRadioButton.text=\u30bf\u30b0\u3055\u308c\u305f\u7d50\u679c
-ReportVisualPanel2.allTaggedResultsRadioButton.text=\u5168\u3066\u306e\u7d50\u679c
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java
index d69e9b9ed3..08a1736940 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java
@@ -58,10 +58,9 @@ final class ReportVisualPanel2 extends JPanel {
     private final ReportWizardPanel2 wizPanel;
     private final Map<String, Boolean> tagStates = new LinkedHashMap<>();
     private final List<String> tags = new ArrayList<>();
-    ArtifactSelectionDialog dialog = new ArtifactSelectionDialog((JFrame) WindowManager.getDefault().getMainWindow(), true);
+    final ArtifactSelectionDialog dialog = new ArtifactSelectionDialog((JFrame) WindowManager.getDefault().getMainWindow(), true);
     private Map<BlackboardArtifact.Type, Boolean> artifactStates = new HashMap<>();
     private List<BlackboardArtifact.Type> artifacts = new ArrayList<>();
-    private TableReportSettings tableReportSettings;
     private final boolean useCaseSpecificData;
     private TagsListModel tagsModel;
     private TagsListRenderer tagsRenderer;
@@ -69,7 +68,7 @@ final class ReportVisualPanel2 extends JPanel {
     /**
      * Creates new form ReportVisualPanel2
      */
-    public ReportVisualPanel2(ReportWizardPanel2 wizPanel, TableReportSettings tableReportSettings, boolean useCaseSpecificData) {
+    public ReportVisualPanel2(ReportWizardPanel2 wizPanel, boolean useCaseSpecificData) {
         initComponents();
         initTags();
         initArtifactTypes();
@@ -77,8 +76,9 @@ final class ReportVisualPanel2 extends JPanel {
         selectAllButton.setEnabled(false);
         deselectAllButton.setEnabled(false);
         allResultsRadioButton.setSelected(true);
+        advancedButton.setEnabled(useCaseSpecificData);
+        specificTaggedResultsRadioButton.setEnabled(useCaseSpecificData);
         this.wizPanel = wizPanel;
-        this.tableReportSettings = tableReportSettings;
         this.useCaseSpecificData = useCaseSpecificData;
         this.allResultsRadioButton.addChangeListener(new ChangeListener() {
             @Override
@@ -114,19 +114,15 @@ final class ReportVisualPanel2 extends JPanel {
 
     // Initialize the list of Tags
     private void initTags() {
-        List<TagName> tagNamesInUse;
-        if (tableReportSettings == null) {
-            // get default table report settings
-            tableReportSettings = TableReportGenerator.getDefaultTableReportSettings(useCaseSpecificData);
-        }
         
-        // use specified configuration
-        List<String> tagNames = tableReportSettings.getTagSelections();
-        // ELTODO convert List<String> tagNames to List<TagName> tagNamesInUse
-        // use this list instead of of calling Case.getCurrentCaseThrows().getServices().getTagsManager().getTagNamesInUse();
-
+        List<TagName> tagNamesInUse = new ArrayList<>();
         try {
-            tagNamesInUse = Case.getCurrentCaseThrows().getServices().getTagsManager().getTagNamesInUse();
+            // only try to load tag names if we are displaying case specific data, otherwise
+            // there may not be a case open.
+            if (useCaseSpecificData) {
+                // get tags and artifact types from current case
+                tagNamesInUse = Case.getCurrentCaseThrows().getServices().getTagsManager().getTagNamesInUse();
+            }
         } catch (TskCoreException | NoCurrentCaseException ex) {
             Logger.getLogger(ReportVisualPanel2.class.getName()).log(Level.SEVERE, "Failed to get tag names", ex); //NON-NLS
             return;
@@ -176,7 +172,13 @@ final class ReportVisualPanel2 extends JPanel {
                     BlackboardArtifact.ARTIFACT_TYPE.TSK_TOOL_OUTPUT.getLabel(),
                     BlackboardArtifact.ARTIFACT_TYPE.TSK_TOOL_OUTPUT.getDisplayName())); // output is too unstructured for table review
 
-            artifacts = openCase.getSleuthkitCase().getArtifactTypesInUse();
+            if (useCaseSpecificData) {
+                // get artifact types that exist in the current case
+                artifacts = openCase.getSleuthkitCase().getArtifactTypesInUse();
+            } else {
+                // get all possible artifact types
+                openCase.getSleuthkitCase().getArtifactTypes().forEach(artifacts::add);
+            }
 
             artifacts.removeAll(doNotReport);
 
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
index 648afe759d..943a5f3a8e 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
@@ -54,8 +54,8 @@ import org.sleuthkit.datamodel.BlackboardArtifact;
     @ActionReference(path = "Toolbars/Case", position = 105)})
 public final class ReportWizardAction extends CallableSystemAction implements Presenter.Toolbar, ActionListener {
 
-    private static final String REPORTING_CONFIGURATION_NAME = "REPORT_ACTION";
-    private static final boolean DISPLAY_CASE_SPECIFIC_DATA = true;
+    private static final String REPORTING_CONFIGURATION_NAME = "ReportAction";
+    private static final boolean DISPLAY_CASE_SPECIFIC_DATA = false; // ELTODO true;
     private static final boolean RUN_REPORTS = true;
     private final JButton toolbarButton = new JButton();
     private static final String ACTION_NAME = NbBundle.getMessage(ReportWizardAction.class, "ReportWizardAction.actionName.text");
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java
index 71c274474c..fbe0372e9a 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java
@@ -69,12 +69,12 @@ final class ReportWizardIterator implements WizardDescriptor.Iterator<WizardDesc
         
         if (config != null) {
             firstPanel = new ReportWizardPanel1(config.getModuleConfigs());
-            tableConfigPanel = new ReportWizardPanel2(config.getTableReportSettings(), useCaseSpecificData);
+            tableConfigPanel = new ReportWizardPanel2(useCaseSpecificData);
             fileConfigPanel = new ReportWizardFileOptionsPanel(config.getFileReportSettings());
             portableCaseConfigPanel = new ReportWizardPortableCaseOptionsPanel(config.getModuleConfigs());
         } else {
             firstPanel = new ReportWizardPanel1(null);
-            tableConfigPanel = new ReportWizardPanel2(null, useCaseSpecificData);
+            tableConfigPanel = new ReportWizardPanel2(useCaseSpecificData);
             fileConfigPanel = new ReportWizardFileOptionsPanel(null);
             portableCaseConfigPanel = new ReportWizardPortableCaseOptionsPanel(null);            
         }
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java
index 847d2020c8..01e547612f 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java
@@ -32,11 +32,9 @@ class ReportWizardPanel2 implements WizardDescriptor.Panel<WizardDescriptor> {
     private final JButton finishButton;
     private final JButton nextButton;
     private WizardDescriptor wiz;
-    private final TableReportSettings tableReportSettings;
     private final boolean useCaseSpecificData;
 
-    ReportWizardPanel2(TableReportSettings tableReportSettings, boolean useCaseSpecificData) {
-        this.tableReportSettings = tableReportSettings;
+    ReportWizardPanel2(boolean useCaseSpecificData) {
         this.useCaseSpecificData = useCaseSpecificData;
         
         finishButton = new JButton(NbBundle.getMessage(this.getClass(), "ReportWizardPanel2.finishButton.text"));
@@ -62,7 +60,7 @@ class ReportWizardPanel2 implements WizardDescriptor.Panel<WizardDescriptor> {
     @Override
     public ReportVisualPanel2 getComponent() {
         if (component == null) {
-            component = new ReportVisualPanel2(this, tableReportSettings, useCaseSpecificData);
+            component = new ReportVisualPanel2(this, useCaseSpecificData);
         }
         return component;
     }
diff --git a/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
index 0e06c50ceb..bd53e95ebe 100644
--- a/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
@@ -72,30 +72,51 @@ class TableReportGenerator {
 
     private final List<String> errorList;
 
-    TableReportGenerator(TableReportSettings settings, ReportProgressPanel progressPanel, TableReportModule tableReport) {
+    TableReportGenerator(TableReportSettings settings, ReportProgressPanel progressPanel, TableReportModule tableReport) throws NoCurrentCaseException, TskCoreException {
 
         this.progressPanel = progressPanel;
         this.tableReport = tableReport;
         this.columnHeaderMap = new HashMap<>();
         errorList = new ArrayList<>();
-        // Get the artifact types selected by the user.
-        artifactTypes = settings.getArtifactSelections();
-
-        // Get the tag names selected by the user and make a tag names filter.
-        tagNamesFilter = new HashSet<>(settings.getTagSelections());
-    }
-    
-    static TableReportSettings getDefaultTableReportSettings(boolean useCaseSpecificData) {
-        Map<BlackboardArtifact.Type, Boolean> artifactTypeSelections = new HashMap<>();
-        Map<String, Boolean> tagNameSelections = new HashMap<>();
         
-        if (useCaseSpecificData) {
-            // get tags and artifact types from current case
+        if (settings.isUseCaseSpecificData()) {
+            // Get the artifact types selected by the user.
+            artifactTypes = settings.getArtifactSelections();
+
+            // Get the tag names selected by the user and make a tag names filter.
+            tagNamesFilter = new HashSet<>(settings.getTagSelections());
         } else {
             // get all possible tag names and artifact types
+            getAllExistingTagsAndArtiacts(true); // ELTODO verify whether we should add (Notable) to tag names like we do in UI
         }
+    }
+    
+    private void getAllExistingTagsAndArtiacts(boolean addNotableToTagNames) throws NoCurrentCaseException, TskCoreException {
+        List<String> tagNames = new ArrayList<>();
+
+        // get all possible tag names
+        List<TagName> tagNamesInUse = Case.getCurrentCaseThrows().getServices().getTagsManager().getAllTagNames();
         
-        return new TableReportSettings(artifactTypeSelections, tagNameSelections);
+        String notableString = "";
+        for (TagName tagName : tagNamesInUse) {
+            if (addNotableToTagNames) {
+                notableString = tagName.getKnownStatus() == TskData.FileKnown.BAD ? TagsManager.getNotableTagLabel() : "";
+            }
+            tagNames.add(tagName.getDisplayName() + notableString);
+        }
+        tagNamesFilter = new HashSet<>(tagNames);
+        
+        // get all possible artifact types
+        ArrayList<BlackboardArtifact.Type> doNotReport = new ArrayList<>();
+        doNotReport.add(new BlackboardArtifact.Type(BlackboardArtifact.ARTIFACT_TYPE.TSK_GEN_INFO.getTypeID(),
+                BlackboardArtifact.ARTIFACT_TYPE.TSK_GEN_INFO.getLabel(),
+                BlackboardArtifact.ARTIFACT_TYPE.TSK_GEN_INFO.getDisplayName()));
+        doNotReport.add(new BlackboardArtifact.Type(BlackboardArtifact.ARTIFACT_TYPE.TSK_TOOL_OUTPUT.getTypeID(),
+                BlackboardArtifact.ARTIFACT_TYPE.TSK_TOOL_OUTPUT.getLabel(),
+                BlackboardArtifact.ARTIFACT_TYPE.TSK_TOOL_OUTPUT.getDisplayName())); // output is too unstructured for table review
+
+        Case.getCurrentCaseThrows().getSleuthkitCase().getArtifactTypes().forEach(artifactTypes::add);
+        artifactTypes.removeAll(doNotReport);
     }
 
     protected void execute() {
diff --git a/Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java b/Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java
index 5c9c5f7985..50747a9b48 100755
--- a/Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java
@@ -34,6 +34,7 @@ final class TableReportSettings implements Serializable {
     private static final long serialVersionUID = 1L;
     private List<BlackboardArtifact.Type> artifactTypes = new ArrayList<>();
     private List<String> tagNames = new ArrayList<>();
+    private boolean useCaseSpecificData = false;
 
     /**
      * Creates TableReportSettings object.
@@ -43,7 +44,7 @@ final class TableReportSettings implements Serializable {
      * @param tagNameSelections The enabled/disabled state of the tag names to
      * be included in the report. Only enabled entries will be kept.
      */
-    TableReportSettings(Map<BlackboardArtifact.Type, Boolean> artifactTypeSelections, Map<String, Boolean> tagNameSelections) {
+    TableReportSettings(Map<BlackboardArtifact.Type, Boolean> artifactTypeSelections, Map<String, Boolean> tagNameSelections, boolean useCaseSpecificData) {
         // Get the artifact types selected by the user
         for (Map.Entry<BlackboardArtifact.Type, Boolean> entry : artifactTypeSelections.entrySet()) {
             if (entry.getValue()) {
@@ -57,11 +58,18 @@ final class TableReportSettings implements Serializable {
                 tagNames.add(entry.getKey());
             }
         }
+        
+        this.useCaseSpecificData = useCaseSpecificData;
     }
     
-    TableReportSettings(List<BlackboardArtifact.Type> artifactTypes, List<String> tagNames) {
+    TableReportSettings(List<BlackboardArtifact.Type> artifactTypes, List<String> tagNames, boolean useCaseSpecificData) {
         this.artifactTypes = artifactTypes;
         this.tagNames = tagNames;
+        this.useCaseSpecificData = useCaseSpecificData;
+    }
+
+    TableReportSettings(boolean useCaseSpecificData) {
+        this.useCaseSpecificData = useCaseSpecificData;
     }
 
     List<BlackboardArtifact.Type> getArtifactSelections() {
@@ -71,4 +79,8 @@ final class TableReportSettings implements Serializable {
     List<String> getTagSelections() {
         return tagNames;
     }
+
+    boolean isUseCaseSpecificData() {
+        return useCaseSpecificData;
+    }
 }

From 9cc641deee83c191b7140d89871174f9f1a052f3 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Mon, 19 Aug 2019 14:39:50 -0400
Subject: [PATCH 068/192] Modified wizard infrastructure to handle and store
 reporting configuration

---
 .../autopsy/report/Bundle.properties          |  2 +
 .../autopsy/report/Bundle.properties-MERGED   |  2 +
 .../autopsy/report/ReportGenerator.java       |  1 -
 .../autopsy/report/ReportVisualPanel1.java    | 19 +++++
 .../autopsy/report/ReportVisualPanel2.java    |  9 ++-
 .../autopsy/report/ReportWizardAction.java    | 76 ++++++++++++++++---
 .../report/ReportWizardFileOptionsPanel.java  |  5 +-
 .../autopsy/report/ReportWizardIterator.java  |  6 +-
 .../autopsy/report/ReportWizardPanel1.java    |  2 +
 .../autopsy/report/ReportWizardPanel2.java    | 10 +--
 .../autopsy/report/ReportingConfig.java       |  7 +-
 .../autopsy/report/ReportingConfigLoader.java | 31 ++++----
 .../autopsy/report/TableReportGenerator.java  | 49 ++++++++----
 .../autopsy/report/TableReportSettings.java   | 55 +++++++++++---
 14 files changed, 201 insertions(+), 73 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties
index 0a725a2ae1..e0e63173de 100644
--- a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties
@@ -227,6 +227,8 @@ ReportGenerator.artTableColHdr.osName.text=Operating System Name
 ReportGenerator.artTableColHdr.osInstallDate.text=Install Date
 ReportGenerator.errList.failedMakeRptFolder=Failed to make report folder, may be unable to generate reports.
 ReportGenerator.notifyErr.errsDuringRptGen=Errors during report generation:
+ReportGenerator.errList.failedGetAllTagsArtifacts=Failed get all possible tag names and artifact types.
+ReportGenerator.errList.noReportSettings=Report settings have not been configured.
 ReportGenerator.errList.failedGetContentTags=Failed to get content tags.
 ReportGenerator.errList.failedGetBBArtifactTags=Failed to get blackboard artifact tags.
 ReportGenerator.errList.errGetContentFromBBArtifact=Error while getting content from a blackboard artifact to report on.
diff --git a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties-MERGED
index b6dd050066..77f9155d6f 100755
--- a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties-MERGED
@@ -287,6 +287,8 @@ ReportGenerator.artTableColHdr.osName.text=Operating System Name
 ReportGenerator.artTableColHdr.osInstallDate.text=Install Date
 ReportGenerator.errList.failedMakeRptFolder=Failed to make report folder, may be unable to generate reports.
 ReportGenerator.notifyErr.errsDuringRptGen=Errors during report generation:
+ReportGenerator.errList.failedGetAllTagsArtifacts=Failed get all possible tag names and artifact types.
+ReportGenerator.errList.noReportSettings=Report settings have not been configured.
 ReportGenerator.errList.failedGetContentTags=Failed to get content tags.
 ReportGenerator.errList.failedGetBBArtifactTags=Failed to get blackboard artifact tags.
 ReportGenerator.errList.errGetContentFromBBArtifact=Error while getting content from a blackboard artifact to report on.
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
index 14f9cb60e2..c762a75f99 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
@@ -30,7 +30,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.ExecutionException;
 import java.util.logging.Level;
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
index b4d490cf95..7b0cbaa646 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
@@ -120,6 +120,7 @@ final class ReportVisualPanel1 extends JPanel implements ListSelectionListener {
             if (moduleConfigs == null) {
                 // ELTODO get default module configuration (API isn't implemented yet)
                 // settings = module.getDefaultConfiguration();
+                // update ReportModuleConfig config
             } else {
                 // get configuration for this module
                 ReportModuleConfig config = moduleConfigs.get(module.getClass().getCanonicalName());                
@@ -129,6 +130,7 @@ final class ReportVisualPanel1 extends JPanel implements ListSelectionListener {
                 } else {
                     // ELTODO get default module configuration (API isn't implemented yet)
                     // settings = module.getDefaultConfiguration();
+                    // update ReportModuleConfig config
                 }
             }
             // ELTODO set module configuration (API isn't implemented yet)
@@ -216,6 +218,23 @@ final class ReportVisualPanel1 extends JPanel implements ListSelectionListener {
         return null;
     }
 
+    /**
+     * Get updated configuration for all report modules.
+     *
+     * @return
+     */
+    Map<String, ReportModuleConfig> getUpdatedModuleConfigs() {
+        // set module configurations
+        for (ReportModule module : modules) {
+            // ELTODO get updated module configuration (API isn't implemented yet)
+            // settings = module.getConfiguration();
+            
+            // update moduleConfigs
+            // moduleConfigs.pu(module.getName(), settings);
+        }
+        return moduleConfigs;
+    }
+
     /**
      * 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
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java
index 08a1736940..48eaa6ace4 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java
@@ -243,8 +243,13 @@ final class ReportVisualPanel2 extends JPanel {
     /**
      * @return true if the Specific Tags radio button is selected, false otherwise
      */
-    boolean isSpecificTaggedResultsRadioButtonSelected() {
-        return specificTaggedResultsRadioButton.isSelected();
+    TableReportSettings.TableReportType getSelectedReportType() {
+        if (allTaggedResultsRadioButton.isSelected()) {
+            return TableReportSettings.TableReportType.ALL_TAGGED_RESULTS;
+        } else if (specificTaggedResultsRadioButton.isSelected()) {
+            return TableReportSettings.TableReportType.SPECIFIC_TAGGED_RESULTS;
+        }        
+        return TableReportSettings.TableReportType.ALL_RESULTS;
     }
 
     /**
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
index 943a5f3a8e..04a9c55423 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
@@ -30,6 +30,7 @@ import java.io.IOException;
 import java.text.MessageFormat;
 import java.util.EnumSet;
 import java.util.Map;
+import java.util.logging.Level;
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import org.openide.DialogDisplayer;
@@ -45,7 +46,7 @@ import org.openide.util.actions.CallableSystemAction;
 import org.openide.util.actions.Presenter;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.core.RuntimeProperties;
-import org.sleuthkit.datamodel.BlackboardArtifact;
+import org.sleuthkit.autopsy.coreutils.Logger;
 
 @ActionID(category = "Tools", id = "org.sleuthkit.autopsy.report.ReportWizardAction")
 @ActionRegistration(displayName = "#CTL_ReportWizardAction", lazy = false)
@@ -54,6 +55,7 @@ import org.sleuthkit.datamodel.BlackboardArtifact;
     @ActionReference(path = "Toolbars/Case", position = 105)})
 public final class ReportWizardAction extends CallableSystemAction implements Presenter.Toolbar, ActionListener {
 
+    private static final Logger logger = Logger.getLogger(ReportWizardAction.class.getName());
     private static final String REPORTING_CONFIGURATION_NAME = "ReportAction";
     private static final boolean DISPLAY_CASE_SPECIFIC_DATA = false; // ELTODO true;
     private static final boolean RUN_REPORTS = true;
@@ -64,10 +66,13 @@ public final class ReportWizardAction extends CallableSystemAction implements Pr
      * When the Generate Report button or menu item is selected, open the
      * reporting wizard. When the wizard is finished, create a ReportGenerator
      * with the wizard information, and start all necessary reports.
+     * @param configName Name of the reporting configuration to use
+     * @param displayCaseSpecificData Flag whether to use case specific data in UI panels or to use all possible result types
+     * @param runReports Flag whether to produce report(s) 
      */
     @SuppressWarnings("unchecked")
-    public static void doReportWizard() {
-        WizardDescriptor wiz = new WizardDescriptor(new ReportWizardIterator(REPORTING_CONFIGURATION_NAME, DISPLAY_CASE_SPECIFIC_DATA, RUN_REPORTS));
+    public static void doReportWizard(String configName, boolean displayCaseSpecificData, boolean runReports) {
+        WizardDescriptor wiz = new WizardDescriptor(new ReportWizardIterator(configName, displayCaseSpecificData));
         wiz.setTitleFormat(new MessageFormat("{0} {1}"));
         wiz.setTitle(NbBundle.getMessage(ReportWizardAction.class, "ReportWizardAction.reportWiz.title"));
         if (DialogDisplayer.getDefault().notify(wiz) == WizardDescriptor.FINISH_OPTION) {
@@ -78,13 +83,48 @@ public final class ReportWizardAction extends CallableSystemAction implements Pr
             PortableCaseReportModule portableCaseReport = (PortableCaseReportModule) wiz.getProperty("portableCaseModule");  // NON-NLS
             try {
                 if (tableReport != null) {
-                    generator.generateTableReport(tableReport, new TableReportSettings((Map<BlackboardArtifact.Type, Boolean>) wiz.getProperty("artifactStates"), (Map<String, Boolean>) wiz.getProperty("tagStates"))); //NON-NLS
-                } else if (generalReport != null) {
-                    generator.generateGeneralReport(generalReport);
+                    // get table report settings
+                    TableReportSettings settings = (TableReportSettings) wiz.getProperty("tableReportSettings");
+                    if (settings == null) {
+                        NotifyDescriptor descriptor = new NotifyDescriptor.Message(NbBundle.getMessage(ReportWizardAction.class, "ReportGenerator.errList.noReportSettings"), NotifyDescriptor.ERROR_MESSAGE);
+                        DialogDisplayer.getDefault().notify(descriptor);
+                        return;
+                    }
+                    
+                    // save reporting configuration
+                    saveReportingConfiguration(configName, wiz);
+                    
+                    if (runReports) {
+                        generator.generateTableReport(tableReport, settings); //NON-NLS
+                    }
+                } else if (generalReport != null) {                    
+                    // save reporting configuration
+                    saveReportingConfiguration(configName, wiz);
+                    
+                    if (runReports) {
+                        generator.generateGeneralReport(generalReport);
+                    }
                 } else if (fileReport != null) {
-                    generator.generateFileListReport(fileReport, new FileReportSettings((Map<FileReportDataTypes, Boolean>) wiz.getProperty("fileReportOptions"))); //NON-NLS
-                } else if (portableCaseReport != null) {
-                    generator.generatePortableCaseReport(portableCaseReport, (PortableCaseReportModule.PortableCaseOptions) wiz.getProperty("portableCaseReportOptions"));
+                    // get file report settings
+                    FileReportSettings settings = (FileReportSettings) wiz.getProperty("fileReportSettings");
+                    if (settings == null) {
+                        NotifyDescriptor descriptor = new NotifyDescriptor.Message(NbBundle.getMessage(ReportWizardAction.class, "ReportGenerator.errList.noReportSettings"), NotifyDescriptor.ERROR_MESSAGE);
+                        DialogDisplayer.getDefault().notify(descriptor);
+                        return;
+                    }
+                    // save reporting configuration
+                    saveReportingConfiguration(configName, wiz);
+                    
+                    if (runReports) {
+                        generator.generateFileListReport(fileReport, settings); //NON-NLS
+                    }
+                } else if (portableCaseReport != null) {                    
+                    // save reporting configuration
+                    saveReportingConfiguration(configName, wiz);
+                    
+                    if (runReports) {
+                        generator.generatePortableCaseReport(portableCaseReport, (PortableCaseReportModule.PortableCaseOptions) wiz.getProperty("portableCaseReportOptions"));
+                    }
                 }
             } catch (IOException e) {
                 NotifyDescriptor descriptor = new NotifyDescriptor.Message(e.getMessage(), NotifyDescriptor.ERROR_MESSAGE);
@@ -92,6 +132,22 @@ public final class ReportWizardAction extends CallableSystemAction implements Pr
             }
         }
     }
+    
+    private static void saveReportingConfiguration(String configName, WizardDescriptor wiz) {
+
+        ReportingConfig reportingConfig = new ReportingConfig(configName);
+        reportingConfig.setModuleConfigs((Map<String, ReportModuleConfig>) wiz.getProperty("moduleConfigs"));
+        reportingConfig.setFileReportSettings((FileReportSettings) wiz.getProperty("fileReportSettings"));
+        reportingConfig.setTableReportSettings((TableReportSettings) wiz.getProperty("tableReportSettings")); 
+
+        try {
+            // save reporting configuration
+            ReportingConfigLoader.saveConfig(reportingConfig);
+        } catch (ReportConfigException ex) {
+            // ELTODO should we do more to let the user know?
+            logger.log(Level.SEVERE, "Failed to save reporting configuration " + reportingConfig.getName(), ex); //NON-NLS
+        }
+    }
 
     public ReportWizardAction() {
         setEnabled(false);
@@ -109,7 +165,7 @@ public final class ReportWizardAction extends CallableSystemAction implements Pr
     @Override
     @SuppressWarnings("unchecked")
     public void actionPerformed(ActionEvent e) {
-        doReportWizard();
+        doReportWizard(REPORTING_CONFIGURATION_NAME, DISPLAY_CASE_SPECIFIC_DATA, RUN_REPORTS);
     }
 
     @Override
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsPanel.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsPanel.java
index a41d2ce3d7..83ba068fc4 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsPanel.java
@@ -35,9 +35,10 @@ class ReportWizardFileOptionsPanel implements WizardDescriptor.FinishablePanel<W
 
     private WizardDescriptor wiz;
     private ReportWizardFileOptionsVisualPanel component;
-    private JButton finishButton;
+    private final JButton finishButton;
 
     ReportWizardFileOptionsPanel(FileReportSettings fileReportSettings) {
+        wiz.putProperty("fileReportSettings", fileReportSettings);
         finishButton = new JButton(
                 NbBundle.getMessage(this.getClass(), "ReportWizardFileOptionsPanel.finishButton.text"));
         finishButton.setEnabled(false);
@@ -83,7 +84,7 @@ class ReportWizardFileOptionsPanel implements WizardDescriptor.FinishablePanel<W
 
     @Override
     public void storeSettings(WizardDescriptor data) {
-        data.putProperty("fileReportOptions", getComponent().getFileReportOptions()); //NON-NLS
+        wiz.putProperty("fileReportSettings", new FileReportSettings(getComponent().getFileReportOptions()));
     }
 
     @Override
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java
index fbe0372e9a..8601d91271 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java
@@ -58,7 +58,7 @@ final class ReportWizardIterator implements WizardDescriptor.Iterator<WizardDesc
     private final WizardDescriptor.Panel<WizardDescriptor>[] portableCaseConfigPanels;
 
     @SuppressWarnings({"rawtypes", "unchecked"})
-    ReportWizardIterator(String reportingConfigurationName, boolean useCaseSpecificData, boolean runReports) {
+    ReportWizardIterator(String reportingConfigurationName, boolean useCaseSpecificData) {
         
         ReportingConfig config = null;
         try {
@@ -69,12 +69,12 @@ final class ReportWizardIterator implements WizardDescriptor.Iterator<WizardDesc
         
         if (config != null) {
             firstPanel = new ReportWizardPanel1(config.getModuleConfigs());
-            tableConfigPanel = new ReportWizardPanel2(useCaseSpecificData);
+            tableConfigPanel = new ReportWizardPanel2(useCaseSpecificData, config.getTableReportSettings());
             fileConfigPanel = new ReportWizardFileOptionsPanel(config.getFileReportSettings());
             portableCaseConfigPanel = new ReportWizardPortableCaseOptionsPanel(config.getModuleConfigs());
         } else {
             firstPanel = new ReportWizardPanel1(null);
-            tableConfigPanel = new ReportWizardPanel2(useCaseSpecificData);
+            tableConfigPanel = new ReportWizardPanel2(useCaseSpecificData, null);
             fileConfigPanel = new ReportWizardFileOptionsPanel(null);
             portableCaseConfigPanel = new ReportWizardPortableCaseOptionsPanel(null);            
         }
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java
index d6736ab1f8..36436bbe83 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java
@@ -114,10 +114,12 @@ class ReportWizardPanel1 implements WizardDescriptor.FinishablePanel<WizardDescr
         TableReportModule module = getComponent().getTableModule();
         GeneralReportModule general = getComponent().getGeneralModule();
         PortableCaseReportModule portable = getComponent().getPortableCaseModule();
+        Map<String, ReportModuleConfig> moduleConfigs = getComponent().getUpdatedModuleConfigs();
         wiz.putProperty("tableModule", module); //NON-NLS
         wiz.putProperty("generalModule", general); //NON-NLS
         wiz.putProperty("fileModule", getComponent().getFileModule()); //NON-NLS
         wiz.putProperty("portableCaseModule", portable); //NON-NLS
+        wiz.putProperty("moduleConfigs", moduleConfigs); //NON-NLS
 
         // Store preferences that WizardIterator will use to determine what 
         // panels need to be shown
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java
index 01e547612f..36615745c8 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java
@@ -34,11 +34,10 @@ class ReportWizardPanel2 implements WizardDescriptor.Panel<WizardDescriptor> {
     private WizardDescriptor wiz;
     private final boolean useCaseSpecificData;
 
-    ReportWizardPanel2(boolean useCaseSpecificData) {
+    ReportWizardPanel2(boolean useCaseSpecificData, TableReportSettings tableResportSettings) {
         this.useCaseSpecificData = useCaseSpecificData;
-        
+        wiz.putProperty("tableReportSettings", tableResportSettings);
         finishButton = new JButton(NbBundle.getMessage(this.getClass(), "ReportWizardPanel2.finishButton.text"));
-
         nextButton = new JButton(NbBundle.getMessage(this.getClass(), "ReportWizardPanel2.nextButton.text"));
         nextButton.setEnabled(true);
 
@@ -98,8 +97,7 @@ class ReportWizardPanel2 implements WizardDescriptor.Panel<WizardDescriptor> {
 
     @Override
     public void storeSettings(WizardDescriptor wiz) {
-        wiz.putProperty("tagStates", getComponent().getTagStates()); //NON-NLS
-        wiz.putProperty("artifactStates", getComponent().getArtifactStates()); //NON-NLS
-        wiz.putProperty("isTagsSelected", getComponent().isSpecificTaggedResultsRadioButtonSelected()); //NON-NLS
+        TableReportSettings settings = new TableReportSettings(getComponent().getArtifactStates(), getComponent().getTagStates(), useCaseSpecificData, getComponent().getSelectedReportType());
+        wiz.putProperty("tableReportSettings", settings);
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportingConfig.java b/Core/src/org/sleuthkit/autopsy/report/ReportingConfig.java
index fb17f919cf..b6b9ebf154 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportingConfig.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportingConfig.java
@@ -20,7 +20,6 @@ package org.sleuthkit.autopsy.report;
 
 import java.io.Serializable;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -51,10 +50,8 @@ final class ReportingConfig implements Serializable {
         return this.configName;
     }
 
-    void setModuleConfigs(List<ReportModuleConfig> moduleConfigs) {
-        for (ReportModuleConfig config : moduleConfigs) {
-            this.moduleConfigs.put(config.getModuleClassName(), config);
-        }
+    void setModuleConfigs(Map<String, ReportModuleConfig> moduleConfigs) {
+        this.moduleConfigs = moduleConfigs;
     }
 
     Map<String, ReportModuleConfig> getModuleConfigs() {
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java b/Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java
index 99d3b7d06a..b7a27052f5 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java
@@ -28,6 +28,8 @@ import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
 import java.util.logging.Level;
 import org.openide.util.io.NbObjectInputStream;
 import org.openide.util.io.NbObjectOutputStream;
@@ -93,22 +95,22 @@ final class ReportingConfigLoader {
             throw new ReportConfigException("Unable to read file report settings " + filePath, ex);
         }
         
-        // read list of module configuration objects
-        List<ReportModuleConfig> moduleConfigs = null;
+        // read map of module configuration objects
+        Map<String, ReportModuleConfig> moduleConfigs = null;
         filePath = reportDirPath.toString() + File.separator + MODULE_CONFIG_FILE;
         try (NbObjectInputStream in = new NbObjectInputStream(new FileInputStream(filePath))) {
-            moduleConfigs = (List<ReportModuleConfig>) in.readObject();
+            moduleConfigs = (Map<String, ReportModuleConfig>) in.readObject();
         } catch (IOException | ClassNotFoundException ex) {
-            throw new ReportConfigException("Unable to read module configurations list " + filePath, ex);
+            throw new ReportConfigException("Unable to read module configurations map " + filePath, ex);
         }
         
         if (moduleConfigs == null) {
-            throw new ReportConfigException("Failed to read module configurations list " + filePath);
+            throw new ReportConfigException("Failed to read module configurations map " + filePath);
         }
         
         // read each ReportModuleSettings object individually
-        for (Iterator<ReportModuleConfig> iterator = moduleConfigs.iterator(); iterator.hasNext();) {
-            ReportModuleConfig moduleConfig = iterator.next();
+        for (Iterator<Entry<String, ReportModuleConfig>> iterator = moduleConfigs.entrySet().iterator(); iterator.hasNext();) {
+            ReportModuleConfig moduleConfig = (ReportModuleConfig) iterator.next().getValue();
             filePath = reportDirPath.toString() + File.separator + moduleConfig.getModuleClassName() + REPORT_SETTINGS_FILE_EXTENSION;
             try (NbObjectInputStream in = new NbObjectInputStream(new FileInputStream(filePath))) {
                 moduleConfig.setModuleSettings((ReportModuleSettings) in.readObject());
@@ -162,17 +164,12 @@ final class ReportingConfigLoader {
             throw new ReportConfigException("Unable to save file report configuration " + filePath, ex);
         }
 
-        // save list of module configuration objects
-        filePath = pathToConfigDir.toString() + File.separator + MODULE_CONFIG_FILE;
-        List<ReportModuleConfig> moduleConfigs = new ArrayList<>();
-        for (ReportModuleConfig config : reportConfig.getModuleConfigs().values()) {
-            moduleConfigs.add(config);
-        }
-        
+        // save map of module configuration objects
+        filePath = pathToConfigDir.toString() + File.separator + MODULE_CONFIG_FILE;        
         try (NbObjectOutputStream out = new NbObjectOutputStream(new FileOutputStream(filePath))) {
-            out.writeObject(moduleConfigs);
+            out.writeObject(reportConfig.getModuleConfigs());
         } catch (IOException ex) {
-            throw new ReportConfigException("Unable to save module configurations list " + filePath, ex);
+            throw new ReportConfigException("Unable to save module configurations map " + filePath, ex);
         }
 
         // save each ReportModuleSettings object individually
@@ -180,7 +177,7 @@ final class ReportingConfigLoader {
         party report module settings. If we were to serialize the entire ReportingConfig 
         object, then a single error while reading in a 3rd party report module 
         would prevent us from reading the entire reporting configuration.*/
-        for (ReportModuleConfig moduleConfig : moduleConfigs) {
+        for (ReportModuleConfig moduleConfig : reportConfig.getModuleConfigs().values()) {
             ReportModuleSettings settings = moduleConfig.getModuleSettings();
             filePath = pathToConfigDir.toString() + File.separator + moduleConfig.getModuleClassName() + REPORT_SETTINGS_FILE_EXTENSION;
             try (NbObjectOutputStream out = new NbObjectOutputStream(new FileOutputStream(filePath))) {
diff --git a/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
index bd53e95ebe..f84dcb69e3 100644
--- a/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
@@ -67,36 +67,27 @@ class TableReportGenerator {
     private final Set<Content> images = new HashSet<>();
     private final ReportProgressPanel progressPanel;
     private final TableReportModule tableReport;
+    private final TableReportSettings settings;
     private final Map<Integer, List<Column>> columnHeaderMap;
     private static final Logger logger = Logger.getLogger(TableReportGenerator.class.getName());
 
     private final List<String> errorList;
 
-    TableReportGenerator(TableReportSettings settings, ReportProgressPanel progressPanel, TableReportModule tableReport) throws NoCurrentCaseException, TskCoreException {
+    TableReportGenerator(TableReportSettings settings, ReportProgressPanel progressPanel, TableReportModule tableReport) {
 
         this.progressPanel = progressPanel;
         this.tableReport = tableReport;
         this.columnHeaderMap = new HashMap<>();
-        errorList = new ArrayList<>();
-        
-        if (settings.isUseCaseSpecificData()) {
-            // Get the artifact types selected by the user.
-            artifactTypes = settings.getArtifactSelections();
-
-            // Get the tag names selected by the user and make a tag names filter.
-            tagNamesFilter = new HashSet<>(settings.getTagSelections());
-        } else {
-            // get all possible tag names and artifact types
-            getAllExistingTagsAndArtiacts(true); // ELTODO verify whether we should add (Notable) to tag names like we do in UI
-        }
+        errorList = new ArrayList<>();        
+        this.settings = settings;
     }
     
-    private void getAllExistingTagsAndArtiacts(boolean addNotableToTagNames) throws NoCurrentCaseException, TskCoreException {
+    private void getAllExistingTags(boolean addNotableToTagNames) throws NoCurrentCaseException, TskCoreException {
         List<String> tagNames = new ArrayList<>();
 
         // get all possible tag names
         List<TagName> tagNamesInUse = Case.getCurrentCaseThrows().getServices().getTagsManager().getAllTagNames();
-        
+
         String notableString = "";
         for (TagName tagName : tagNamesInUse) {
             if (addNotableToTagNames) {
@@ -105,7 +96,9 @@ class TableReportGenerator {
             tagNames.add(tagName.getDisplayName() + notableString);
         }
         tagNamesFilter = new HashSet<>(tagNames);
-        
+    }
+
+    private void getAllExistingArtiactTypes() throws NoCurrentCaseException, TskCoreException {
         // get all possible artifact types
         ArrayList<BlackboardArtifact.Type> doNotReport = new ArrayList<>();
         doNotReport.add(new BlackboardArtifact.Type(BlackboardArtifact.ARTIFACT_TYPE.TSK_GEN_INFO.getTypeID(),
@@ -125,6 +118,30 @@ class TableReportGenerator {
         progressPanel.start();
         progressPanel.setIndeterminate(false);
         progressPanel.setMaximumProgress(this.artifactTypes.size() + 2); // +2 for content and blackboard artifact tags
+        
+        if (settings.isUseCaseSpecificData()) {
+            // Get the artifact types selected by the user.
+            artifactTypes = settings.getArtifactSelections();
+
+            // Get the tag names selected by the user and make a tag names filter.
+            tagNamesFilter = new HashSet<>(settings.getTagSelections());
+        } else {
+            try {
+                // If report type is "all tagged results", then read all possible tab names from database.
+                // Otherwise do not load tag names, i.e. run "all results" report
+                if (settings.getReportType() == TableReportSettings.TableReportType.ALL_TAGGED_RESULTS) {
+                    getAllExistingTags(true); // ELTODO verify whether we should add (Notable) to tag names like we do in UI
+                }
+                
+                // get all possible artifact types
+                getAllExistingArtiactTypes();
+            } catch (NoCurrentCaseException | TskCoreException ex) {
+                errorList.add(NbBundle.getMessage(this.getClass(), "ReportGenerator.errList.failedGetAllTagsArtifacts"));
+                logger.log(Level.SEVERE, "Failed get all possible tag names and artifact types", ex); //NON-NLS
+                return;
+            }
+        }
+        
         // report on the blackboard results
         if (progressPanel.getStatus() != ReportProgressPanel.ReportStatus.CANCELED) {
             makeBlackboardArtifactTables();
diff --git a/Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java b/Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java
index 50747a9b48..1eb49b74c3 100755
--- a/Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java
@@ -31,20 +31,32 @@ import org.sleuthkit.datamodel.BlackboardArtifact;
  */
 final class TableReportSettings implements Serializable {
 
+    /**
+     * An enumeration of table report types.
+     */
+    enum TableReportType {
+        ALL_RESULTS, //NON-NLS
+        ALL_TAGGED_RESULTS, //NON-NLS
+        SPECIFIC_TAGGED_RESULTS;   //NON-NLS
+    }
+
     private static final long serialVersionUID = 1L;
     private List<BlackboardArtifact.Type> artifactTypes = new ArrayList<>();
     private List<String> tagNames = new ArrayList<>();
     private boolean useCaseSpecificData = false;
+    private TableReportType reportType = TableReportType.ALL_RESULTS;
 
     /**
-     * Creates TableReportSettings object.
+     * Creates TableReportSettings object. This constructor is used when user
+     * selects specific tags and artifacts in UI (which requires a case to be
+     * open).
      *
      * @param artifactTypeSelections The enabled/disabled state of the artifact
      * types to be included in the report. Only enabled entries will be kept.
      * @param tagNameSelections The enabled/disabled state of the tag names to
      * be included in the report. Only enabled entries will be kept.
      */
-    TableReportSettings(Map<BlackboardArtifact.Type, Boolean> artifactTypeSelections, Map<String, Boolean> tagNameSelections, boolean useCaseSpecificData) {
+    TableReportSettings(Map<BlackboardArtifact.Type, Boolean> artifactTypeSelections, Map<String, Boolean> tagNameSelections, boolean useCaseSpecificData, TableReportType reportType) {
         // Get the artifact types selected by the user
         for (Map.Entry<BlackboardArtifact.Type, Boolean> entry : artifactTypeSelections.entrySet()) {
             if (entry.getValue()) {
@@ -53,24 +65,36 @@ final class TableReportSettings implements Serializable {
         }
 
         // Get the tag names selected by the user
+
         for (Map.Entry<String, Boolean> entry : tagNameSelections.entrySet()) {
             if (entry.getValue() == true) {
                 tagNames.add(entry.getKey());
             }
         }
-        
-        this.useCaseSpecificData = useCaseSpecificData;
-    }
-    
-    TableReportSettings(List<BlackboardArtifact.Type> artifactTypes, List<String> tagNames, boolean useCaseSpecificData) {
-        this.artifactTypes = artifactTypes;
-        this.tagNames = tagNames;
+
+        this.reportType = reportType;
         this.useCaseSpecificData = useCaseSpecificData;
     }
 
-    TableReportSettings(boolean useCaseSpecificData) {
+    // ELTODO remove this constructor?
+    /*TableReportSettings(List<BlackboardArtifact.Type> artifactTypes, List<String> tagNames, boolean useCaseSpecificData) {
+        this.artifactTypes = artifactTypes;
+        this.tagNames = tagNames;
         this.useCaseSpecificData = useCaseSpecificData;
-    }
+    }*/
+    /**
+     * Creates TableReportSettings object. This constructor is used when user
+     * configures command line ingest. Most likely there will be no case open at
+     * the time, so tags and artifacts will have to be read from database at the
+     * report execution time.
+     *
+     * @param useCaseSpecificData
+     * @param reportType
+     */
+    /*TableReportSettings(boolean useCaseSpecificData, TableReportType reportType) {
+        this.useCaseSpecificData = useCaseSpecificData;
+        this.reportType = reportType;
+    }*/
 
     List<BlackboardArtifact.Type> getArtifactSelections() {
         return artifactTypes;
@@ -83,4 +107,13 @@ final class TableReportSettings implements Serializable {
     boolean isUseCaseSpecificData() {
         return useCaseSpecificData;
     }
+
+    /**
+     * Get report type.
+     * 
+     * @return the reportType
+     */
+    TableReportType getReportType() {
+        return reportType;
+    }
 }

From 17580c484d85d0a64e766560e2e6b617e9c54c8c Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Mon, 19 Aug 2019 16:46:34 -0400
Subject: [PATCH 069/192] Bug fixes

---
 .../autopsy/report/ReportWizardFileOptionsPanel.java  |  1 -
 .../autopsy/report/ReportWizardIterator.java          |  2 +-
 .../sleuthkit/autopsy/report/ReportWizardPanel2.java  |  3 +--
 .../autopsy/report/ReportingConfigLoader.java         | 11 +++++++++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsPanel.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsPanel.java
index 83ba068fc4..fa9ac57efe 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsPanel.java
@@ -38,7 +38,6 @@ class ReportWizardFileOptionsPanel implements WizardDescriptor.FinishablePanel<W
     private final JButton finishButton;
 
     ReportWizardFileOptionsPanel(FileReportSettings fileReportSettings) {
-        wiz.putProperty("fileReportSettings", fileReportSettings);
         finishButton = new JButton(
                 NbBundle.getMessage(this.getClass(), "ReportWizardFileOptionsPanel.finishButton.text"));
         finishButton.setEnabled(false);
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java
index 8601d91271..631c5a4ab3 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java
@@ -76,7 +76,7 @@ final class ReportWizardIterator implements WizardDescriptor.Iterator<WizardDesc
             firstPanel = new ReportWizardPanel1(null);
             tableConfigPanel = new ReportWizardPanel2(useCaseSpecificData, null);
             fileConfigPanel = new ReportWizardFileOptionsPanel(null);
-            portableCaseConfigPanel = new ReportWizardPortableCaseOptionsPanel(null);            
+            portableCaseConfigPanel = new ReportWizardPortableCaseOptionsPanel(null);
         }
 
         allConfigPanels = new WizardDescriptor.Panel[]{firstPanel, tableConfigPanel, fileConfigPanel, portableCaseConfigPanel};
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java
index 36615745c8..ae6896fb41 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java
@@ -34,9 +34,8 @@ class ReportWizardPanel2 implements WizardDescriptor.Panel<WizardDescriptor> {
     private WizardDescriptor wiz;
     private final boolean useCaseSpecificData;
 
-    ReportWizardPanel2(boolean useCaseSpecificData, TableReportSettings tableResportSettings) {
+    ReportWizardPanel2(boolean useCaseSpecificData, TableReportSettings tableReportSettings) {
         this.useCaseSpecificData = useCaseSpecificData;
-        wiz.putProperty("tableReportSettings", tableResportSettings);
         finishButton = new JButton(NbBundle.getMessage(this.getClass(), "ReportWizardPanel2.finishButton.text"));
         nextButton = new JButton(NbBundle.getMessage(this.getClass(), "ReportWizardPanel2.nextButton.text"));
         nextButton.setEnabled(true);
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java b/Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java
index b7a27052f5..a17894dda8 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java
@@ -104,8 +104,8 @@ final class ReportingConfigLoader {
             throw new ReportConfigException("Unable to read module configurations map " + filePath, ex);
         }
         
-        if (moduleConfigs == null) {
-            throw new ReportConfigException("Failed to read module configurations map " + filePath);
+        if (moduleConfigs == null || moduleConfigs.isEmpty()) {
+            return config;
         }
         
         // read each ReportModuleSettings object individually
@@ -138,6 +138,10 @@ final class ReportingConfigLoader {
      */
     static synchronized void saveConfig(ReportingConfig reportConfig) throws ReportConfigException {
 
+        if (reportConfig == null) {
+            throw new ReportConfigException("Reporting configuration is NULL");
+        }
+        
         // construct the configuration directory path
         Path pathToConfigDir = Paths.get(ReportingConfigLoader.REPORT_CONFIG_FOLDER_PATH, reportConfig.getName());
 
@@ -177,6 +181,9 @@ final class ReportingConfigLoader {
         party report module settings. If we were to serialize the entire ReportingConfig 
         object, then a single error while reading in a 3rd party report module 
         would prevent us from reading the entire reporting configuration.*/
+        if (reportConfig.getModuleConfigs() == null) {
+            return;
+        }
         for (ReportModuleConfig moduleConfig : reportConfig.getModuleConfigs().values()) {
             ReportModuleSettings settings = moduleConfig.getModuleSettings();
             filePath = pathToConfigDir.toString() + File.separator + moduleConfig.getModuleClassName() + REPORT_SETTINGS_FILE_EXTENSION;

From 269662c591df480ac061ba2fdef56b3976e94a2c Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Tue, 20 Aug 2019 12:38:52 -0400
Subject: [PATCH 070/192] Loading UI settings based on input configuration, bug
 fixes

---
 .../autopsy/report/ReportVisualPanel2.java    | 71 +++++++++++++------
 .../autopsy/report/ReportWizardAction.java    |  2 +-
 .../report/ReportWizardFileOptionsPanel.java  |  6 +-
 .../ReportWizardFileOptionsVisualPanel.java   | 25 +++++--
 .../autopsy/report/ReportWizardPanel2.java    |  6 +-
 .../autopsy/report/TableReportSettings.java   | 30 ++------
 6 files changed, 83 insertions(+), 57 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java
index 48eaa6ace4..03cdeb9160 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java
@@ -68,25 +68,20 @@ final class ReportVisualPanel2 extends JPanel {
     /**
      * Creates new form ReportVisualPanel2
      */
-    public ReportVisualPanel2(ReportWizardPanel2 wizPanel, boolean useCaseSpecificData) {
+    public ReportVisualPanel2(ReportWizardPanel2 wizPanel, boolean useCaseSpecificData, TableReportSettings settings) {
+        this.useCaseSpecificData = useCaseSpecificData;
         initComponents();
         initTags();
         initArtifactTypes();
-        tagsList.setEnabled(false);
-        selectAllButton.setEnabled(false);
-        deselectAllButton.setEnabled(false);
-        allResultsRadioButton.setSelected(true);
-        advancedButton.setEnabled(useCaseSpecificData);
-        specificTaggedResultsRadioButton.setEnabled(useCaseSpecificData);
         this.wizPanel = wizPanel;
-        this.useCaseSpecificData = useCaseSpecificData;
+
         this.allResultsRadioButton.addChangeListener(new ChangeListener() {
             @Override
             public void stateChanged(ChangeEvent e) {
                 tagsList.setEnabled(specificTaggedResultsRadioButton.isSelected());
                 selectAllButton.setEnabled(specificTaggedResultsRadioButton.isSelected());
                 deselectAllButton.setEnabled(specificTaggedResultsRadioButton.isSelected());
-                advancedButton.setEnabled(!specificTaggedResultsRadioButton.isSelected() && useCaseSpecificData);
+                advancedButton.setEnabled(allResultsRadioButton.isSelected() && useCaseSpecificData);
                 updateFinishButton();
             }
         });
@@ -96,7 +91,7 @@ final class ReportVisualPanel2 extends JPanel {
                 tagsList.setEnabled(specificTaggedResultsRadioButton.isSelected());
                 selectAllButton.setEnabled(specificTaggedResultsRadioButton.isSelected());
                 deselectAllButton.setEnabled(specificTaggedResultsRadioButton.isSelected());
-                advancedButton.setEnabled(!specificTaggedResultsRadioButton.isSelected() && useCaseSpecificData);
+                advancedButton.setEnabled(allResultsRadioButton.isSelected() && useCaseSpecificData);
                 updateFinishButton();
             }
         });
@@ -106,16 +101,48 @@ final class ReportVisualPanel2 extends JPanel {
                 tagsList.setEnabled(specificTaggedResultsRadioButton.isSelected());
                 selectAllButton.setEnabled(specificTaggedResultsRadioButton.isSelected());
                 deselectAllButton.setEnabled(specificTaggedResultsRadioButton.isSelected());
-                advancedButton.setEnabled(!specificTaggedResultsRadioButton.isSelected() && useCaseSpecificData);
+                advancedButton.setEnabled(allResultsRadioButton.isSelected() && useCaseSpecificData);
                 updateFinishButton();
             }
         });
+        
+        // enable things based on input settings
+        advancedButton.setEnabled(useCaseSpecificData);
+        specificTaggedResultsRadioButton.setEnabled(useCaseSpecificData);
+        TableReportSettings.TableReportType type = TableReportSettings.TableReportType.ALL_RESULTS;
+        if (settings != null) {
+            type = settings.getReportType();
+        }
+        switch (type) {
+            case ALL_TAGGED_RESULTS:
+                allTaggedResultsRadioButton.setSelected(true);
+                tagsList.setEnabled(false);
+                selectAllButton.setEnabled(false);
+                deselectAllButton.setEnabled(false);
+                break;
+            case SPECIFIC_TAGGED_RESULTS:
+                specificTaggedResultsRadioButton.setSelected(useCaseSpecificData);
+                tagsList.setEnabled(useCaseSpecificData);
+                selectAllButton.setEnabled(useCaseSpecificData);
+                deselectAllButton.setEnabled(useCaseSpecificData);
+                break;
+            case ALL_RESULTS:
+            default:
+                allResultsRadioButton.setSelected(true);
+                tagsList.setEnabled(false);
+                selectAllButton.setEnabled(false);
+                deselectAllButton.setEnabled(false);
+                break;
+        }
     }
 
     // Initialize the list of Tags
     private void initTags() {
-        
+
         List<TagName> tagNamesInUse = new ArrayList<>();
+        // NOTE: we do not want to load tag names that came from persisted settings
+        // because there might have been new/additional tag names that have been added 
+        // by user. We should read tag names from the database each time.
         try {
             // only try to load tag names if we are displaying case specific data, otherwise
             // there may not be a case open.
@@ -162,6 +189,12 @@ final class ReportVisualPanel2 extends JPanel {
     @SuppressWarnings("deprecation")
     private void initArtifactTypes() {
 
+        // only try to load existing artifact types if we are displaying case 
+        // specific data, otherwise there may not be a case open.
+        if (!useCaseSpecificData) {
+            return;
+        }
+
         try {
             Case openCase = Case.getCurrentCaseThrows();
             ArrayList<BlackboardArtifact.Type> doNotReport = new ArrayList<>();
@@ -172,13 +205,8 @@ final class ReportVisualPanel2 extends JPanel {
                     BlackboardArtifact.ARTIFACT_TYPE.TSK_TOOL_OUTPUT.getLabel(),
                     BlackboardArtifact.ARTIFACT_TYPE.TSK_TOOL_OUTPUT.getDisplayName())); // output is too unstructured for table review
 
-            if (useCaseSpecificData) {
-                // get artifact types that exist in the current case
-                artifacts = openCase.getSleuthkitCase().getArtifactTypesInUse();
-            } else {
-                // get all possible artifact types
-                openCase.getSleuthkitCase().getArtifactTypes().forEach(artifacts::add);
-            }
+            // get artifact types that exist in the current case
+            artifacts = openCase.getSleuthkitCase().getArtifactTypesInUse();
 
             artifacts.removeAll(doNotReport);
 
@@ -241,14 +269,15 @@ final class ReportVisualPanel2 extends JPanel {
     }
 
     /**
-     * @return true if the Specific Tags radio button is selected, false otherwise
+     * @return true if the Specific Tags radio button is selected, false
+     * otherwise
      */
     TableReportSettings.TableReportType getSelectedReportType() {
         if (allTaggedResultsRadioButton.isSelected()) {
             return TableReportSettings.TableReportType.ALL_TAGGED_RESULTS;
         } else if (specificTaggedResultsRadioButton.isSelected()) {
             return TableReportSettings.TableReportType.SPECIFIC_TAGGED_RESULTS;
-        }        
+        }
         return TableReportSettings.TableReportType.ALL_RESULTS;
     }
 
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
index 04a9c55423..7ab3a30751 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
@@ -57,7 +57,7 @@ public final class ReportWizardAction extends CallableSystemAction implements Pr
 
     private static final Logger logger = Logger.getLogger(ReportWizardAction.class.getName());
     private static final String REPORTING_CONFIGURATION_NAME = "ReportAction";
-    private static final boolean DISPLAY_CASE_SPECIFIC_DATA = false; // ELTODO true;
+    private static final boolean DISPLAY_CASE_SPECIFIC_DATA = true;
     private static final boolean RUN_REPORTS = true;
     private final JButton toolbarButton = new JButton();
     private static final String ACTION_NAME = NbBundle.getMessage(ReportWizardAction.class, "ReportWizardAction.actionName.text");
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsPanel.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsPanel.java
index fa9ac57efe..de95271485 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsPanel.java
@@ -36,8 +36,10 @@ class ReportWizardFileOptionsPanel implements WizardDescriptor.FinishablePanel<W
     private WizardDescriptor wiz;
     private ReportWizardFileOptionsVisualPanel component;
     private final JButton finishButton;
+    private final FileReportSettings settings;
 
-    ReportWizardFileOptionsPanel(FileReportSettings fileReportSettings) {
+    ReportWizardFileOptionsPanel(FileReportSettings settings) {
+        this.settings = settings;
         finishButton = new JButton(
                 NbBundle.getMessage(this.getClass(), "ReportWizardFileOptionsPanel.finishButton.text"));
         finishButton.setEnabled(false);
@@ -65,7 +67,7 @@ class ReportWizardFileOptionsPanel implements WizardDescriptor.FinishablePanel<W
     @Override
     public ReportWizardFileOptionsVisualPanel getComponent() {
         if (component == null) {
-            component = new ReportWizardFileOptionsVisualPanel(this);
+            component = new ReportWizardFileOptionsVisualPanel(this, settings);
         }
         return component;
     }
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsVisualPanel.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsVisualPanel.java
index eb844b2bba..19edc56528 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsVisualPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsVisualPanel.java
@@ -21,10 +21,12 @@ package org.sleuthkit.autopsy.report;
 import java.awt.Component;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import javax.swing.JCheckBox;
 import javax.swing.JLabel;
 import javax.swing.JList;
@@ -39,15 +41,15 @@ import org.openide.util.NbBundle;
 @SuppressWarnings("PMD.SingularField") // UI widgets cause lots of false positives
 class ReportWizardFileOptionsVisualPanel extends javax.swing.JPanel {
 
-    private List<FileReportDataTypes> options;
+    private List<FileReportDataTypes> options = new ArrayList<>();
     private final Map<FileReportDataTypes, Boolean> optionStates = new EnumMap<>(FileReportDataTypes.class);
     private ListModel<FileReportDataTypes> model;
     private final ReportWizardFileOptionsPanel wizPanel;
 
-    public ReportWizardFileOptionsVisualPanel(ReportWizardFileOptionsPanel wizPanel) {
+    public ReportWizardFileOptionsVisualPanel(ReportWizardFileOptionsPanel wizPanel, FileReportSettings settings) {
         this.wizPanel = wizPanel;
         initComponents();
-        initOptionsList();
+        initOptionsList(settings);
     }
 
     @Override
@@ -58,10 +60,19 @@ class ReportWizardFileOptionsVisualPanel extends javax.swing.JPanel {
     /**
      * Populate the list of File Report Information that can be selected.
      */
-    private void initOptionsList() {
-        options = Arrays.asList(FileReportDataTypes.values());
-        for (FileReportDataTypes col : options) {
-            optionStates.put(col, Boolean.FALSE);
+    private void initOptionsList(FileReportSettings settings) {
+        if (settings != null && settings.getFileProperties() != null && !settings.getFileProperties().isEmpty()) {
+            // load the configuration
+            for (Entry<FileReportDataTypes, Boolean> entry : settings.getFileProperties().entrySet()) {
+                optionStates.put(entry.getKey(), entry.getValue());
+                options.add(entry.getKey());
+            }
+        } else {
+            // load defaults
+            options = Arrays.asList(FileReportDataTypes.values());
+            for (FileReportDataTypes entry : options) {
+                optionStates.put(entry, Boolean.FALSE);
+            }
         }
 
         model = new OptionsListModel();
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java
index ae6896fb41..6d78b74941 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java
@@ -33,9 +33,11 @@ class ReportWizardPanel2 implements WizardDescriptor.Panel<WizardDescriptor> {
     private final JButton nextButton;
     private WizardDescriptor wiz;
     private final boolean useCaseSpecificData;
+    private final TableReportSettings settings;
 
-    ReportWizardPanel2(boolean useCaseSpecificData, TableReportSettings tableReportSettings) {
+    ReportWizardPanel2(boolean useCaseSpecificData, TableReportSettings settings) {
         this.useCaseSpecificData = useCaseSpecificData;
+        this.settings = settings;
         finishButton = new JButton(NbBundle.getMessage(this.getClass(), "ReportWizardPanel2.finishButton.text"));
         nextButton = new JButton(NbBundle.getMessage(this.getClass(), "ReportWizardPanel2.nextButton.text"));
         nextButton.setEnabled(true);
@@ -58,7 +60,7 @@ class ReportWizardPanel2 implements WizardDescriptor.Panel<WizardDescriptor> {
     @Override
     public ReportVisualPanel2 getComponent() {
         if (component == null) {
-            component = new ReportVisualPanel2(this, useCaseSpecificData);
+            component = new ReportVisualPanel2(this, useCaseSpecificData, settings);
         }
         return component;
     }
diff --git a/Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java b/Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java
index 1eb49b74c3..b33595db68 100755
--- a/Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java
@@ -41,10 +41,10 @@ final class TableReportSettings implements Serializable {
     }
 
     private static final long serialVersionUID = 1L;
-    private List<BlackboardArtifact.Type> artifactTypes = new ArrayList<>();
-    private List<String> tagNames = new ArrayList<>();
-    private boolean useCaseSpecificData = false;
-    private TableReportType reportType = TableReportType.ALL_RESULTS;
+    private final List<BlackboardArtifact.Type> artifactTypes = new ArrayList<>();
+    private final List<String> tagNames = new ArrayList<>();
+    private final boolean useCaseSpecificData;
+    private final TableReportType reportType;
 
     /**
      * Creates TableReportSettings object. This constructor is used when user
@@ -55,6 +55,8 @@ final class TableReportSettings implements Serializable {
      * types to be included in the report. Only enabled entries will be kept.
      * @param tagNameSelections The enabled/disabled state of the tag names to
      * be included in the report. Only enabled entries will be kept.
+     * @param useCaseSpecificData Flag whether to use case specific tag and artifact data.
+     * @param reportType Table report type.
      */
     TableReportSettings(Map<BlackboardArtifact.Type, Boolean> artifactTypeSelections, Map<String, Boolean> tagNameSelections, boolean useCaseSpecificData, TableReportType reportType) {
         // Get the artifact types selected by the user
@@ -76,26 +78,6 @@ final class TableReportSettings implements Serializable {
         this.useCaseSpecificData = useCaseSpecificData;
     }
 
-    // ELTODO remove this constructor?
-    /*TableReportSettings(List<BlackboardArtifact.Type> artifactTypes, List<String> tagNames, boolean useCaseSpecificData) {
-        this.artifactTypes = artifactTypes;
-        this.tagNames = tagNames;
-        this.useCaseSpecificData = useCaseSpecificData;
-    }*/
-    /**
-     * Creates TableReportSettings object. This constructor is used when user
-     * configures command line ingest. Most likely there will be no case open at
-     * the time, so tags and artifacts will have to be read from database at the
-     * report execution time.
-     *
-     * @param useCaseSpecificData
-     * @param reportType
-     */
-    /*TableReportSettings(boolean useCaseSpecificData, TableReportType reportType) {
-        this.useCaseSpecificData = useCaseSpecificData;
-        this.reportType = reportType;
-    }*/
-
     List<BlackboardArtifact.Type> getArtifactSelections() {
         return artifactTypes;
     }

From 82dfa7227fd7f55088d6e821440c68e1970100f7 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Tue, 20 Aug 2019 13:31:13 -0400
Subject: [PATCH 071/192] Bug fixes

---
 .../autopsy/report/ReportWizardAction.java    |  2 +-
 .../autopsy/report/ReportWizardPanel1.java    | 23 ++-----------------
 .../autopsy/report/TableReportGenerator.java  |  8 +++----
 3 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
index 7ab3a30751..872e7c7a20 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
@@ -57,7 +57,7 @@ public final class ReportWizardAction extends CallableSystemAction implements Pr
 
     private static final Logger logger = Logger.getLogger(ReportWizardAction.class.getName());
     private static final String REPORTING_CONFIGURATION_NAME = "ReportAction";
-    private static final boolean DISPLAY_CASE_SPECIFIC_DATA = true;
+    private static final boolean DISPLAY_CASE_SPECIFIC_DATA = false; //ELTODO true;
     private static final boolean RUN_REPORTS = true;
     private final JButton toolbarButton = new JButton();
     private static final String ACTION_NAME = NbBundle.getMessage(ReportWizardAction.class, "ReportWizardAction.actionName.text");
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java
index 36436bbe83..c39efacdb6 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java
@@ -20,8 +20,6 @@ package org.sleuthkit.autopsy.report;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.util.Collection;
-import java.util.List;
 import java.util.Map;
 import java.util.prefs.Preferences;
 import javax.swing.JButton;
@@ -35,7 +33,7 @@ class ReportWizardPanel1 implements WizardDescriptor.FinishablePanel<WizardDescr
 
     private WizardDescriptor wiz;
     private ReportVisualPanel1 component;
-    private Map<String, ReportModuleConfig> moduleConfigs;
+    private final Map<String, ReportModuleConfig> moduleConfigs;
     private final JButton nextButton;
     private final JButton finishButton;
 
@@ -114,12 +112,11 @@ class ReportWizardPanel1 implements WizardDescriptor.FinishablePanel<WizardDescr
         TableReportModule module = getComponent().getTableModule();
         GeneralReportModule general = getComponent().getGeneralModule();
         PortableCaseReportModule portable = getComponent().getPortableCaseModule();
-        Map<String, ReportModuleConfig> moduleConfigs = getComponent().getUpdatedModuleConfigs();
         wiz.putProperty("tableModule", module); //NON-NLS
         wiz.putProperty("generalModule", general); //NON-NLS
         wiz.putProperty("fileModule", getComponent().getFileModule()); //NON-NLS
         wiz.putProperty("portableCaseModule", portable); //NON-NLS
-        wiz.putProperty("moduleConfigs", moduleConfigs); //NON-NLS
+        wiz.putProperty("moduleConfigs", getComponent().getUpdatedModuleConfigs()); //NON-NLS
 
         // Store preferences that WizardIterator will use to determine what 
         // panels need to be shown
@@ -128,20 +125,4 @@ class ReportWizardPanel1 implements WizardDescriptor.FinishablePanel<WizardDescr
         prefs.putBoolean("generalModule", general != null); //NON-NLS
         prefs.putBoolean("portableCaseModule", portable != null); //NON-NLS
     }
-
-    /**
-     * Are any of the given booleans true?
-     *
-     * @param bools
-     *
-     * @return
-     */
-    private boolean any(Collection<Boolean> bools) {
-        for (Boolean b : bools) {
-            if (b) {
-                return true;
-            }
-        }
-        return false;
-    }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
index f84dcb69e3..34f25c67db 100644
--- a/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
@@ -82,7 +82,7 @@ class TableReportGenerator {
         this.settings = settings;
     }
     
-    private void getAllExistingTags(boolean addNotableToTagNames) throws NoCurrentCaseException, TskCoreException {
+    private void getAllExistingTags() throws NoCurrentCaseException, TskCoreException {
         List<String> tagNames = new ArrayList<>();
 
         // get all possible tag names
@@ -90,9 +90,7 @@ class TableReportGenerator {
 
         String notableString = "";
         for (TagName tagName : tagNamesInUse) {
-            if (addNotableToTagNames) {
-                notableString = tagName.getKnownStatus() == TskData.FileKnown.BAD ? TagsManager.getNotableTagLabel() : "";
-            }
+            notableString = tagName.getKnownStatus() == TskData.FileKnown.BAD ? TagsManager.getNotableTagLabel() : "";
             tagNames.add(tagName.getDisplayName() + notableString);
         }
         tagNamesFilter = new HashSet<>(tagNames);
@@ -130,7 +128,7 @@ class TableReportGenerator {
                 // If report type is "all tagged results", then read all possible tab names from database.
                 // Otherwise do not load tag names, i.e. run "all results" report
                 if (settings.getReportType() == TableReportSettings.TableReportType.ALL_TAGGED_RESULTS) {
-                    getAllExistingTags(true); // ELTODO verify whether we should add (Notable) to tag names like we do in UI
+                    getAllExistingTags();
                 }
                 
                 // get all possible artifact types

From d7bd6cedd0b8fb2d00c53825f42f8100db4786d3 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Tue, 20 Aug 2019 15:31:48 -0400
Subject: [PATCH 072/192] Changes to ReportModule interface, modified UI to use
 it

---
 .../autopsy/report/ReportModule.java          | 27 ++++++++++++++
 .../autopsy/report/ReportModuleConfig.java    |  1 +
 .../autopsy/report/ReportVisualPanel1.java    | 35 +++++++++++--------
 3 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportModule.java b/Core/src/org/sleuthkit/autopsy/report/ReportModule.java
index 8796041474..f6a072f2fa 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportModule.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportModule.java
@@ -61,4 +61,31 @@ interface ReportModule {
     public default JPanel getConfigurationPanel() {
         return new DefaultReportConfigurationPanel();
     }
+    
+    /**
+     * Get default configuration for this report module.
+     *
+     * @return Object which contains default report module settings.
+     */
+    public default ReportModuleSettings getDefaultConfiguration() {
+        return new NoReportModuleSettings();
+    }
+
+     /**
+     * Get current configuration for this report module.
+     *
+     * @return Object which contains current report module settings.
+     */
+    public default ReportModuleSettings getConfiguration() {
+        return new NoReportModuleSettings();
+    }
+
+     /**
+     * Set report module configuration.
+     *
+     * @param settings Object which contains report module settings.
+     */
+    public default void setConfiguration(ReportModuleSettings settings) {
+        // NO-OP
+    }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportModuleConfig.java b/Core/src/org/sleuthkit/autopsy/report/ReportModuleConfig.java
index 2ec5e7a260..9099c218a7 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportModuleConfig.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportModuleConfig.java
@@ -40,6 +40,7 @@ final class ReportModuleConfig implements Serializable {
     ReportModuleConfig(ReportModule module, boolean enabled) {
         this.moduleName = module.getClass().getCanonicalName();
         this.enabled = enabled;
+        this.settings = new NoReportModuleSettings();
     }
 
     /**
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
index 7b0cbaa646..fd61c56121 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
@@ -50,7 +50,7 @@ final class ReportVisualPanel1 extends JPanel implements ListSelectionListener {
     private List<TableReportModule> tableModules = new ArrayList<>();
     private List<FileReportModule> fileModules = new ArrayList<>();
     private PortableCaseReportModule portableCaseModule;
-    private Map<String, ReportModuleConfig> moduleConfigs;
+    private final Map<String, ReportModuleConfig> moduleConfigs;
     private Integer selectedIndex;
 
     /**
@@ -118,9 +118,12 @@ final class ReportVisualPanel1 extends JPanel implements ListSelectionListener {
         for (ReportModule module : modules) {
             ReportModuleSettings settings;
             if (moduleConfigs == null) {
-                // ELTODO get default module configuration (API isn't implemented yet)
-                // settings = module.getDefaultConfiguration();
-                // update ReportModuleConfig config
+                // get default module configuration
+                settings = module.getDefaultConfiguration();
+                // update config for this module
+                ReportModuleConfig moduleConfig = new ReportModuleConfig(module, false);
+                moduleConfig.setModuleSettings(settings);
+                moduleConfigs.put(module.getName(), moduleConfig);
             } else {
                 // get configuration for this module
                 ReportModuleConfig config = moduleConfigs.get(module.getClass().getCanonicalName());                
@@ -128,13 +131,16 @@ final class ReportVisualPanel1 extends JPanel implements ListSelectionListener {
                     // there is an existing configuration for this module
                     settings = config.getModuleSettings();
                 } else {
-                    // ELTODO get default module configuration (API isn't implemented yet)
-                    // settings = module.getDefaultConfiguration();
-                    // update ReportModuleConfig config
+                    // get default module configuration
+                    settings = module.getDefaultConfiguration();
+                    // update config for this module
+                    ReportModuleConfig moduleConfig = new ReportModuleConfig(module, false);
+                    moduleConfig.setModuleSettings(settings);
+                    moduleConfigs.put(module.getName(), moduleConfig);
                 }
             }
-            // ELTODO set module configuration (API isn't implemented yet)
-            // module.setConfiguration(settings);
+            // set module configuration
+            module.setConfiguration(settings);
         }
 
         modulesJList.getSelectionModel().addListSelectionListener(this);
@@ -224,13 +230,14 @@ final class ReportVisualPanel1 extends JPanel implements ListSelectionListener {
      * @return
      */
     Map<String, ReportModuleConfig> getUpdatedModuleConfigs() {
-        // set module configurations
         for (ReportModule module : modules) {
-            // ELTODO get updated module configuration (API isn't implemented yet)
-            // settings = module.getConfiguration();
+            // get updated module configuration
+            ReportModuleSettings settings = module.getConfiguration();
             
-            // update moduleConfigs
-            // moduleConfigs.pu(module.getName(), settings);
+            // update ReportModuleConfig for this module
+            ReportModuleConfig moduleConfig = new ReportModuleConfig(module, false);
+            moduleConfig.setModuleSettings(settings);
+            moduleConfigs.put(module.getName(), moduleConfig);
         }
         return moduleConfigs;
     }

From d74e68be49750d6313318dc21a4cc3bb277cb2f5 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Wed, 21 Aug 2019 14:31:11 -0400
Subject: [PATCH 073/192] First cut at HTML report integration

---
 .../report/HTMLReportModuleSettings.java      | 68 +++++++++++++++++++
 .../sleuthkit/autopsy/report/ReportHTML.java  | 30 ++++++++
 .../report/ReportHTMLConfigurationPanel.java  | 10 +++
 .../autopsy/report/ReportingConfigLoader.java |  2 -
 4 files changed, 108 insertions(+), 2 deletions(-)
 create mode 100755 Core/src/org/sleuthkit/autopsy/report/HTMLReportModuleSettings.java

diff --git a/Core/src/org/sleuthkit/autopsy/report/HTMLReportModuleSettings.java b/Core/src/org/sleuthkit/autopsy/report/HTMLReportModuleSettings.java
new file mode 100755
index 0000000000..1a6b5a8dda
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/HTMLReportModuleSettings.java
@@ -0,0 +1,68 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2019 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.report;
+
+/**
+ * Settings for the HTML report module.
+ */
+class HTMLReportModuleSettings implements ReportModuleSettings {
+    
+    private static final long serialVersionUID = 1L;
+    
+    private String header;
+    private String footer;
+    
+    HTMLReportModuleSettings(String header, String footer) {
+        this.header = header;
+        this.footer = footer;
+    }
+    
+    @Override
+    public long getVersionNumber() {
+        return serialVersionUID;
+    }
+    
+    /**
+     * @return the header
+     */
+    String getHeader() {
+        return header;
+    }
+
+    /**
+     * @param header the header to set
+     */
+    void setHeader(String header) {
+        this.header = header;
+    }
+
+    /**
+     * @return the footer
+     */
+    String getFooter() {
+        return footer;
+    }
+
+    /**
+     * @param footer the footer to set
+     */
+    void setFooter(String footer) {
+        this.footer = footer;
+    }
+}
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java b/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java
index e7bb2f313d..e524736e21 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java
@@ -123,6 +123,36 @@ class ReportHTML implements TableReportModule {
         }
         return configPanel;
     }
+    
+    /**
+     * Get default configuration for this report module.
+     *
+     * @return Object which contains default report module settings.
+     */
+    @Override
+    public ReportModuleSettings getDefaultConfiguration() {
+        return new NoReportModuleSettings();
+    }
+
+     /**
+     * Get current configuration for this report module.
+     *
+     * @return Object which contains current report module settings.
+     */
+    @Override
+    public ReportModuleSettings getConfiguration() {
+        return new NoReportModuleSettings();
+    }
+
+     /**
+     * Set report module configuration.
+     *
+     * @param settings Object which contains report module settings.
+     */
+    @Override
+    public void setConfiguration(ReportModuleSettings settings) {
+        // NO-OP
+    }    
 
     // Refesh the member variables
     private void refresh() throws NoCurrentCaseException {
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportHTMLConfigurationPanel.java b/Core/src/org/sleuthkit/autopsy/report/ReportHTMLConfigurationPanel.java
index fbaa9d3a1a..f67b059a96 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportHTMLConfigurationPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportHTMLConfigurationPanel.java
@@ -33,6 +33,7 @@ final class ReportHTMLConfigurationPanel extends javax.swing.JPanel {
         initComponents();
         
         // Load settings
+        // ELTODO REMOVE
         String header = ModuleSettings.getConfigSetting("HTMLReport", "header"); //NON-NLS
         String footer = ModuleSettings.getConfigSetting("HTMLReport", "footer"); //NON-NLS
         
@@ -40,6 +41,15 @@ final class ReportHTMLConfigurationPanel extends javax.swing.JPanel {
         footerTextField.setText(footer != null ? footer : "");
     }
     
+    void setConfiguration(HTMLReportModuleSettings settings) {
+        headerTextField.setText(settings.getHeader());
+        footerTextField.setText(settings.getFooter());
+    }
+    
+    HTMLReportModuleSettings getConfiguration() {
+        return new HTMLReportModuleSettings(headerTextField.getText(), footerTextField.getText());
+    }
+    
     /**
      * Get the header text.
      * 
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java b/Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java
index a17894dda8..1a05f8539c 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java
@@ -25,9 +25,7 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.logging.Level;

From d37354d392f5f3aa15ee495ca4735517bf97c11d Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Wed, 21 Aug 2019 16:53:17 -0400
Subject: [PATCH 074/192] Implement module settings persistence for HTML report

---
 .../report/HTMLReportModuleSettings.java      |   5 +
 .../sleuthkit/autopsy/report/ReportHTML.java  | 134 +++++++++---------
 .../report/ReportHTMLConfigurationPanel.java  |  14 +-
 .../autopsy/report/ReportModuleConfig.java    |  15 +-
 .../autopsy/report/ReportVisualPanel1.java    |  18 +--
 .../autopsy/report/ReportWizardAction.java    |   2 +-
 .../autopsy/report/ReportingConfigLoader.java |   2 +-
 7 files changed, 96 insertions(+), 94 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/HTMLReportModuleSettings.java b/Core/src/org/sleuthkit/autopsy/report/HTMLReportModuleSettings.java
index 1a6b5a8dda..5e2809a882 100755
--- a/Core/src/org/sleuthkit/autopsy/report/HTMLReportModuleSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/report/HTMLReportModuleSettings.java
@@ -28,6 +28,11 @@ class HTMLReportModuleSettings implements ReportModuleSettings {
     private String header;
     private String footer;
     
+    HTMLReportModuleSettings() {
+        this.header = "";
+        this.footer = "";
+    }
+    
     HTMLReportModuleSettings(String header, String footer) {
         this.header = header;
         this.footer = footer;
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java b/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java
index e524736e21..3e55486aab 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java
@@ -64,7 +64,6 @@ import org.sleuthkit.autopsy.contentviewers.imagetagging.ImageTagsUtil;
 import org.sleuthkit.autopsy.coreutils.EscapeUtil;
 import org.sleuthkit.autopsy.coreutils.ImageUtils;
 import org.sleuthkit.autopsy.coreutils.Logger;
-import org.sleuthkit.autopsy.coreutils.ModuleSettings;
 import org.sleuthkit.autopsy.coreutils.Version;
 import org.sleuthkit.autopsy.datamodel.ContentUtils.ExtractFscContentVisitor;
 import org.sleuthkit.autopsy.ingest.IngestManager;
@@ -98,8 +97,8 @@ class ReportHTML implements TableReportModule {
     private String currentDataType; // name of current data type
     private Integer rowCount;       // number of rows (aka artifacts or tags) for the current data type
     private Writer out;
-    
-    private ReportHTMLConfigurationPanel configPanel;
+
+    private final ReportHTMLConfigurationPanel configPanel = new ReportHTMLConfigurationPanel();
 
     private final ReportBranding reportBranding;
 
@@ -115,15 +114,12 @@ class ReportHTML implements TableReportModule {
     private ReportHTML() {
         reportBranding = new ReportBranding();
     }
-    
+
     @Override
     public JPanel getConfigurationPanel() {
-        if (configPanel == null) {
-            configPanel = new ReportHTMLConfigurationPanel();
-        }
         return configPanel;
     }
-    
+
     /**
      * Get default configuration for this report module.
      *
@@ -131,28 +127,38 @@ class ReportHTML implements TableReportModule {
      */
     @Override
     public ReportModuleSettings getDefaultConfiguration() {
-        return new NoReportModuleSettings();
+        return new HTMLReportModuleSettings();
     }
 
-     /**
+    /**
      * Get current configuration for this report module.
      *
      * @return Object which contains current report module settings.
      */
     @Override
     public ReportModuleSettings getConfiguration() {
-        return new NoReportModuleSettings();
+        return configPanel.getConfiguration();
     }
 
-     /**
+    /**
      * Set report module configuration.
      *
      * @param settings Object which contains report module settings.
      */
     @Override
     public void setConfiguration(ReportModuleSettings settings) {
-        // NO-OP
-    }    
+        if (settings instanceof HTMLReportModuleSettings) {
+            configPanel.setConfiguration((HTMLReportModuleSettings) settings);
+            return;
+        }
+
+        if (settings instanceof NoReportModuleSettings) {
+            configPanel.setConfiguration((HTMLReportModuleSettings) getDefaultConfiguration());
+            return;
+        }
+
+        throw new IllegalArgumentException("Expected settings argument to be an instance of HTMLReportModuleSettings");
+    }
 
     // Refesh the member variables
     private void refresh() throws NoCurrentCaseException {
@@ -337,7 +343,7 @@ class ReportHTML implements TableReportModule {
                     break;
                 case TSK_VERIFICATION_FAILED:
                     in = getClass().getResourceAsStream("/org/sleuthkit/autopsy/images/validationFailed.png"); //NON-NLS
-                    break;    
+                    break;
                 default:
                     logger.log(Level.WARNING, "useDataTypeIcon: unhandled artifact type = {0}", dataType); //NON-NLS
                     in = getClass().getResourceAsStream("/org/sleuthkit/autopsy/report/images/star.png"); //NON-NLS
@@ -396,10 +402,7 @@ class ReportHTML implements TableReportModule {
      */
     @Override
     public void startReport(String baseReportDir) {
-        // Save settings
-        ModuleSettings.setConfigSetting("HTMLReport", "header", configPanel.getHeader()); //NON-NLS
-        ModuleSettings.setConfigSetting("HTMLReport", "footer", configPanel.getFooter()); //NON-NLS
-        
+
         // Refresh the HTML report
         try {
             refresh();
@@ -444,7 +447,7 @@ class ReportHTML implements TableReportModule {
      * to this page, and setup the web page header. Note: This method is a
      * temporary workaround to avoid modifying the TableReportModule interface.
      *
-     * @param name    Name of the data type
+     * @param name Name of the data type
      * @param comment Comment on the data type, may be the empty string
      */
     @Override
@@ -461,9 +464,9 @@ class ReportHTML implements TableReportModule {
         try {
             StringBuilder page = new StringBuilder();
             page.append("<html>\n<head>\n\t<title>").append(name).append("</title>\n\t<link rel=\"stylesheet\" type=\"text/css\" href=\"index.css\" />\n<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">\n</head>\n<body>\n") //NON-NLS
-            .append(writePageHeader())
-            .append("<div id=\"header\">").append(name).append("</div>\n")
-            .append("<div id=\"content\">\n"); //NON-NLS
+                    .append(writePageHeader())
+                    .append("<div id=\"header\">").append(name).append("</div>\n")
+                    .append("<div id=\"content\">\n"); //NON-NLS
             if (!description.isEmpty()) {
                 page.append("<p><strong>"); //NON-NLS
                 page.append(description);
@@ -503,11 +506,11 @@ class ReportHTML implements TableReportModule {
             }
         }
     }
-    
+
     /**
      * Write HTML-formatted page header text based on the text provided in the
      * configuration panel.
-     * 
+     *
      * @return The HTML-formatted text.
      */
     private String writePageHeader() {
@@ -520,11 +523,11 @@ class ReportHTML implements TableReportModule {
         }
         return output.toString();
     }
-    
+
     /**
      * Write HTML-formatted page footer text based on the text provided in the
      * configuration panel.
-     * 
+     *
      * @return The HTML-formatted text.
      */
     private String writePageFooter() {
@@ -627,7 +630,7 @@ class ReportHTML implements TableReportModule {
      * Start a new table with the given column headers. Note: This method is a
      * temporary workaround to avoid modifying the TableReportModule interface.
      *
-     * @param columnHeaders  column headers
+     * @param columnHeaders column headers
      * @param sourceArtifact source blackboard artifact for the table data
      */
     public void startContentTagsTable(List<String> columnHeaders) {
@@ -677,9 +680,9 @@ class ReportHTML implements TableReportModule {
     /**
      * Add a row to the current table.
      *
-     * @param row        values for each cell in the row
+     * @param row values for each cell in the row
      * @param escapeText whether or not the text of the row should be escaped,
-     *                   true for escaped, false for not escaped
+     * true for escaped, false for not escaped
      */
     private void addRow(List<String> row, boolean escapeText) {
         StringBuilder builder = new StringBuilder();
@@ -704,10 +707,9 @@ class ReportHTML implements TableReportModule {
      * Saves a local copy of a tagged file and adds a row with a hyper link to
      * the file. The content of the hyperlink is provided in linkHTMLContent.
      *
-     * @param row             Values for each data cell in the row
-     * @param file            The file to link to in the report.
-     * @param tagName         the name of the tag that the content was flagged
-     *                        by
+     * @param row Values for each data cell in the row
+     * @param file The file to link to in the report.
+     * @param tagName the name of the tag that the content was flagged by
      * @param linkHTMLContent the html that will be the body of the link
      */
     public void addRowWithTaggedContentHyperlink(List<String> row, ContentTag contentTag) {
@@ -762,12 +764,12 @@ class ReportHTML implements TableReportModule {
             logger.log(Level.SEVERE, "Output writer is null. Page was not initialized before writing.", ex); //NON-NLS
         }
     }
-    
+
     /**
      * Finds all associated image tags.
-     * 
+     *
      * @param contentTags
-     * @return 
+     * @return
      */
     private List<ImageTagRegion> getTaggedRegions(List<ContentTag> contentTags) {
         ArrayList<ImageTagRegion> tagRegions = new ArrayList<>();
@@ -825,7 +827,7 @@ class ReportHTML implements TableReportModule {
 
             AbstractFile file = (AbstractFile) content;
             List<ContentTag> contentTags = new ArrayList<>();
-            
+
             String thumbnailPath = null;
             String imageWithTagsFullPath = null;
             try {
@@ -833,26 +835,26 @@ class ReportHTML implements TableReportModule {
                 contentTags = Case.getCurrentCase().getServices()
                         .getTagsManager().getContentTagsByContent(file);
                 List<ImageTagRegion> imageTags = getTaggedRegions(contentTags);
-                
-                if(!imageTags.isEmpty()) {
+
+                if (!imageTags.isEmpty()) {
                     //Write the tags to the fullsize and thumbnail images
                     BufferedImage fullImageWithTags = ImageTagsUtil.getImageWithTags(file, imageTags);
-                    
-                    BufferedImage thumbnailWithTags = ImageTagsUtil.getThumbnailWithTags(file, 
+
+                    BufferedImage thumbnailWithTags = ImageTagsUtil.getThumbnailWithTags(file,
                             imageTags, ImageTagsUtil.IconSize.MEDIUM);
-                    
+
                     String fileName = org.sleuthkit.autopsy.coreutils.FileUtil.escapeFileName(file.getName());
-                    
+
                     //Create paths in report to write tagged images
                     File thumbnailImageWithTagsFile = Paths.get(thumbsPath, FilenameUtils.removeExtension(fileName) + ".png").toFile();
                     String fullImageWithTagsPath = makeCustomUniqueFilePath(file, "thumbs_fullsize");
                     fullImageWithTagsPath = FilenameUtils.removeExtension(fullImageWithTagsPath) + ".png";
                     File fullImageWithTagsFile = Paths.get(fullImageWithTagsPath).toFile();
-                    
+
                     //Save images
                     ImageIO.write(thumbnailWithTags, "png", thumbnailImageWithTagsFile);
                     ImageIO.write(fullImageWithTags, "png", fullImageWithTagsFile);
-                    
+
                     thumbnailPath = THUMBS_REL_PATH + thumbnailImageWithTagsFile.getName();
                     //Relative path
                     imageWithTagsFullPath = fullImageWithTagsPath.substring(subPath.length());
@@ -864,10 +866,10 @@ class ReportHTML implements TableReportModule {
             }
 
             // save copies of the orginal image and thumbnail image
-            if(thumbnailPath == null) {
+            if (thumbnailPath == null) {
                 thumbnailPath = prepareThumbnail(file);
             }
-            
+
             if (thumbnailPath == null) {
                 continue;
             }
@@ -885,7 +887,7 @@ class ReportHTML implements TableReportModule {
                     .append("\" target=\"_top\"><img src=\"")
                     .append(thumbnailPath).append("\" title=\"").append(nameInImage).append("\"/></a><br>") //NON-NLS
                     .append(file.getName()).append("<br>"); //NON-NLS
-            if(imageWithTagsFullPath != null) {
+            if (imageWithTagsFullPath != null) {
                 linkToThumbnail.append("<a href=\"").append(contentPath).append("\" target=\"_top\">View Original</a><br>");
             }
 
@@ -900,7 +902,7 @@ class ReportHTML implements TableReportModule {
                     linkToThumbnail.append(", ");
                 }
             }
-                
+
             linkToThumbnail.append("</div>");
             currentRow.add(linkToThumbnail.toString());
 
@@ -929,7 +931,7 @@ class ReportHTML implements TableReportModule {
                 || file.getType() == TSK_DB_FILES_TYPE_ENUM.UNALLOC_BLOCKS
                 || file.getType() == TSK_DB_FILES_TYPE_ENUM.UNUSED_BLOCKS;
     }
-    
+
     private String makeCustomUniqueFilePath(AbstractFile file, String dirName) {
         // clean up the dir name passed in
         String dirName2 = org.sleuthkit.autopsy.coreutils.FileUtil.escapeFileName(dirName);
@@ -964,21 +966,21 @@ class ReportHTML implements TableReportModule {
         }
         localFilePath.append(File.separator);
         localFilePath.append(fileName);
-        
+
         return localFilePath.toString();
     }
 
     /**
      * Save a local copy of the given file in the reports folder.
      *
-     * @param file    File to save
+     * @param file File to save
      * @param dirName Custom top-level folder to use to store the files in (tag
-     *                name, etc.)
+     * name, etc.)
      *
      * @return Path to where file was stored (relative to root of HTML folder)
      */
     public String saveContent(AbstractFile file, String dirName) {
-        
+
         String localFilePath = makeCustomUniqueFilePath(file, dirName);
 
         // If the local file doesn't already exist, create it now.
@@ -1342,9 +1344,9 @@ class ReportHTML implements TableReportModule {
      */
     private StringBuilder writeSummaryCaseDetails() {
         StringBuilder summary = new StringBuilder();
-        
+
         final boolean agencyLogoSet = reportBranding.getAgencyLogoPath() != null && !reportBranding.getAgencyLogoPath().isEmpty();
-        
+
         // Case
         String caseName = currentCase.getDisplayName();
         String caseNumber = currentCase.getNumber();
@@ -1355,10 +1357,10 @@ class ReportHTML implements TableReportModule {
             imagecount = 0;
         }
         String caseNotes = currentCase.getCaseNotes();
-        
+
         // Examiner
         String examinerName = currentCase.getExaminer();
-        
+
         // Start the layout.
         summary.append("<div class=\"title\">\n"); //NON-NLS
         if (agencyLogoSet) {
@@ -1371,30 +1373,30 @@ class ReportHTML implements TableReportModule {
         final String align = agencyLogoSet ? "right" : "left"; //NON-NLS NON-NLS
         summary.append("<div class=\"").append(align).append("\">\n"); //NON-NLS
         summary.append("<table>\n"); //NON-NLS
-        
+
         // Case details
         summary.append("<tr><td>").append(Bundle.ReportHTML_writeSum_case()).append("</td><td>") //NON-NLS
                 .append(formatHtmlString(caseName)).append("</td></tr>\n"); //NON-NLS
-        
+
         if (!caseNumber.isEmpty()) {
             summary.append("<tr><td>").append(Bundle.ReportHTML_writeSum_caseNumber()).append("</td><td>") //NON-NLS
                     .append(formatHtmlString(caseNumber)).append("</td></tr>\n"); //NON-NLS
         }
-        
+
         summary.append("<tr><td>").append(Bundle.ReportHTML_writeSum_caseNumImages()).append("</td><td>") //NON-NLS
                 .append(imagecount).append("</td></tr>\n"); //NON-NLS
-        
+
         if (!caseNotes.isEmpty()) {
             summary.append("<tr><td>").append(Bundle.ReportHTML_writeSum_caseNotes()).append("</td><td>") //NON-NLS
                     .append(formatHtmlString(caseNotes)).append("</td></tr>\n"); //NON-NLS
         }
-        
+
         // Examiner details
         if (!examinerName.isEmpty()) {
             summary.append("<tr><td>").append(Bundle.ReportHTML_writeSum_examiner()).append("</td><td>") //NON-NLS
                     .append(formatHtmlString(examinerName)).append("</td></tr>\n"); //NON-NLS
         }
-        
+
         // End the layout.
         summary.append("</table>\n"); //NON-NLS
         summary.append("</div>\n"); //NON-NLS
@@ -1516,7 +1518,7 @@ class ReportHTML implements TableReportModule {
      * @param file The file from which to create the thumbnail.
      *
      * @return The path to the thumbnail file, or null if a thumbnail couldn't
-     *         be created.
+     * be created.
      */
     private String prepareThumbnail(AbstractFile file) {
         BufferedImage bufferedThumb = ImageUtils.getThumbnail(file, ImageUtils.ICON_SIZE_MEDIUM);
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportHTMLConfigurationPanel.java b/Core/src/org/sleuthkit/autopsy/report/ReportHTMLConfigurationPanel.java
index f67b059a96..ab1d97fa43 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportHTMLConfigurationPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportHTMLConfigurationPanel.java
@@ -18,8 +18,6 @@
  */
 package org.sleuthkit.autopsy.report;
 
-import org.sleuthkit.autopsy.coreutils.ModuleSettings;
-
 /**
  * The panel shown for all TableReportModules when configuring report modules.
  */
@@ -30,15 +28,9 @@ final class ReportHTMLConfigurationPanel extends javax.swing.JPanel {
      * Creates new form DefaultReportConfigurationPanel
      */
     ReportHTMLConfigurationPanel() {
-        initComponents();
-        
-        // Load settings
-        // ELTODO REMOVE
-        String header = ModuleSettings.getConfigSetting("HTMLReport", "header"); //NON-NLS
-        String footer = ModuleSettings.getConfigSetting("HTMLReport", "footer"); //NON-NLS
-        
-        headerTextField.setText(header != null ? header : "");
-        footerTextField.setText(footer != null ? footer : "");
+        initComponents();        
+        headerTextField.setText("");
+        footerTextField.setText("");
     }
     
     void setConfiguration(HTMLReportModuleSettings settings) {
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportModuleConfig.java b/Core/src/org/sleuthkit/autopsy/report/ReportModuleConfig.java
index 9099c218a7..5b7d12fde6 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportModuleConfig.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportModuleConfig.java
@@ -32,7 +32,7 @@ final class ReportModuleConfig implements Serializable {
     private boolean enabled;
 
     /**
-     * Creates ModuleStatus object.
+     * Creates ReportModuleConfig object.
      *
      * @param module Implementation of a ReportModule interface
      * @param enabled Boolean flag whether the module is enabled
@@ -42,6 +42,19 @@ final class ReportModuleConfig implements Serializable {
         this.enabled = enabled;
         this.settings = new NoReportModuleSettings();
     }
+    
+    /**
+     * Creates ReportModuleConfig object.
+     *
+     * @param module Implementation of a ReportModule interface
+     * @param enabled Boolean flag whether the module is enabled
+     * @param settings Report module settings object
+     */
+    ReportModuleConfig(ReportModule module, boolean enabled, ReportModuleSettings settings) {
+        this.moduleName = module.getClass().getCanonicalName();
+        this.enabled = enabled;
+        this.settings = settings;
+    }
 
     /**
      * Get full canonical report module name.
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
index fd61c56121..3df150e663 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
@@ -22,6 +22,7 @@ import java.awt.BorderLayout;
 import java.awt.Component;
 import java.util.ArrayList;
 import static java.util.Collections.swap;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Level;
@@ -50,7 +51,7 @@ final class ReportVisualPanel1 extends JPanel implements ListSelectionListener {
     private List<TableReportModule> tableModules = new ArrayList<>();
     private List<FileReportModule> fileModules = new ArrayList<>();
     private PortableCaseReportModule portableCaseModule;
-    private final Map<String, ReportModuleConfig> moduleConfigs;
+    private Map<String, ReportModuleConfig> moduleConfigs;
     private Integer selectedIndex;
 
     /**
@@ -120,10 +121,6 @@ final class ReportVisualPanel1 extends JPanel implements ListSelectionListener {
             if (moduleConfigs == null) {
                 // get default module configuration
                 settings = module.getDefaultConfiguration();
-                // update config for this module
-                ReportModuleConfig moduleConfig = new ReportModuleConfig(module, false);
-                moduleConfig.setModuleSettings(settings);
-                moduleConfigs.put(module.getName(), moduleConfig);
             } else {
                 // get configuration for this module
                 ReportModuleConfig config = moduleConfigs.get(module.getClass().getCanonicalName());                
@@ -133,10 +130,6 @@ final class ReportVisualPanel1 extends JPanel implements ListSelectionListener {
                 } else {
                     // get default module configuration
                     settings = module.getDefaultConfiguration();
-                    // update config for this module
-                    ReportModuleConfig moduleConfig = new ReportModuleConfig(module, false);
-                    moduleConfig.setModuleSettings(settings);
-                    moduleConfigs.put(module.getName(), moduleConfig);
                 }
             }
             // set module configuration
@@ -230,14 +223,11 @@ final class ReportVisualPanel1 extends JPanel implements ListSelectionListener {
      * @return
      */
     Map<String, ReportModuleConfig> getUpdatedModuleConfigs() {
+        moduleConfigs = new HashMap<>();
         for (ReportModule module : modules) {
             // get updated module configuration
             ReportModuleSettings settings = module.getConfiguration();
-            
-            // update ReportModuleConfig for this module
-            ReportModuleConfig moduleConfig = new ReportModuleConfig(module, false);
-            moduleConfig.setModuleSettings(settings);
-            moduleConfigs.put(module.getName(), moduleConfig);
+            moduleConfigs.put(module.getClass().getCanonicalName(), new ReportModuleConfig(module, false, settings));
         }
         return moduleConfigs;
     }
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
index 872e7c7a20..7ab3a30751 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
@@ -57,7 +57,7 @@ public final class ReportWizardAction extends CallableSystemAction implements Pr
 
     private static final Logger logger = Logger.getLogger(ReportWizardAction.class.getName());
     private static final String REPORTING_CONFIGURATION_NAME = "ReportAction";
-    private static final boolean DISPLAY_CASE_SPECIFIC_DATA = false; //ELTODO true;
+    private static final boolean DISPLAY_CASE_SPECIFIC_DATA = true;
     private static final boolean RUN_REPORTS = true;
     private final JButton toolbarButton = new JButton();
     private static final String ACTION_NAME = NbBundle.getMessage(ReportWizardAction.class, "ReportWizardAction.actionName.text");
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java b/Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java
index 1a05f8539c..ef40bf4eb9 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java
@@ -108,7 +108,7 @@ final class ReportingConfigLoader {
         
         // read each ReportModuleSettings object individually
         for (Iterator<Entry<String, ReportModuleConfig>> iterator = moduleConfigs.entrySet().iterator(); iterator.hasNext();) {
-            ReportModuleConfig moduleConfig = (ReportModuleConfig) iterator.next().getValue();
+            ReportModuleConfig moduleConfig = iterator.next().getValue();
             filePath = reportDirPath.toString() + File.separator + moduleConfig.getModuleClassName() + REPORT_SETTINGS_FILE_EXTENSION;
             try (NbObjectInputStream in = new NbObjectInputStream(new FileInputStream(filePath))) {
                 moduleConfig.setModuleSettings((ReportModuleSettings) in.readObject());

From 76e7cfbaf7f28a5a8651e2284439f98fd3bf3087 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Thu, 22 Aug 2019 09:24:34 -0400
Subject: [PATCH 075/192] Minor

---
 Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java | 2 +-
 Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
index 7ab3a30751..78febf26eb 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
@@ -58,7 +58,7 @@ public final class ReportWizardAction extends CallableSystemAction implements Pr
     private static final Logger logger = Logger.getLogger(ReportWizardAction.class.getName());
     private static final String REPORTING_CONFIGURATION_NAME = "ReportAction";
     private static final boolean DISPLAY_CASE_SPECIFIC_DATA = true;
-    private static final boolean RUN_REPORTS = true;
+    private static final boolean RUN_REPORTS = false; // ELTODO true;
     private final JButton toolbarButton = new JButton();
     private static final String ACTION_NAME = NbBundle.getMessage(ReportWizardAction.class, "ReportWizardAction.actionName.text");
 
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java
index 6d78b74941..c7ed85c0cf 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java
@@ -98,7 +98,6 @@ class ReportWizardPanel2 implements WizardDescriptor.Panel<WizardDescriptor> {
 
     @Override
     public void storeSettings(WizardDescriptor wiz) {
-        TableReportSettings settings = new TableReportSettings(getComponent().getArtifactStates(), getComponent().getTagStates(), useCaseSpecificData, getComponent().getSelectedReportType());
-        wiz.putProperty("tableReportSettings", settings);
+        wiz.putProperty("tableReportSettings", new TableReportSettings(getComponent().getArtifactStates(), getComponent().getTagStates(), useCaseSpecificData, getComponent().getSelectedReportType()));
     }
 }

From 91b08e400199211449e8758e246afbe80aac18fc Mon Sep 17 00:00:00 2001
From: Kelly Kelly <kelly@basistech.com>
Date: Thu, 22 Aug 2019 09:43:21 -0400
Subject: [PATCH 076/192] Inital pass of creating deleted files for recycle
 files.

---
 .../recentactivity/ExtractRecycleBin.java     | 126 +++++++++++++++++-
 1 file changed, 121 insertions(+), 5 deletions(-)

diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java
index 926f8b2d9f..4c9f4b9618 100755
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java
@@ -28,6 +28,7 @@ import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -35,6 +36,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Level;
+import org.openide.util.Exceptions;
 import org.openide.util.NbBundle.Messages;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.services.FileManager;
@@ -51,7 +53,10 @@ import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_PAT
 import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_USER_ID;
 import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_USER_NAME;
 import org.sleuthkit.datamodel.Content;
+import org.sleuthkit.datamodel.FsContent;
+import org.sleuthkit.datamodel.SleuthkitCase;
 import org.sleuthkit.datamodel.TskCoreException;
+import org.sleuthkit.datamodel.TskData;
 import org.sleuthkit.datamodel.TskDataException;
 
 /**
@@ -134,7 +139,7 @@ final class ExtractRecycleBin extends Extract {
                 return;
             }
             
-            processIFiles(context, recycleBinArtifactType, iFile, userNameMap, rFileMap, tempRARecycleBinPath);
+            processIFiles(dataSource, context, recycleBinArtifactType, iFile, userNameMap, rFileMap, tempRARecycleBinPath);
         }
 
         (new File(tempRARecycleBinPath)).delete();
@@ -150,7 +155,7 @@ final class ExtractRecycleBin extends Extract {
      * @param userNameMap Map of user ids to names
      * @param tempRARecycleBinPath Temp directory path
      */
-    private void processIFiles(IngestJobContext context,  BlackboardArtifact.Type recycleBinArtifactType, AbstractFile iFile,  Map<String, String> userNameMap, Map<String, List<AbstractFile>> rFileMap, String tempRARecycleBinPath) {
+    private void processIFiles(Content dataSource, IngestJobContext context,  BlackboardArtifact.Type recycleBinArtifactType, AbstractFile iFile,  Map<String, String> userNameMap, Map<String, List<AbstractFile>> rFileMap, String tempRARecycleBinPath) {
         String tempFilePath = tempRARecycleBinPath + File.separator + iFile.getName();
         try {
             try {
@@ -188,7 +193,7 @@ final class ExtractRecycleBin extends Extract {
             if(rFiles == null) {
                 return;
             }
-
+            SleuthkitCase skCase = Case.getCurrentCase().getSleuthkitCase();
             for (AbstractFile rFile : rFiles) {
                 if (context.dataSourceIngestIsCancelled()) {
                     return;
@@ -198,6 +203,16 @@ final class ExtractRecycleBin extends Extract {
                         && iFile.getMetaFlagsAsString().equals(rFile.getMetaFlagsAsString())) {
                     try {
                         postArtifact(createArtifact(rFile, recycleBinArtifactType, metaData.getFileName(), userName, metaData.getDeletedTimeStamp()));
+                        if(rFile instanceof FsContent) {
+                            if(rFile.isDir()) {
+                                AbstractFile directory = getOrMakeFolder(Case.getCurrentCase().getSleuthkitCase(), (FsContent)rFile, metaData.getFileName());
+                                popuplateDirectory(Case.getCurrentCase().getSleuthkitCase(), directory, rFile.getChildren(), metaData.getFileName(), metaData.getDeletedTimeStamp());
+                                
+                            } else {
+                                AbstractFile folder = getOrMakeFolder(Case.getCurrentCase().getSleuthkitCase(), (FsContent)rFile.getParent(), Paths.get(metaData.getFileName()).getParent().toString());
+                                addFileToDirectory(skCase, rFile, folder, Paths.get(metaData.getFileName()).getFileName().toString(), metaData.getDeletedTimeStamp());
+                            }
+                        }
                     } catch (TskCoreException ex) {
                         logger.log(Level.WARNING, String.format("Unable to add attributes to artifact %s", rFile.getName()), ex); //NON-NLS
                     }
@@ -207,6 +222,34 @@ final class ExtractRecycleBin extends Extract {
             (new File(tempFilePath)).delete();
         }
     }
+    
+    /**
+     * 
+     * @param skCase
+     * @param folder
+     * @param children
+     * @param parentPath
+     * @param deletedTimeStamp
+     * @throws TskCoreException 
+     */
+    private void popuplateDirectory(SleuthkitCase skCase, AbstractFile folder, List<Content> recycledChildren, String parentPath, long deletedTimeStamp) throws TskCoreException {
+        if (recycledChildren == null) {
+            return;
+        }
+        
+        for(Content child: recycledChildren) {
+            if(child instanceof AbstractFile) {
+                AbstractFile fileChild = (AbstractFile) child;
+                if(fileChild.isFile()) {
+                    addFileToDirectory(skCase, fileChild, folder, fileChild.getName(), deletedTimeStamp);
+                } else if(fileChild.isDir()) {
+                    String newPath = parentPath + File.separator + fileChild.getName();
+                    AbstractFile childFolder = getOrMakeFolder(skCase, (FsContent)fileChild, parentPath);
+                    popuplateDirectory(skCase, childFolder, fileChild.getChildren(), newPath, deletedTimeStamp);
+                }
+            }
+        }
+    }
 
     /**
      * Parse the $I file.
@@ -383,7 +426,80 @@ final class ExtractRecycleBin extends Extract {
         
         return bba;
     }
-
+    
+    private AbstractFile getOrMakeFolder(SleuthkitCase skCase, FsContent dataSource, String path) throws TskCoreException {
+        
+        String parentPath = getParentPath(path);
+        String folderName = getFileName(path);
+        
+        List<AbstractFile> files = null;
+        if(parentPath != null) {
+            if(!parentPath.equals("/")) {
+                parentPath = parentPath + "/";
+            }
+            files = skCase.findAllFilesWhere(String.format("fs_obj_id=%s AND parent_path='%s' AND name='%s'", dataSource.getFileSystemId(), parentPath, folderName != null ? folderName : ""));
+        } else {
+            files = skCase.findAllFilesWhere(String.format("fs_obj_id=%s AND parent_path='/' AND name=''", dataSource.getFileSystemId()));
+        }
+        
+        if(files == null || files.isEmpty()) {
+            AbstractFile parent = getOrMakeFolder(skCase, dataSource, parentPath); 
+            return skCase.addVirtualDirectory(parent.getId(), folderName);
+           
+        } else {
+            return files.get(0);
+        }
+    }
+    
+    private void addFileToDirectory (SleuthkitCase skCase, AbstractFile rFile, Content parentDir, String fileName, long deletedTime) throws TskCoreException {
+        FsContent fsContent = (FsContent)rFile;
+        
+        skCase.addFileSystemFile(fsContent.getFileSystemId(), 
+                                rFile.getDataSourceObjectId(),
+                                rFile.getAttrType(),
+                                rFile.getAttributeId(),
+                                fileName,
+                                TskData.TSK_FS_NAME_FLAG_ENUM.UNALLOC,
+                                rFile.getSize(),
+                                0,0,0,deletedTime,
+                                rFile.getMetaAddr(),
+                                (int)rFile.getMetaSeq(),
+                                true, parentDir);
+    }
+    
+    /**
+     * 
+     * @param path
+     * @return 
+     */
+    String normalizeFilePath(String pathString) {
+        if (pathString == null || pathString.isEmpty()) {
+            return null;
+        }
+        
+        Path path = Paths.get(pathString);
+        Path rootPath = path.getRoot();
+        
+        String rootless = pathString.replace(rootPath.toString().replace("\\", ""), "");
+        return rootless.replace("\\", "/");
+    }
+    
+    String getFileName(String filePath) {
+        Path fileNamePath = Paths.get(filePath).getFileName();
+        if(fileNamePath != null) {
+            return fileNamePath.toString();
+        }
+        return filePath;
+    }
+    
+    String getParentPath(String path) {
+        Path parentPath = Paths.get(path).getParent();
+        if(parentPath != null) {
+            return normalizeFilePath(parentPath.toString());
+        }
+        return null;
+    }
+    
     /**
      * Stores the data from the $I files.
      */
@@ -430,7 +546,7 @@ final class ExtractRecycleBin extends Extract {
          * @return String name of the deleted file
          */
         String getFileName() {
-            return fileName;
+            return fileName.trim();
         }
     }
 }

From 27556fa49db0d83f5aa434a1354bc454ee7a67c0 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Thu, 22 Aug 2019 11:41:05 -0400
Subject: [PATCH 077/192] Updated Excel report module to implement new API

---
 .../sleuthkit/autopsy/report/ReportExcel.java | 36 +++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportExcel.java b/Core/src/org/sleuthkit/autopsy/report/ReportExcel.java
index 8503003e50..60c34b1df7 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportExcel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportExcel.java
@@ -59,6 +59,38 @@ class ReportExcel implements TableReportModule {
     private ReportExcel() {
     }
 
+    /**
+     * Get default configuration for this report module.
+     *
+     * @return Object which contains default report module settings.
+     */
+    @Override
+    public ReportModuleSettings getDefaultConfiguration() {
+        // This module does not have configuration
+        return new NoReportModuleSettings();
+    }
+
+    /**
+     * Get current configuration for this report module.
+     *
+     * @return Object which contains current report module settings.
+     */
+    @Override
+    public ReportModuleSettings getConfiguration() {
+        // This module does not have configuration
+        return new NoReportModuleSettings();
+    }
+
+    /**
+     * Set report module configuration.
+     *
+     * @param settings Object which contains report module settings.
+     */
+    @Override
+    public void setConfiguration(ReportModuleSettings settings) {
+        // This module does not have configuration
+    }
+
     /**
      * Start the Excel report by creating the Workbook, initializing styles, and
      * writing the summary.
@@ -69,7 +101,7 @@ class ReportExcel implements TableReportModule {
     public void startReport(String baseReportDir) {
         // Set the path and save it for when the report is written to disk.
         this.reportPath = baseReportDir + getRelativeFilePath();
- 
+
         // Make a workbook.
         wb = new XSSFWorkbook();
 
@@ -137,7 +169,7 @@ class ReportExcel implements TableReportModule {
      * Start a new worksheet for the given data type. Note: This method is a
      * temporary workaround to avoid modifying the TableReportModule interface.
      *
-     * @param name    Name of the data type
+     * @param name Name of the data type
      * @param comment Comment on the data type, may be the empty string
      */
     @Override

From 41c71a0b03273ce9d34fea7680a8a291a831674b Mon Sep 17 00:00:00 2001
From: Kelly Kelly <kelly@basistech.com>
Date: Thu, 22 Aug 2019 12:02:26 -0400
Subject: [PATCH 078/192] updated after review comments

---
 .../recentactivity/ExtractRecycleBin.java     | 329 ++++++++++--------
 1 file changed, 192 insertions(+), 137 deletions(-)

diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java
index 4c9f4b9618..8beaa0bd87 100755
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java
@@ -36,7 +36,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Level;
-import org.openide.util.Exceptions;
 import org.openide.util.NbBundle.Messages;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.services.FileManager;
@@ -87,7 +86,7 @@ final class ExtractRecycleBin extends Extract {
         // At this time it was decided that we would not include TSK_RECYCLE_BIN
         // in the default list of BlackboardArtifact types.
         try {
-           createRecycleBinArtifactType();
+            createRecycleBinArtifactType();
         } catch (TskCoreException ex) {
             logger.log(Level.WARNING, String.format("%s may not have been created.", RECYCLE_BIN_ARTIFACT_NAME), ex);
         }
@@ -102,16 +101,16 @@ final class ExtractRecycleBin extends Extract {
             return;
         }
         Map<String, String> userNameMap;
-        
+
         try {
             userNameMap = makeUserNameMap(dataSource);
         } catch (TskCoreException ex) {
-           logger.log(Level.WARNING, "Unable to create OS Account user name map", ex);
-           // This is not the end of the world we will just continue without 
-           // user names
-           userNameMap = new HashMap<>();
+            logger.log(Level.WARNING, "Unable to create OS Account user name map", ex);
+            // This is not the end of the world we will just continue without 
+            // user names
+            userNameMap = new HashMap<>();
         }
-        
+
         FileManager fileManager = Case.getCurrentCase().getServices().getFileManager();
 
         Map<String, List<AbstractFile>> rFileMap;
@@ -130,7 +129,7 @@ final class ExtractRecycleBin extends Extract {
             logger.log(Level.WARNING, "Unable to find recycle bin I files.", ex); //NON-NLS
             return;  // No need to continue
         }
-        
+
         String tempRARecycleBinPath = RAImageIngestModule.getRATempPath(Case.getCurrentCase(), "recyclebin"); //NON-NLS
 
         for (AbstractFile iFile : iFiles) {
@@ -138,24 +137,23 @@ final class ExtractRecycleBin extends Extract {
             if (context.dataSourceIngestIsCancelled()) {
                 return;
             }
-            
-            processIFiles(dataSource, context, recycleBinArtifactType, iFile, userNameMap, rFileMap, tempRARecycleBinPath);
+
+            processIFile(context, recycleBinArtifactType, iFile, userNameMap, rFileMap, tempRARecycleBinPath);
         }
 
         (new File(tempRARecycleBinPath)).delete();
     }
-    
+
     /**
      * Process each individual iFile.
-     * 
-     * @param dataSource
+     *
      * @param context
      * @param recycleBinArtifactType Module created artifact type
-     * @param iFile The AbstractFile to process
-     * @param userNameMap Map of user ids to names
-     * @param tempRARecycleBinPath Temp directory path
+     * @param iFile                  The AbstractFile to process
+     * @param userNameMap            Map of user ids to names
+     * @param tempRARecycleBinPath   Temp directory path
      */
-    private void processIFiles(Content dataSource, IngestJobContext context,  BlackboardArtifact.Type recycleBinArtifactType, AbstractFile iFile,  Map<String, String> userNameMap, Map<String, List<AbstractFile>> rFileMap, String tempRARecycleBinPath) {
+    private void processIFile(IngestJobContext context, BlackboardArtifact.Type recycleBinArtifactType, AbstractFile iFile, Map<String, String> userNameMap, Map<String, List<AbstractFile>> rFileMap, String tempRARecycleBinPath) {
         String tempFilePath = tempRARecycleBinPath + File.separator + iFile.getName();
         try {
             try {
@@ -187,10 +185,10 @@ final class ExtractRecycleBin extends Extract {
             }
 
             String rFileName = iFile.getName().replace("$I", "$R"); //NON-NLS
-            
+
             List<AbstractFile> rFiles = rFileMap.get(rFileName);
-            
-            if(rFiles == null) {
+
+            if (rFiles == null) {
                 return;
             }
             SleuthkitCase skCase = Case.getCurrentCase().getSleuthkitCase();
@@ -199,18 +197,18 @@ final class ExtractRecycleBin extends Extract {
                     return;
                 }
 
-                if (iFile.getParentPath().equals(rFile.getParentPath()) 
+                if (iFile.getParentPath().equals(rFile.getParentPath())
                         && iFile.getMetaFlagsAsString().equals(rFile.getMetaFlagsAsString())) {
                     try {
                         postArtifact(createArtifact(rFile, recycleBinArtifactType, metaData.getFileName(), userName, metaData.getDeletedTimeStamp()));
-                        if(rFile instanceof FsContent) {
-                            if(rFile.isDir()) {
-                                AbstractFile directory = getOrMakeFolder(Case.getCurrentCase().getSleuthkitCase(), (FsContent)rFile, metaData.getFileName());
-                                popuplateDirectory(Case.getCurrentCase().getSleuthkitCase(), directory, rFile.getChildren(), metaData.getFileName(), metaData.getDeletedTimeStamp());
-                                
+                        if (rFile instanceof FsContent) {
+                            if (rFile.isDir()) {
+                                AbstractFile directory = getOrMakeFolder(Case.getCurrentCase().getSleuthkitCase(), (FsContent) rFile, metaData.getFileName());
+                                popuplateDeletedDirectory(Case.getCurrentCase().getSleuthkitCase(), directory, rFile.getChildren(), metaData.getFileName(), metaData.getDeletedTimeStamp());
+
                             } else {
-                                AbstractFile folder = getOrMakeFolder(Case.getCurrentCase().getSleuthkitCase(), (FsContent)rFile.getParent(), Paths.get(metaData.getFileName()).getParent().toString());
-                                addFileToDirectory(skCase, rFile, folder, Paths.get(metaData.getFileName()).getFileName().toString(), metaData.getDeletedTimeStamp());
+                                AbstractFile folder = getOrMakeFolder(Case.getCurrentCase().getSleuthkitCase(), (FsContent) rFile.getParent(), Paths.get(metaData.getFileName()).getParent().toString());
+                                addFileSystemFile(skCase, (FsContent)rFile, folder, Paths.get(metaData.getFileName()).getFileName().toString(), metaData.getDeletedTimeStamp());
                             }
                         }
                     } catch (TskCoreException ex) {
@@ -222,30 +220,35 @@ final class ExtractRecycleBin extends Extract {
             (new File(tempFilePath)).delete();
         }
     }
-    
+
     /**
-     * 
-     * @param skCase
-     * @param folder
-     * @param children
-     * @param parentPath
-     * @param deletedTimeStamp
-     * @throws TskCoreException 
+     * Add the children of recycled $R folder to the folder.
+     *
+     * @param skCase           The current Sleuthkit case
+     * @param parentFolder     The folder to folder the deleted files are to be
+     *                         added.
+     * @param children         The recycled children of the $R folder
+     * @param parentPath       String path to the directory the children were
+     *                         deleted from
+     * @param deletedTimeStamp The time at which the files were deleted,
+     *                         inherited from the $R file.
+     *
+     * @throws TskCoreException
      */
-    private void popuplateDirectory(SleuthkitCase skCase, AbstractFile folder, List<Content> recycledChildren, String parentPath, long deletedTimeStamp) throws TskCoreException {
+    private void popuplateDeletedDirectory(SleuthkitCase skCase, AbstractFile parentFolder, List<Content> recycledChildren, String parentPath, long deletedTimeStamp) throws TskCoreException {
         if (recycledChildren == null) {
             return;
         }
-        
-        for(Content child: recycledChildren) {
-            if(child instanceof AbstractFile) {
-                AbstractFile fileChild = (AbstractFile) child;
-                if(fileChild.isFile()) {
-                    addFileToDirectory(skCase, fileChild, folder, fileChild.getName(), deletedTimeStamp);
-                } else if(fileChild.isDir()) {
-                    String newPath = parentPath + File.separator + fileChild.getName();
-                    AbstractFile childFolder = getOrMakeFolder(skCase, (FsContent)fileChild, parentPath);
-                    popuplateDirectory(skCase, childFolder, fileChild.getChildren(), newPath, deletedTimeStamp);
+
+        for (Content child : recycledChildren) {
+            if (child instanceof FsContent) {
+                FsContent fsContent = (FsContent) child;
+                if (fsContent.isFile()) {
+                    addFileSystemFile(skCase, fsContent, parentFolder, fsContent.getName(), deletedTimeStamp);
+                } else if (fsContent.isDir()) {
+                    String newPath = parentPath + "\\" + fsContent.getName();
+                    AbstractFile childFolder = getOrMakeFolder(skCase, (FsContent) fsContent, parentPath);
+                    popuplateDeletedDirectory(skCase, childFolder, fsContent.getChildren(), newPath, deletedTimeStamp);
                 }
             }
         }
@@ -290,7 +293,7 @@ final class ExtractRecycleBin extends Extract {
         long version = byteBuffer.getLong();
         long fileSize = byteBuffer.getLong();
         long timestamp = byteBuffer.getLong();
-  
+
         // Convert from windows FILETIME to Unix Epoch seconds
         timestamp = Util.filetimeToMillis(timestamp) / 1000;
 
@@ -307,71 +310,73 @@ final class ExtractRecycleBin extends Extract {
 
         return new RecycledFileMetaData(fileSize, timestamp, fileName);
     }
-    
+
     /**
      * Create a map of userids to usernames from the OS Accounts.
-     * 
+     *
      * @param dataSource
-     * 
+     *
      * @return A Map of userIDs and userNames
-     * 
-     * @throws TskCoreException 
+     *
+     * @throws TskCoreException
      */
-    private Map<String, String> makeUserNameMap(Content dataSource) throws TskCoreException{
+    private Map<String, String> makeUserNameMap(Content dataSource) throws TskCoreException {
         Map<String, String> userNameMap = new HashMap<>();
-      
+
         List<BlackboardArtifact> accounts = blackboard.getArtifacts(TSK_OS_ACCOUNT.getTypeID(), dataSource.getId());
-        
-        for (BlackboardArtifact account: accounts) {
+
+        for (BlackboardArtifact account : accounts) {
             BlackboardAttribute nameAttribute = getAttributeForArtifact(account, TSK_USER_NAME);
             BlackboardAttribute idAttribute = getAttributeForArtifact(account, TSK_USER_ID);
-            
+
             String userName = nameAttribute != null ? nameAttribute.getDisplayString() : "";
             String userID = idAttribute != null ? idAttribute.getDisplayString() : "";
-            
+
             if (!userID.isEmpty()) {
                 userNameMap.put(userID, userName);
             }
         }
-        
+
         return userNameMap;
     }
-    
+
     /**
-     * Get a list of files that start with $R and create a map of the file to 
+     * Get a list of files that start with $R and create a map of the file to
      * their name.
-     * 
+     *
      * @param dataSource
+     *
      * @return File map
-     * @throws TskCoreException 
+     *
+     * @throws TskCoreException
      */
-    private Map<String, List<AbstractFile>> makeRFileMap(Content dataSource) throws TskCoreException{
+    private Map<String, List<AbstractFile>> makeRFileMap(Content dataSource) throws TskCoreException {
         FileManager fileManager = Case.getCurrentCase().getServices().getFileManager();
         List<AbstractFile> rFiles = fileManager.findFiles(dataSource, "$R%");
         Map<String, List<AbstractFile>> fileMap = new HashMap<>();
-        
-        for (AbstractFile rFile: rFiles) {
+
+        for (AbstractFile rFile : rFiles) {
             String fileName = rFile.getName();
             List<AbstractFile> fileList = fileMap.get(fileName);
-            
-            if(fileList == null) {
+
+            if (fileList == null) {
                 fileList = new ArrayList<>();
                 fileMap.put(fileName, fileList);
             }
-            
+
             fileList.add(rFile);
         }
-        
+
         return fileMap;
     }
-    
+
     /**
      * Helper functions to get the user ID from the iFile parent path. User ids
      * will be of the form S-<more characters>.
-     * 
+     *
      * @param iFileParentPath String parent path of the iFile
-     * 
-     * @return String user id 
+     *
+     * @return String user id
      */
     private String getUserIDFromPath(String iFileParentPath) {
         int index = iFileParentPath.indexOf('-') - 1;
@@ -381,125 +386,175 @@ final class ExtractRecycleBin extends Extract {
             return "";
         }
     }
-    
+
     /**
      * Gets the attribute for the given type from the given artifact.
-     * 
+     *
      * @param artifact BlackboardArtifact to get the attribute from
-     * @param type The BlackboardAttribute Type to get
-     * 
+     * @param type     The BlackboardAttribute Type to get
+     *
      * @return BlackboardAttribute for given artifact and type
-     * 
-     * @throws TskCoreException 
+     *
+     * @throws TskCoreException
      */
-    private BlackboardAttribute getAttributeForArtifact(BlackboardArtifact artifact, BlackboardAttribute.ATTRIBUTE_TYPE type) throws TskCoreException{
-       return artifact.getAttribute(new BlackboardAttribute.Type(BlackboardAttribute.ATTRIBUTE_TYPE.fromID(type.getTypeID())));
+    private BlackboardAttribute getAttributeForArtifact(BlackboardArtifact artifact, BlackboardAttribute.ATTRIBUTE_TYPE type) throws TskCoreException {
+        return artifact.getAttribute(new BlackboardAttribute.Type(BlackboardAttribute.ATTRIBUTE_TYPE.fromID(type.getTypeID())));
     }
-    
+
+    /**
+     * Create TSK_RECYCLE_BIN artifact type.
+     *
+     * @throws TskCoreException
+     */
     private void createRecycleBinArtifactType() throws TskCoreException {
-         try {
+        try {
             tskCase.addBlackboardArtifactType(RECYCLE_BIN_ARTIFACT_NAME, "Recycle Bin"); //NON-NLS
         } catch (TskDataException ex) {
             logger.log(Level.INFO, String.format("%s may have already been defined for this case", RECYCLE_BIN_ARTIFACT_NAME));
         }
 
     }
-    
+
     /**
      * Create the new artifact for the give rFile
-     * 
-     * @param rFile AbstractFile to create the artifact for
-     * @param type Type of artifact to create
+     *
+     * @param rFile    AbstractFile to create the artifact for
+     * @param type     Type of artifact to create
      * @param fileName The original path of the deleted file
      * @param userName The name of the user that deleted the file
      * @param dateTime The time in epoch seconds that the file was deleted
-     * 
+     *
      * @return Newly created artifact
-     * 
-     * @throws TskCoreException 
+     *
+     * @throws TskCoreException
      */
-    private BlackboardArtifact createArtifact(AbstractFile rFile, BlackboardArtifact.Type type, String fileName, String userName, long dateTime) throws TskCoreException{
+    private BlackboardArtifact createArtifact(AbstractFile rFile, BlackboardArtifact.Type type, String fileName, String userName, long dateTime) throws TskCoreException {
         BlackboardArtifact bba = rFile.newArtifact(type.getTypeID());
         bba.addAttribute(new BlackboardAttribute(TSK_PATH, getName(), fileName));
         bba.addAttribute(new BlackboardAttribute(TSK_DATETIME_DELETED, getName(), dateTime));
         bba.addAttribute(new BlackboardAttribute(TSK_USER_NAME, getName(), userName == null || userName.isEmpty() ? "" : userName));
-        
+
         return bba;
     }
-    
+
+    /**
+     * Returns a folder for the given path.  If the path does not exist the
+     * the folder is created.
+     * 
+     * @param skCase
+     * @param dataSource
+     * @param path
+     *
+     * @return AbstractFile for the given path.
+     *
+     * @throws TskCoreException
+     */
     private AbstractFile getOrMakeFolder(SleuthkitCase skCase, FsContent dataSource, String path) throws TskCoreException {
-        
+
         String parentPath = getParentPath(path);
         String folderName = getFileName(path);
-        
+
         List<AbstractFile> files = null;
-        if(parentPath != null) {
-            if(!parentPath.equals("/")) {
+        if (parentPath != null) {
+            if (!parentPath.equals("/")) {
                 parentPath = parentPath + "/";
             }
-            files = skCase.findAllFilesWhere(String.format("fs_obj_id=%s AND parent_path='%s' AND name='%s'", dataSource.getFileSystemId(), parentPath, folderName != null ? folderName : ""));
+            
+            files = skCase.findAllFilesWhere(String.format("fs_obj_id=%s AND parent_path='%s' AND name='%s'", 
+                    dataSource.getFileSystemId(), SleuthkitCase.escapeSingleQuotes(parentPath), folderName != null ? SleuthkitCase.escapeSingleQuotes(folderName) : ""));
         } else {
             files = skCase.findAllFilesWhere(String.format("fs_obj_id=%s AND parent_path='/' AND name=''", dataSource.getFileSystemId()));
         }
-        
-        if(files == null || files.isEmpty()) {
-            AbstractFile parent = getOrMakeFolder(skCase, dataSource, parentPath); 
+
+        if (files == null || files.isEmpty()) {
+            AbstractFile parent = getOrMakeFolder(skCase, dataSource, parentPath);
             return skCase.addVirtualDirectory(parent.getId(), folderName);
-           
         } else {
             return files.get(0);
         }
     }
-    
-    private void addFileToDirectory (SleuthkitCase skCase, AbstractFile rFile, Content parentDir, String fileName, long deletedTime) throws TskCoreException {
-        FsContent fsContent = (FsContent)rFile;
-        
-        skCase.addFileSystemFile(fsContent.getFileSystemId(), 
-                                rFile.getDataSourceObjectId(),
-                                rFile.getAttrType(),
-                                rFile.getAttributeId(),
-                                fileName,
-                                TskData.TSK_FS_NAME_FLAG_ENUM.UNALLOC,
-                                rFile.getSize(),
-                                0,0,0,deletedTime,
-                                rFile.getMetaAddr(),
-                                (int)rFile.getMetaSeq(),
-                                true, parentDir);
-    }
-    
+
     /**
+     * Adds a new file system file that is unallocated and maps to the original 
+     * file in recycle bin directory.
      * 
-     * @param path
-     * @return 
+     * @param skCase         The current case.
+     * @param recycleBinFile The file from the recycle bin.
+     * @param parentDir      The directory that the recycled file was deleted.
+     * @param fileName       The name of the file.
+     * @param deletedTime    The time the file was deleted.
+     *
+     * @throws TskCoreException
+     */
+    private void addFileSystemFile(SleuthkitCase skCase, FsContent recycleBinFile, Content parentDir, String fileName, long deletedTime) throws TskCoreException {
+        skCase.addFileSystemFile(recycleBinFile.getFileSystemId(),
+                recycleBinFile.getDataSourceObjectId(),
+                recycleBinFile.getAttrType(),
+                recycleBinFile.getAttributeId(),
+                fileName,
+                TskData.TSK_FS_NAME_FLAG_ENUM.UNALLOC,
+                recycleBinFile.getSize(),
+                0, 0, 0, deletedTime,
+                recycleBinFile.getMetaAddr(),
+                (int) recycleBinFile.getMetaSeq(),
+                true, parentDir);
+    }
+
+    /**
+     * Clean up the windows path string to match what the autopsy db uses.
+     *
+     * @param path The file\folder path to normalize
+     *
+     * @return New path string with the root removed (ie X:) and the slashes
+     *         changed from windows to unix.
      */
     String normalizeFilePath(String pathString) {
         if (pathString == null || pathString.isEmpty()) {
             return null;
         }
-        
+
         Path path = Paths.get(pathString);
-        Path rootPath = path.getRoot();
-        
-        String rootless = pathString.replace(rootPath.toString().replace("\\", ""), "");
-        return rootless.replace("\\", "/");
+        int nameCount = path.getNameCount();
+        if(nameCount > 0) {
+            String rootless = "/" + path.subpath(0, nameCount);
+            return rootless.replace("\\", "/");
+        } else {
+            return "/";
+        }
     }
-    
+
+    /**
+     * Helper function get from the given path either the file name or
+     * the last directory in the path.
+     * 
+     * @param filePath The file\directory path
+     *
+     * @return  If file path, returns the file name.  If directory path the 
+     *          The last directory in the path is returned.
+     */
     String getFileName(String filePath) {
         Path fileNamePath = Paths.get(filePath).getFileName();
-        if(fileNamePath != null) {
+        if (fileNamePath != null) {
             return fileNamePath.toString();
         }
         return filePath;
     }
-    
+
+    /**
+     * Returns the parent path for the given path.
+     * 
+     * @param path Path string
+     * 
+     * @return The parent path for the given path. 
+     */
     String getParentPath(String path) {
         Path parentPath = Paths.get(path).getParent();
-        if(parentPath != null) {
+        if (parentPath != null) {
             return normalizeFilePath(parentPath.toString());
         }
         return null;
     }
-    
+
     /**
      * Stores the data from the $I files.
      */
@@ -524,7 +579,7 @@ final class ExtractRecycleBin extends Extract {
 
         /**
          * Returns the size of the recycled file.
-         * 
+         *
          * @return Size of deleted file
          */
         long getFileSize() {
@@ -533,7 +588,7 @@ final class ExtractRecycleBin extends Extract {
 
         /**
          * Returns the time the file was deleted.
-         * 
+         *
          * @return deleted time in epoch seconds.
          */
         long getDeletedTimeStamp() {
@@ -542,7 +597,7 @@ final class ExtractRecycleBin extends Extract {
 
         /**
          * Returns the name of the deleted file.
-         * 
+         *
          * @return String name of the deleted file
          */
         String getFileName() {

From 7d1c3b37e9676a3e4198e1af4254427d5d44c137 Mon Sep 17 00:00:00 2001
From: Kelly Kelly <kelly@basistech.com>
Date: Thu, 22 Aug 2019 14:13:36 -0400
Subject: [PATCH 079/192] modified the temp  name to be unique

---
 .../sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java
index 8beaa0bd87..9690a04aa0 100755
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java
@@ -36,6 +36,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Level;
+import org.joda.time.Instant;
 import org.openide.util.NbBundle.Messages;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.services.FileManager;
@@ -154,7 +155,7 @@ final class ExtractRecycleBin extends Extract {
      * @param tempRARecycleBinPath   Temp directory path
      */
     private void processIFile(IngestJobContext context, BlackboardArtifact.Type recycleBinArtifactType, AbstractFile iFile, Map<String, String> userNameMap, Map<String, List<AbstractFile>> rFileMap, String tempRARecycleBinPath) {
-        String tempFilePath = tempRARecycleBinPath + File.separator + iFile.getName();
+        String tempFilePath = tempRARecycleBinPath + File.separator + Instant.now().toString() + iFile.getName();
         try {
             try {
                 ContentUtils.writeToFile(iFile, new File(tempFilePath));

From 157fb54219f366b1a24d1d12b7fab8a5bdbe847f Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Thu, 22 Aug 2019 15:30:34 -0400
Subject: [PATCH 080/192] Ported HashDB report module

---
 .../sleuthkit/autopsy/report/ReportHTML.java  |  19 +++-
 .../taggedhashes/AddTaggedHashesToHashDb.java |  52 ++++++++-
 .../AddTaggedHashesToHashDbConfigPanel.form   |  51 +++++----
 .../AddTaggedHashesToHashDbConfigPanel.java   | 102 +++++++++++++-----
 .../report/taggedhashes/Bundle.properties     |   1 +
 .../taggedhashes/Bundle.properties-MERGED     |   1 +
 .../HashesReportModuleSettings.java           |  72 +++++++++++++
 7 files changed, 250 insertions(+), 48 deletions(-)
 create mode 100755 Core/src/org/sleuthkit/autopsy/report/taggedhashes/HashesReportModuleSettings.java

diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java b/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java
index 3e55486aab..3f2175bc42 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java
@@ -98,7 +98,7 @@ class ReportHTML implements TableReportModule {
     private Integer rowCount;       // number of rows (aka artifacts or tags) for the current data type
     private Writer out;
 
-    private final ReportHTMLConfigurationPanel configPanel = new ReportHTMLConfigurationPanel();
+    private ReportHTMLConfigurationPanel configPanel;
 
     private final ReportBranding reportBranding;
 
@@ -117,9 +117,16 @@ class ReportHTML implements TableReportModule {
 
     @Override
     public JPanel getConfigurationPanel() {
+        initializePanel();
         return configPanel;
     }
 
+    private void initializePanel() {
+        if (configPanel == null) {
+            configPanel = new ReportHTMLConfigurationPanel();
+        }
+    }
+
     /**
      * Get default configuration for this report module.
      *
@@ -137,6 +144,7 @@ class ReportHTML implements TableReportModule {
      */
     @Override
     public ReportModuleSettings getConfiguration() {
+        initializePanel();
         return configPanel.getConfiguration();
     }
 
@@ -147,13 +155,14 @@ class ReportHTML implements TableReportModule {
      */
     @Override
     public void setConfiguration(ReportModuleSettings settings) {
-        if (settings instanceof HTMLReportModuleSettings) {
-            configPanel.setConfiguration((HTMLReportModuleSettings) settings);
+        initializePanel();
+        if (settings == null || settings instanceof NoReportModuleSettings) {
+            configPanel.setConfiguration((HTMLReportModuleSettings) getDefaultConfiguration());
             return;
         }
 
-        if (settings instanceof NoReportModuleSettings) {
-            configPanel.setConfiguration((HTMLReportModuleSettings) getDefaultConfiguration());
+        if (settings instanceof HTMLReportModuleSettings) {
+            configPanel.setConfiguration((HTMLReportModuleSettings) settings);
             return;
         }
 
diff --git a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDb.java b/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDb.java
index 3c1111bf7a..acd3d8d94c 100644
--- a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDb.java
+++ b/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDb.java
@@ -33,6 +33,8 @@ import org.sleuthkit.autopsy.casemodule.services.TagsManager;
 import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
 import org.sleuthkit.autopsy.modules.hashdatabase.HashDbManager.HashDb;
 import org.sleuthkit.autopsy.report.GeneralReportModule;
+import org.sleuthkit.autopsy.report.NoReportModuleSettings;
+import org.sleuthkit.autopsy.report.ReportModuleSettings;
 import org.sleuthkit.autopsy.report.ReportProgressPanel;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.Content;
@@ -67,6 +69,48 @@ public class AddTaggedHashesToHashDb implements GeneralReportModule {
     public String getRelativeFilePath() {
         return null;
     }
+    
+    /**
+     * Get default configuration for this report module.
+     *
+     * @return Object which contains default report module settings.
+     */
+    @Override
+    public ReportModuleSettings getDefaultConfiguration() {
+        return new HashesReportModuleSettings();
+    }
+
+    /**
+     * Get current configuration for this report module.
+     *
+     * @return Object which contains current report module settings.
+     */
+    @Override
+    public ReportModuleSettings getConfiguration() {
+        initializePanel();
+        return configPanel.getConfiguration();
+    }
+
+    /**
+     * Set report module configuration.
+     *
+     * @param settings Object which contains report module settings.
+     */
+    @Override
+    public void setConfiguration(ReportModuleSettings settings) {
+        initializePanel();
+        if (settings == null || settings instanceof NoReportModuleSettings) {
+            configPanel.setConfiguration((HashesReportModuleSettings) getDefaultConfiguration());
+            return;
+        }
+        
+        if (settings instanceof HashesReportModuleSettings) {
+            configPanel.setConfiguration((HashesReportModuleSettings) settings);
+            return;
+        }
+
+        throw new IllegalArgumentException("Expected settings argument to be an instance of HashesReportModuleSettings");
+    }    
 
     @Messages({
         "AddTaggedHashesToHashDb.error.noHashSetsSelected=No hash set selected for export.",
@@ -158,7 +202,13 @@ public class AddTaggedHashesToHashDb implements GeneralReportModule {
 
     @Override
     public JPanel getConfigurationPanel() {
-        configPanel = new AddTaggedHashesToHashDbConfigPanel();
+        initializePanel();
         return configPanel;
     }
+    
+    private void initializePanel() {
+        if (configPanel == null) {
+            configPanel = new AddTaggedHashesToHashDbConfigPanel();
+        }
+    }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.form b/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.form
index 1acd36abf4..2670f6f0f9 100644
--- a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.form
@@ -16,53 +16,58 @@
   <Layout>
     <DimensionLayout dim="0">
       <Group type="103" groupAlignment="0" attributes="0">
-          <Group type="102" alignment="0" attributes="0">
-              <EmptySpace min="-2" max="-2" attributes="0"/>
+          <Group type="102" attributes="0">
+              <EmptySpace max="-2" attributes="0"/>
               <Group type="103" groupAlignment="0" attributes="0">
-                  <Component id="jLabel2" min="-2" max="-2" attributes="0"/>
-                  <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
                   <Group type="102" alignment="0" attributes="0">
-                      <Group type="103" groupAlignment="0" attributes="0">
-                          <Component id="jScrollPane1" max="32767" attributes="0"/>
-                          <Group type="102" attributes="0">
-                              <Component id="hashSetsComboBox" min="-2" pref="159" max="-2" attributes="0"/>
-                              <EmptySpace max="-2" attributes="0"/>
-                              <Component id="configureHashDatabasesButton" min="-2" max="-2" attributes="0"/>
-                          </Group>
-                      </Group>
+                      <Component id="jScrollPane1" pref="359" max="32767" attributes="0"/>
                       <EmptySpace min="-2" max="-2" attributes="0"/>
                       <Group type="103" groupAlignment="0" max="-2" attributes="0">
                           <Component id="deselectAllButton" linkSize="1" max="32767" attributes="0"/>
                           <Component id="selectAllButton" linkSize="1" max="32767" attributes="0"/>
                       </Group>
                   </Group>
+                  <Group type="102" attributes="0">
+                      <Group type="103" groupAlignment="0" attributes="0">
+                          <Component id="jAllTagsCheckBox" min="-2" max="-2" attributes="0"/>
+                          <Component id="jLabel1" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Group type="102" alignment="0" attributes="0">
+                              <Component id="hashSetsComboBox" min="-2" pref="159" max="-2" attributes="0"/>
+                              <EmptySpace max="-2" attributes="0"/>
+                              <Component id="configureHashDatabasesButton" min="-2" max="-2" attributes="0"/>
+                          </Group>
+                          <Component id="jLabel2" alignment="0" min="-2" max="-2" attributes="0"/>
+                      </Group>
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
               </Group>
-              <EmptySpace min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
     <DimensionLayout dim="1">
       <Group type="103" groupAlignment="0" attributes="0">
           <Group type="102" alignment="0" attributes="0">
-              <EmptySpace max="-2" attributes="0"/>
               <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
-              <EmptySpace min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="32767" attributes="0"/>
+              <Component id="jAllTagsCheckBox" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
               <Group type="103" groupAlignment="0" attributes="0">
                   <Group type="102" attributes="0">
                       <Component id="selectAllButton" min="-2" max="-2" attributes="0"/>
                       <EmptySpace max="-2" attributes="0"/>
                       <Component id="deselectAllButton" min="-2" max="-2" attributes="0"/>
                   </Group>
-                  <Component id="jScrollPane1" max="32767" attributes="0"/>
+                  <Component id="jScrollPane1" min="-2" pref="112" max="-2" attributes="0"/>
               </Group>
-              <EmptySpace type="unrelated" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
               <Component id="jLabel2" min="-2" max="-2" attributes="0"/>
               <EmptySpace min="-2" pref="4" max="-2" attributes="0"/>
               <Group type="103" groupAlignment="3" attributes="0">
                   <Component id="hashSetsComboBox" alignment="3" min="-2" max="-2" attributes="0"/>
                   <Component id="configureHashDatabasesButton" alignment="3" min="-2" max="-2" attributes="0"/>
               </Group>
-              <EmptySpace max="-2" attributes="0"/>
+              <EmptySpace min="-2" pref="34" max="-2" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
@@ -144,5 +149,15 @@
         </Property>
       </Properties>
     </Component>
+    <Component class="javax.swing.JCheckBox" name="jAllTagsCheckBox">
+      <Properties>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/sleuthkit/autopsy/report/taggedhashes/Bundle.properties" key="AddTaggedHashesToHashDbConfigPanel.jAllTagsCheckBox.text" 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="jAllTagsCheckBoxActionPerformed"/>
+      </Events>
+    </Component>
   </SubComponents>
 </Form>
diff --git a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java b/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java
index 5f95f18bbd..8346b040bb 100644
--- a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java
@@ -32,6 +32,8 @@ import javax.swing.JList;
 import javax.swing.JOptionPane;
 import javax.swing.ListCellRenderer;
 import javax.swing.ListModel;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
 import javax.swing.event.ListDataListener;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
@@ -59,6 +61,31 @@ class AddTaggedHashesToHashDbConfigPanel extends javax.swing.JPanel {
     AddTaggedHashesToHashDbConfigPanel() {
         initComponents();
         customizeComponents();
+        
+        this.jAllTagsCheckBox.addChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                tagNamesListBox.setEnabled(!jAllTagsCheckBox.isSelected());
+                selectAllButton.setEnabled(!jAllTagsCheckBox.isSelected());
+                deselectAllButton.setEnabled(!jAllTagsCheckBox.isSelected());
+                selectAllTags(jAllTagsCheckBox.isSelected());
+            }
+        });
+    }
+    
+    HashesReportModuleSettings getConfiguration() {
+        return new HashesReportModuleSettings(jAllTagsCheckBox.isSelected(), selectedHashSet);
+    }
+    
+    void setConfiguration(HashesReportModuleSettings settings) {
+        // update tag selection
+        jAllTagsCheckBox.setSelected(settings.isExportAllTags());
+        
+        // update hash database selection
+        if (settings.getHashDb() != null) {
+            populateHashSetComponents();
+            hashSetsComboBox.setSelectedItem(settings.getHashDb());
+        }
     }
 
     private void customizeComponents() {
@@ -68,14 +95,17 @@ class AddTaggedHashesToHashDbConfigPanel extends javax.swing.JPanel {
 
     private void populateTagNameComponents() {
         // Get the tag names in use for the current case.
+        tagNames = new ArrayList<>();
         try {
+            // There may not be a case open when configuring report modules for Command Line execution
             tagNames = Case.getCurrentCaseThrows().getServices().getTagsManager().getTagNamesInUse();
         } catch (TskCoreException ex) {
             Logger.getLogger(AddTaggedHashesToHashDbConfigPanel.class.getName()).log(Level.SEVERE, "Failed to get tag names", ex);
-            JOptionPane.showMessageDialog(this, "Error getting tag names for case.", "Tag Names Not Found", JOptionPane.ERROR_MESSAGE);
+            // ELTODO remove all these JOptionPane.showMessageDialog(this, "Error getting tag names for case.", "Tag Names Not Found", JOptionPane.ERROR_MESSAGE);
         } catch (NoCurrentCaseException ex) {
-            Logger.getLogger(AddTaggedHashesToHashDbConfigPanel.class.getName()).log(Level.SEVERE, "Exception while getting open case.", ex);
-            JOptionPane.showMessageDialog(this, "Error getting tag names for case.", "Exception while getting open case.", JOptionPane.ERROR_MESSAGE);
+            // There may not be a case open when configuring report modules for Command Line execution
+            Logger.getLogger(AddTaggedHashesToHashDbConfigPanel.class.getName()).log(Level.WARNING, "Exception while getting open case.", ex);
+            // ELTODO JOptionPane.showMessageDialog(this, "Error getting tag names for case.", "Exception while getting open case.", JOptionPane.ERROR_MESSAGE);
         }
 
         // Mark the tag names as unselected. Note that tagNameSelections is a
@@ -94,6 +124,9 @@ class AddTaggedHashesToHashDbConfigPanel extends javax.swing.JPanel {
         tagNamesListBox.addMouseListener(new MouseAdapter() {
             @Override
             public void mousePressed(MouseEvent evt) {
+                if (!jAllTagsCheckBox.isSelected()) {
+                    return;
+                }
                 JList<?> list = (JList) evt.getSource();
                 int index = list.locationToIndex(evt.getPoint());
                 if (index > -1) {
@@ -205,6 +238,7 @@ class AddTaggedHashesToHashDbConfigPanel extends javax.swing.JPanel {
         hashSetsComboBox = new javax.swing.JComboBox<>();
         configureHashDatabasesButton = new javax.swing.JButton();
         jLabel2 = new javax.swing.JLabel();
+        jAllTagsCheckBox = new javax.swing.JCheckBox();
 
         jScrollPane1.setViewportView(tagNamesListBox);
 
@@ -239,6 +273,13 @@ class AddTaggedHashesToHashDbConfigPanel extends javax.swing.JPanel {
 
         org.openide.awt.Mnemonics.setLocalizedText(jLabel2, org.openide.util.NbBundle.getMessage(AddTaggedHashesToHashDbConfigPanel.class, "AddTaggedHashesToHashDbConfigPanel.jLabel2.text")); // NOI18N
 
+        org.openide.awt.Mnemonics.setLocalizedText(jAllTagsCheckBox, org.openide.util.NbBundle.getMessage(AddTaggedHashesToHashDbConfigPanel.class, "AddTaggedHashesToHashDbConfigPanel.jAllTagsCheckBox.text")); // NOI18N
+        jAllTagsCheckBox.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                jAllTagsCheckBoxActionPerformed(evt);
+            }
+        });
+
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
@@ -246,19 +287,22 @@ class AddTaggedHashesToHashDbConfigPanel extends javax.swing.JPanel {
             .addGroup(layout.createSequentialGroup()
                 .addContainerGap()
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(jLabel2)
-                    .addComponent(jLabel1)
                     .addGroup(layout.createSequentialGroup()
-                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addComponent(jScrollPane1)
-                            .addGroup(layout.createSequentialGroup()
-                                .addComponent(hashSetsComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, 159, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                .addComponent(configureHashDatabasesButton)))
+                        .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 359, Short.MAX_VALUE)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                         .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
                             .addComponent(deselectAllButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                            .addComponent(selectAllButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
+                            .addComponent(selectAllButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
+                    .addGroup(layout.createSequentialGroup()
+                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                            .addComponent(jAllTagsCheckBox)
+                            .addComponent(jLabel1)
+                            .addGroup(layout.createSequentialGroup()
+                                .addComponent(hashSetsComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, 159, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                                .addComponent(configureHashDatabasesButton))
+                            .addComponent(jLabel2))
+                        .addGap(0, 0, Short.MAX_VALUE)))
                 .addContainerGap())
         );
 
@@ -267,30 +311,28 @@ class AddTaggedHashesToHashDbConfigPanel extends javax.swing.JPanel {
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(layout.createSequentialGroup()
-                .addContainerGap()
                 .addComponent(jLabel1)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                .addComponent(jAllTagsCheckBox)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addGroup(layout.createSequentialGroup()
                         .addComponent(selectAllButton)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                         .addComponent(deselectAllButton))
-                    .addComponent(jScrollPane1))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                    .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 112, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(jLabel2)
                 .addGap(4, 4, 4)
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                     .addComponent(hashSetsComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                     .addComponent(configureHashDatabasesButton))
-                .addContainerGap())
+                .addGap(34, 34, 34))
         );
     }// </editor-fold>//GEN-END:initComponents
 
     private void selectAllButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_selectAllButtonActionPerformed
-        for (TagName tagName : tagNames) {
-            tagNameSelections.put(tagName.getDisplayName(), Boolean.TRUE);
-        }
-        tagNamesListBox.repaint();
+        selectAllTags(true);
     }//GEN-LAST:event_selectAllButtonActionPerformed
 
     private void hashSetsComboBoxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_hashSetsComboBoxActionPerformed
@@ -298,10 +340,7 @@ class AddTaggedHashesToHashDbConfigPanel extends javax.swing.JPanel {
     }//GEN-LAST:event_hashSetsComboBoxActionPerformed
 
     private void deselectAllButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_deselectAllButtonActionPerformed
-        for (TagName tagName : tagNames) {
-            tagNameSelections.put(tagName.getDisplayName(), Boolean.FALSE);
-        }
-        tagNamesListBox.repaint();
+        selectAllTags(false);
     }//GEN-LAST:event_deselectAllButtonActionPerformed
 
     private void configureHashDatabasesButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_configureHashDatabasesButtonActionPerformed
@@ -316,10 +355,25 @@ class AddTaggedHashesToHashDbConfigPanel extends javax.swing.JPanel {
         }
     }//GEN-LAST:event_configureHashDatabasesButtonActionPerformed
 
+    private void selectAllTags(boolean select) {
+        Boolean state = Boolean.TRUE;
+        if (!select) {
+            state = Boolean.FALSE;
+        }
+        for (TagName tagName : tagNames) {
+            tagNameSelections.put(tagName.getDisplayName(), state);
+        }
+        tagNamesListBox.repaint();
+    }
+    private void jAllTagsCheckBoxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jAllTagsCheckBoxActionPerformed
+        selectAllTags(true);
+    }//GEN-LAST:event_jAllTagsCheckBoxActionPerformed
+
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JButton configureHashDatabasesButton;
     private javax.swing.JButton deselectAllButton;
     private javax.swing.JComboBox<HashDb> hashSetsComboBox;
+    private javax.swing.JCheckBox jAllTagsCheckBox;
     private javax.swing.JLabel jLabel1;
     private javax.swing.JLabel jLabel2;
     private javax.swing.JScrollPane jScrollPane1;
diff --git a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/Bundle.properties b/Core/src/org/sleuthkit/autopsy/report/taggedhashes/Bundle.properties
index 82da454a0c..d38d075953 100644
--- a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/report/taggedhashes/Bundle.properties
@@ -5,3 +5,4 @@ AddTaggedHashesToHashDbConfigPanel.jLabel2.text=Export to hash set:
 AddTaggedHashesToHashDbConfigPanel.configureHashDatabasesButton.text=Configure Hash Sets...
 AddTaggedHashesToHashDbConfigPanel.jLabel1.text=Export hashes of files tagged as:
 AddTaggedHashesToHashDbConfigPanel.deselectAllButton.text=Deselect All
+AddTaggedHashesToHashDbConfigPanel.jAllTagsCheckBox.text=All Tagged Results
diff --git a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/report/taggedhashes/Bundle.properties-MERGED
index fc86777434..5b51059280 100755
--- a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/report/taggedhashes/Bundle.properties-MERGED
@@ -7,3 +7,4 @@ AddTaggedHashesToHashDbConfigPanel.jLabel2.text=Export to hash set:
 AddTaggedHashesToHashDbConfigPanel.configureHashDatabasesButton.text=Configure Hash Sets...
 AddTaggedHashesToHashDbConfigPanel.jLabel1.text=Export hashes of files tagged as:
 AddTaggedHashesToHashDbConfigPanel.deselectAllButton.text=Deselect All
+AddTaggedHashesToHashDbConfigPanel.jAllTagsCheckBox.text=All Tagged Results
diff --git a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/HashesReportModuleSettings.java b/Core/src/org/sleuthkit/autopsy/report/taggedhashes/HashesReportModuleSettings.java
new file mode 100755
index 0000000000..f43dfebf10
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/taggedhashes/HashesReportModuleSettings.java
@@ -0,0 +1,72 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2019 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.report.taggedhashes;
+
+import org.sleuthkit.autopsy.modules.hashdatabase.HashDbManager.HashDb;
+import org.sleuthkit.autopsy.report.ReportModuleSettings;
+
+/**
+ * Settings for the Tagged Hashes report module.
+ */
+class HashesReportModuleSettings implements ReportModuleSettings {
+
+    private static final long serialVersionUID = 1L;
+    private final boolean exportAllTags;
+    private final HashDb hashDb;
+
+    @Override
+    public long getVersionNumber() {
+        return serialVersionUID;
+    }
+
+    /**
+     * Default configuration for the Tagged Hashes report module.
+     */
+    HashesReportModuleSettings() {
+        exportAllTags = true;
+        hashDb = null;
+    }
+
+    /**
+     * Configuration for the Tagged Hashes report module.
+     *
+     * @param exportAllTags Flag whether to export all tags.
+     * @param hashDb Selected HashDb object to export to
+     */
+    HashesReportModuleSettings(boolean exportAllTags, HashDb hashDb) {
+        this.exportAllTags = exportAllTags;
+        this.hashDb = hashDb;
+    }
+
+    /**
+     * Flag whether to export all tags.
+     *
+     * @return Flag whether to export all tags
+     */
+    boolean isExportAllTags() {
+        return exportAllTags;
+    }
+
+    /**
+     * @return the hashDb
+     */
+    public HashDb getHashDb() {
+        return hashDb;
+    }
+}

From d4c55b2bb9b1420627677b8efd1fe88934d4f93b Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Thu, 22 Aug 2019 15:52:41 -0400
Subject: [PATCH 081/192] Ported HashDB report module

---
 .../taggedhashes/AddTaggedHashesToHashDbConfigPanel.form      | 2 +-
 .../taggedhashes/AddTaggedHashesToHashDbConfigPanel.java      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.form b/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.form
index 2670f6f0f9..d2bda3b577 100644
--- a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.form
@@ -67,7 +67,7 @@
                   <Component id="hashSetsComboBox" alignment="3" min="-2" max="-2" attributes="0"/>
                   <Component id="configureHashDatabasesButton" alignment="3" min="-2" max="-2" attributes="0"/>
               </Group>
-              <EmptySpace min="-2" pref="34" max="-2" attributes="0"/>
+              <EmptySpace min="-2" max="-2" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
diff --git a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java b/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java
index 8346b040bb..17eaedb169 100644
--- a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java
@@ -124,7 +124,7 @@ class AddTaggedHashesToHashDbConfigPanel extends javax.swing.JPanel {
         tagNamesListBox.addMouseListener(new MouseAdapter() {
             @Override
             public void mousePressed(MouseEvent evt) {
-                if (!jAllTagsCheckBox.isSelected()) {
+                if (jAllTagsCheckBox.isSelected()) {
                     return;
                 }
                 JList<?> list = (JList) evt.getSource();
@@ -327,7 +327,7 @@ class AddTaggedHashesToHashDbConfigPanel extends javax.swing.JPanel {
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                     .addComponent(hashSetsComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                     .addComponent(configureHashDatabasesButton))
-                .addGap(34, 34, 34))
+                .addContainerGap())
         );
     }// </editor-fold>//GEN-END:initComponents
 

From 6385c5e0705f63256d8b2c8501873e98a633d990 Mon Sep 17 00:00:00 2001
From: Brian Carrier <bcarrier@users.noreply.github.com>
Date: Thu, 22 Aug 2019 16:06:34 -0400
Subject: [PATCH 082/192] Added comments.  No logic changes.

---
 .../recentactivity/ExtractRecycleBin.java     | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java
index 9690a04aa0..1086a346eb 100755
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java
@@ -101,8 +101,9 @@ final class ExtractRecycleBin extends Extract {
             // If this doesn't work bail.
             return;
         }
+        
+        // map SIDs to user names so that we can include that in the artifact
         Map<String, String> userNameMap;
-
         try {
             userNameMap = makeUserNameMap(dataSource);
         } catch (TskCoreException ex) {
@@ -114,6 +115,7 @@ final class ExtractRecycleBin extends Extract {
 
         FileManager fileManager = Case.getCurrentCase().getServices().getFileManager();
 
+        // Collect all of the $R files so that we can later easily map them to corresponding $I file
         Map<String, List<AbstractFile>> rFileMap;
         try {
             rFileMap = makeRFileMap(dataSource);
@@ -122,8 +124,8 @@ final class ExtractRecycleBin extends Extract {
             return; // No $R files, no need to continue;
         }
 
+        // Get the $I files
         List<AbstractFile> iFiles;
-
         try {
             iFiles = fileManager.findFiles(dataSource, "$I%"); //NON-NLS            
         } catch (TskCoreException ex) {
@@ -133,6 +135,7 @@ final class ExtractRecycleBin extends Extract {
 
         String tempRARecycleBinPath = RAImageIngestModule.getRATempPath(Case.getCurrentCase(), "recyclebin"); //NON-NLS
 
+        // cycle through the $I files and process each. 
         for (AbstractFile iFile : iFiles) {
 
             if (context.dataSourceIngestIsCancelled()) {
@@ -166,6 +169,7 @@ final class ExtractRecycleBin extends Extract {
                 return;
             }
 
+            // get the original name, dates, etc. from the $I file
             RecycledFileMetaData metaData;
             try {
                 metaData = parseIFile(tempFilePath);
@@ -175,6 +179,7 @@ final class ExtractRecycleBin extends Extract {
                 return;
             }
 
+            // each user has its own Recyle Bin folder.  Figure out the user name based on its name .
             String userID = getUserIDFromPath(iFile.getParentPath());
             String userName = "";
             if (!userID.isEmpty()) {
@@ -185,10 +190,9 @@ final class ExtractRecycleBin extends Extract {
                 return;
             }
 
+            // get the corresponding $R file, which is in the same folder and has the file content
             String rFileName = iFile.getName().replace("$I", "$R"); //NON-NLS
-
             List<AbstractFile> rFiles = rFileMap.get(rFileName);
-
             if (rFiles == null) {
                 return;
             }
@@ -202,7 +206,13 @@ final class ExtractRecycleBin extends Extract {
                         && iFile.getMetaFlagsAsString().equals(rFile.getMetaFlagsAsString())) {
                     try {
                         postArtifact(createArtifact(rFile, recycleBinArtifactType, metaData.getFileName(), userName, metaData.getDeletedTimeStamp()));
+                        
+                        // If we are processing a disk image, we will also make a deleted file entry so that the user
+                        // sees the deleted file in its original folder.  We re-use the metadata address so that the user 
+                        // can see the content. 
                         if (rFile instanceof FsContent) {
+                            // if the user deleted a folder, then we need to recusively go into it.  Note the contents of the $R folder
+                            // do not have corresponding $I files anymore.  Only the $R folder does.
                             if (rFile.isDir()) {
                                 AbstractFile directory = getOrMakeFolder(Case.getCurrentCase().getSleuthkitCase(), (FsContent) rFile, metaData.getFileName());
                                 popuplateDeletedDirectory(Case.getCurrentCase().getSleuthkitCase(), directory, rFile.getChildren(), metaData.getFileName(), metaData.getDeletedTimeStamp());
@@ -280,7 +290,7 @@ final class ExtractRecycleBin extends Extract {
      * For versions of Windows prior to 10, header = 0x01. Windows 10+ header ==
      * 0x02
      *
-     * @param iFilePath
+     * @param iFilePath Path to local copy of file in temp folder
      *
      * @throws FileNotFoundException
      * @throws IOException
@@ -440,7 +450,7 @@ final class ExtractRecycleBin extends Extract {
 
     /**
      * Returns a folder for the given path.  If the path does not exist the
-     * the folder is created.
+     * the folder is created.  Recursively makes as many parent folders as needed.
      * 
      * @param skCase
      * @param dataSource

From 6491c0fe52a310daa9d98754eff6259ba7c7c9bc Mon Sep 17 00:00:00 2001
From: Akira Ueda <ue@gol.com>
Date: Mon, 26 Aug 2019 18:57:01 +0900
Subject: [PATCH 083/192] Japanese search feature

---
 KeywordSearch/ivy.xml                         |   1 +
 KeywordSearch/nbproject/project.properties    |   1 +
 KeywordSearch/nbproject/project.xml           |   4 +
 .../AutopsyConfig/conf/lang/stoptags_ja.txt   | 420 ++++++++++++++++++
 .../AutopsyConfig/conf/lang/stopwords_ja.txt  | 127 ++++++
 .../configsets/AutopsyConfig/conf/schema.xml  |  17 +
 .../keywordsearch/HighlightedText.java        |  76 +++-
 .../autopsy/keywordsearch/IndexFinder.java    |   2 +-
 .../autopsy/keywordsearch/Ingester.java       |  24 +-
 .../keywordsearch/LanguageDetector.java       |  55 +++
 ...LanguageSpecificContentIndexingHelper.java |  90 ++++
 .../LanguageSpecificContentQueryHelper.java   | 218 +++++++++
 .../autopsy/keywordsearch/LuceneQuery.java    |  63 ++-
 .../autopsy/keywordsearch/MiniChunks.java     |  18 +
 .../autopsy/keywordsearch/QueryParser.java    |  63 +++
 .../autopsy/keywordsearch/Server.java         |  22 +-
 ...anguageSpecificContentQueryHelperTest.java |  40 ++
 .../autopsy/keywordsearch/MiniChunksTest.java |  25 ++
 .../keywordsearch/QueryParserTest.java        |  20 +
 19 files changed, 1258 insertions(+), 28 deletions(-)
 create mode 100644 KeywordSearch/solr/solr/configsets/AutopsyConfig/conf/lang/stoptags_ja.txt
 create mode 100644 KeywordSearch/solr/solr/configsets/AutopsyConfig/conf/lang/stopwords_ja.txt
 create mode 100644 KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageDetector.java
 create mode 100644 KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentIndexingHelper.java
 create mode 100644 KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelper.java
 create mode 100644 KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/MiniChunks.java
 create mode 100644 KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/QueryParser.java
 create mode 100644 KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelperTest.java
 create mode 100644 KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/MiniChunksTest.java
 create mode 100644 KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/QueryParserTest.java

diff --git a/KeywordSearch/ivy.xml b/KeywordSearch/ivy.xml
index 2d7bb8b4a5..9f39e52d7c 100644
--- a/KeywordSearch/ivy.xml
+++ b/KeywordSearch/ivy.xml
@@ -21,6 +21,7 @@
         <dependency conf="autopsy->*" org="org.apache.solr" name="solr-solrj" rev="4.9.1"/>
         <dependency conf="autopsy->*" org="commons-lang" name="commons-lang" rev="2.4"/>
         <dependency conf="autopsy->*" org="commons-validator" name="commons-validator" rev="1.5.1"/>
+        <dependency conf="autopsy->*" org="com.optimaize.languagedetector" name="language-detector" rev="0.6"/>
         <!-- Exclude the version of cxf-rt-rs-client from Tika 1.20, one of its depedencies breaks Ivy -->
         <dependency conf="autopsy->*" org="org.apache.tika" name="tika-parsers" rev="1.20">
             <exclude module="cxf-rt-rs-client"/>
diff --git a/KeywordSearch/nbproject/project.properties b/KeywordSearch/nbproject/project.properties
index 1041bdd524..86b4519538 100644
--- a/KeywordSearch/nbproject/project.properties
+++ b/KeywordSearch/nbproject/project.properties
@@ -29,6 +29,7 @@ file.reference.jericho-html-3.3.jar=release/modules/ext/jericho-html-3.3.jar
 file.reference.joda-time-2.2.jar=release/modules/ext/joda-time-2.2.jar
 file.reference.json-simple-1.1.1.jar=release/modules/ext/json-simple-1.1.1.jar
 file.reference.juniversalchardet-1.0.3.jar=release/modules/ext/juniversalchardet-1.0.3.jar
+file.reference.language-detector-0.6.jar=release/modules/ext/language-detector-0.6.jar
 file.reference.libsvm-3.1.jar=release/modules/ext/libsvm-3.1.jar
 file.reference.log4j-1.2.17.jar=release/modules/ext/log4j-1.2.17.jar
 file.reference.lucene-core-4.0.0.jar=release/modules/ext/lucene-core-4.0.0.jar
diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml
index 3f40ab3ace..96bbdef0c5 100644
--- a/KeywordSearch/nbproject/project.xml
+++ b/KeywordSearch/nbproject/project.xml
@@ -467,6 +467,10 @@
                 <runtime-relative-path>ext/vorbis-java-tika-0.8.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/vorbis-java-tika-0.8.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/language-detector-0.6.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/language-detector-0.6.jar</binary-origin>
+            </class-path-extension>
         </data>
     </configuration>
 </project>
diff --git a/KeywordSearch/solr/solr/configsets/AutopsyConfig/conf/lang/stoptags_ja.txt b/KeywordSearch/solr/solr/configsets/AutopsyConfig/conf/lang/stoptags_ja.txt
new file mode 100644
index 0000000000..71b750845e
--- /dev/null
+++ b/KeywordSearch/solr/solr/configsets/AutopsyConfig/conf/lang/stoptags_ja.txt
@@ -0,0 +1,420 @@
+#
+# This file defines a Japanese stoptag set for JapanesePartOfSpeechStopFilter.
+#
+# Any token with a part-of-speech tag that exactly matches those defined in this
+# file are removed from the token stream.
+#
+# Set your own stoptags by uncommenting the lines below.  Note that comments are
+# not allowed on the same line as a stoptag.  See LUCENE-3745 for frequency lists,
+# etc. that can be useful for building you own stoptag set.
+#
+# The entire possible tagset is provided below for convenience.
+#
+#####
+#  noun: unclassified nouns
+#名詞
+#
+#  noun-common: Common nouns or nouns where the sub-classification is undefined
+#名詞-一般
+#
+#  noun-proper: Proper nouns where the sub-classification is undefined 
+#名詞-固有名詞
+#
+#  noun-proper-misc: miscellaneous proper nouns
+#名詞-固有名詞-一般
+#
+#  noun-proper-person: Personal names where the sub-classification is undefined
+#名詞-固有名詞-人名
+#
+#  noun-proper-person-misc: names that cannot be divided into surname and 
+#  given name; foreign names; names where the surname or given name is unknown.
+#  e.g. お市の方
+#名詞-固有名詞-人名-一般
+#
+#  noun-proper-person-surname: Mainly Japanese surnames.
+#  e.g. 山田
+#名詞-固有名詞-人名-姓
+#
+#  noun-proper-person-given_name: Mainly Japanese given names.
+#  e.g. 太郎
+#名詞-固有名詞-人名-名
+#
+#  noun-proper-organization: Names representing organizations.
+#  e.g. 通産省, NHK
+#名詞-固有名詞-組織
+#
+#  noun-proper-place: Place names where the sub-classification is undefined
+#名詞-固有名詞-地域
+#
+#  noun-proper-place-misc: Place names excluding countries.
+#  e.g. アジア, バルセロナ, 京都
+#名詞-固有名詞-地域-一般
+#
+#  noun-proper-place-country: Country names. 
+#  e.g. 日本, オーストラリア
+#名詞-固有名詞-地域-国
+#
+#  noun-pronoun: Pronouns where the sub-classification is undefined
+#名詞-代名詞
+#
+#  noun-pronoun-misc: miscellaneous pronouns: 
+#  e.g. それ, ここ, あいつ, あなた, あちこち, いくつ, どこか, なに, みなさん, みんな, わたくし, われわれ
+#名詞-代名詞-一般
+#
+#  noun-pronoun-contraction: Spoken language contraction made by combining a 
+#  pronoun and the particle 'wa'.
+#  e.g. ありゃ, こりゃ, こりゃあ, そりゃ, そりゃあ 
+#名詞-代名詞-縮約
+#
+#  noun-adverbial: Temporal nouns such as names of days or months that behave 
+#  like adverbs. Nouns that represent amount or ratios and can be used adverbially,
+#  e.g. 金曜, 一月, 午後, 少量
+#名詞-副詞可能
+#
+#  noun-verbal: Nouns that take arguments with case and can appear followed by 
+#  'suru' and related verbs (する, できる, なさる, くださる)
+#  e.g. インプット, 愛着, 悪化, 悪戦苦闘, 一安心, 下取り
+#名詞-サ変接続
+#
+#  noun-adjective-base: The base form of adjectives, words that appear before な ("na")
+#  e.g. 健康, 安易, 駄目, だめ
+#名詞-形容動詞語幹
+#
+#  noun-numeric: Arabic numbers, Chinese numerals, and counters like 何 (回), 数.
+#  e.g. 0, 1, 2, 何, 数, 幾
+#名詞-数
+#
+#  noun-affix: noun affixes where the sub-classification is undefined
+#名詞-非自立
+#
+#  noun-affix-misc: Of adnominalizers, the case-marker の ("no"), and words that 
+#  attach to the base form of inflectional words, words that cannot be classified 
+#  into any of the other categories below. This category includes indefinite nouns.
+#  e.g. あかつき, 暁, かい, 甲斐, 気, きらい, 嫌い, くせ, 癖, こと, 事, ごと, 毎, しだい, 次第, 
+#       順, せい, 所為, ついで, 序で, つもり, 積もり, 点, どころ, の, はず, 筈, はずみ, 弾み, 
+#       拍子, ふう, ふり, 振り, ほう, 方, 旨, もの, 物, 者, ゆえ, 故, ゆえん, 所以, わけ, 訳,
+#       わり, 割り, 割, ん-口語/, もん-口語/
+#名詞-非自立-一般
+#
+#  noun-affix-adverbial: noun affixes that that can behave as adverbs.
+#  e.g. あいだ, 間, あげく, 挙げ句, あと, 後, 余り, 以外, 以降, 以後, 以上, 以前, 一方, うえ, 
+#       上, うち, 内, おり, 折り, かぎり, 限り, きり, っきり, 結果, ころ, 頃, さい, 際, 最中, さなか, 
+#       最中, じたい, 自体, たび, 度, ため, 為, つど, 都度, とおり, 通り, とき, 時, ところ, 所, 
+#       とたん, 途端, なか, 中, のち, 後, ばあい, 場合, 日, ぶん, 分, ほか, 他, まえ, 前, まま, 
+#       儘, 侭, みぎり, 矢先
+#名詞-非自立-副詞可能
+#
+#  noun-affix-aux: noun affixes treated as 助動詞 ("auxiliary verb") in school grammars 
+#  with the stem よう(だ) ("you(da)").
+#  e.g.  よう, やう, 様 (よう)
+#名詞-非自立-助動詞語幹
+#  
+#  noun-affix-adjective-base: noun affixes that can connect to the indeclinable
+#  connection form な (aux "da").
+#  e.g. みたい, ふう
+#名詞-非自立-形容動詞語幹
+#
+#  noun-special: special nouns where the sub-classification is undefined.
+#名詞-特殊
+#
+#  noun-special-aux: The そうだ ("souda") stem form that is used for reporting news, is 
+#  treated as 助動詞 ("auxiliary verb") in school grammars, and attach to the base 
+#  form of inflectional words.
+#  e.g. そう
+#名詞-特殊-助動詞語幹
+#
+#  noun-suffix: noun suffixes where the sub-classification is undefined.
+#名詞-接尾
+#
+#  noun-suffix-misc: Of the nouns or stem forms of other parts of speech that connect 
+#  to ガル or タイ and can combine into compound nouns, words that cannot be classified into
+#  any of the other categories below. In general, this category is more inclusive than 
+#  接尾語 ("suffix") and is usually the last element in a compound noun.
+#  e.g. おき, かた, 方, 甲斐 (がい), がかり, ぎみ, 気味, ぐるみ, (～した) さ, 次第, 済 (ず) み,
+#       よう, (でき)っこ, 感, 観, 性, 学, 類, 面, 用
+#名詞-接尾-一般
+#
+#  noun-suffix-person: Suffixes that form nouns and attach to person names more often
+#  than other nouns.
+#  e.g. 君, 様, 著
+#名詞-接尾-人名
+#
+#  noun-suffix-place: Suffixes that form nouns and attach to place names more often 
+#  than other nouns.
+#  e.g. 町, 市, 県
+#名詞-接尾-地域
+#
+#  noun-suffix-verbal: Of the suffixes that attach to nouns and form nouns, those that 
+#  can appear before スル ("suru").
+#  e.g. 化, 視, 分け, 入り, 落ち, 買い
+#名詞-接尾-サ変接続
+#
+#  noun-suffix-aux: The stem form of そうだ (様態) that is used to indicate conditions, 
+#  is treated as 助動詞 ("auxiliary verb") in school grammars, and attach to the 
+#  conjunctive form of inflectional words.
+#  e.g. そう
+#名詞-接尾-助動詞語幹
+#
+#  noun-suffix-adjective-base: Suffixes that attach to other nouns or the conjunctive 
+#  form of inflectional words and appear before the copula だ ("da").
+#  e.g. 的, げ, がち
+#名詞-接尾-形容動詞語幹
+#
+#  noun-suffix-adverbial: Suffixes that attach to other nouns and can behave as adverbs.
+#  e.g. 後 (ご), 以後, 以降, 以前, 前後, 中, 末, 上, 時 (じ)
+#名詞-接尾-副詞可能
+#
+#  noun-suffix-classifier: Suffixes that attach to numbers and form nouns. This category 
+#  is more inclusive than 助数詞 ("classifier") and includes common nouns that attach 
+#  to numbers.
+#  e.g. 個, つ, 本, 冊, パーセント, cm, kg, カ月, か国, 区画, 時間, 時半
+#名詞-接尾-助数詞
+#
+#  noun-suffix-special: Special suffixes that mainly attach to inflecting words.
+#  e.g. (楽し) さ, (考え) 方
+#名詞-接尾-特殊
+#
+#  noun-suffix-conjunctive: Nouns that behave like conjunctions and join two words 
+#  together.
+#  e.g. (日本) 対 (アメリカ), 対 (アメリカ), (3) 対 (5), (女優) 兼 (主婦)
+#名詞-接続詞的
+#
+#  noun-verbal_aux: Nouns that attach to the conjunctive particle て ("te") and are 
+#  semantically verb-like.
+#  e.g. ごらん, ご覧, 御覧, 頂戴
+#名詞-動詞非自立的
+#
+#  noun-quotation: text that cannot be segmented into words, proverbs, Chinese poetry, 
+#  dialects, English, etc. Currently, the only entry for 名詞 引用文字列 ("noun quotation") 
+#  is いわく ("iwaku").
+#名詞-引用文字列
+#
+#  noun-nai_adjective: Words that appear before the auxiliary verb ない ("nai") and
+#  behave like an adjective.
+#  e.g. 申し訳, 仕方, とんでも, 違い
+#名詞-ナイ形容詞語幹
+#
+#####
+#  prefix: unclassified prefixes
+#接頭詞
+#
+#  prefix-nominal: Prefixes that attach to nouns (including adjective stem forms) 
+#  excluding numerical expressions.
+#  e.g. お (水), 某 (氏), 同 (社), 故 (～氏), 高 (品質), お (見事), ご (立派)
+#接頭詞-名詞接続
+#
+#  prefix-verbal: Prefixes that attach to the imperative form of a verb or a verb
+#  in conjunctive form followed by なる/なさる/くださる.
+#  e.g. お (読みなさい), お (座り)
+#接頭詞-動詞接続
+#
+#  prefix-adjectival: Prefixes that attach to adjectives.
+#  e.g. お (寒いですねえ), バカ (でかい)
+#接頭詞-形容詞接続
+#
+#  prefix-numerical: Prefixes that attach to numerical expressions.
+#  e.g. 約, およそ, 毎時
+#接頭詞-数接続
+#
+#####
+#  verb: unclassified verbs
+#動詞
+#
+#  verb-main:
+#動詞-自立
+#
+#  verb-auxiliary:
+#動詞-非自立
+#
+#  verb-suffix:
+#動詞-接尾
+#
+#####
+#  adjective: unclassified adjectives
+#形容詞
+#
+#  adjective-main:
+#形容詞-自立
+#
+#  adjective-auxiliary:
+#形容詞-非自立
+#
+#  adjective-suffix:
+#形容詞-接尾
+#
+#####
+#  adverb: unclassified adverbs
+#副詞
+#
+#  adverb-misc: Words that can be segmented into one unit and where adnominal 
+#  modification is not possible.
+#  e.g. あいかわらず, 多分
+#副詞-一般
+#
+#  adverb-particle_conjunction: Adverbs that can be followed by の, は, に, 
+#  な, する, だ, etc.
+#  e.g. こんなに, そんなに, あんなに, なにか, なんでも
+#副詞-助詞類接続
+#
+#####
+#  adnominal: Words that only have noun-modifying forms.
+#  e.g. この, その, あの, どの, いわゆる, なんらかの, 何らかの, いろんな, こういう, そういう, ああいう, 
+#       どういう, こんな, そんな, あんな, どんな, 大きな, 小さな, おかしな, ほんの, たいした, 
+#       「(, も) さる (ことながら)」, 微々たる, 堂々たる, 単なる, いかなる, 我が」「同じ, 亡き
+#連体詞
+#
+#####
+#  conjunction: Conjunctions that can occur independently.
+#  e.g. が, けれども, そして, じゃあ, それどころか
+接続詞
+#
+#####
+#  particle: unclassified particles.
+助詞
+#
+#  particle-case: case particles where the subclassification is undefined.
+助詞-格助詞
+#
+#  particle-case-misc: Case particles.
+#  e.g. から, が, で, と, に, へ, より, を, の, にて
+助詞-格助詞-一般
+#
+#  particle-case-quote: the "to" that appears after nouns, a person’s speech, 
+#  quotation marks, expressions of decisions from a meeting, reasons, judgements,
+#  conjectures, etc.
+#  e.g. ( だ) と (述べた.), ( である) と (して執行猶予...)
+助詞-格助詞-引用
+#
+#  particle-case-compound: Compounds of particles and verbs that mainly behave 
+#  like case particles.
+#  e.g. という, といった, とかいう, として, とともに, と共に, でもって, にあたって, に当たって, に当って,
+#       にあたり, に当たり, に当り, に当たる, にあたる, において, に於いて,に於て, における, に於ける, 
+#       にかけ, にかけて, にかんし, に関し, にかんして, に関して, にかんする, に関する, に際し, 
+#       に際して, にしたがい, に従い, に従う, にしたがって, に従って, にたいし, に対し, にたいして, 
+#       に対して, にたいする, に対する, について, につき, につけ, につけて, につれ, につれて, にとって,
+#       にとり, にまつわる, によって, に依って, に因って, により, に依り, に因り, による, に依る, に因る, 
+#       にわたって, にわたる, をもって, を以って, を通じ, を通じて, を通して, をめぐって, をめぐり, をめぐる,
+#       って-口語/, ちゅう-関西弁「という」/, (何) ていう (人)-口語/, っていう-口語/, といふ, とかいふ
+助詞-格助詞-連語
+#
+#  particle-conjunctive:
+#  e.g. から, からには, が, けれど, けれども, けど, し, つつ, て, で, と, ところが, どころか, とも, ども, 
+#       ながら, なり, ので, のに, ば, ものの, や ( した), やいなや, (ころん) じゃ(いけない)-口語/, 
+#       (行っ) ちゃ(いけない)-口語/, (言っ) たって (しかたがない)-口語/, (それがなく)ったって (平気)-口語/
+助詞-接続助詞
+#
+#  particle-dependency:
+#  e.g. こそ, さえ, しか, すら, は, も, ぞ
+助詞-係助詞
+#
+#  particle-adverbial:
+#  e.g. がてら, かも, くらい, 位, ぐらい, しも, (学校) じゃ(これが流行っている)-口語/, 
+#       (それ)じゃあ (よくない)-口語/, ずつ, (私) なぞ, など, (私) なり (に), (先生) なんか (大嫌い)-口語/,
+#       (私) なんぞ, (先生) なんて (大嫌い)-口語/, のみ, だけ, (私) だって-口語/, だに, 
+#       (彼)ったら-口語/, (お茶) でも (いかが), 等 (とう), (今後) とも, ばかり, ばっか-口語/, ばっかり-口語/,
+#       ほど, 程, まで, 迄, (誰) も (が)([助詞-格助詞] および [助詞-係助詞] の前に位置する「も」)
+助詞-副助詞
+#
+#  particle-interjective: particles with interjective grammatical roles.
+#  e.g. (松島) や
+助詞-間投助詞
+#
+#  particle-coordinate:
+#  e.g. と, たり, だの, だり, とか, なり, や, やら
+助詞-並立助詞
+#
+#  particle-final:
+#  e.g. かい, かしら, さ, ぜ, (だ)っけ-口語/, (とまってる) で-方言/, な, ナ, なあ-口語/, ぞ, ね, ネ, 
+#       ねぇ-口語/, ねえ-口語/, ねん-方言/, の, のう-口語/, や, よ, ヨ, よぉ-口語/, わ, わい-口語/
+助詞-終助詞
+#
+#  particle-adverbial/conjunctive/final: The particle "ka" when unknown whether it is 
+#  adverbial, conjunctive, or sentence final. For example:
+#       (a) 「A か B か」. Ex:「(国内で運用する) か,(海外で運用する) か (.)」
+#       (b) Inside an adverb phrase. Ex:「(幸いという) か (, 死者はいなかった.)」
+#           「(祈りが届いたせい) か (, 試験に合格した.)」
+#       (c) 「かのように」. Ex:「(何もなかった) か (のように振る舞った.)」
+#  e.g. か
+助詞-副助詞／並立助詞／終助詞
+#
+#  particle-adnominalizer: The "no" that attaches to nouns and modifies 
+#  non-inflectional words.
+助詞-連体化
+#
+#  particle-adnominalizer: The "ni" and "to" that appear following nouns and adverbs 
+#  that are giongo, giseigo, or gitaigo.
+#  e.g. に, と
+助詞-副詞化
+#
+#  particle-special: A particle that does not fit into one of the above classifications. 
+#  This includes particles that are used in Tanka, Haiku, and other poetry.
+#  e.g. かな, けむ, ( しただろう) に, (あんた) にゃ(わからん), (俺) ん (家)
+助詞-特殊
+#
+#####
+#  auxiliary-verb:
+助動詞
+#
+#####
+#  interjection: Greetings and other exclamations.
+#  e.g. おはよう, おはようございます, こんにちは, こんばんは, ありがとう, どうもありがとう, ありがとうございます, 
+#       いただきます, ごちそうさま, さよなら, さようなら, はい, いいえ, ごめん, ごめんなさい
+#感動詞
+#
+#####
+#  symbol: unclassified Symbols.
+記号
+#
+#  symbol-misc: A general symbol not in one of the categories below.
+#  e.g. [○◎@$〒→+]
+記号-一般
+#
+#  symbol-comma: Commas
+#  e.g. [,、]
+記号-読点
+#
+#  symbol-period: Periods and full stops.
+#  e.g. [.．。]
+記号-句点
+#
+#  symbol-space: Full-width whitespace.
+記号-空白
+#
+#  symbol-open_bracket:
+#  e.g. [({‘“『【]
+記号-括弧開
+#
+#  symbol-close_bracket:
+#  e.g. [)}’”』」】]
+記号-括弧閉
+#
+#  symbol-alphabetic:
+#記号-アルファベット
+#
+#####
+#  other: unclassified other
+#その他
+#
+#  other-interjection: Words that are hard to classify as noun-suffixes or 
+#  sentence-final particles.
+#  e.g. (だ)ァ
+その他-間投
+#
+#####
+#  filler: Aizuchi that occurs during a conversation or sounds inserted as filler.
+#  e.g. あの, うんと, えと
+フィラー
+#
+#####
+#  non-verbal: non-verbal sound.
+非言語音
+#
+#####
+#  fragment:
+#語断片
+#
+#####
+#  unknown: unknown part of speech.
+#未知語
+#
+##### End of file
diff --git a/KeywordSearch/solr/solr/configsets/AutopsyConfig/conf/lang/stopwords_ja.txt b/KeywordSearch/solr/solr/configsets/AutopsyConfig/conf/lang/stopwords_ja.txt
new file mode 100644
index 0000000000..d4321be6b1
--- /dev/null
+++ b/KeywordSearch/solr/solr/configsets/AutopsyConfig/conf/lang/stopwords_ja.txt
@@ -0,0 +1,127 @@
+#
+# This file defines a stopword set for Japanese.
+#
+# This set is made up of hand-picked frequent terms from segmented Japanese Wikipedia.
+# Punctuation characters and frequent kanji have mostly been left out.  See LUCENE-3745
+# for frequency lists, etc. that can be useful for making your own set (if desired)
+#
+# Note that there is an overlap between these stopwords and the terms stopped when used
+# in combination with the JapanesePartOfSpeechStopFilter.  When editing this file, note
+# that comments are not allowed on the same line as stopwords.
+#
+# Also note that stopping is done in a case-insensitive manner.  Change your StopFilter
+# configuration if you need case-sensitive stopping.  Lastly, note that stopping is done
+# using the same character width as the entries in this file.  Since this StopFilter is
+# normally done after a CJKWidthFilter in your chain, you would usually want your romaji
+# entries to be in half-width and your kana entries to be in full-width.
+#
+の
+に
+は
+を
+た
+が
+で
+て
+と
+し
+れ
+さ
+ある
+いる
+も
+する
+から
+な
+こと
+として
+い
+や
+れる
+など
+なっ
+ない
+この
+ため
+その
+あっ
+よう
+また
+もの
+という
+あり
+まで
+られ
+なる
+へ
+か
+だ
+これ
+によって
+により
+おり
+より
+による
+ず
+なり
+られる
+において
+ば
+なかっ
+なく
+しかし
+について
+せ
+だっ
+その後
+できる
+それ
+う
+ので
+なお
+のみ
+でき
+き
+つ
+における
+および
+いう
+さらに
+でも
+ら
+たり
+その他
+に関する
+たち
+ます
+ん
+なら
+に対して
+特に
+せる
+及び
+これら
+とき
+では
+にて
+ほか
+ながら
+うち
+そして
+とともに
+ただし
+かつて
+それぞれ
+または
+お
+ほど
+ものの
+に対する
+ほとんど
+と共に
+といった
+です
+とも
+ところ
+ここ
+##### End of file
diff --git a/KeywordSearch/solr/solr/configsets/AutopsyConfig/conf/schema.xml b/KeywordSearch/solr/solr/configsets/AutopsyConfig/conf/schema.xml
index 05ea8891a5..1d2c566d3a 100644
--- a/KeywordSearch/solr/solr/configsets/AutopsyConfig/conf/schema.xml
+++ b/KeywordSearch/solr/solr/configsets/AutopsyConfig/conf/schema.xml
@@ -243,6 +243,18 @@
       </analyzer>
     </fieldType>
 
+    <fieldType name="text_ja" class="solr.TextField" positionIncrementGap="100" autoGeneratePhraseQueries="false">
+      <analyzer>
+        <tokenizer class="solr.JapaneseTokenizerFactory" mode="search"/>
+        <filter class="solr.JapaneseBaseFormFilterFactory"/>
+        <filter class="solr.JapanesePartOfSpeechStopFilterFactory" tags="lang/stoptags_ja.txt" />
+        <filter class="solr.CJKWidthFilterFactory"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_ja.txt" />
+        <filter class="solr.JapaneseKatakanaStemFilterFactory" minimumLength="4"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+      </analyzer>
+    </fieldType>
+
     <!-- A text field with defaults appropriate for English: it
          tokenizes with StandardTokenizer, removes English stop words
          (stopwords_en.txt), down cases, protects words from protwords.txt, and
@@ -557,6 +569,11 @@
         via copyField further on in this schema  -->
    <field name="text" type="text_general" indexed="true" stored="true" termVectors="true" termPositions="true" termOffsets="true" multiValued="true"/>
 
+   <!-- Store language detection result. Only parents of text documents have this -->
+   <field name="language" type="string" indexed="false" stored="true" required="false"/>
+
+   <field name="content_ja" type="text_ja" indexed="true" stored="true" termVectors="true" termPositions="true" termOffsets="true" multiValued="true"/>
+
    <!-- catchall text field that indexes tokens both normally and in reverse for efficient
         leading wildcard queries. -->
    <!--<field name="text_rev" type="text_general_rev" indexed="true" stored="false" multiValued="true"/>-->
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedText.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedText.java
index 240c10e431..5223a50a74 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedText.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedText.java
@@ -38,6 +38,7 @@ import org.apache.commons.lang3.math.NumberUtils;
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.SolrRequest.METHOD;
 import org.apache.solr.client.solrj.response.QueryResponse;
+import org.apache.solr.common.SolrDocument;
 import org.apache.solr.common.SolrDocumentList;
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
@@ -346,6 +347,8 @@ class HighlightedText implements IndexedText {
         String chunkID = "";
         String highlightField = "";
         try {
+            double indexSchemaVersion = NumberUtils.toDouble(solrServer.getIndexInfo().getSchemaVersion());
+
             loadPageInfo(); //inits once
             SolrQuery q = new SolrQuery();
             q.setShowDebugInfo(DEBUG); //debug
@@ -359,16 +362,33 @@ class HighlightedText implements IndexedText {
 
             highlightField = LuceneQuery.HIGHLIGHT_FIELD;
             if (isLiteral) {
-                //if the query is literal try to get solr to do the highlighting
-                final String highlightQuery = keywords.stream()
-                        .map(HighlightedText::constructEscapedSolrQuery)
-                        .collect(Collectors.joining(" "));
+                if (2.2 <= indexSchemaVersion) {
+                    //if the query is literal try to get solr to do the highlighting
+                    final String highlightQuery = keywords.stream().map(s ->
+                        LanguageSpecificContentQueryHelper.expandQueryString(KeywordSearchUtil.escapeLuceneQuery(s)))
+                        .collect(Collectors.joining(" OR "));
+                    q.setQuery(highlightQuery);
+                    for (Server.Schema field : LanguageSpecificContentQueryHelper.getQueryFields()) {
+                        q.addField(field.toString());
+                        q.addHighlightField(field.toString());
+                    }
+                    q.addField(Server.Schema.LANGUAGE.toString());
+                    // in case of single term literal query there is only 1 term
+                    LanguageSpecificContentQueryHelper.configureTermfreqQuery(q, keywords.iterator().next());
+                    q.addFilterQuery(filterQuery);
+                    q.setHighlightFragsize(0); // don't fragment the highlight, works with original highlighter, or needs "single" list builder with FVH
+                } else {
+                    //if the query is literal try to get solr to do the highlighting
+                    final String highlightQuery = keywords.stream()
+                            .map(HighlightedText::constructEscapedSolrQuery)
+                            .collect(Collectors.joining(" "));
 
-                q.setQuery(highlightQuery);
-                q.addField(highlightField);
-                q.addFilterQuery(filterQuery);
-                q.addHighlightField(highlightField);
-                q.setHighlightFragsize(0); // don't fragment the highlight, works with original highlighter, or needs "single" list builder with FVH
+                    q.setQuery(highlightQuery);
+                    q.addField(highlightField);
+                    q.addFilterQuery(filterQuery);
+                    q.addHighlightField(highlightField);
+                    q.setHighlightFragsize(0); // don't fragment the highlight, works with original highlighter, or needs "single" list builder with FVH
+                }
 
                 //tune the highlighter
                 q.setParam("hl.useFastVectorHighlighter", "on"); //fast highlighter scales better than standard one NON-NLS
@@ -406,12 +426,40 @@ class HighlightedText implements IndexedText {
                 if (responseHighlightID == null) {
                     highlightedContent = attemptManualHighlighting(response.getResults(), highlightField, keywords);
                 } else {
-                    List<String> contentHighlights = responseHighlightID.get(LuceneQuery.HIGHLIGHT_FIELD);
-                    if (contentHighlights == null) {
-                        highlightedContent = attemptManualHighlighting(response.getResults(), highlightField, keywords);
+                    SolrDocument document = response.getResults().get(0);
+                    Object language = document.getFieldValue(Server.Schema.LANGUAGE.toString());
+                    if (2.2 <= indexSchemaVersion && language != null) {
+                        List<String> contentHighlights = LanguageSpecificContentQueryHelper.getHighlights(responseHighlightID).orElse(null);
+                        if (contentHighlights == null) {
+                            highlightedContent = "";
+                        } else {
+                            int hitCountInMiniChunk = LanguageSpecificContentQueryHelper.queryChunkTermfreq(keywords, MiniChunks.getChunkIdString(contentIdStr));
+                            String s = contentHighlights.get(0).trim();
+                            // If there is a mini-chunk, trim the content not to show highlighted text in it.
+                            if (0 < hitCountInMiniChunk) {
+                                int hitCountInChunk = ((Float) document.getFieldValue(Server.Schema.TERMFREQ.toString())).intValue();
+                                int idx = LanguageSpecificContentQueryHelper.findNthIndexOf(
+                                    s,
+                                    HIGHLIGHT_PRE,
+                                    // trim after the last hit in chunk
+                                    hitCountInChunk - hitCountInMiniChunk);
+                                if (idx != -1) {
+                                    highlightedContent = s.substring(0, idx);
+                                } else {
+                                    highlightedContent = s;
+                                }
+                            } else {
+                                highlightedContent = s;
+                            }
+                        }
                     } else {
-                        // extracted content (minus highlight tags) is HTML-escaped
-                        highlightedContent = contentHighlights.get(0).trim();
+                        List<String> contentHighlights = responseHighlightID.get(LuceneQuery.HIGHLIGHT_FIELD);
+                        if (contentHighlights == null) {
+                            highlightedContent = attemptManualHighlighting(response.getResults(), highlightField, keywords);
+                        } else {
+                            // extracted content (minus highlight tags) is HTML-escaped
+                            highlightedContent = contentHighlights.get(0).trim();
+                        }
                     }
                 }
             }
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/IndexFinder.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/IndexFinder.java
index e46791d270..e2abde6eb0 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/IndexFinder.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/IndexFinder.java
@@ -39,7 +39,7 @@ class IndexFinder {
     private static final String KWS_DATA_FOLDER_NAME = "data";
     private static final String INDEX_FOLDER_NAME = "index";
     private static final String CURRENT_SOLR_VERSION = "4";
-    private static final String CURRENT_SOLR_SCHEMA_VERSION = "2.1";
+    private static final String CURRENT_SOLR_SCHEMA_VERSION = "2.2";
 
     static String getCurrentSolrVersion() {
         return CURRENT_SOLR_VERSION;
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Ingester.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Ingester.java
index bcdf143697..7de05777c7 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Ingester.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Ingester.java
@@ -20,8 +20,10 @@ package org.sleuthkit.autopsy.keywordsearch;
 
 import java.io.BufferedReader;
 import java.io.Reader;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 import java.util.logging.Level;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.apache.solr.client.solrj.SolrServerException;
@@ -59,6 +61,8 @@ class Ingester {
     private final Server solrServer = KeywordSearch.getServer();
     private static final SolrFieldsVisitor SOLR_FIELDS_VISITOR = new SolrFieldsVisitor();
     private static Ingester instance;
+    private final LanguageSpecificContentIndexingHelper languageSpecificContentIndexingHelper
+        = new LanguageSpecificContentIndexingHelper();
 
     private Ingester() {
     }
@@ -93,7 +97,7 @@ class Ingester {
      *                           file, but the Solr server is probably fine.
      */
     void indexMetaDataOnly(AbstractFile file) throws IngesterException {
-        indexChunk("", file.getName().toLowerCase(), getContentFields(file));
+        indexChunk("", file.getName().toLowerCase(), new HashMap<>(getContentFields(file)));
     }
 
     /**
@@ -107,7 +111,7 @@ class Ingester {
      *                           artifact, but the Solr server is probably fine.
      */
     void indexMetaDataOnly(BlackboardArtifact artifact, String sourceName) throws IngesterException {
-        indexChunk("", sourceName, getContentFields(artifact));
+        indexChunk("", sourceName, new HashMap<>(getContentFields(artifact)));
     }
 
     /**
@@ -143,21 +147,30 @@ class Ingester {
     < T extends SleuthkitVisitableItem> boolean indexText(Reader sourceReader, long sourceID, String sourceName, T source, IngestJobContext context) throws Ingester.IngesterException {
         int numChunks = 0; //unknown until chunking is done
         
-        Map<String, String> fields = getContentFields(source);
+        Map<String, String> contentFields = Collections.unmodifiableMap(getContentFields(source));
         //Get a reader for the content of the given source
         try (BufferedReader reader = new BufferedReader(sourceReader)) {
             Chunker chunker = new Chunker(reader);
-            for (Chunk chunk : chunker) {
+            while (chunker.hasNext()) {
+                Chunk chunk = chunker.next();
+
                 if (context != null && context.fileIngestIsCancelled()) {
                     logger.log(Level.INFO, "File ingest cancelled. Cancelling keyword search indexing of {0}", sourceName);
                     return false;
                 }
+                Map<String, Object> fields = new HashMap<>(contentFields);
                 String chunkId = Server.getChunkIdString(sourceID, numChunks + 1);
                 fields.put(Server.Schema.ID.toString(), chunkId);
                 fields.put(Server.Schema.CHUNK_SIZE.toString(), String.valueOf(chunk.getBaseChunkLength()));
+                Optional<LanguageSpecificContentIndexingHelper.Language> language = languageSpecificContentIndexingHelper.detectLanguageIfNeeded(chunk);
+                language.ifPresent(lang -> languageSpecificContentIndexingHelper.updateLanguageSpecificFields(fields, chunk, lang));
                 try {
                     //add the chunk text to Solr index
                     indexChunk(chunk.toString(), sourceName, fields);
+                    // add mini chunk when there's a language specific field
+                    if (chunker.hasNext() && language.isPresent()) {
+                        languageSpecificContentIndexingHelper.indexMiniChunk(chunk, sourceName, new HashMap<>(contentFields), chunkId, language.get());
+                    }
                     numChunks++;
                 } catch (Ingester.IngesterException ingEx) {
                     logger.log(Level.WARNING, "Ingester had a problem with extracted string from file '" //NON-NLS
@@ -177,6 +190,7 @@ class Ingester {
             if (context != null && context.fileIngestIsCancelled()) {
                 return false;
             } else {
+                Map<String, Object> fields = new HashMap<>(contentFields);
                 //after all chunks, index just the meta data, including the  numChunks, of the parent file
                 fields.put(Server.Schema.NUM_CHUNKS.toString(), Integer.toString(numChunks));
                 //reset id field to base document id
@@ -202,7 +216,7 @@ class Ingester {
      *
      * @throws org.sleuthkit.autopsy.keywordsearch.Ingester.IngesterException
      */
-    private void indexChunk(String chunk, String sourceName, Map<String, String> fields) throws IngesterException {
+    private void indexChunk(String chunk, String sourceName, Map<String, Object> fields) throws IngesterException {
         if (fields.get(Server.Schema.IMAGE_ID.toString()) == null) {
             //JMTODO: actually if the we couldn't get the image id it is set to -1,
             // but does this really mean we don't want to index it?
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageDetector.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageDetector.java
new file mode 100644
index 0000000000..3bcd06d856
--- /dev/null
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageDetector.java
@@ -0,0 +1,55 @@
+package org.sleuthkit.autopsy.keywordsearch;
+
+import com.optimaize.langdetect.LanguageDetectorBuilder;
+import com.optimaize.langdetect.i18n.LdLocale;
+import com.optimaize.langdetect.ngram.NgramExtractors;
+import com.optimaize.langdetect.profiles.LanguageProfile;
+import com.optimaize.langdetect.profiles.LanguageProfileReader;
+import com.optimaize.langdetect.text.CommonTextObjectFactories;
+import com.optimaize.langdetect.text.TextObject;
+import com.optimaize.langdetect.text.TextObjectFactory;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+
+class LanguageDetector {
+
+  public enum Language {
+    JAPANESE,
+    ENGLISH,
+  }
+
+  private List<LanguageProfile> languageProfiles;
+
+  LanguageDetector() {
+    try {
+      languageProfiles = Arrays.asList(
+          new LanguageProfileReader().readBuiltIn(LdLocale.fromString("en")),
+          new LanguageProfileReader().readBuiltIn(LdLocale.fromString("ja"))
+      );
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  Optional<Language> detect(String text) {
+    com.optimaize.langdetect.LanguageDetector languageDetector = LanguageDetectorBuilder.create(NgramExtractors.standard())
+        .withProfiles(languageProfiles)
+        .build();
+
+    TextObjectFactory textObjectFactory = CommonTextObjectFactories.forDetectingOnLargeText();
+
+    TextObject textObject = textObjectFactory.forText(text);
+    return languageDetector.detect(textObject).transform(Optional::of).or(Optional.empty()).map(LdLocale::getLanguage).flatMap(LanguageDetector::toLanguage);
+  }
+
+  private static Optional<Language> toLanguage(String s) {
+    switch (s) {
+      case "ja": return Optional.of(Language.JAPANESE);
+      case "en": return Optional.of(Language.ENGLISH);
+      default: return Optional.empty();
+    }
+  }
+}
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentIndexingHelper.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentIndexingHelper.java
new file mode 100644
index 0000000000..fbea9bc995
--- /dev/null
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentIndexingHelper.java
@@ -0,0 +1,90 @@
+package org.sleuthkit.autopsy.keywordsearch;
+
+import org.apache.commons.lang3.math.NumberUtils;
+import org.apache.solr.common.SolrInputDocument;
+import org.openide.util.NbBundle;
+import org.sleuthkit.autopsy.healthmonitor.HealthMonitor;
+import org.sleuthkit.autopsy.healthmonitor.TimingMetric;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+class LanguageSpecificContentIndexingHelper {
+
+  enum Language {
+    JAPANESE
+  }
+
+  private final LanguageDetector languageDetector = new LanguageDetector();
+
+  Optional<Language> detectLanguageIfNeeded(Chunker.Chunk chunk) throws NoOpenCoreException {
+    double indexSchemaVersion = NumberUtils.toDouble(KeywordSearch.getServer().getIndexInfo().getSchemaVersion());
+    if (2.2 <= indexSchemaVersion) {
+      return languageDetector.detect(chunk.toString()).flatMap(lang -> Optional.ofNullable(toLanguage(lang)));
+    } else {
+      return Optional.empty();
+    }
+  }
+
+  void updateLanguageSpecificFields(Map<String, Object> fields, Chunker.Chunk chunk, Language language) {
+    List<String> values = new ArrayList<>();
+    values.add(chunk.toString());
+    if (fields.containsKey(Server.Schema.FILE_NAME.toString())) {
+      values.add(fields.get(Server.Schema.FILE_NAME.toString()).toString());
+    }
+
+    // index the chunk to a language specific field
+    fields.put(Server.Schema.CONTENT_JA.toString(), values);
+    fields.put(Server.Schema.LANGUAGE.toString(), toFieldValue(language));
+  }
+
+  void indexMiniChunk(Chunker.Chunk chunk, String sourceName, Map<String, Object> fields, String baseChunkID, Language language)
+      throws Ingester.IngesterException {
+    //Make a SolrInputDocument out of the field map
+    SolrInputDocument updateDoc = new SolrInputDocument();
+    for (String key : fields.keySet()) {
+      updateDoc.addField(key, fields.get(key));
+    }
+
+    try {
+      updateDoc.setField(Server.Schema.ID.toString(), MiniChunks.getChunkIdString(baseChunkID));
+
+      // index the chunk to a language specific field
+      updateDoc.addField(Server.Schema.CONTENT_JA.toString(), chunk.toString().substring(chunk.getBaseChunkLength()));
+      updateDoc.addField(Server.Schema.LANGUAGE.toString(), toFieldValue(language));
+
+      TimingMetric metric = HealthMonitor.getTimingMetric("Solr: Index chunk");
+
+      KeywordSearch.getServer().addDocument(updateDoc);
+      HealthMonitor.submitTimingMetric(metric);
+
+    } catch (KeywordSearchModuleException | NoOpenCoreException ex) {
+      throw new Ingester.IngesterException(
+          NbBundle.getMessage(Ingester.class, "Ingester.ingest.exception.err.msg", sourceName), ex);
+    }
+  }
+
+  private static String toFieldValue(Language language) {
+    if (language == null) {
+      return null;
+    }
+    switch (language) {
+      case JAPANESE: return "ja";
+      default:
+        throw new IllegalStateException("Unknown language: " + language);
+    }
+  }
+
+  private Language toLanguage(LanguageDetector.Language language) {
+    if (language == null) {
+      return null;
+    }
+    switch (language) {
+      case JAPANESE: return Language.JAPANESE;
+      default:
+        return null;
+    }
+  }
+}
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelper.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelper.java
new file mode 100644
index 0000000000..c4df0e7fdc
--- /dev/null
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelper.java
@@ -0,0 +1,218 @@
+package org.sleuthkit.autopsy.keywordsearch;
+
+import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.SolrRequest;
+import org.apache.solr.client.solrj.response.QueryResponse;
+import org.apache.solr.common.SolrDocument;
+import org.apache.solr.common.SolrDocumentList;
+import org.sleuthkit.autopsy.coreutils.EscapeUtil;
+import org.sleuthkit.autopsy.coreutils.Version;
+import org.sleuthkit.datamodel.TskException;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+class LanguageSpecificContentQueryHelper {
+
+  private static final List<Server.Schema> QUERY_FIELDS = new ArrayList<>();
+  private static final List<Server.Schema> LANGUAGE_SPECIFIC_CONTENT_FIELDS
+      = Collections.singletonList(Server.Schema.CONTENT_JA);
+  private static final boolean DEBUG = (Version.getBuildType() == Version.Type.DEVELOPMENT);
+
+  static {
+    QUERY_FIELDS.add(Server.Schema.TEXT);
+    QUERY_FIELDS.addAll(LANGUAGE_SPECIFIC_CONTENT_FIELDS);
+  }
+
+  static class QueryResults {
+    List<SolrDocument> chunks = new ArrayList<>();
+    Map</* ID */ String, SolrDocument> miniChunks = new HashMap<>();
+    // objectId_chunk -> "text" -> List of previews
+    Map<String, Map<String, List<String>>> highlighting = new HashMap<>();
+  }
+
+  /**
+   * Make a query string from the given one by applying it to the multiple query fields
+   * @param queryStr escaped query string
+   * @return query string
+   */
+  static String expandQueryString(final String queryStr) {
+    List<String> fieldQueries = new ArrayList<>();
+    fieldQueries.add(Server.Schema.TEXT.toString() + ":" + KeywordSearchUtil.quoteQuery(queryStr));
+    fieldQueries.addAll(LANGUAGE_SPECIFIC_CONTENT_FIELDS.stream().map(field -> field.toString() + ":" + queryStr).collect(Collectors.toList()));
+    return String.join(" OR ", fieldQueries);
+  }
+
+  static List<Server.Schema> getQueryFields() {
+    return QUERY_FIELDS;
+  }
+
+  static void updateQueryResults(QueryResults results, SolrDocument document) {
+    String id = (String) document.getFieldValue(Server.Schema.ID.toString());
+    if (MiniChunks.isMiniChunkID(id)) {
+      results.miniChunks.put(MiniChunks.getBaseChunkID(id), document);
+    } else {
+      results.chunks.add(document);
+    }
+  }
+
+  /**
+   * Get snippets
+   *
+   * @param highlight field ID -> snippets
+   * @return snippets of appropriate fields.
+   *   Note that this method returns {@code Optional.empty} if the result is empty for convenience to interact with the existing code.
+   */
+  static Optional<List<String>> getHighlights(Map<String, List<String>> highlight) {
+    for (Server.Schema field : LANGUAGE_SPECIFIC_CONTENT_FIELDS) {
+      if (highlight.containsKey(field.toString())) {
+        return Optional.of(highlight.get(field.toString()));
+      }
+    }
+    return Optional.empty();
+  }
+
+  /**
+   * Merge KeywordHits from TEXT field and a language specific field
+   *
+   * Replace KeywordHits in the given {@code matches} if its chunk ID is same.
+   */
+  static List<KeywordHit> mergeKeywordHits(List<KeywordHit> matches, Keyword originalKeyword, QueryResults queryResults) throws KeywordSearchModuleException {
+    Map<String, KeywordHit> map = findMatches(originalKeyword, queryResults).stream().collect(Collectors.toMap(KeywordHit::getSolrDocumentId, x -> x));
+    List<KeywordHit> merged = new ArrayList<>();
+
+    // first, replace KeywordHit in matches
+    for (KeywordHit match : matches) {
+      String key = match.getSolrDocumentId();
+      if (map.containsKey(key)) {
+        merged.add(map.get(key));
+        map.remove(key);
+      } else {
+        merged.add(match);
+      }
+    }
+    // second, add rest of KeywordHits from queryResults
+    merged.addAll(map.values());
+
+    return merged;
+  }
+
+  static void configureTermfreqQuery(SolrQuery query, String keyword) throws KeywordSearchModuleException, NoOpenCoreException {
+    // make a request to Solr to parse query.
+    QueryParser.Result queryParserResult = QueryParser.parse(keyword, LANGUAGE_SPECIFIC_CONTENT_FIELDS);
+    query.addField(buildTermfreqQuery(keyword, queryParserResult));
+  }
+
+  static String buildTermfreqQuery(String keyword, QueryParser.Result result) {
+    List<String> termfreqs = new ArrayList<>();
+    for (Map.Entry<String, List<String>> e : result.fieldTermsMap.entrySet()) {
+      String field = e.getKey();
+      for (String term : e.getValue()) {
+        termfreqs.add(String.format("termfreq(\"%s\",\"%s\")", field, KeywordSearchUtil.escapeLuceneQuery(term)));
+      }
+    }
+
+    // sum of all language specific query fields.
+    // only one of these fields could be non-zero.
+    return String.format("termfreq:sum(%s)", String.join(",", termfreqs));
+  }
+
+  static int queryChunkTermfreq(Set<String> keywords, String contentID) throws KeywordSearchModuleException, NoOpenCoreException {
+    SolrQuery q = new SolrQuery();
+    q.setShowDebugInfo(DEBUG);
+
+    final String filterQuery = Server.Schema.ID.toString() + ":" + KeywordSearchUtil.escapeLuceneQuery(contentID);
+    final String highlightQuery = keywords.stream()
+        .map(s -> LanguageSpecificContentQueryHelper.expandQueryString(KeywordSearchUtil.escapeLuceneQuery(s)))
+        .collect(Collectors.joining(" "));
+
+    q.addFilterQuery(filterQuery);
+    q.setQuery(highlightQuery);
+    LanguageSpecificContentQueryHelper.configureTermfreqQuery(q, keywords.iterator().next());
+
+    QueryResponse response = KeywordSearch.getServer().query(q, SolrRequest.METHOD.POST);
+    SolrDocumentList results = response.getResults();
+    if (results.isEmpty()) {
+      return 0;
+    }
+
+    SolrDocument document = results.get(0);
+    return ((Float) document.getFieldValue(Server.Schema.TERMFREQ.toString())).intValue();
+  }
+
+  static int findNthIndexOf(String s, String pattern, int n) {
+    int found = 0;
+    int idx = -1;
+    int len = s.length();
+    while (idx < len && found <= n) {
+      idx = s.indexOf(pattern, idx + 1);
+      if (idx == -1) {
+        break;
+      }
+      found++;
+    }
+
+    return idx;
+  }
+
+  private static List<KeywordHit> findMatches(Keyword originalKeyword, QueryResults queryResults) throws KeywordSearchModuleException {
+    List<KeywordHit> matches = new ArrayList<>();
+    for (SolrDocument document : queryResults.chunks) {
+      String docId = (String) document.getFieldValue(Server.Schema.ID.toString());
+
+      try {
+        int hitCountInChunk = ((Float) document.getFieldValue(Server.Schema.TERMFREQ.toString())).intValue();
+        SolrDocument miniChunk = queryResults.miniChunks.get(docId);
+        if (miniChunk == null) {
+          // last chunk does not have mini chunk because there's no overlapped region with next one
+          matches.add(createKeywordHit(originalKeyword, queryResults.highlighting, docId));
+        } else {
+          int hitCountInMiniChunk = ((Float) miniChunk.getFieldValue(Server.Schema.TERMFREQ.toString())).intValue();
+          if (hitCountInMiniChunk < hitCountInChunk) {
+            // there are at least one hit in base chunk
+            matches.add(createKeywordHit(originalKeyword, queryResults.highlighting, docId));
+          }
+        }
+      } catch (TskException ex) {
+        throw new KeywordSearchModuleException(ex);
+      }
+    }
+    return matches;
+  }
+
+  /** copied from LuceneQuery and modified to use getHighlightFieldValue */
+  private static KeywordHit createKeywordHit(Keyword originalKeyword, Map<String, Map<String, List<String>>> highlightResponse, String docId) throws TskException {
+    /**
+     * Get the first snippet from the document if keyword search is
+     * configured to use snippets.
+     */
+    String snippet = "";
+    if (KeywordSearchSettings.getShowSnippets()) {
+      List<String> snippetList = getHighlightFieldValue(highlightResponse.get(docId)).orElse(null);
+      // list is null if there wasn't a snippet
+      if (snippetList != null) {
+        snippet = EscapeUtil.unEscapeHtml(snippetList.get(0)).trim();
+      }
+    }
+
+    return new KeywordHit(docId, snippet, originalKeyword.getSearchTerm());
+  }
+
+  /**
+   * @return Optional.empty if empty
+   */
+  private static Optional<List<String>> getHighlightFieldValue(Map<String, List<String>> highlight) {
+    for (Server.Schema field : LANGUAGE_SPECIFIC_CONTENT_FIELDS) {
+      if (highlight.containsKey(field.toString())) {
+        return Optional.of(highlight.get(field.toString()));
+      }
+    }
+    return Optional.empty();
+  }
+}
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java
index 70c6155d5f..8bc5191149 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java
@@ -134,6 +134,7 @@ class LuceneQuery implements KeywordSearchQuery {
         String cursorMark = CursorMarkParams.CURSOR_MARK_START;
         boolean allResultsProcessed = false;
         List<KeywordHit> matches = new ArrayList<>();
+        LanguageSpecificContentQueryHelper.QueryResults languageSpecificQueryResults = new LanguageSpecificContentQueryHelper.QueryResults();
         while (!allResultsProcessed) {
             solrQuery.set(CursorMarkParams.CURSOR_MARK_PARAM, cursorMark);
             QueryResponse response = solrServer.query(solrQuery, SolrRequest.METHOD.POST);
@@ -141,7 +142,18 @@ class LuceneQuery implements KeywordSearchQuery {
             // objectId_chunk -> "text" -> List of previews
             Map<String, Map<String, List<String>>> highlightResponse = response.getHighlighting();
 
+            if (2.2 <= indexSchemaVersion) {
+                languageSpecificQueryResults.highlighting.putAll(response.getHighlighting());
+            }
+
             for (SolrDocument resultDoc : resultList) {
+                if (2.2 <= indexSchemaVersion) {
+                    Object language = resultDoc.getFieldValue(Server.Schema.LANGUAGE.toString());
+                    if (language != null) {
+                        LanguageSpecificContentQueryHelper.updateQueryResults(languageSpecificQueryResults, resultDoc);
+                    }
+                }
+
                 try {
                     /*
                      * for each result doc, check that the first occurence of
@@ -153,6 +165,11 @@ class LuceneQuery implements KeywordSearchQuery {
                     final Integer chunkSize = (Integer) resultDoc.getFieldValue(Server.Schema.CHUNK_SIZE.toString());
                     final Collection<Object> content = resultDoc.getFieldValues(Server.Schema.CONTENT_STR.toString());
 
+                    // if the document has language, it should be hit in language specific content fields. So skip here.
+                    if (resultDoc.containsKey(Server.Schema.LANGUAGE.toString())) {
+                        continue;
+                    }
+
                     if (indexSchemaVersion < 2.0) {
                         //old schema versions don't support chunk_size or the content_str fields, so just accept hits
                         matches.add(createKeywordtHit(highlightResponse, docId));
@@ -179,9 +196,16 @@ class LuceneQuery implements KeywordSearchQuery {
             cursorMark = nextCursorMark;
         }
 
+        List<KeywordHit> mergedMatches;
+        if (2.2 <= indexSchemaVersion) {
+            mergedMatches = LanguageSpecificContentQueryHelper.mergeKeywordHits(matches, originalKeyword, languageSpecificQueryResults);
+        } else {
+            mergedMatches = matches;
+        }
+
         QueryResults results = new QueryResults(this);
         //in case of single term literal query there is only 1 term
-        results.addResult(new Keyword(originalKeyword.getSearchTerm(), true, true, originalKeyword.getListName(), originalKeyword.getOriginalTerm()), matches);
+        results.addResult(new Keyword(originalKeyword.getSearchTerm(), true, true, originalKeyword.getListName(), originalKeyword.getOriginalTerm()), mergedMatches);
 
         return results;
     }
@@ -262,19 +286,25 @@ class LuceneQuery implements KeywordSearchQuery {
      *
      * @return
      */
-    private SolrQuery createAndConfigureSolrQuery(boolean snippets) {
+    private SolrQuery createAndConfigureSolrQuery(boolean snippets) throws NoOpenCoreException, KeywordSearchModuleException {
+        double indexSchemaVersion = NumberUtils.toDouble(KeywordSearch.getServer().getIndexInfo().getSchemaVersion());
+
         SolrQuery q = new SolrQuery();
         q.setShowDebugInfo(DEBUG); //debug
         // Wrap the query string in quotes if this is a literal search term.
         String queryStr = originalKeyword.searchTermIsLiteral()
-                ? KeywordSearchUtil.quoteQuery(keywordStringEscaped) : keywordStringEscaped;
+            ? KeywordSearchUtil.quoteQuery(keywordStringEscaped) : keywordStringEscaped;
 
         // Run the query against an optional alternative field. 
         if (field != null) {
             //use the optional field
             queryStr = field + ":" + queryStr;
+            q.setQuery(queryStr);
+        } else if (2.2 <= indexSchemaVersion && originalKeyword.searchTermIsLiteral()) {
+            q.setQuery(LanguageSpecificContentQueryHelper.expandQueryString(keywordStringEscaped));
+        } else {
+            q.setQuery(queryStr);
         }
-        q.setQuery(queryStr);
         q.setRows(MAX_RESULTS_PER_CURSOR_MARK);
         // Setting the sort order is necessary for cursor based paging to work.
         q.setSort(SolrQuery.SortClause.asc(Server.Schema.ID.toString()));
@@ -283,6 +313,11 @@ class LuceneQuery implements KeywordSearchQuery {
                 Server.Schema.CHUNK_SIZE.toString(),
                 Server.Schema.CONTENT_STR.toString());
 
+        if (2.2 <= indexSchemaVersion && originalKeyword.searchTermIsLiteral()) {
+            q.addField(Server.Schema.LANGUAGE.toString());
+            LanguageSpecificContentQueryHelper.configureTermfreqQuery(q, keywordStringEscaped);
+        }
+
         for (KeywordQueryFilter filter : filters) {
             q.addFilterQuery(filter.toString());
         }
@@ -300,8 +335,16 @@ class LuceneQuery implements KeywordSearchQuery {
      *
      * @param q The SolrQuery to configure.
      */
-    private static void configurwQueryForHighlighting(SolrQuery q) {
-        q.addHighlightField(HIGHLIGHT_FIELD);
+    private static void configurwQueryForHighlighting(SolrQuery q) throws NoOpenCoreException {
+        double indexSchemaVersion = NumberUtils.toDouble(KeywordSearch.getServer().getIndexInfo().getSchemaVersion());
+        if (2.2 <= indexSchemaVersion) {
+            for (Server.Schema field : LanguageSpecificContentQueryHelper.getQueryFields()) {
+                q.addHighlightField(field.toString());
+            }
+        } else {
+            q.addHighlightField(HIGHLIGHT_FIELD);
+        }
+
         q.setHighlightSnippets(1);
         q.setHighlightFragsize(SNIPPET_LENGTH);
 
@@ -404,7 +447,13 @@ class LuceneQuery implements KeywordSearchQuery {
             if (responseHighlightID == null) {
                 return "";
             }
-            List<String> contentHighlights = responseHighlightID.get(LuceneQuery.HIGHLIGHT_FIELD);
+            double indexSchemaVersion = NumberUtils.toDouble(solrServer.getIndexInfo().getSchemaVersion());
+            List<String> contentHighlights;
+            if (2.2 <= indexSchemaVersion) {
+                contentHighlights = LanguageSpecificContentQueryHelper.getHighlights(responseHighlightID).orElse(null);
+            } else {
+                contentHighlights = responseHighlightID.get(LuceneQuery.HIGHLIGHT_FIELD);
+            }
             if (contentHighlights == null) {
                 return "";
             } else {
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/MiniChunks.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/MiniChunks.java
new file mode 100644
index 0000000000..c6d3c28d73
--- /dev/null
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/MiniChunks.java
@@ -0,0 +1,18 @@
+package org.sleuthkit.autopsy.keywordsearch;
+
+class MiniChunks {
+
+  static String SUFFIX = "_mini";
+
+  static String getChunkIdString(String baseChunkID) {
+    return baseChunkID + SUFFIX;
+  }
+
+  static boolean isMiniChunkID(String chunkID) {
+    return chunkID.endsWith(SUFFIX);
+  }
+
+  static String getBaseChunkID(String miniChunkID) {
+    return miniChunkID.replaceFirst(SUFFIX + "$", "");
+  }
+}
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/QueryParser.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/QueryParser.java
new file mode 100644
index 0000000000..2572ab34c3
--- /dev/null
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/QueryParser.java
@@ -0,0 +1,63 @@
+package org.sleuthkit.autopsy.keywordsearch;
+
+import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.SolrRequest;
+import org.apache.solr.client.solrj.response.QueryResponse;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * Parse query using Solr
+ */
+class QueryParser {
+
+  static class Result {
+    /**
+     * field name -> [term]
+     */
+    Map<String, List<String>> fieldTermsMap;
+  }
+
+  /**
+   * Parse the given query string on Solr and return the result
+   */
+  static Result parse(String query, List<Server.Schema> fields) throws KeywordSearchModuleException, NoOpenCoreException {
+    SolrQuery q = new SolrQuery();
+    q.setShowDebugInfo(true);
+    q.setQuery(fields.stream().map(f -> String.format("%s:%s", f, KeywordSearchUtil.escapeLuceneQuery(query))).collect(Collectors.joining(" OR ")));
+    q.setRows(0);
+
+    QueryResponse response = KeywordSearch.getServer().query(q, SolrRequest.METHOD.POST);
+    Map<String, Object> debugMap = response.getDebugMap();
+    String parsedQuery = debugMap.getOrDefault("parsedquery", "").toString();
+
+    Result result = new Result();
+    result.fieldTermsMap = getFieldTermsMap(parsedQuery);
+    return result;
+  }
+
+  static Map<String, List<String>> getFieldTermsMap(String parsedQuery) {
+    Map<String, List<String>> map = new HashMap<>();
+
+    for (String fieldTermStr : parsedQuery.split(" ")) {
+      String[] fieldTerm = fieldTermStr.split(":");
+      if (fieldTerm.length != 2) {
+        continue;
+      }
+
+      String field = fieldTerm[0];
+      String term = fieldTerm[1];
+
+      List<String> terms = map.getOrDefault(field, new ArrayList<>());
+      terms.add(term);
+
+      map.put(field, terms);
+    }
+
+    return map;
+  }
+}
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
index 0e047456f6..eab213c2c8 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
@@ -39,6 +39,7 @@ import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
@@ -130,6 +131,18 @@ public class Server {
                 return "content_ws"; //NON-NLS
             }
         },
+        CONTENT_JA {
+            @Override
+            public String toString() {
+                return "content_ja"; //NON-NLS
+            }
+        },
+        LANGUAGE {
+            @Override
+            public String toString() {
+                return "language"; //NON-NLS
+            }
+        },
         FILE_NAME {
             @Override
             public String toString() {
@@ -175,6 +188,12 @@ public class Server {
             public String toString() {
                 return "chunk_size"; //NON-NLS
             }
+        },
+        TERMFREQ {
+            @Override
+            public String toString() {
+                return "termfreq"; //NON-NLS
+            }
         }
     };
 
@@ -1635,7 +1654,8 @@ public class Server {
         private int queryNumFileChunks(long contentID) throws SolrServerException, IOException {
             String id = KeywordSearchUtil.escapeLuceneQuery(Long.toString(contentID));
             final SolrQuery q
-                    = new SolrQuery(Server.Schema.ID + ":" + id + Server.CHUNK_ID_SEPARATOR + "*");
+                    = new SolrQuery(Server.Schema.ID + ":" + id + Server.CHUNK_ID_SEPARATOR + "*"
+                        + " NOT " + Server.Schema.ID + ":*" + MiniChunks.SUFFIX);
             q.setRows(0);
             return (int) query(q).getResults().getNumFound();
         }
diff --git a/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelperTest.java b/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelperTest.java
new file mode 100644
index 0000000000..8941133cfd
--- /dev/null
+++ b/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelperTest.java
@@ -0,0 +1,40 @@
+package org.sleuthkit.autopsy.keywordsearch;
+
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.HashMap;
+
+import static org.junit.Assert.assertEquals;
+
+public class LanguageSpecificContentQueryHelperTest {
+
+  @Test
+  public void makeQueryString() {
+    assertEquals("text:query OR content_ja:query", LanguageSpecificContentQueryHelper.expandQueryString("query"));
+  }
+
+  @Test
+  public void findNthIndexOf() {
+    assertEquals(-1, LanguageSpecificContentQueryHelper.findNthIndexOf("A1AA45", "_", 0));
+    assertEquals(0, LanguageSpecificContentQueryHelper.findNthIndexOf("A1AA45", "A", 0));
+    assertEquals(2, LanguageSpecificContentQueryHelper.findNthIndexOf("A1AA45", "A", 1));
+    assertEquals(3, LanguageSpecificContentQueryHelper.findNthIndexOf("A1AA45", "A", 2));
+    assertEquals(-1, LanguageSpecificContentQueryHelper.findNthIndexOf("A1AA45", "A", 3));
+    assertEquals(0, LanguageSpecificContentQueryHelper.findNthIndexOf("A1AA45", "", 0));
+    assertEquals(-1, LanguageSpecificContentQueryHelper.findNthIndexOf("", "A", 0));
+    assertEquals(-1, LanguageSpecificContentQueryHelper.findNthIndexOf("A1AA45", "A", -1));
+    assertEquals(-1, LanguageSpecificContentQueryHelper.findNthIndexOf("A1AA45", "A", 999));
+  }
+
+  @Test
+  public void buildTermfreqQuery() {
+    QueryParser.Result result = new QueryParser.Result();
+    result.fieldTermsMap = new HashMap<>();
+    result.fieldTermsMap.put("field1", Arrays.asList("term1"));
+    result.fieldTermsMap.put("field2", Arrays.asList("term1", "term2"));
+    assertEquals(
+        "termfreq:sum(termfreq(\"field1\",\"term1\"),termfreq(\"field1\",\"term1\"),termfreq(\"field1\",\"term1\"))",
+        LanguageSpecificContentQueryHelper.buildTermfreqQuery("query", result));
+  }
+}
diff --git a/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/MiniChunksTest.java b/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/MiniChunksTest.java
new file mode 100644
index 0000000000..9505418ff6
--- /dev/null
+++ b/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/MiniChunksTest.java
@@ -0,0 +1,25 @@
+package org.sleuthkit.autopsy.keywordsearch;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class MiniChunksTest {
+
+  @Test
+  public void isMiniChunkID() {
+    assertTrue(MiniChunks.isMiniChunkID("1_1_mini"));
+    assertFalse(MiniChunks.isMiniChunkID("1_1"));
+    assertFalse(MiniChunks.isMiniChunkID("1"));
+  }
+
+  @Test
+  public void getBaseChunkID() {
+    Assert.assertEquals("1_1", MiniChunks.getBaseChunkID("1_1_mini"));
+    Assert.assertEquals("1_1", MiniChunks.getBaseChunkID("1_1"));
+    Assert.assertEquals("1", MiniChunks.getBaseChunkID("1"));
+  }
+
+}
\ No newline at end of file
diff --git a/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/QueryParserTest.java b/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/QueryParserTest.java
new file mode 100644
index 0000000000..866d721e22
--- /dev/null
+++ b/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/QueryParserTest.java
@@ -0,0 +1,20 @@
+package org.sleuthkit.autopsy.keywordsearch;
+
+import org.junit.Test;
+
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+
+public class QueryParserTest {
+
+  @Test
+  public void getFieldTermsMap() {
+    Map<String, List<String>> map = QueryParser.getFieldTermsMap("content_ja:雨 content_ja:降る");
+    List<String> terms = map.get("content_ja");
+    assertEquals(2, terms.size());
+    assertEquals("雨", terms.get(0));
+    assertEquals("降る", terms.get(1));
+  }
+}

From 2fa8a2ff0985a8e7c25013844bea6bbb52515130 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Mon, 26 Aug 2019 11:44:55 -0400
Subject: [PATCH 084/192] Done with HadhDm module, bug fixes

---
 .../modules/hashdatabase/HashDbManager.java      |  5 +++--
 .../autopsy/report/ReportVisualPanel2.java       | 16 ++++++++--------
 .../AddTaggedHashesToHashDbConfigPanel.java      |  8 ++++----
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbManager.java b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbManager.java
index 00003da9e7..f769061c0f 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbManager.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbManager.java
@@ -23,6 +23,7 @@ import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.io.File;
 import java.io.IOException;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -692,7 +693,7 @@ public class HashDbManager implements PropertyChangeListener {
         return filePath;
     }
     
-    public static abstract class HashDb {
+    public static abstract class HashDb implements Serializable {
         
         /**
          * Indicates how files with hashes stored in a particular hash database
@@ -791,7 +792,7 @@ public class HashDbManager implements PropertyChangeListener {
      * Instances of this class represent hash databases used to classify files
      * as known or know bad.
      */
-    class SleuthkitHashSet extends HashDb{
+    class SleuthkitHashSet extends HashDb {
         
         private static final long serialVersionUID = 1L;
         private final int handle;
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java
index 03cdeb9160..6cff8d3e14 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java
@@ -19,6 +19,8 @@
 package org.sleuthkit.autopsy.report;
 
 import java.awt.Component;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
@@ -35,8 +37,6 @@ import javax.swing.JList;
 import javax.swing.JPanel;
 import javax.swing.ListCellRenderer;
 import javax.swing.ListModel;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
 import javax.swing.event.ListDataListener;
 import org.openide.util.NbBundle;
 import org.openide.windows.WindowManager;
@@ -75,9 +75,9 @@ final class ReportVisualPanel2 extends JPanel {
         initArtifactTypes();
         this.wizPanel = wizPanel;
 
-        this.allResultsRadioButton.addChangeListener(new ChangeListener() {
+        this.allResultsRadioButton.addItemListener(new ItemListener() {
             @Override
-            public void stateChanged(ChangeEvent e) {
+            public void itemStateChanged(ItemEvent e) {
                 tagsList.setEnabled(specificTaggedResultsRadioButton.isSelected());
                 selectAllButton.setEnabled(specificTaggedResultsRadioButton.isSelected());
                 deselectAllButton.setEnabled(specificTaggedResultsRadioButton.isSelected());
@@ -85,9 +85,9 @@ final class ReportVisualPanel2 extends JPanel {
                 updateFinishButton();
             }
         });
-        this.allTaggedResultsRadioButton.addChangeListener(new ChangeListener() {
+        this.allTaggedResultsRadioButton.addItemListener(new ItemListener() {
             @Override
-            public void stateChanged(ChangeEvent e) {
+            public void itemStateChanged(ItemEvent e) {
                 tagsList.setEnabled(specificTaggedResultsRadioButton.isSelected());
                 selectAllButton.setEnabled(specificTaggedResultsRadioButton.isSelected());
                 deselectAllButton.setEnabled(specificTaggedResultsRadioButton.isSelected());
@@ -95,9 +95,9 @@ final class ReportVisualPanel2 extends JPanel {
                 updateFinishButton();
             }
         });
-        this.specificTaggedResultsRadioButton.addChangeListener(new ChangeListener() {
+        this.specificTaggedResultsRadioButton.addItemListener(new ItemListener() {
             @Override
-            public void stateChanged(ChangeEvent e) {
+            public void itemStateChanged(ItemEvent e) {
                 tagsList.setEnabled(specificTaggedResultsRadioButton.isSelected());
                 selectAllButton.setEnabled(specificTaggedResultsRadioButton.isSelected());
                 deselectAllButton.setEnabled(specificTaggedResultsRadioButton.isSelected());
diff --git a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java b/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java
index 17eaedb169..e9e63afe24 100644
--- a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java
@@ -19,6 +19,8 @@
 package org.sleuthkit.autopsy.report.taggedhashes;
 
 import java.awt.Component;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
@@ -32,8 +34,6 @@ import javax.swing.JList;
 import javax.swing.JOptionPane;
 import javax.swing.ListCellRenderer;
 import javax.swing.ListModel;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
 import javax.swing.event.ListDataListener;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
@@ -62,9 +62,9 @@ class AddTaggedHashesToHashDbConfigPanel extends javax.swing.JPanel {
         initComponents();
         customizeComponents();
         
-        this.jAllTagsCheckBox.addChangeListener(new ChangeListener() {
+        this.jAllTagsCheckBox.addItemListener(new ItemListener() {
             @Override
-            public void stateChanged(ChangeEvent e) {
+            public void itemStateChanged(ItemEvent e) {
                 tagNamesListBox.setEnabled(!jAllTagsCheckBox.isSelected());
                 selectAllButton.setEnabled(!jAllTagsCheckBox.isSelected());
                 deselectAllButton.setEnabled(!jAllTagsCheckBox.isSelected());

From 4b9c08f19fd959516f719a1ea4514253f461452f Mon Sep 17 00:00:00 2001
From: Kelly Kelly <kelly@basistech.com>
Date: Mon, 26 Aug 2019 11:52:23 -0400
Subject: [PATCH 085/192] Changed the order of the args for addFileSystemFile

---
 .../recentactivity/Bundle.properties-MERGED   |  8 ++++-
 .../recentactivity/ExtractRecycleBin.java     | 33 ++++++++++---------
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED
index 40771a0d41..a54c840799 100755
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED
@@ -2,9 +2,14 @@ cannotBuildXmlParser=Unable to build XML parser:
 cannotLoadSEUQA=Unable to load Search Engine URL Query Analyzer settings file, SEUQAMappings.xml: 
 cannotParseXml=Unable to parse XML file: 
 ChromeCacheExtractor.moduleName=ChromeCacheExtractor
+# {0} - module name
+# {1} - row number
+# {2} - table length
+# {3} - cache path
 ChromeCacheExtractor.progressMsg={0}: Extracting cache entry {1} of {2} entries from {3}
 DataSourceUsage_AndroidMedia=Android Media Card
 DataSourceUsage_FlashDrive=Flash Drive
+# {0} - OS name
 DataSourceUsageAnalyzer.customVolume.label=OS Drive ({0})
 DataSourceUsageAnalyzer.parentModuleName=Recent Activity
 Extract.indexError.message=Failed to index artifact for keyword search.
@@ -60,7 +65,7 @@ ExtractZone_progress_Msg=Extracting :Zone.Identifer files
 ExtractZone_Restricted=Restricted Sites Zone
 ExtractZone_Trusted=Trusted Sites Zone
 OpenIDE-Module-Display-Category=Ingest Module
-OpenIDE-Module-Long-Description=Recent Activity ingest module.\n\nThe module extracts useful information about the recent user activity on the disk image being ingested, such as:\n\n- Recently open documents,\n- Web activity (sites visited, stored cookies, book marked sites, search engine queries, file downloads),\n- Recently attached devices,\n- Installed programs.\n\nThe module currently supports Windows only disk images.\nThe plugin is also fully functional when deployed on Windows version of Autopsy.
+OpenIDE-Module-Long-Description=Recent Activity ingest module.\n\n\The module extracts useful information about the recent user activity on the disk image being ingested, such as:\n\n- Recently open documents,\n- Web activity (sites visited, stored cookies, book marked sites, search engine queries, file downloads),\n- Recently attached devices,\n- Installed programs.\n\nThe module currently supports Windows only disk images.\nThe plugin is also fully functional when deployed on Windows version of Autopsy.
 OpenIDE-Module-Name=RecentActivity
 OpenIDE-Module-Short-Description=Recent Activity finder ingest module
 Chrome.moduleName=Chrome
@@ -183,6 +188,7 @@ RecentDocumentsByLnk.parentModuleName.noSpace=RecentActivity
 RecentDocumentsByLnk.parentModuleName=Recent Activity
 RegRipperFullNotFound=Full version RegRipper executable not found.
 RegRipperNotFound=Autopsy RegRipper executable not found.
+# {0} - file name
 SearchEngineURLQueryAnalyzer.init.exception.msg=Unable to find {0}.
 SearchEngineURLQueryAnalyzer.moduleName.text=Search Engine
 SearchEngineURLQueryAnalyzer.engineName.none=NONE
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java
index 1086a346eb..f461a2d026 100755
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java
@@ -158,7 +158,7 @@ final class ExtractRecycleBin extends Extract {
      * @param tempRARecycleBinPath   Temp directory path
      */
     private void processIFile(IngestJobContext context, BlackboardArtifact.Type recycleBinArtifactType, AbstractFile iFile, Map<String, String> userNameMap, Map<String, List<AbstractFile>> rFileMap, String tempRARecycleBinPath) {
-        String tempFilePath = tempRARecycleBinPath + File.separator + Instant.now().toString() + iFile.getName();
+        String tempFilePath = tempRARecycleBinPath + File.separator + Instant.now().getMillis() + iFile.getName();
         try {
             try {
                 ContentUtils.writeToFile(iFile, new File(tempFilePath));
@@ -205,8 +205,8 @@ final class ExtractRecycleBin extends Extract {
                 if (iFile.getParentPath().equals(rFile.getParentPath())
                         && iFile.getMetaFlagsAsString().equals(rFile.getMetaFlagsAsString())) {
                     try {
-                        postArtifact(createArtifact(rFile, recycleBinArtifactType, metaData.getFileName(), userName, metaData.getDeletedTimeStamp()));
-                        
+                        postArtifact(createArtifact(rFile, recycleBinArtifactType, metaData.getFullWindowsPath(), userName, metaData.getDeletedTimeStamp()));
+
                         // If we are processing a disk image, we will also make a deleted file entry so that the user
                         // sees the deleted file in its original folder.  We re-use the metadata address so that the user 
                         // can see the content. 
@@ -214,12 +214,12 @@ final class ExtractRecycleBin extends Extract {
                             // if the user deleted a folder, then we need to recusively go into it.  Note the contents of the $R folder
                             // do not have corresponding $I files anymore.  Only the $R folder does.
                             if (rFile.isDir()) {
-                                AbstractFile directory = getOrMakeFolder(Case.getCurrentCase().getSleuthkitCase(), (FsContent) rFile, metaData.getFileName());
-                                popuplateDeletedDirectory(Case.getCurrentCase().getSleuthkitCase(), directory, rFile.getChildren(), metaData.getFileName(), metaData.getDeletedTimeStamp());
+                                AbstractFile directory = getOrMakeFolder(Case.getCurrentCase().getSleuthkitCase(), (FsContent) rFile, metaData.getFullWindowsPath());
+                                popuplateDeletedDirectory(Case.getCurrentCase().getSleuthkitCase(), directory, rFile.getChildren(), metaData.getFullWindowsPath(), metaData.getDeletedTimeStamp());
 
                             } else {
-                                AbstractFile folder = getOrMakeFolder(Case.getCurrentCase().getSleuthkitCase(), (FsContent) rFile.getParent(), Paths.get(metaData.getFileName()).getParent().toString());
-                                addFileSystemFile(skCase, (FsContent)rFile, folder, Paths.get(metaData.getFileName()).getFileName().toString(), metaData.getDeletedTimeStamp());
+                                AbstractFile folder = getOrMakeFolder(Case.getCurrentCase().getSleuthkitCase(), (FsContent) rFile.getParent(), Paths.get(metaData.getFullWindowsPath()).getParent().toString());
+                                addFileSystemFile(skCase, (FsContent)rFile, folder, Paths.get(metaData.getFullWindowsPath()).getFileName().toString(), metaData.getDeletedTimeStamp());
                             }
                         }
                     } catch (TskCoreException ex) {
@@ -498,16 +498,18 @@ final class ExtractRecycleBin extends Extract {
      * @throws TskCoreException
      */
     private void addFileSystemFile(SleuthkitCase skCase, FsContent recycleBinFile, Content parentDir, String fileName, long deletedTime) throws TskCoreException {
-        skCase.addFileSystemFile(recycleBinFile.getFileSystemId(),
+        skCase.addFileSystemFile(
                 recycleBinFile.getDataSourceObjectId(),
-                recycleBinFile.getAttrType(),
-                recycleBinFile.getAttributeId(),
+                recycleBinFile.getFileSystemId(),
                 fileName,
-                TskData.TSK_FS_NAME_FLAG_ENUM.UNALLOC,
-                recycleBinFile.getSize(),
-                0, 0, 0, deletedTime,
                 recycleBinFile.getMetaAddr(),
                 (int) recycleBinFile.getMetaSeq(),
+                recycleBinFile.getAttrType(),
+                recycleBinFile.getAttributeId(),
+                TskData.TSK_FS_NAME_FLAG_ENUM.UNALLOC,
+                (short) (TskData.TSK_FS_META_FLAG_ENUM.UNALLOC.getValue() | TskData.TSK_FS_META_FLAG_ENUM.USED.getValue()),
+                recycleBinFile.getSize(),
+                0, 0, 0, deletedTime,
                 true, parentDir);
     }
 
@@ -607,11 +609,12 @@ final class ExtractRecycleBin extends Extract {
         }
 
         /**
-         * Returns the name of the deleted file.
+         * Returns the full path to the deleted file or folder.  This path will 
+         * include the drive letter, ie C:\
          *
          * @return String name of the deleted file
          */
-        String getFileName() {
+        String  getFullWindowsPath() {
             return fileName.trim();
         }
     }

From 08e3181b1674c15c5e59a66d1760f4e9d1bdcd2a Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Mon, 26 Aug 2019 14:01:53 -0400
Subject: [PATCH 086/192] Done with CASE/UCO module

---
 .../report/caseuco/Bundle.properties-MERGED   |   2 +-
 .../report/caseuco/CaseUcoFormatExporter.java | 112 ++++++++-------
 .../autopsy/report/caseuco/ReportCaseUco.java |  78 ++++++-----
 .../caseuco/ReportCaseUcoConfigPanel.form     |  67 ---------
 .../caseuco/ReportCaseUcoConfigPanel.java     | 131 ------------------
 5 files changed, 101 insertions(+), 289 deletions(-)
 delete mode 100755 Core/src/org/sleuthkit/autopsy/report/caseuco/ReportCaseUcoConfigPanel.form
 delete mode 100755 Core/src/org/sleuthkit/autopsy/report/caseuco/ReportCaseUcoConfigPanel.java

diff --git a/Core/src/org/sleuthkit/autopsy/report/caseuco/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/report/caseuco/Bundle.properties-MERGED
index fa3d0589aa..b2a6d8e1e7 100755
--- a/Core/src/org/sleuthkit/autopsy/report/caseuco/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/report/caseuco/Bundle.properties-MERGED
@@ -1,7 +1,7 @@
-CaseUcoFormatExporter.datasourceMsg=Generating CASE-UCO Report for %s
 CaseUcoFormatExporter.finishMsg=Finished generating CASE-UCO Report
 CaseUcoFormatExporter.startMsg=Generating CASE-UCO Report
 OpenIDE-Module-Name=CaseUcoModule
+ReportCaseUco.datasourceMsg=Generating CASE-UCO Report for %s
 ReportCaseUco.getName.text=CASE-UCO
 ReportCaseUco.getDesc.text=CASE-UCO format report with basic property fields for every file.
 ReportCaseUco.ingestWarning=Warning, this report will be created before ingest services completed
diff --git a/Core/src/org/sleuthkit/autopsy/report/caseuco/CaseUcoFormatExporter.java b/Core/src/org/sleuthkit/autopsy/report/caseuco/CaseUcoFormatExporter.java
index 03bffed89d..459262eacf 100755
--- a/Core/src/org/sleuthkit/autopsy/report/caseuco/CaseUcoFormatExporter.java
+++ b/Core/src/org/sleuthkit/autopsy/report/caseuco/CaseUcoFormatExporter.java
@@ -75,7 +75,6 @@ public final class CaseUcoFormatExporter {
     /**
      * Generates CASE-UCO report for the selected data source.
      *
-     * @param selectedDataSourceId Object ID of the data source
      * @param reportOutputPath Full path to directory where to save CASE-UCO
      * report file
      * @param progressPanel ReportProgressPanel to update progress
@@ -86,11 +85,11 @@ public final class CaseUcoFormatExporter {
         "ReportCaseUco.initializing=Creating directories...",
         "ReportCaseUco.querying=Querying files...",
         "ReportCaseUco.ingestWarning=Warning, this report will be created before ingest services completed",
-        "ReportCaseUco.processing=Saving files in CASE-UCO format...",
+        "ReportCaseUco.datasourceMsg=Generating CASE-UCO Report for %s",
         "ReportCaseUco.srcModuleName.text=CASE-UCO Report"
     })
     @SuppressWarnings("deprecation")
-    public static void generateReport(Long selectedDataSourceId, String reportOutputPath, ReportProgressPanel progressPanel) {
+    public static void generateReport(String reportOutputPath, ReportProgressPanel progressPanel) {
 
         // Start the progress bar and setup the report
         progressPanel.setIndeterminate(false);
@@ -131,40 +130,45 @@ public final class CaseUcoFormatExporter {
             // create CASE-UCO entry for the Autopsy case
             String caseTraceId = saveCaseInfo(skCase, jsonGenerator);
 
-            // create CASE-UCO data source entry
-            String dataSourceTraceId = saveDataSourceInfo(selectedDataSourceId, caseTraceId, skCase, jsonGenerator);
+            // loop over all data sources in the case
+            for (DataSource ds : skCase.getDataSources()) {
+                progressPanel.updateStatusLabel(String.format(
+                        Bundle.ReportCaseUco_datasourceMsg(), ds.getName()));
+                
+                // create CASE-UCO data source entry
+                long selectedDataSourceId = ds.getId();
+                String dataSourceTraceId = saveDataSourceInfo(selectedDataSourceId, caseTraceId, skCase, jsonGenerator);
 
-            // Run getAllFilesQuery to get all files, exclude directories
-            final String getAllFilesQuery = "select obj_id, name, size, crtime, atime, mtime, md5, parent_path, mime_type, extension from tsk_files where "
-                    + "data_source_obj_id = " + Long.toString(selectedDataSourceId)
-                    + " AND ((meta_type = " + TskData.TSK_FS_META_TYPE_ENUM.TSK_FS_META_TYPE_UNDEF.getValue()
-                    + ") OR (meta_type = " + TskData.TSK_FS_META_TYPE_ENUM.TSK_FS_META_TYPE_REG.getValue()
-                    + ") OR (meta_type = " + TskData.TSK_FS_META_TYPE_ENUM.TSK_FS_META_TYPE_VIRT.getValue() + "))"; //NON-NLS
+                // Run getAllFilesQuery to get all files, exclude directories
+                final String getAllFilesQuery = "select obj_id, name, size, crtime, atime, mtime, md5, parent_path, mime_type, extension from tsk_files where "
+                        + "data_source_obj_id = " + Long.toString(selectedDataSourceId)
+                        + " AND ((meta_type = " + TskData.TSK_FS_META_TYPE_ENUM.TSK_FS_META_TYPE_UNDEF.getValue()
+                        + ") OR (meta_type = " + TskData.TSK_FS_META_TYPE_ENUM.TSK_FS_META_TYPE_REG.getValue()
+                        + ") OR (meta_type = " + TskData.TSK_FS_META_TYPE_ENUM.TSK_FS_META_TYPE_VIRT.getValue() + "))"; //NON-NLS
 
-            try (SleuthkitCase.CaseDbQuery queryResult = skCase.executeQuery(getAllFilesQuery)) {
-                ResultSet resultSet = queryResult.getResultSet();
+                try (SleuthkitCase.CaseDbQuery queryResult = skCase.executeQuery(getAllFilesQuery)) {
+                    ResultSet resultSet = queryResult.getResultSet();
 
-                progressPanel.updateStatusLabel(Bundle.ReportCaseUco_processing());
+                    // Loop files and write info to CASE-UCO report
+                    while (resultSet.next()) {
 
-                // Loop files and write info to CASE-UCO report
-                while (resultSet.next()) {
+                        if (progressPanel.getStatus() == ReportProgressPanel.ReportStatus.CANCELED) {
+                            break;
+                        }
 
-                    if (progressPanel.getStatus() == ReportProgressPanel.ReportStatus.CANCELED) {
-                        break;
+                        Long objectId = resultSet.getLong(1);
+                        String fileName = resultSet.getString(2);
+                        long size = resultSet.getLong("size");
+                        String crtime = ContentUtils.getStringTimeISO8601(resultSet.getLong("crtime"), timeZone);
+                        String atime = ContentUtils.getStringTimeISO8601(resultSet.getLong("atime"), timeZone);
+                        String mtime = ContentUtils.getStringTimeISO8601(resultSet.getLong("mtime"), timeZone);
+                        String md5Hash = resultSet.getString("md5");
+                        String parent_path = resultSet.getString("parent_path");
+                        String mime_type = resultSet.getString("mime_type");
+                        String extension = resultSet.getString("extension");
+
+                        saveFileInCaseUcoFormat(objectId, fileName, parent_path, md5Hash, mime_type, size, crtime, atime, mtime, extension, jsonGenerator, dataSourceTraceId);
                     }
-
-                    Long objectId = resultSet.getLong(1);
-                    String fileName = resultSet.getString(2);
-                    long size = resultSet.getLong("size");
-                    String crtime = ContentUtils.getStringTimeISO8601(resultSet.getLong("crtime"), timeZone);
-                    String atime = ContentUtils.getStringTimeISO8601(resultSet.getLong("atime"), timeZone);
-                    String mtime = ContentUtils.getStringTimeISO8601(resultSet.getLong("mtime"), timeZone);
-                    String md5Hash = resultSet.getString("md5");
-                    String parent_path = resultSet.getString("parent_path");
-                    String mime_type = resultSet.getString("mime_type");
-                    String extension = resultSet.getString("extension");
-
-                    saveFileInCaseUcoFormat(objectId, fileName, parent_path, md5Hash, mime_type, size, crtime, atime, mtime, extension, jsonGenerator, dataSourceTraceId);
                 }
             }
 
@@ -198,22 +202,24 @@ public final class CaseUcoFormatExporter {
     }
 
     /**
-     * Exports files that are tagged w/ the following TagNames and that belong to 
-     * the following interesting file sets (set name attributes of TSK_INTERSTING_FILE_HIT
-     * and TSK_INTERESTING_ARTIFACT_HIT). Artifacts that are tagged with 
-     * the following TagNames also have their associated source files included.
-     * 
+     * Exports files that are tagged w/ the following TagNames and that belong
+     * to the following interesting file sets (set name attributes of
+     * TSK_INTERSTING_FILE_HIT and TSK_INTERESTING_ARTIFACT_HIT). Artifacts that
+     * are tagged with the following TagNames also have their associated source
+     * files included.
+     *
      * Duplicate files are excluded.
-     * 
+     *
      * @param tagTypes Collection of TagNames to match
-     * @param interestingItemSets Collection of SET_NAMEs to match on in TSK_INTERESTING_FILE_HITs
-     *                            and TSK_INTERESTING_ARTIFACT_HITs.
-     * @param outputFilePath Path to the folder that the CASE-UCO report should be written into
-     * @param progressPanel UI Component to be updated with current processing status
+     * @param interestingItemSets Collection of SET_NAMEs to match on in
+     * TSK_INTERESTING_FILE_HITs and TSK_INTERESTING_ARTIFACT_HITs.
+     * @param outputFilePath Path to the folder that the CASE-UCO report should
+     * be written into
+     * @param progressPanel UI Component to be updated with current processing
+     * status
      */
     @NbBundle.Messages({
         "CaseUcoFormatExporter.startMsg=Generating CASE-UCO Report",
-        "CaseUcoFormatExporter.datasourceMsg=Generating CASE-UCO Report for %s",
         "CaseUcoFormatExporter.finishMsg=Finished generating CASE-UCO Report"
     })
     public static void export(List<TagName> tagTypes, List<String> interestingItemSets,
@@ -233,21 +239,21 @@ public final class CaseUcoFormatExporter {
         Files.createDirectory(tmpDir);
 
         //Create our report file
-        Path reportFile = Paths.get(caseReportFolder.toString(), 
+        Path reportFile = Paths.get(caseReportFolder.toString(),
                 ReportCaseUco.getReportFileName());
 
         //Timezone for formatting file creation, modification, and accessed times
         SimpleTimeZone timeZone = new SimpleTimeZone(0, "GMT");
 
-        try (JsonGenerator jsonGenerator = createJsonGenerator(reportFile.toFile())) {   
+        try (JsonGenerator jsonGenerator = createJsonGenerator(reportFile.toFile())) {
             initializeJsonOutputFile(jsonGenerator);
             //Make the case the first entity in the report file.
             String caseTraceId = saveCaseInfo(skCase, jsonGenerator);
 
             for (DataSource ds : skCase.getDataSources()) {
                 progressPanel.updateStatusLabel(String.format(
-                        Bundle.CaseUcoFormatExporter_datasourceMsg(), ds.getName()));
-                String dataSourceTraceId = saveDataSourceInfo(ds.getId(), 
+                        Bundle.ReportCaseUco_datasourceMsg(), ds.getName()));
+                String dataSourceTraceId = saveDataSourceInfo(ds.getId(),
                         caseTraceId, skCase, jsonGenerator);
                 for (TagName tn : tagTypes) {
                     for (ContentTag ct : tagsManager.getContentTagsByTagName(tn, ds.getId())) {
@@ -259,12 +265,12 @@ public final class CaseUcoFormatExporter {
                                 jsonGenerator, timeZone, dataSourceTraceId);
                     }
                 }
-                if(!interestingItemSets.isEmpty()) {
+                if (!interestingItemSets.isEmpty()) {
                     List<BlackboardArtifact.ARTIFACT_TYPE> typesToQuery = Lists.newArrayList(
                             INTERESTING_FILE_HIT, INTERESTING_ARTIFACT_HIT);
-                    for(BlackboardArtifact.ARTIFACT_TYPE artType : typesToQuery) {
-                        for(BlackboardArtifact bArt : skCase.getBlackboardArtifacts(artType)) {
-                            if(bArt.getDataSource().getId() != ds.getId()) {
+                    for (BlackboardArtifact.ARTIFACT_TYPE artType : typesToQuery) {
+                        for (BlackboardArtifact bArt : skCase.getBlackboardArtifacts(artType)) {
+                            if (bArt.getDataSource().getId() != ds.getId()) {
                                 continue;
                             }
                             BlackboardAttribute setAttr = bArt.getAttribute(SET_NAME);
@@ -283,9 +289,9 @@ public final class CaseUcoFormatExporter {
     }
 
     /**
-     * Saves only unique abstract files to the report. Uniqueness is
-     * determined by object id. The tmpDir Path is used to stored object 
-     * ids that have already been visited.
+     * Saves only unique abstract files to the report. Uniqueness is determined
+     * by object id. The tmpDir Path is used to stored object ids that have
+     * already been visited.
      *
      * @param content Abstractfile isntance
      * @param tmpDir Directory to write object ids
diff --git a/Core/src/org/sleuthkit/autopsy/report/caseuco/ReportCaseUco.java b/Core/src/org/sleuthkit/autopsy/report/caseuco/ReportCaseUco.java
index 53bc8ec4d9..278dacb6cb 100755
--- a/Core/src/org/sleuthkit/autopsy/report/caseuco/ReportCaseUco.java
+++ b/Core/src/org/sleuthkit/autopsy/report/caseuco/ReportCaseUco.java
@@ -19,17 +19,13 @@
  */
 package org.sleuthkit.autopsy.report.caseuco;
 
-import java.util.logging.Level;
 import javax.swing.JPanel;
-import java.sql.SQLException;
 import org.openide.util.NbBundle;
-import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
 import org.sleuthkit.autopsy.coreutils.Logger;
-import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
 import org.sleuthkit.autopsy.report.GeneralReportModule;
+import org.sleuthkit.autopsy.report.NoReportModuleSettings;
+import org.sleuthkit.autopsy.report.ReportModuleSettings;
 import org.sleuthkit.autopsy.report.ReportProgressPanel;
-import org.sleuthkit.autopsy.report.ReportProgressPanel.ReportStatus;
-import org.sleuthkit.datamodel.*;
 
 /**
  * ReportCaseUco generates a report in the CASE-UCO format. It saves basic file
@@ -39,7 +35,6 @@ public final class ReportCaseUco implements GeneralReportModule {
 
     private static final Logger logger = Logger.getLogger(ReportCaseUco.class.getName());
     private static ReportCaseUco instance = null;
-    private ReportCaseUcoConfigPanel configPanel;
 
     private static final String REPORT_FILE_NAME = "CASE_UCO_output.json-ld";
 
@@ -54,12 +49,49 @@ public final class ReportCaseUco implements GeneralReportModule {
         }
         return instance;
     }
-    
+
+    /**
+     * Get default configuration for this report module.
+     *
+     * @return Object which contains default report module settings.
+     */
+    @Override
+    public ReportModuleSettings getDefaultConfiguration() {
+        // This module does not have configuration
+        return new NoReportModuleSettings();
+    }
+
+    /**
+     * Get current configuration for this report module.
+     *
+     * @return Object which contains current report module settings.
+     */
+    @Override
+    public ReportModuleSettings getConfiguration() {
+        // This module does not have configuration
+        return new NoReportModuleSettings();
+    }
+
+    /**
+     * Set report module configuration.
+     *
+     * @param settings Object which contains report module settings.
+     */
+    @Override
+    public void setConfiguration(ReportModuleSettings settings) {
+        // This module does not have configuration
+    }
+
     @Override
     public String getName() {
         String name = NbBundle.getMessage(this.getClass(), "ReportCaseUco.getName.text");
         return name;
     }
+    
+    @Override
+    public JPanel getConfigurationPanel() {
+        return null; // No configuration panel
+    }
 
     @Override
     public String getRelativeFilePath() {
@@ -72,18 +104,6 @@ public final class ReportCaseUco implements GeneralReportModule {
         return desc;
     }
 
-    @Override
-    public JPanel getConfigurationPanel() {
-        try {
-            configPanel = new ReportCaseUcoConfigPanel();
-        } catch (NoCurrentCaseException | TskCoreException | SQLException ex) {
-            logger.log(Level.SEVERE, "Failed to initialize CASE-UCO settings panel", ex); //NON-NLS
-            MessageNotifyUtil.Message.error(Bundle.ReportCaseUco_notInitialized());
-            configPanel = null;
-        }
-        return configPanel;
-    }    
-
     /**
      * Returns CASE-UCO report file name
      *
@@ -106,23 +126,7 @@ public final class ReportCaseUco implements GeneralReportModule {
     @Override
     @SuppressWarnings("deprecation")
     public void generateReport(String baseReportDir, ReportProgressPanel progressPanel) {
-
-        if (configPanel == null) {
-            logger.log(Level.SEVERE, "CASE-UCO settings panel has not been initialized"); //NON-NLS
-            MessageNotifyUtil.Message.error(Bundle.ReportCaseUco_notInitialized());
-            progressPanel.complete(ReportStatus.ERROR);
-            return;
-        }
-
-        Long selectedDataSourceId = configPanel.getSelectedDataSourceId();
-        if (selectedDataSourceId == ReportCaseUcoConfigPanel.NO_DATA_SOURCE_SELECTED) {
-            logger.log(Level.SEVERE, "No data source selected for CASE-UCO report"); //NON-NLS
-            MessageNotifyUtil.Message.error(Bundle.ReportCaseUco_noDataSourceSelected());
-            progressPanel.complete(ReportStatus.ERROR);
-            return;
-        }
-
         String reportPath = baseReportDir + getRelativeFilePath();
-        CaseUcoFormatExporter.generateReport(selectedDataSourceId, reportPath, progressPanel);
+        CaseUcoFormatExporter.generateReport(reportPath, progressPanel);
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/report/caseuco/ReportCaseUcoConfigPanel.form b/Core/src/org/sleuthkit/autopsy/report/caseuco/ReportCaseUcoConfigPanel.form
deleted file mode 100755
index 133e75b1a1..0000000000
--- a/Core/src/org/sleuthkit/autopsy/report/caseuco/ReportCaseUcoConfigPanel.form
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<Form version="1.5" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
-  <AuxValues>
-    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
-    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
-    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
-    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
-    <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
-    <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
-  </AuxValues>
-
-  <Layout>
-    <DimensionLayout dim="0">
-      <Group type="103" groupAlignment="0" attributes="0">
-          <Group type="102" alignment="0" attributes="0">
-              <EmptySpace min="-2" pref="21" max="-2" attributes="0"/>
-              <Group type="103" groupAlignment="0" attributes="0">
-                  <Group type="102" attributes="0">
-                      <Component id="jLabelSelectDataSource" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                  </Group>
-                  <Component id="selectDataSourceComboBox" pref="348" max="32767" attributes="0"/>
-              </Group>
-              <EmptySpace max="-2" attributes="0"/>
-          </Group>
-      </Group>
-    </DimensionLayout>
-    <DimensionLayout dim="1">
-      <Group type="103" groupAlignment="0" attributes="0">
-          <Group type="102" alignment="0" attributes="0">
-              <EmptySpace min="-2" pref="11" max="-2" attributes="0"/>
-              <Component id="jLabelSelectDataSource" min="-2" max="-2" attributes="0"/>
-              <EmptySpace max="-2" attributes="0"/>
-              <Component id="selectDataSourceComboBox" min="-2" max="-2" attributes="0"/>
-              <EmptySpace pref="130" max="32767" attributes="0"/>
-          </Group>
-      </Group>
-    </DimensionLayout>
-  </Layout>
-  <SubComponents>
-    <Component class="javax.swing.JComboBox" name="selectDataSourceComboBox">
-      <Properties>
-        <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
-          <Connection code="dataSourcesList" type="code"/>
-        </Property>
-        <Property name="enabled" type="boolean" value="false"/>
-      </Properties>
-      <AuxValues>
-        <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;String&gt;"/>
-      </AuxValues>
-    </Component>
-    <Component class="javax.swing.JLabel" name="jLabelSelectDataSource">
-      <Properties>
-        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/caseuco/Bundle.properties" key="ReportCaseUcoConfigPanel.jLabelSelectDataSource.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-        </Property>
-      </Properties>
-      <AuxValues>
-        <AuxValue name="generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
-      </AuxValues>
-    </Component>
-  </SubComponents>
-</Form>
diff --git a/Core/src/org/sleuthkit/autopsy/report/caseuco/ReportCaseUcoConfigPanel.java b/Core/src/org/sleuthkit/autopsy/report/caseuco/ReportCaseUcoConfigPanel.java
deleted file mode 100755
index e317425163..0000000000
--- a/Core/src/org/sleuthkit/autopsy/report/caseuco/ReportCaseUcoConfigPanel.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- *
- * Autopsy Forensic Browser
- *
- * Copyright 2019-2019 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.report.caseuco;
-
-import java.sql.SQLException;
-import java.util.Map;
-import java.util.Map.Entry;
-import javax.swing.ComboBoxModel;
-import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
-import org.sleuthkit.autopsy.datamodel.utils.DataSourceLoader;
-import org.sleuthkit.autopsy.guiutils.DataSourceComboBoxModel;
-import org.sleuthkit.datamodel.TskCoreException;
-
-/**
- * UI controls for CASE-UCO report. It is a panel which provides the
- * ability to select a single datasource from a dropdown list
- * of sources in the current case.
- */
-final class ReportCaseUcoConfigPanel extends javax.swing.JPanel {
-
-    private static final long serialVersionUID = 1L;
-    static final long NO_DATA_SOURCE_SELECTED = -1;
-    private ComboBoxModel<String> dataSourcesList = new DataSourceComboBoxModel();
-    private final Map<Long, String> dataSourceMap;
-
-    /**
-     * Creates new form ReportCaseUcoConfigPanel
-     */
-    ReportCaseUcoConfigPanel() throws NoCurrentCaseException, TskCoreException, SQLException {
-        initComponents();
-        this.dataSourceMap = DataSourceLoader.getAllDataSources();
-        
-        String[] dataSourcesNames = new String[dataSourceMap.size()];
-        if (dataSourcesNames.length > 0) {
-            dataSourcesNames = dataSourceMap.values().toArray(dataSourcesNames);
-            setDatasourceComboboxModel(new DataSourceComboBoxModel(dataSourcesNames));
-            
-            selectDataSourceComboBox.setEnabled(true);
-            selectDataSourceComboBox.setSelectedIndex(0);
-        }
-    }
-
-    /**
-     * Get the ID for the datasource selected in the combo box.
-     *
-     * @return the selected datasource ID or
-         ReportCaseUcoConfigPanel.NO_DATA_SOURCE_SELECTED if none is selected
-     */
-    Long getSelectedDataSourceId() {
-        for (Entry<Long, String> entry : this.dataSourceMap.entrySet()) {
-            if (entry.getValue().equals(this.selectDataSourceComboBox.getSelectedItem())) {
-                return entry.getKey();
-            }
-        }
-        return ReportCaseUcoConfigPanel.NO_DATA_SOURCE_SELECTED;
-    }
-
-    /**
-     * 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
-     * regenerated by the Form Editor.
-     */
-    @SuppressWarnings("unchecked")
-    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
-    private void initComponents() {
-
-        selectDataSourceComboBox = new javax.swing.JComboBox<>();
-        jLabelSelectDataSource = new javax.swing.JLabel();
-
-        selectDataSourceComboBox.setModel(dataSourcesList);
-        selectDataSourceComboBox.setEnabled(false);
-
-        jLabelSelectDataSource.setText(org.openide.util.NbBundle.getMessage(ReportCaseUcoConfigPanel.class, "ReportCaseUcoConfigPanel.jLabelSelectDataSource.text")); // NOI18N
-
-        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
-        this.setLayout(layout);
-        layout.setHorizontalGroup(
-            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(layout.createSequentialGroup()
-                .addGap(21, 21, 21)
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addGroup(layout.createSequentialGroup()
-                        .addComponent(jLabelSelectDataSource)
-                        .addGap(0, 0, Short.MAX_VALUE))
-                    .addComponent(selectDataSourceComboBox, 0, 348, Short.MAX_VALUE))
-                .addContainerGap())
-        );
-        layout.setVerticalGroup(
-            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(layout.createSequentialGroup()
-                .addGap(11, 11, 11)
-                .addComponent(jLabelSelectDataSource)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(selectDataSourceComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addContainerGap(130, Short.MAX_VALUE))
-        );
-    }// </editor-fold>//GEN-END:initComponents
-
-    // Variables declaration - do not modify//GEN-BEGIN:variables
-    private javax.swing.JLabel jLabelSelectDataSource;
-    private javax.swing.JComboBox<String> selectDataSourceComboBox;
-    // End of variables declaration//GEN-END:variables
-
-    /**
-     * Set the datamodel for the combo box which displays the data sources in
-     * the current case
-     *
-     * @param dataSourceComboBoxModel the DataSourceComboBoxModel to use
-     */
-    void setDatasourceComboboxModel(DataSourceComboBoxModel dataSourceComboBoxModel) {
-        this.dataSourcesList = dataSourceComboBoxModel;
-        this.selectDataSourceComboBox.setModel(dataSourcesList);
-    }
-}

From cd7b386fba84e6db3cc3245db53f6641ae5f1d20 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Mon, 26 Aug 2019 15:43:33 -0400
Subject: [PATCH 087/192] Updated STIX report module

---
 .../autopsy/modules/stix/Bundle.properties    |  2 +-
 .../modules/stix/STIXReportModule.java        | 63 ++++++++++++--
 .../stix/STIXReportModuleConfigPanel.form     | 14 ++--
 .../stix/STIXReportModuleConfigPanel.java     | 83 ++++++++-----------
 .../stix/STIXReportModuleSettings.java        | 62 ++++++++++++++
 .../report/FileReportModuleSettings.java      | 59 +++++++++++++
 .../autopsy/report/FileReportText.java        | 48 ++++++++++-
 .../sleuthkit/autopsy/report/ReportExcel.java | 32 -------
 .../ReportFileTextConfigurationPanel.java     | 27 ++++++
 .../autopsy/report/ReportWizardAction.java    |  2 +-
 10 files changed, 292 insertions(+), 100 deletions(-)
 create mode 100755 Core/src/org/sleuthkit/autopsy/modules/stix/STIXReportModuleSettings.java
 create mode 100755 Core/src/org/sleuthkit/autopsy/report/FileReportModuleSettings.java

diff --git a/Core/src/org/sleuthkit/autopsy/modules/stix/Bundle.properties b/Core/src/org/sleuthkit/autopsy/modules/stix/Bundle.properties
index cb44363a4a..afb1fd207c 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/stix/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/modules/stix/Bundle.properties
@@ -3,7 +3,6 @@ STIXReportModule.getName.text=STIX
 STIXReportModule.getDesc.text=Generate a report by running a collection of STIX (Structured Threat Information eXpression) files against the data sources. Also creates artifacts under Interesting Files.
 STIXReportModule.progress.readSTIX=Parsing STIX files
 STIXReportModuleConfigPanel.jLabel2.text=Select a STIX file or directory of STIX files
-STIXReportModuleConfigPanel.jTextField1.text=
 STIXReportModuleConfigPanel.jButton1.text=Choose file
 STIXReportModuleConfigPanel.jCheckBox1.text=Include results for false indicators in output file
 STIXReportModule.notifyMsg.unableToOpenReportFile=Unable to complete STIX report.
@@ -13,3 +12,4 @@ STIXReportModule.progress.couldNotOpenFileDir=Could not open file/directory {0}
 STIXReportModule.notifyMsg.tooManyArtifactsgt1000=Too many STIX-related artifacts generated for "{0}". Only saving first 1000.
 STIXReportModule.notifyErr.noFildDirProvided=No STIX file/directory provided
 STIXReportModule.progress.noFildDirProvided=No STIX file/directory provided
+STIXReportModuleConfigPanel.jStixFileTextField.text=
diff --git a/Core/src/org/sleuthkit/autopsy/modules/stix/STIXReportModule.java b/Core/src/org/sleuthkit/autopsy/modules/stix/STIXReportModule.java
index 5daf23c217..f2dfe4e18f 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/stix/STIXReportModule.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/stix/STIXReportModule.java
@@ -55,8 +55,9 @@ import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
-import org.sleuthkit.autopsy.coreutils.ModuleSettings;
 import org.sleuthkit.autopsy.report.GeneralReportModule;
+import org.sleuthkit.autopsy.report.NoReportModuleSettings;
+import org.sleuthkit.autopsy.report.ReportModuleSettings;
 import org.sleuthkit.autopsy.report.ReportProgressPanel;
 import org.sleuthkit.autopsy.report.ReportProgressPanel.ReportStatus;
 import org.sleuthkit.datamodel.TskCoreException;
@@ -72,8 +73,8 @@ public class STIXReportModule implements GeneralReportModule {
     private String reportPath;
     private boolean reportAllResults;
 
-    private Map<String, ObjectType> idToObjectMap = new HashMap<String, ObjectType>();
-    private Map<String, ObservableResult> idToResult = new HashMap<String, ObservableResult>();
+    private Map<String, ObjectType> idToObjectMap = new HashMap<>();
+    private Map<String, ObservableResult> idToResult = new HashMap<>();
 
     private List<EvalRegistryObj.RegistryFileInfo> registryFileData = null;
 
@@ -148,8 +149,6 @@ public class STIXReportModule implements GeneralReportModule {
         }
 
         try (BufferedWriter output = new BufferedWriter(new FileWriter(reportFile))) {
-            // Store the path
-            ModuleSettings.setConfigSetting("STIX", "defaultPath", stixFileName); //NON-NLS
 
             // Create array of stix file(s)
             File[] stixFiles;
@@ -180,8 +179,8 @@ public class STIXReportModule implements GeneralReportModule {
                     break;
                 }
                 // Clear out the ID maps before loading the next file
-                idToObjectMap = new HashMap<String, ObjectType>();
-                idToResult = new HashMap<String, ObservableResult>();
+                idToObjectMap = new HashMap<>();
+                idToResult = new HashMap<>();
             }
 
             // Set the progress bar to done. If any errors occurred along the way, modify
@@ -661,8 +660,56 @@ public class STIXReportModule implements GeneralReportModule {
 
     @Override
     public JPanel getConfigurationPanel() {
-        configPanel = new STIXReportModuleConfigPanel();
+        initializePanel();
         return configPanel;
     }
 
+    private void initializePanel() {
+        if (configPanel == null) {
+            configPanel = new STIXReportModuleConfigPanel();
+        }
+    }
+
+    /**
+     * Get default configuration for this report module.
+     *
+     * @return Object which contains default report module settings.
+     */
+    @Override
+    public ReportModuleSettings getDefaultConfiguration() {
+        return new STIXReportModuleSettings();
+    }
+
+    /**
+     * Get current configuration for this report module.
+     *
+     * @return Object which contains current report module settings.
+     */
+    @Override
+    public ReportModuleSettings getConfiguration() {
+        initializePanel();
+        return configPanel.getConfiguration();
+    }
+
+    /**
+     * Set report module configuration.
+     *
+     * @param settings Object which contains report module settings.
+     */
+    @Override
+    public void setConfiguration(ReportModuleSettings settings) {
+        initializePanel();
+        if (settings == null || settings instanceof NoReportModuleSettings) {
+            configPanel.setConfiguration((STIXReportModuleSettings) getDefaultConfiguration());
+            return;
+        }
+
+        if (settings instanceof STIXReportModuleSettings) {
+            configPanel.setConfiguration((STIXReportModuleSettings) settings);
+            return;
+        }
+
+        throw new IllegalArgumentException("Expected settings argument to be an instance of STIXReportModuleSettings");
+    }
+
 }
diff --git a/Core/src/org/sleuthkit/autopsy/modules/stix/STIXReportModuleConfigPanel.form b/Core/src/org/sleuthkit/autopsy/modules/stix/STIXReportModuleConfigPanel.form
index a93961382f..a75ce772f4 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/stix/STIXReportModuleConfigPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/modules/stix/STIXReportModuleConfigPanel.form
@@ -21,7 +21,7 @@
               <Group type="103" groupAlignment="0" attributes="0">
                   <Component id="jLabel2" min="-2" max="-2" attributes="0"/>
                   <Group type="102" alignment="0" attributes="0">
-                      <Component id="jTextField1" min="-2" pref="292" max="-2" attributes="0"/>
+                      <Component id="jStixFileTextField" min="-2" pref="292" max="-2" attributes="0"/>
                       <EmptySpace max="-2" attributes="0"/>
                       <Component id="jButton1" min="-2" max="-2" attributes="0"/>
                   </Group>
@@ -38,7 +38,7 @@
               <Component id="jLabel2" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
               <Group type="103" groupAlignment="3" attributes="0">
-                  <Component id="jTextField1" alignment="3" min="-2" max="-2" attributes="0"/>
+                  <Component id="jStixFileTextField" alignment="3" min="-2" max="-2" attributes="0"/>
                   <Component id="jButton1" alignment="3" min="-2" max="-2" attributes="0"/>
               </Group>
               <EmptySpace type="unrelated" max="-2" attributes="0"/>
@@ -59,16 +59,16 @@
         <AuxValue name="generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
       </AuxValues>
     </Component>
-    <Component class="javax.swing.JTextField" name="jTextField1">
+    <Component class="javax.swing.JTextField" name="jStixFileTextField">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/modules/stix/Bundle.properties" key="STIXReportModuleConfigPanel.jTextField1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/modules/stix/Bundle.properties" key="STIXReportModuleConfigPanel.jStixFileTextField.text" 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="jTextField1ActionPerformed"/>
-        <EventHandler event="keyReleased" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="jTextField1KeyReleased"/>
-        <EventHandler event="keyTyped" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="jTextField1KeyTyped"/>
+        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jStixFileTextFieldActionPerformed"/>
+        <EventHandler event="keyReleased" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="jStixFileTextFieldKeyReleased"/>
+        <EventHandler event="keyTyped" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="jStixFileTextFieldKeyTyped"/>
       </Events>
     </Component>
     <Component class="javax.swing.JButton" name="jButton1">
diff --git a/Core/src/org/sleuthkit/autopsy/modules/stix/STIXReportModuleConfigPanel.java b/Core/src/org/sleuthkit/autopsy/modules/stix/STIXReportModuleConfigPanel.java
index b8d03d7cb4..acf3dd6664 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/stix/STIXReportModuleConfigPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/stix/STIXReportModuleConfigPanel.java
@@ -20,7 +20,6 @@ package org.sleuthkit.autopsy.modules.stix;
 
 import java.io.File;
 import javax.swing.JFileChooser;
-import org.sleuthkit.autopsy.coreutils.ModuleSettings;
 
 /**
  * Configuration panel for STIX report generation.
@@ -36,35 +35,25 @@ public class STIXReportModuleConfigPanel extends javax.swing.JPanel {
      */
     public STIXReportModuleConfigPanel() {
         initComponents();
-
-        // Set the default path to the last one used
-        if ((ModuleSettings.getConfigSetting("STIX", "defaultPath") != null) //NON-NLS
-                && (!ModuleSettings.getConfigSetting("STIX", "defaultPath").isEmpty())) { //NON-NLS
-            jTextField1.setText(ModuleSettings.getConfigSetting("STIX", "defaultPath")); //NON-NLS
-            stixFile = ModuleSettings.getConfigSetting("STIX", "defaultPath"); //NON-NLS
-        }
-
-        // Set the results checkbox to the last one used
-        if ((ModuleSettings.getConfigSetting("STIX", "showAllResults") != null) //NON-NLS
-                && (!ModuleSettings.getConfigSetting("STIX", "showAllResults").isEmpty())) { //NON-NLS
-
-            if (ModuleSettings.getConfigSetting("STIX", "showAllResults").equals("true")) { //NON-NLS
-                jCheckBox1.setSelected(true);
-                showAllResults = true;
-            } else {
-                jCheckBox1.setSelected(false);
-                showAllResults = false;
-            }
-        } else {
-            showAllResults = false;
-        }
+        showAllResults = false;
+        jCheckBox1.setSelected(false);
+    }
+    
+    void setConfiguration(STIXReportModuleSettings settings) {
+        jStixFileTextField.setText(settings.getStixFile());
+        showAllResults = settings.isShowAllResults();
+        jCheckBox1.setSelected(settings.isShowAllResults());
     }
 
-    public String getStixFile() {
+    STIXReportModuleSettings getConfiguration() {
+        return new STIXReportModuleSettings(jStixFileTextField.getText(), jCheckBox1.isSelected());
+    }
+
+    String getStixFile() {
         return stixFile;
     }
 
-    public boolean getShowAllResults() {
+    boolean getShowAllResults() {
         return showAllResults;
     }
 
@@ -78,24 +67,24 @@ public class STIXReportModuleConfigPanel extends javax.swing.JPanel {
     private void initComponents() {
 
         jLabel2 = new javax.swing.JLabel();
-        jTextField1 = new javax.swing.JTextField();
+        jStixFileTextField = new javax.swing.JTextField();
         jButton1 = new javax.swing.JButton();
         jCheckBox1 = new javax.swing.JCheckBox();
 
         jLabel2.setText(org.openide.util.NbBundle.getMessage(STIXReportModuleConfigPanel.class, "STIXReportModuleConfigPanel.jLabel2.text")); // NOI18N
 
-        jTextField1.setText(org.openide.util.NbBundle.getMessage(STIXReportModuleConfigPanel.class, "STIXReportModuleConfigPanel.jTextField1.text")); // NOI18N
-        jTextField1.addActionListener(new java.awt.event.ActionListener() {
+        jStixFileTextField.setText(org.openide.util.NbBundle.getMessage(STIXReportModuleConfigPanel.class, "STIXReportModuleConfigPanel.jStixFileTextField.text")); // NOI18N
+        jStixFileTextField.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
-                jTextField1ActionPerformed(evt);
+                jStixFileTextFieldActionPerformed(evt);
             }
         });
-        jTextField1.addKeyListener(new java.awt.event.KeyAdapter() {
+        jStixFileTextField.addKeyListener(new java.awt.event.KeyAdapter() {
             public void keyReleased(java.awt.event.KeyEvent evt) {
-                jTextField1KeyReleased(evt);
+                jStixFileTextFieldKeyReleased(evt);
             }
             public void keyTyped(java.awt.event.KeyEvent evt) {
-                jTextField1KeyTyped(evt);
+                jStixFileTextFieldKeyTyped(evt);
             }
         });
 
@@ -122,7 +111,7 @@ public class STIXReportModuleConfigPanel extends javax.swing.JPanel {
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addComponent(jLabel2)
                     .addGroup(layout.createSequentialGroup()
-                        .addComponent(jTextField1, javax.swing.GroupLayout.PREFERRED_SIZE, 292, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addComponent(jStixFileTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 292, javax.swing.GroupLayout.PREFERRED_SIZE)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                         .addComponent(jButton1))
                     .addComponent(jCheckBox1))
@@ -135,7 +124,7 @@ public class STIXReportModuleConfigPanel extends javax.swing.JPanel {
                 .addComponent(jLabel2)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(jTextField1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jStixFileTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                     .addComponent(jButton1))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                 .addComponent(jCheckBox1)
@@ -143,16 +132,16 @@ public class STIXReportModuleConfigPanel extends javax.swing.JPanel {
         );
     }// </editor-fold>//GEN-END:initComponents
 
-    private void jTextField1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jTextField1ActionPerformed
+    private void jStixFileTextFieldActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jStixFileTextFieldActionPerformed
 
-    }//GEN-LAST:event_jTextField1ActionPerformed
+    }//GEN-LAST:event_jStixFileTextFieldActionPerformed
 
     private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
 
         JFileChooser fileChooser = new JFileChooser();
         fileChooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
 
-        File currentSelection = new File(jTextField1.getText());
+        File currentSelection = new File(jStixFileTextField.getText());
         if (currentSelection.exists()) {
             fileChooser.setCurrentDirectory(currentSelection);
         }
@@ -161,33 +150,27 @@ public class STIXReportModuleConfigPanel extends javax.swing.JPanel {
 
         if (result == JFileChooser.APPROVE_OPTION) {
             stixFile = fileChooser.getSelectedFile().getAbsolutePath();
-            jTextField1.setText(stixFile);
+            jStixFileTextField.setText(stixFile);
         }
 
     }//GEN-LAST:event_jButton1ActionPerformed
 
-    private void jTextField1KeyTyped(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_jTextField1KeyTyped
+    private void jStixFileTextFieldKeyTyped(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_jStixFileTextFieldKeyTyped
 
-    }//GEN-LAST:event_jTextField1KeyTyped
+    }//GEN-LAST:event_jStixFileTextFieldKeyTyped
 
-    private void jTextField1KeyReleased(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_jTextField1KeyReleased
-        stixFile = jTextField1.getText();
-    }//GEN-LAST:event_jTextField1KeyReleased
+    private void jStixFileTextFieldKeyReleased(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_jStixFileTextFieldKeyReleased
+        stixFile = jStixFileTextField.getText();
+    }//GEN-LAST:event_jStixFileTextFieldKeyReleased
 
     private void jCheckBox1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jCheckBox1ActionPerformed
-        // TODO add your handling code here:
         showAllResults = jCheckBox1.isSelected();
-        if (showAllResults) {
-            ModuleSettings.setConfigSetting("STIX", "showAllResults", "true"); //NON-NLS
-        } else {
-            ModuleSettings.setConfigSetting("STIX", "showAllResults", "false"); //NON-NLS
-        }
     }//GEN-LAST:event_jCheckBox1ActionPerformed
 
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JButton jButton1;
     private javax.swing.JCheckBox jCheckBox1;
     private javax.swing.JLabel jLabel2;
-    private javax.swing.JTextField jTextField1;
+    private javax.swing.JTextField jStixFileTextField;
     // End of variables declaration//GEN-END:variables
 }
diff --git a/Core/src/org/sleuthkit/autopsy/modules/stix/STIXReportModuleSettings.java b/Core/src/org/sleuthkit/autopsy/modules/stix/STIXReportModuleSettings.java
new file mode 100755
index 0000000000..e545aca81a
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/modules/stix/STIXReportModuleSettings.java
@@ -0,0 +1,62 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2019 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.modules.stix;
+
+import org.sleuthkit.autopsy.report.ReportModuleSettings;
+
+/**
+ * Settings for the STIX report module.
+ */
+class STIXReportModuleSettings  implements ReportModuleSettings {
+    
+    private static final long serialVersionUID = 1L;
+    
+    private final String stixFile;
+    private final boolean showAllResults;
+    
+    STIXReportModuleSettings() {
+        stixFile = null;
+        showAllResults = false;
+    }
+    
+    STIXReportModuleSettings(String stixFile, boolean showAllResults) {
+        this.stixFile = stixFile;
+        this.showAllResults = showAllResults;
+    }
+    
+    @Override
+    public long getVersionNumber() {
+        return serialVersionUID;
+    }
+
+    /**
+     * @return the stixFile
+     */
+    String getStixFile() {
+        return stixFile;
+    }
+
+    /**
+     * @return the showAllResults
+     */
+    boolean isShowAllResults() {
+        return showAllResults;
+    }
+    
+}
diff --git a/Core/src/org/sleuthkit/autopsy/report/FileReportModuleSettings.java b/Core/src/org/sleuthkit/autopsy/report/FileReportModuleSettings.java
new file mode 100755
index 0000000000..4826b9481e
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/FileReportModuleSettings.java
@@ -0,0 +1,59 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2019 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.report;
+
+/**
+ * Settings for the File report module.
+ */
+class FileReportModuleSettings implements ReportModuleSettings {
+
+    private static final long serialVersionUID = 1L;
+    
+    enum ReportType {
+        TAB_DELIMITED,
+        COMA_DELIMITED
+    }
+    private final ReportType type;
+
+    /**
+     * Default File report module settings. Default to tab delimited since it
+     * was previously the only option.
+     */
+    FileReportModuleSettings() {
+        this.type = ReportType.TAB_DELIMITED;
+    }
+
+    FileReportModuleSettings(ReportType type) {
+        this.type = type;
+    }
+
+    @Override
+    public long getVersionNumber() {
+        return serialVersionUID;
+    }
+
+    /**
+     * Get type of the report.
+     *
+     * @return Type of the report.
+     */
+    ReportType getReportType() {
+        return type;
+    }
+}
diff --git a/Core/src/org/sleuthkit/autopsy/report/FileReportText.java b/Core/src/org/sleuthkit/autopsy/report/FileReportText.java
index ea0f3452c2..f35a4bdf1f 100644
--- a/Core/src/org/sleuthkit/autopsy/report/FileReportText.java
+++ b/Core/src/org/sleuthkit/autopsy/report/FileReportText.java
@@ -60,6 +60,48 @@ class FileReportText implements FileReportModule {
         return instance;
     }
 
+    /**
+     * Get default configuration for this report module.
+     *
+     * @return Object which contains default report module settings.
+     */
+    @Override
+    public ReportModuleSettings getDefaultConfiguration() {
+        return new HTMLReportModuleSettings();
+    }
+
+    /**
+     * Get current configuration for this report module.
+     *
+     * @return Object which contains current report module settings.
+     */
+    @Override
+    public ReportModuleSettings getConfiguration() {
+        initializePanel();
+        return configPanel.getConfiguration();
+    }
+
+    /**
+     * Set report module configuration.
+     *
+     * @param settings Object which contains report module settings.
+     */
+    @Override
+    public void setConfiguration(ReportModuleSettings settings) {
+        initializePanel();
+        if (settings == null || settings instanceof NoReportModuleSettings) {
+            configPanel.setConfiguration((FileReportModuleSettings) getDefaultConfiguration());
+            return;
+        }
+
+        if (settings instanceof FileReportModuleSettings) {
+            configPanel.setConfiguration((FileReportModuleSettings) settings);
+            return;
+        }
+
+        throw new IllegalArgumentException("Expected settings argument to be an instance of FileReportModuleSettings");
+    }
+
     @Override
     public void startReport(String baseReportDir) {
         this.reportPath = baseReportDir + FILE_NAME;
@@ -153,9 +195,13 @@ class FileReportText implements FileReportModule {
 
     @Override
     public JPanel getConfigurationPanel() {
+        initializePanel();
+        return configPanel;
+    }
+
+    private void initializePanel() {
         if (configPanel == null) {
             configPanel = new ReportFileTextConfigurationPanel();
         }
-        return configPanel;
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportExcel.java b/Core/src/org/sleuthkit/autopsy/report/ReportExcel.java
index 60c34b1df7..bba8477bad 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportExcel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportExcel.java
@@ -59,38 +59,6 @@ class ReportExcel implements TableReportModule {
     private ReportExcel() {
     }
 
-    /**
-     * Get default configuration for this report module.
-     *
-     * @return Object which contains default report module settings.
-     */
-    @Override
-    public ReportModuleSettings getDefaultConfiguration() {
-        // This module does not have configuration
-        return new NoReportModuleSettings();
-    }
-
-    /**
-     * Get current configuration for this report module.
-     *
-     * @return Object which contains current report module settings.
-     */
-    @Override
-    public ReportModuleSettings getConfiguration() {
-        // This module does not have configuration
-        return new NoReportModuleSettings();
-    }
-
-    /**
-     * Set report module configuration.
-     *
-     * @param settings Object which contains report module settings.
-     */
-    @Override
-    public void setConfiguration(ReportModuleSettings settings) {
-        // This module does not have configuration
-    }
-
     /**
      * Start the Excel report by creating the Workbook, initializing styles, and
      * writing the summary.
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportFileTextConfigurationPanel.java b/Core/src/org/sleuthkit/autopsy/report/ReportFileTextConfigurationPanel.java
index e1b9de2df2..2fbb6e97fc 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportFileTextConfigurationPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportFileTextConfigurationPanel.java
@@ -34,6 +34,33 @@ class ReportFileTextConfigurationPanel extends javax.swing.JPanel {
         initComponents();
     }
 
+    /**
+     * Set module configuration
+     *
+     * @param settings File report module settings object
+     */
+    void setConfiguration(FileReportModuleSettings settings) {
+        if (settings.getReportType() == FileReportModuleSettings.ReportType.COMA_DELIMITED) {
+            commaDelimitedButton.setSelected(true);
+        } else {
+            // default to tab since it was previously the only option
+            tabDelimitedButton.setSelected(true);
+        }
+    }
+
+    /**
+     * Get current report module settings.
+     *
+     * @return Current report module settings.
+     */
+    FileReportModuleSettings getConfiguration() {
+        if (commaDelimitedButton.isSelected()) {
+            return new FileReportModuleSettings(FileReportModuleSettings.ReportType.COMA_DELIMITED);
+        } else {
+            return new FileReportModuleSettings(FileReportModuleSettings.ReportType.TAB_DELIMITED);
+        }
+    }
+
     /**
      * Get the delimiter that was selected on this panel
      *
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
index 78febf26eb..7ab3a30751 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
@@ -58,7 +58,7 @@ public final class ReportWizardAction extends CallableSystemAction implements Pr
     private static final Logger logger = Logger.getLogger(ReportWizardAction.class.getName());
     private static final String REPORTING_CONFIGURATION_NAME = "ReportAction";
     private static final boolean DISPLAY_CASE_SPECIFIC_DATA = true;
-    private static final boolean RUN_REPORTS = false; // ELTODO true;
+    private static final boolean RUN_REPORTS = true;
     private final JButton toolbarButton = new JButton();
     private static final String ACTION_NAME = NbBundle.getMessage(ReportWizardAction.class, "ReportWizardAction.actionName.text");
 

From 974068df3ac642c9425b975a9c7216bbc043bf3f Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Tue, 27 Aug 2019 15:23:33 -0400
Subject: [PATCH 088/192] Converter protable case report to new infrastructure

---
 .../autopsy/report/Bundle.properties          |   2 +
 .../autopsy/report/Bundle.properties-MERGED   |   2 +
 .../autopsy/report/FileReportText.java        |   2 +-
 ...PortableCaseInterestingItemsListPanel.form |  17 +-
 ...PortableCaseInterestingItemsListPanel.java |  83 ++++++---
 .../report/PortableCaseReportModule.java      | 109 +-----------
 .../PortableCaseReportModuleSettings.java     | 158 ++++++++++++++++++
 .../report/PortableCaseTagsListPanel.form     |  18 +-
 .../report/PortableCaseTagsListPanel.java     |  84 +++++++---
 .../autopsy/report/ReportGenerator.java       |   4 +-
 .../autopsy/report/ReportVisualPanel1.java    |  14 +-
 .../autopsy/report/ReportWizardAction.java    |  37 +++-
 .../ReportWizardPortableCaseOptionsPanel.java |   6 +-
 ...tWizardPortableCaseOptionsVisualPanel.java |  58 +++++--
 .../report/caseuco/Bundle.properties-MERGED   |   1 -
 .../AddTaggedHashesToHashDbConfigPanel.java   |   5 +-
 16 files changed, 407 insertions(+), 193 deletions(-)
 create mode 100755 Core/src/org/sleuthkit/autopsy/report/PortableCaseReportModuleSettings.java

diff --git a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties
index e0e63173de..a1ea9222d5 100644
--- a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties
@@ -274,3 +274,5 @@ ReportProgressDialog.statusMessageLabel.text=processingLabel
 ReportVisualPanel2.specificTaggedResultsRadioButton.text=Specific Tagged Results
 ReportVisualPanel2.allTaggedResultsRadioButton.text=All Tagged Results
 ArtifactSelectionDialog.titleLabel.toolTipText=
+PortableCaseTagsListPanel.jAllTagsCheckBox.text=All Tagged Results
+PortableCaseInterestingItemsListPanel.jAllSetsCheckBox.text=All Interesting Items
diff --git a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties-MERGED
index 77f9155d6f..80fc69d11d 100755
--- a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties-MERGED
@@ -334,5 +334,7 @@ ReportProgressDialog.statusMessageLabel.text=processingLabel
 ReportVisualPanel2.specificTaggedResultsRadioButton.text=Specific Tagged Results
 ReportVisualPanel2.allTaggedResultsRadioButton.text=All Tagged Results
 ArtifactSelectionDialog.titleLabel.toolTipText=
+PortableCaseTagsListPanel.jAllTagsCheckBox.text=All Tagged Results
+PortableCaseInterestingItemsListPanel.jAllSetsCheckBox.text=All Interesting Items
 ReportWizardPortableCaseOptionsVisualPanel.getName.title=Choose Portable Case settings
 TableReportGenerator.StatusColumn.Header=Review Status
diff --git a/Core/src/org/sleuthkit/autopsy/report/FileReportText.java b/Core/src/org/sleuthkit/autopsy/report/FileReportText.java
index f35a4bdf1f..d938aef263 100644
--- a/Core/src/org/sleuthkit/autopsy/report/FileReportText.java
+++ b/Core/src/org/sleuthkit/autopsy/report/FileReportText.java
@@ -67,7 +67,7 @@ class FileReportText implements FileReportModule {
      */
     @Override
     public ReportModuleSettings getDefaultConfiguration() {
-        return new HTMLReportModuleSettings();
+        return new FileReportModuleSettings();
     }
 
     /**
diff --git a/Core/src/org/sleuthkit/autopsy/report/PortableCaseInterestingItemsListPanel.form b/Core/src/org/sleuthkit/autopsy/report/PortableCaseInterestingItemsListPanel.form
index 081e7c92c5..6deb5d86d2 100644
--- a/Core/src/org/sleuthkit/autopsy/report/PortableCaseInterestingItemsListPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/report/PortableCaseInterestingItemsListPanel.form
@@ -43,6 +43,7 @@
                                   <EmptySpace max="-2" attributes="0"/>
                                   <Component id="deselectButton" min="-2" max="-2" attributes="0"/>
                               </Group>
+                              <Component id="jAllSetsCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
                           </Group>
                           <EmptySpace min="0" pref="8" max="32767" attributes="0"/>
                       </Group>
@@ -54,10 +55,12 @@
         <DimensionLayout dim="1">
           <Group type="103" groupAlignment="0" attributes="0">
               <Group type="102" attributes="0">
-                  <EmptySpace max="-2" attributes="0"/>
+                  <EmptySpace min="-2" pref="6" max="-2" attributes="0"/>
                   <Component id="descLabel" min="-2" max="-2" attributes="0"/>
+                  <EmptySpace max="32767" attributes="0"/>
+                  <Component id="jAllSetsCheckBox" min="-2" max="-2" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
-                  <Component id="jScrollPane1" pref="179" max="32767" attributes="0"/>
+                  <Component id="jScrollPane1" min="-2" pref="164" max="-2" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
                   <Group type="103" groupAlignment="3" attributes="0">
                       <Component id="selectButton" alignment="3" min="-2" max="-2" attributes="0"/>
@@ -117,6 +120,16 @@
             <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="deselectButtonActionPerformed"/>
           </Events>
         </Component>
+        <Component class="javax.swing.JCheckBox" name="jAllSetsCheckBox">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="PortableCaseInterestingItemsListPanel.jAllSetsCheckBox.text" 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="jAllSetsCheckBoxActionPerformed"/>
+          </Events>
+        </Component>
       </SubComponents>
     </Container>
   </SubComponents>
diff --git a/Core/src/org/sleuthkit/autopsy/report/PortableCaseInterestingItemsListPanel.java b/Core/src/org/sleuthkit/autopsy/report/PortableCaseInterestingItemsListPanel.java
index afd49dbe33..b2623a80c9 100644
--- a/Core/src/org/sleuthkit/autopsy/report/PortableCaseInterestingItemsListPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/PortableCaseInterestingItemsListPanel.java
@@ -19,6 +19,8 @@
 package org.sleuthkit.autopsy.report;
 
 import java.awt.Component;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.sql.ResultSet;
@@ -59,16 +61,33 @@ class PortableCaseInterestingItemsListPanel extends javax.swing.JPanel {
     private Map<String, Long> setCounts;
     
     private final ReportWizardPortableCaseOptionsPanel wizPanel;
-    private final PortableCaseReportModule.PortableCaseOptions options;
+    private final PortableCaseReportModuleSettings settings;
     
     /**
      * Creates new form PortableCaseListPanel
      */
-    PortableCaseInterestingItemsListPanel(ReportWizardPortableCaseOptionsPanel wizPanel, PortableCaseReportModule.PortableCaseOptions options) {
+    PortableCaseInterestingItemsListPanel(ReportWizardPortableCaseOptionsPanel wizPanel, PortableCaseReportModuleSettings options) {
         this.wizPanel = wizPanel;
-        this.options = options;
+        this.settings = options;
         initComponents();
         customizeComponents();
+        
+        // update tag selection
+        jAllSetsCheckBox.setSelected(settings.isAllTagsSelected());
+        setNamesListBox.setEnabled(!jAllSetsCheckBox.isSelected());
+        selectButton.setEnabled(!jAllSetsCheckBox.isSelected());
+        deselectButton.setEnabled(!jAllSetsCheckBox.isSelected());
+        selectAllSets(jAllSetsCheckBox.isSelected());
+        
+        this.jAllSetsCheckBox.addItemListener(new ItemListener() {
+            @Override
+            public void itemStateChanged(ItemEvent e) {
+                setNamesListBox.setEnabled(!jAllSetsCheckBox.isSelected());
+                selectButton.setEnabled(!jAllSetsCheckBox.isSelected());
+                deselectButton.setEnabled(!jAllSetsCheckBox.isSelected());
+                selectAllSets(jAllSetsCheckBox.isSelected());
+            }
+        });
     }
 
     @NbBundle.Messages({
@@ -80,7 +99,9 @@ class PortableCaseInterestingItemsListPanel extends javax.swing.JPanel {
         
         // Get the set names in use for the current case.
         setNames = new ArrayList<>();
+        setCounts = new HashMap<>();
         try {
+            // There may not be a case open when configuring report modules for Command Line execution
             // Get all SET_NAMEs from interesting item artifacts
             String innerSelect = "SELECT (value_text) AS set_name FROM blackboard_attributes WHERE (artifact_type_id = '" + 
                     BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT.getTypeID() + "' OR artifact_type_id = '" +
@@ -95,11 +116,9 @@ class PortableCaseInterestingItemsListPanel extends javax.swing.JPanel {
             setCounts = callback.getSetCountMap();
             setNames.addAll(setCounts.keySet());
         } catch (TskCoreException ex) {
-            Logger.getLogger(ReportWizardPortableCaseOptionsVisualPanel.class.getName()).log(Level.SEVERE, "Failed to get interesting item set names", ex); // NON-NLS
-            JOptionPane.showMessageDialog(this, Bundle.PortableCaseInterestingItemsListPanel_error_errorLoadingTags(), Bundle.PortableCaseInterestingItemsListPanel_error_errorTitle(), JOptionPane.ERROR_MESSAGE);
+            Logger.getLogger(ReportWizardPortableCaseOptionsVisualPanel.class.getName()).log(Level.WARNING, "Failed to get interesting item set names", ex); // NON-NLS
         } catch (NoCurrentCaseException ex) {
-            Logger.getLogger(ReportWizardPortableCaseOptionsVisualPanel.class.getName()).log(Level.SEVERE, "Exception while getting open case.", ex); // NON-NLS
-            JOptionPane.showMessageDialog(this, Bundle.PortableCaseInterestingItemsListPanel_error_noOpenCase(), Bundle.PortableCaseInterestingItemsListPanel_error_errorTitle(), JOptionPane.ERROR_MESSAGE);
+            Logger.getLogger(ReportWizardPortableCaseOptionsVisualPanel.class.getName()).log(Level.WARNING, "Exception while getting open case.", ex); // NON-NLS
         }
         Collections.sort(setNames);
 
@@ -135,8 +154,9 @@ class PortableCaseInterestingItemsListPanel extends javax.swing.JPanel {
      * Save the current selections and enabled/disable the finish button as needed.
      */
     private void updateSetNameList() {
-        options.updateSetNames(getSelectedSetNames());
-        wizPanel.setFinish(options.isValid());
+        settings.updateSetNames(getSelectedSetNames());
+        settings.setAllSetsSelected(jAllSetsCheckBox.isSelected());
+        wizPanel.setFinish(settings.isValid());
     }    
 
     /**
@@ -253,6 +273,7 @@ class PortableCaseInterestingItemsListPanel extends javax.swing.JPanel {
         descLabel = new javax.swing.JLabel();
         selectButton = new javax.swing.JButton();
         deselectButton = new javax.swing.JButton();
+        jAllSetsCheckBox = new javax.swing.JCheckBox();
 
         jScrollPane1.setViewportView(setNamesListBox);
 
@@ -274,6 +295,13 @@ class PortableCaseInterestingItemsListPanel extends javax.swing.JPanel {
             }
         });
 
+        org.openide.awt.Mnemonics.setLocalizedText(jAllSetsCheckBox, org.openide.util.NbBundle.getMessage(PortableCaseInterestingItemsListPanel.class, "PortableCaseInterestingItemsListPanel.jAllSetsCheckBox.text")); // NOI18N
+        jAllSetsCheckBox.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                jAllSetsCheckBoxActionPerformed(evt);
+            }
+        });
+
         javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
         jPanel1.setLayout(jPanel1Layout);
         jPanel1Layout.setHorizontalGroup(
@@ -288,17 +316,20 @@ class PortableCaseInterestingItemsListPanel extends javax.swing.JPanel {
                             .addGroup(jPanel1Layout.createSequentialGroup()
                                 .addComponent(selectButton, javax.swing.GroupLayout.PREFERRED_SIZE, 96, javax.swing.GroupLayout.PREFERRED_SIZE)
                                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                .addComponent(deselectButton)))
+                                .addComponent(deselectButton))
+                            .addComponent(jAllSetsCheckBox))
                         .addGap(0, 8, Short.MAX_VALUE)))
                 .addContainerGap())
         );
         jPanel1Layout.setVerticalGroup(
             jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(jPanel1Layout.createSequentialGroup()
-                .addContainerGap()
+                .addGap(6, 6, 6)
                 .addComponent(descLabel)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                .addComponent(jAllSetsCheckBox)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 179, Short.MAX_VALUE)
+                .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 164, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                     .addComponent(selectButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
@@ -318,25 +349,33 @@ class PortableCaseInterestingItemsListPanel extends javax.swing.JPanel {
     }// </editor-fold>//GEN-END:initComponents
 
     private void deselectButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_deselectButtonActionPerformed
-        for (String setName : setNames) {
-            setNameSelections.put(setName, Boolean.FALSE);
-        }
-        updateSetNameList();
-        setNamesListBox.repaint();
+        selectAllSets(false);
     }//GEN-LAST:event_deselectButtonActionPerformed
 
     private void selectButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_selectButtonActionPerformed
-        for (String setName : setNames) {
-            setNameSelections.put(setName, Boolean.TRUE);
-        }
-        updateSetNameList();
-        setNamesListBox.repaint();
+        selectAllSets(true);
     }//GEN-LAST:event_selectButtonActionPerformed
 
+    private void jAllSetsCheckBoxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jAllSetsCheckBoxActionPerformed
+        selectAllSets(true);
+    }//GEN-LAST:event_jAllSetsCheckBoxActionPerformed
+
+    private void selectAllSets(boolean select) {
+        Boolean state = Boolean.TRUE;
+        if (!select) {
+            state = Boolean.FALSE;
+        }
+        for (String setName : setNames) {
+            setNameSelections.put(setName, state);
+        }
+        updateSetNameList();
+        setNamesListBox.repaint();        
+    }
 
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JLabel descLabel;
     private javax.swing.JButton deselectButton;
+    private javax.swing.JCheckBox jAllSetsCheckBox;
     private javax.swing.JPanel jPanel1;
     private javax.swing.JScrollPane jScrollPane1;
     private javax.swing.JButton selectButton;
diff --git a/Core/src/org/sleuthkit/autopsy/report/PortableCaseReportModule.java b/Core/src/org/sleuthkit/autopsy/report/PortableCaseReportModule.java
index 3c712c067f..9e3c515001 100644
--- a/Core/src/org/sleuthkit/autopsy/report/PortableCaseReportModule.java
+++ b/Core/src/org/sleuthkit/autopsy/report/PortableCaseReportModule.java
@@ -70,7 +70,7 @@ class PortableCaseReportModule implements ReportModule {
     private static final String FILE_FOLDER_NAME = "PortableCaseFiles";  // NON-NLS
     private static final String UNKNOWN_FILE_TYPE_FOLDER = "Other";  // NON-NLS
     private static final String MAX_ID_TABLE_NAME = "portable_case_max_ids";  // NON-NLS
-    private PortableCaseOptions options;
+    private PortableCaseReportModuleSettings settings;
     
     // These are the types for the exported file subfolders
     private static final List<FileTypeCategory> FILE_TYPE_CATEGORIES = Arrays.asList(FileTypeCategory.AUDIO, FileTypeCategory.DOCUMENTS,
@@ -184,8 +184,8 @@ class PortableCaseReportModule implements ReportModule {
         "PortableCaseReportModule.generateReport.compressingCase=Compressing case...",
     })
 
-    void generateReport(String reportPath, PortableCaseOptions options, ReportProgressPanel progressPanel) {
-        this.options = options;
+    void generateReport(String reportPath, PortableCaseReportModuleSettings options, ReportProgressPanel progressPanel) {
+        this.settings = options;
         progressPanel.setIndeterminate(true);
         progressPanel.start();
         progressPanel.updateStatusLabel(Bundle.PortableCaseReportModule_generateReport_verifying());
@@ -911,8 +911,8 @@ class PortableCaseReportModule implements ReportModule {
         
         // Create the chunk option
         String chunkOption = "";
-        if (options.getChunkSize() != ChunkSize.NONE) {
-            chunkOption = "-v" + options.getChunkSize().getSevenZipParam();
+        if (settings.getChunkSize() != PortableCaseReportModuleSettings.ChunkSize.NONE) {
+            chunkOption = "-v" + settings.getChunkSize().getSevenZipParam();
         }
         
         File zipFile = Paths.get(tempZipFolder.getAbsolutePath(), caseName + ".zip").toFile(); // NON-NLS
@@ -989,103 +989,4 @@ class PortableCaseReportModule implements ReportModule {
 
         return exeFile;
     }
-    
-    /**
-     * Enum for storing the display name for each chunk type and the
-     * parameter needed for 7-Zip.
-     */
-    enum ChunkSize {
-        
-        NONE("Do not split", ""), // NON-NLS
-        ONE_HUNDRED_MB("Split into 100 MB chunks", "100m"),
-        CD("Split into 700 MB chunks (CD)", "700m"),
-        ONE_GB("Split into 1 GB chunks", "1000m"),
-        DVD("Split into 4.5 GB chunks (DVD)", "4500m"); // NON-NLS
-        
-        private final String displayName;
-        private final String sevenZipParam;
-
-        /**
-         * Create a chunk size object.
-         * 
-         * @param displayName
-         * @param sevenZipParam 
-         */
-        private ChunkSize(String displayName, String sevenZipParam) {
-            this.displayName = displayName;
-            this.sevenZipParam = sevenZipParam;
-        }
-        
-        String getDisplayName() {
-            return displayName;
-        }
-        
-        String getSevenZipParam() {
-            return sevenZipParam;
-        }
-        
-        @Override
-        public String toString() {
-            return displayName;
-        }
-    }
-    
-    /**
-     * Convenience class to hold the options from the config panel.
-     */
-    static class PortableCaseOptions {
-        
-        private final List<TagName> tagNames = new ArrayList<>();
-        private final List<String> setNames = new ArrayList<>();
-        private boolean compress;
-        private ChunkSize chunkSize;
-        
-        PortableCaseOptions(List<String> setNames, List<TagName> tagNames,
-                boolean compress, ChunkSize chunkSize) {
-            this.setNames.addAll(setNames);
-            this.tagNames.addAll(tagNames);
-            this.compress = compress;
-            this.chunkSize = chunkSize;
-        }
-        
-        PortableCaseOptions() {
-            this.compress = false;
-            this.chunkSize = ChunkSize.NONE;
-        }
-        
-        void updateSetNames(List<String> setNames) {
-            this.setNames.clear();
-            this.setNames.addAll(setNames);
-        }
-        
-        void updateTagNames(List<TagName> tagNames) {
-            this.tagNames.clear();
-            this.tagNames.addAll(tagNames);
-        }
-        
-        void updateCompression(boolean compress, ChunkSize chunkSize) {
-            this.compress = compress;
-            this.chunkSize = chunkSize;
-        }
-        
-        boolean isValid() {
-            return (( !setNames.isEmpty()) || ( ! tagNames.isEmpty()));
-        }
-        
-        List<String> getSelectedSetNames() {
-            return new ArrayList<>(setNames);
-        }
-        
-        List<TagName> getSelectedTagNames() {
-            return new ArrayList<>(tagNames);
-        }
-        
-        boolean shouldCompress() {
-            return compress;
-        }
-        
-        ChunkSize getChunkSize() {
-            return chunkSize;
-        }
-    }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/report/PortableCaseReportModuleSettings.java b/Core/src/org/sleuthkit/autopsy/report/PortableCaseReportModuleSettings.java
new file mode 100755
index 0000000000..09692ff022
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/PortableCaseReportModuleSettings.java
@@ -0,0 +1,158 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2019 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.report;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.sleuthkit.datamodel.TagName;
+
+/**
+ * Settings for the HTML report module.
+ */
+class PortableCaseReportModuleSettings implements ReportModuleSettings {
+
+    private static final long serialVersionUID = 1L;
+
+    private final List<TagName> tagNames = new ArrayList<>();
+    private final List<String> setNames = new ArrayList<>();
+    private boolean compress;
+    private ChunkSize chunkSize;
+    private boolean allTagsSelected;
+    private boolean allSetsSelected;
+    
+        /**
+     * Enum for storing the display name for each chunk type and the
+     * parameter needed for 7-Zip.
+     */
+    enum ChunkSize {
+        
+        NONE("Do not split", ""), // NON-NLS
+        ONE_HUNDRED_MB("Split into 100 MB chunks", "100m"),
+        CD("Split into 700 MB chunks (CD)", "700m"),
+        ONE_GB("Split into 1 GB chunks", "1000m"),
+        DVD("Split into 4.5 GB chunks (DVD)", "4500m"); // NON-NLS
+        
+        private final String displayName;
+        private final String sevenZipParam;
+
+        /**
+         * Create a chunk size object.
+         * 
+         * @param displayName
+         * @param sevenZipParam 
+         */
+        private ChunkSize(String displayName, String sevenZipParam) {
+            this.displayName = displayName;
+            this.sevenZipParam = sevenZipParam;
+        }
+        
+        String getDisplayName() {
+            return displayName;
+        }
+        
+        String getSevenZipParam() {
+            return sevenZipParam;
+        }
+        
+        @Override
+        public String toString() {
+            return displayName;
+        }
+    }
+
+    PortableCaseReportModuleSettings() {
+        this.compress = false;
+        this.chunkSize = ChunkSize.NONE;
+        this.allTagsSelected = true;
+        this.allSetsSelected = true;
+    }
+
+    PortableCaseReportModuleSettings(List<String> setNames, List<TagName> tagNames,
+            boolean compress, ChunkSize chunkSize, boolean allTagsSelected, boolean allSetsSelected) {
+        this.setNames.addAll(setNames);
+        this.tagNames.addAll(tagNames);
+        this.compress = compress;
+        this.chunkSize = chunkSize;
+        this.allTagsSelected = allTagsSelected;
+        this.allSetsSelected = allSetsSelected;
+    }
+
+    @Override
+    public long getVersionNumber() {
+        return serialVersionUID;
+    }
+
+    void updateSetNames(List<String> setNames) {
+        this.setNames.clear();
+        this.setNames.addAll(setNames);
+    }
+
+    void updateTagNames(List<TagName> tagNames) {
+        this.tagNames.clear();
+        this.tagNames.addAll(tagNames);
+    }
+
+    void updateCompression(boolean compress, ChunkSize chunkSize) {
+        this.compress = compress;
+        this.chunkSize = chunkSize;
+    }
+
+    boolean isValid() {
+        return ((!setNames.isEmpty()) || (!tagNames.isEmpty()));
+    }
+
+    List<String> getSelectedSetNames() {
+        return new ArrayList<>(setNames);
+    }
+
+    List<TagName> getSelectedTagNames() {
+        return new ArrayList<>(tagNames);
+    }
+
+    boolean shouldCompress() {
+        return compress;
+    }
+
+    ChunkSize getChunkSize() {
+        return chunkSize;
+    }
+
+    boolean isAllTagsSelected() {
+        return allTagsSelected;
+    }
+
+    boolean isAllSetsSelected() {
+        return allSetsSelected;
+    }
+
+    /**
+     * @param allTagsSelected the allTagsSelected to set
+     */
+    public void setAllTagsSelected(boolean allTagsSelected) {
+        this.allTagsSelected = allTagsSelected;
+    }
+
+    /**
+     * @param allSetsSelected the allSetsSelected to set
+     */
+    public void setAllSetsSelected(boolean allSetsSelected) {
+        this.allSetsSelected = allSetsSelected;
+    }
+
+}
diff --git a/Core/src/org/sleuthkit/autopsy/report/PortableCaseTagsListPanel.form b/Core/src/org/sleuthkit/autopsy/report/PortableCaseTagsListPanel.form
index 9680bd321d..5ed74d5489 100644
--- a/Core/src/org/sleuthkit/autopsy/report/PortableCaseTagsListPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/report/PortableCaseTagsListPanel.form
@@ -34,7 +34,7 @@
               <Group type="102" attributes="0">
                   <EmptySpace max="-2" attributes="0"/>
                   <Group type="103" groupAlignment="0" attributes="0">
-                      <Component id="jScrollPane1" pref="215" max="32767" attributes="0"/>
+                      <Component id="jScrollPane1" pref="0" max="32767" attributes="0"/>
                       <Group type="102" attributes="0">
                           <Group type="103" groupAlignment="0" attributes="0">
                               <Component id="descLabel" min="-2" max="-2" attributes="0"/>
@@ -43,6 +43,7 @@
                                   <EmptySpace max="-2" attributes="0"/>
                                   <Component id="deselectButton" min="-2" max="-2" attributes="0"/>
                               </Group>
+                              <Component id="jAllTagsCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
                           </Group>
                           <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
                       </Group>
@@ -54,10 +55,11 @@
         <DimensionLayout dim="1">
           <Group type="103" groupAlignment="0" attributes="0">
               <Group type="102" attributes="0">
-                  <EmptySpace max="-2" attributes="0"/>
                   <Component id="descLabel" min="-2" max="-2" attributes="0"/>
+                  <EmptySpace max="32767" attributes="0"/>
+                  <Component id="jAllTagsCheckBox" min="-2" max="-2" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
-                  <Component id="jScrollPane1" pref="178" max="32767" attributes="0"/>
+                  <Component id="jScrollPane1" min="-2" pref="168" max="-2" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
                   <Group type="103" groupAlignment="3" attributes="0">
                       <Component id="selectButton" alignment="3" min="-2" max="-2" attributes="0"/>
@@ -117,6 +119,16 @@
             <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="deselectButtonActionPerformed"/>
           </Events>
         </Component>
+        <Component class="javax.swing.JCheckBox" name="jAllTagsCheckBox">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="PortableCaseTagsListPanel.jAllTagsCheckBox.text" 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="jAllTagsCheckBoxActionPerformed"/>
+          </Events>
+        </Component>
       </SubComponents>
     </Container>
   </SubComponents>
diff --git a/Core/src/org/sleuthkit/autopsy/report/PortableCaseTagsListPanel.java b/Core/src/org/sleuthkit/autopsy/report/PortableCaseTagsListPanel.java
index db40932835..c1199cac04 100644
--- a/Core/src/org/sleuthkit/autopsy/report/PortableCaseTagsListPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/PortableCaseTagsListPanel.java
@@ -19,6 +19,8 @@
 package org.sleuthkit.autopsy.report;
 
 import java.awt.Component;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.sql.ResultSet;
@@ -32,7 +34,6 @@ import java.util.logging.Level;
 import javax.swing.JCheckBox;
 import javax.swing.JLabel;
 import javax.swing.JList;
-import javax.swing.JOptionPane;
 import javax.swing.ListCellRenderer;
 import javax.swing.ListModel;
 import javax.swing.event.ListDataListener;
@@ -57,16 +58,32 @@ class PortableCaseTagsListPanel extends javax.swing.JPanel {
     private final Map<String, Long> tagCounts = new HashMap<>();
     
     private final ReportWizardPortableCaseOptionsPanel wizPanel;
-    private final PortableCaseReportModule.PortableCaseOptions options;
+    private final PortableCaseReportModuleSettings settings;
     
     /**
      * Creates new form PortableCaseListPanel
      */
-    PortableCaseTagsListPanel(ReportWizardPortableCaseOptionsPanel wizPanel, PortableCaseReportModule.PortableCaseOptions options) {
+    PortableCaseTagsListPanel(ReportWizardPortableCaseOptionsPanel wizPanel, PortableCaseReportModuleSettings options) {
         this.wizPanel = wizPanel;
-        this.options = options;
+        this.settings = options;
         initComponents();
         customizeComponents();
+        // update tag selection
+        jAllTagsCheckBox.setSelected(settings.isAllTagsSelected());
+        tagNamesListBox.setEnabled(!jAllTagsCheckBox.isSelected());
+        selectButton.setEnabled(!jAllTagsCheckBox.isSelected());
+        deselectButton.setEnabled(!jAllTagsCheckBox.isSelected());
+        selectAllTags(jAllTagsCheckBox.isSelected());
+
+        this.jAllTagsCheckBox.addItemListener(new ItemListener() {
+            @Override
+            public void itemStateChanged(ItemEvent e) {
+                tagNamesListBox.setEnabled(!jAllTagsCheckBox.isSelected());
+                selectButton.setEnabled(!jAllTagsCheckBox.isSelected());
+                deselectButton.setEnabled(!jAllTagsCheckBox.isSelected());
+                selectAllTags(jAllTagsCheckBox.isSelected());
+            }
+        });
     }
 
     @NbBundle.Messages({
@@ -76,7 +93,9 @@ class PortableCaseTagsListPanel extends javax.swing.JPanel {
     })    
     private void customizeComponents() {
         // Get the tag names in use for the current case.
+        tagNames = new ArrayList<>();
         try {
+            // There may not be a case open when configuring report modules for Command Line execution
             tagNames = Case.getCurrentCaseThrows().getServices().getTagsManager().getTagNamesInUse();
       
             // Get the counts for each tag ID
@@ -100,14 +119,10 @@ class PortableCaseTagsListPanel extends javax.swing.JPanel {
                 }
             }
         } catch (TskCoreException ex) {
-            Logger.getLogger(ReportWizardPortableCaseOptionsVisualPanel.class.getName()).log(Level.SEVERE, "Failed to get tag names", ex); // NON-NLS
-            JOptionPane.showMessageDialog(this, Bundle.PortableCaseTagsListPanel_error_errorLoadingTags(), Bundle.PortableCaseTagsListPanel_error_errorTitle(), JOptionPane.ERROR_MESSAGE);
-            return;
+            Logger.getLogger(ReportWizardPortableCaseOptionsVisualPanel.class.getName()).log(Level.WARNING, "Failed to get tag names", ex); // NON-NLS
         } catch (NoCurrentCaseException ex) {
-            Logger.getLogger(ReportWizardPortableCaseOptionsVisualPanel.class.getName()).log(Level.SEVERE, "Exception while getting open case.", ex); // NON-NLS
-            JOptionPane.showMessageDialog(this, Bundle.PortableCaseTagsListPanel_error_noOpenCase(), Bundle.PortableCaseTagsListPanel_error_errorTitle(), JOptionPane.ERROR_MESSAGE);
-            return;
-        }            
+            Logger.getLogger(ReportWizardPortableCaseOptionsVisualPanel.class.getName()).log(Level.WARNING, "Exception while getting open case.", ex); // NON-NLS
+        }
 
         // Set up the tag names JList component to be a collection of check boxes
         // for selecting tag names. The mouse click listener updates tagNameSelections
@@ -134,8 +149,9 @@ class PortableCaseTagsListPanel extends javax.swing.JPanel {
      * Save the current selections and enabled/disable the finish button as needed.
      */
     private void updateTagList() {
-        options.updateTagNames(getSelectedTagNames());
-        wizPanel.setFinish(options.isValid());
+        settings.updateTagNames(getSelectedTagNames());
+        settings.setAllTagsSelected(jAllTagsCheckBox.isSelected());
+        wizPanel.setFinish(settings.isValid());
     }    
     
     /**
@@ -252,6 +268,7 @@ class PortableCaseTagsListPanel extends javax.swing.JPanel {
         descLabel = new javax.swing.JLabel();
         selectButton = new javax.swing.JButton();
         deselectButton = new javax.swing.JButton();
+        jAllTagsCheckBox = new javax.swing.JCheckBox();
 
         jScrollPane1.setViewportView(tagNamesListBox);
 
@@ -273,6 +290,13 @@ class PortableCaseTagsListPanel extends javax.swing.JPanel {
             }
         });
 
+        org.openide.awt.Mnemonics.setLocalizedText(jAllTagsCheckBox, org.openide.util.NbBundle.getMessage(PortableCaseTagsListPanel.class, "PortableCaseTagsListPanel.jAllTagsCheckBox.text")); // NOI18N
+        jAllTagsCheckBox.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                jAllTagsCheckBoxActionPerformed(evt);
+            }
+        });
+
         javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
         jPanel1.setLayout(jPanel1Layout);
         jPanel1Layout.setHorizontalGroup(
@@ -280,24 +304,26 @@ class PortableCaseTagsListPanel extends javax.swing.JPanel {
             .addGroup(jPanel1Layout.createSequentialGroup()
                 .addContainerGap()
                 .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 215, Short.MAX_VALUE)
+                    .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)
                     .addGroup(jPanel1Layout.createSequentialGroup()
                         .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                             .addComponent(descLabel)
                             .addGroup(jPanel1Layout.createSequentialGroup()
                                 .addComponent(selectButton, javax.swing.GroupLayout.PREFERRED_SIZE, 96, javax.swing.GroupLayout.PREFERRED_SIZE)
                                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                .addComponent(deselectButton)))
+                                .addComponent(deselectButton))
+                            .addComponent(jAllTagsCheckBox))
                         .addGap(0, 0, Short.MAX_VALUE)))
                 .addContainerGap())
         );
         jPanel1Layout.setVerticalGroup(
             jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(jPanel1Layout.createSequentialGroup()
-                .addContainerGap()
                 .addComponent(descLabel)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                .addComponent(jAllTagsCheckBox)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 178, Short.MAX_VALUE)
+                .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 168, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                     .addComponent(selectButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
@@ -317,25 +343,33 @@ class PortableCaseTagsListPanel extends javax.swing.JPanel {
     }// </editor-fold>//GEN-END:initComponents
 
     private void deselectButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_deselectButtonActionPerformed
-        for (TagName tagName : tagNames) {
-            tagNameSelections.put(tagName.getDisplayName(), Boolean.FALSE);
-        }
-        updateTagList();
-        tagNamesListBox.repaint();
+        selectAllTags(false);
     }//GEN-LAST:event_deselectButtonActionPerformed
 
     private void selectButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_selectButtonActionPerformed
+        selectAllTags(true);
+    }//GEN-LAST:event_selectButtonActionPerformed
+
+    private void jAllTagsCheckBoxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jAllTagsCheckBoxActionPerformed
+        selectAllTags(true);
+    }//GEN-LAST:event_jAllTagsCheckBoxActionPerformed
+
+    private void selectAllTags(boolean select) {
+        Boolean state = Boolean.TRUE;
+        if (!select) {
+            state = Boolean.FALSE;
+        }
         for (TagName tagName : tagNames) {
-            tagNameSelections.put(tagName.getDisplayName(), Boolean.TRUE);
+            tagNameSelections.put(tagName.getDisplayName(), state);
         }
         updateTagList();
         tagNamesListBox.repaint();
-    }//GEN-LAST:event_selectButtonActionPerformed
-
+    }
 
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JLabel descLabel;
     private javax.swing.JButton deselectButton;
+    private javax.swing.JCheckBox jAllTagsCheckBox;
     private javax.swing.JPanel jPanel1;
     private javax.swing.JScrollPane jScrollPane1;
     private javax.swing.JButton selectButton;
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
index c762a75f99..d902240c5b 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
@@ -217,12 +217,12 @@ class ReportGenerator {
     /**
      * Run the Portable Case Report Module
      */
-    void generatePortableCaseReport(PortableCaseReportModule portableCaseReportModule, PortableCaseReportModule.PortableCaseOptions options) throws IOException {
+    void generatePortableCaseReport(PortableCaseReportModule portableCaseReportModule, PortableCaseReportModuleSettings settings) throws IOException {
         if (portableCaseReportModule != null) {
             String reportDir = createReportDirectory(portableCaseReportModule);
             setupProgressPanel(portableCaseReportModule, reportDir);
             ReportWorker worker = new ReportWorker(() -> {
-                portableCaseReportModule.generateReport(reportDir, options, progressPanel);
+                portableCaseReportModule.generateReport(reportDir, settings, progressPanel);
             });
             worker.execute();
             displayProgressPanel();
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
index 3df150e663..2b54e1b1db 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
@@ -117,21 +117,19 @@ final class ReportVisualPanel1 extends JPanel implements ListSelectionListener {
         
         // set module configurations
         for (ReportModule module : modules) {
-            ReportModuleSettings settings;
-            if (moduleConfigs == null) {
-                // get default module configuration
-                settings = module.getDefaultConfiguration();
-            } else {
+            ReportModuleSettings settings = null;
+            if (moduleConfigs != null) {
                 // get configuration for this module
                 ReportModuleConfig config = moduleConfigs.get(module.getClass().getCanonicalName());                
                 if (config != null) {
                     // there is an existing configuration for this module
                     settings = config.getModuleSettings();
-                } else {
-                    // get default module configuration
-                    settings = module.getDefaultConfiguration();
                 }
             }
+            if (settings == null) {
+                // get default module configuration
+                settings = module.getDefaultConfiguration();
+            }
             // set module configuration
             module.setConfiguration(settings);
         }
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
index 7ab3a30751..161a713642 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
@@ -118,12 +118,20 @@ public final class ReportWizardAction extends CallableSystemAction implements Pr
                     if (runReports) {
                         generator.generateFileListReport(fileReport, settings); //NON-NLS
                     }
-                } else if (portableCaseReport != null) {                    
+                } else if (portableCaseReport != null) {
+                    // get table report settings
+                    PortableCaseReportModuleSettings settings = (PortableCaseReportModuleSettings) wiz.getProperty("portableCaseReportSettings");
+                    if (settings == null) {
+                        NotifyDescriptor descriptor = new NotifyDescriptor.Message(NbBundle.getMessage(ReportWizardAction.class, "ReportGenerator.errList.noReportSettings"), NotifyDescriptor.ERROR_MESSAGE);
+                        DialogDisplayer.getDefault().notify(descriptor);
+                        return;
+                    }
+                    
                     // save reporting configuration
                     saveReportingConfiguration(configName, wiz);
                     
                     if (runReports) {
-                        generator.generatePortableCaseReport(portableCaseReport, (PortableCaseReportModule.PortableCaseOptions) wiz.getProperty("portableCaseReportOptions"));
+                        generator.generatePortableCaseReport(portableCaseReport, settings);
                     }
                 }
             } catch (IOException e) {
@@ -136,10 +144,29 @@ public final class ReportWizardAction extends CallableSystemAction implements Pr
     private static void saveReportingConfiguration(String configName, WizardDescriptor wiz) {
 
         ReportingConfig reportingConfig = new ReportingConfig(configName);
-        reportingConfig.setModuleConfigs((Map<String, ReportModuleConfig>) wiz.getProperty("moduleConfigs"));
         reportingConfig.setFileReportSettings((FileReportSettings) wiz.getProperty("fileReportSettings"));
-        reportingConfig.setTableReportSettings((TableReportSettings) wiz.getProperty("tableReportSettings")); 
-
+        reportingConfig.setTableReportSettings((TableReportSettings) wiz.getProperty("tableReportSettings"));
+        
+        Map<String, ReportModuleConfig> moduleConfigs = (Map<String, ReportModuleConfig>) wiz.getProperty("moduleConfigs");
+        
+        // update portable case settings
+        ReportModuleConfig config = moduleConfigs.get(PortableCaseReportModule.class.getCanonicalName());
+        PortableCaseReportModuleSettings portableCaseReportSettings = (PortableCaseReportModuleSettings) wiz.getProperty("portableCaseReportSettings");
+        if (config != null) {
+            config.setModuleSettings(portableCaseReportSettings);
+        } else {
+            PortableCaseReportModule portableCaseReport = (PortableCaseReportModule) wiz.getProperty("portableCaseModule");  // NON-NLS
+            if (portableCaseReport != null) {
+                config = new ReportModuleConfig(portableCaseReport, true, portableCaseReportSettings);
+            }
+        }
+        if (config != null) {
+            moduleConfigs.put(PortableCaseReportModule.class.getCanonicalName(), config);
+        }
+        
+        // set module configs
+        reportingConfig.setModuleConfigs(moduleConfigs);
+        
         try {
             // save reporting configuration
             ReportingConfigLoader.saveConfig(reportingConfig);
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPortableCaseOptionsPanel.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPortableCaseOptionsPanel.java
index 7367b868f5..2fbe656d58 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPortableCaseOptionsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPortableCaseOptionsPanel.java
@@ -36,8 +36,10 @@ class ReportWizardPortableCaseOptionsPanel implements WizardDescriptor.Finishabl
     private WizardDescriptor wiz;
     private ReportWizardPortableCaseOptionsVisualPanel component;
     private final JButton finishButton;
+    private Map<String, ReportModuleConfig> moduleConfigs;
 
     ReportWizardPortableCaseOptionsPanel(Map<String, ReportModuleConfig> moduleConfigs) {
+        this.moduleConfigs = moduleConfigs;
         finishButton = new JButton(
                 NbBundle.getMessage(this.getClass(), "ReportWizardFileOptionsPanel.finishButton.text"));
         finishButton.setEnabled(false);
@@ -67,7 +69,7 @@ class ReportWizardPortableCaseOptionsPanel implements WizardDescriptor.Finishabl
     @Override
     public ReportWizardPortableCaseOptionsVisualPanel getComponent() {
         if (component == null) {
-            component = new ReportWizardPortableCaseOptionsVisualPanel(this);
+            component = new ReportWizardPortableCaseOptionsVisualPanel(this, moduleConfigs);
         }
         return component;
     }
@@ -85,7 +87,7 @@ class ReportWizardPortableCaseOptionsPanel implements WizardDescriptor.Finishabl
 
     @Override
     public void storeSettings(WizardDescriptor data) {
-        data.putProperty("portableCaseReportOptions", getComponent().getPortableCaseReportOptions()); //NON-NLS
+        data.putProperty("portableCaseReportSettings", getComponent().getPortableCaseReportSettings()); //NON-NLS
     }
 
     @Override
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPortableCaseOptionsVisualPanel.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPortableCaseOptionsVisualPanel.java
index f721f26bf9..f56ae7db1b 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPortableCaseOptionsVisualPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPortableCaseOptionsVisualPanel.java
@@ -19,10 +19,10 @@
 package org.sleuthkit.autopsy.report;
 
 import java.awt.GridLayout;
+import java.util.Map;
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.PlatformUtil;
-import org.sleuthkit.autopsy.report.PortableCaseReportModule.ChunkSize;
-import org.sleuthkit.autopsy.report.PortableCaseReportModule.PortableCaseOptions;
+import org.sleuthkit.autopsy.report.PortableCaseReportModuleSettings.ChunkSize;
 
 /**
  * The UI portion of the Portable Case config panel
@@ -31,36 +31,60 @@ import org.sleuthkit.autopsy.report.PortableCaseReportModule.PortableCaseOptions
 class ReportWizardPortableCaseOptionsVisualPanel extends javax.swing.JPanel {
 
     private final ReportWizardPortableCaseOptionsPanel wizPanel;
-    private final PortableCaseOptions options = new PortableCaseOptions();
+    private PortableCaseReportModuleSettings settings = null;
+    private Map<String, ReportModuleConfig> moduleConfigs;
     
     /**
      * Creates new form ReportWizardPortableCaseOptionsVisualPanel
      */
-    ReportWizardPortableCaseOptionsVisualPanel(ReportWizardPortableCaseOptionsPanel wizPanel) {
+    ReportWizardPortableCaseOptionsVisualPanel(ReportWizardPortableCaseOptionsPanel wizPanel, Map<String, ReportModuleConfig> moduleConfigs) {
         this.wizPanel = wizPanel;
+        this.moduleConfigs = moduleConfigs;
         initComponents();
         customizeComponents();
     }
     
     private void customizeComponents() {
         
-        if ( ! PlatformUtil.isWindowsOS()) {
+        if (!PlatformUtil.isWindowsOS()) {
             errorLabel.setVisible(true);
             compressCheckbox.setEnabled(false);
         } else {
             errorLabel.setVisible(false);
         }
-        
-        for (ChunkSize chunkSize:ChunkSize.values()) {
+
+        for (ChunkSize chunkSize : ChunkSize.values()) {
             chunkSizeComboBox.addItem(chunkSize);
         }
-        chunkSizeComboBox.setSelectedItem(ChunkSize.NONE);
-        chunkSizeComboBox.setEnabled(false);
-        options.updateCompression(false, ChunkSize.NONE);        
+               
+        // initialize settings
+        if (moduleConfigs != null) {
+            // get configuration for this module
+            ReportModuleConfig config = moduleConfigs.get(PortableCaseReportModule.class.getCanonicalName());
+            if (config != null) {
+                // there is an existing configuration for this module
+                ReportModuleSettings reportSettings = config.getModuleSettings();
+                // check if the settings are for this module, it could be NoReportModuleSettings
+                if (reportSettings instanceof PortableCaseReportModuleSettings) {
+                    settings = (PortableCaseReportModuleSettings) reportSettings;
+                }
+            }
+        }
         
+        if (settings == null) {
+            // get default module configuration
+            settings = new PortableCaseReportModuleSettings();
+        }
+                        
+        // update according to input configuration
+        compressCheckbox.setSelected(settings.shouldCompress());
+        chunkSizeComboBox.setEnabled(settings.shouldCompress());
+        chunkSizeComboBox.setSelectedItem(settings.getChunkSize());
+        
+        // initialize other panels and pass them the settings
         listPanel.setLayout(new GridLayout(1,2));
-        listPanel.add(new PortableCaseTagsListPanel(wizPanel, options));
-        listPanel.add(new PortableCaseInterestingItemsListPanel(wizPanel, options));
+        listPanel.add(new PortableCaseTagsListPanel(wizPanel, settings));
+        listPanel.add(new PortableCaseInterestingItemsListPanel(wizPanel, settings));
     }
     
     @NbBundle.Messages({
@@ -84,8 +108,10 @@ class ReportWizardPortableCaseOptionsVisualPanel extends javax.swing.JPanel {
      * Update the selected compression options and enable/disable the finish button
      */
     private void updateCompression() {
-        options.updateCompression(compressCheckbox.isSelected(), getChunkSize());
-        wizPanel.setFinish(options.isValid());
+        if (settings != null) {
+            settings.updateCompression(compressCheckbox.isSelected(), getChunkSize());
+            wizPanel.setFinish(settings.isValid());
+        }
     }
     
     /**
@@ -93,8 +119,8 @@ class ReportWizardPortableCaseOptionsVisualPanel extends javax.swing.JPanel {
      *
      * @return the current settings
      */
-    PortableCaseOptions getPortableCaseReportOptions() {
-        return options;
+    PortableCaseReportModuleSettings getPortableCaseReportSettings() {
+        return settings;
     }    
 
     /**
diff --git a/Core/src/org/sleuthkit/autopsy/report/caseuco/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/report/caseuco/Bundle.properties-MERGED
index b2a6d8e1e7..15625c1ad2 100755
--- a/Core/src/org/sleuthkit/autopsy/report/caseuco/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/report/caseuco/Bundle.properties-MERGED
@@ -9,7 +9,6 @@ ReportCaseUco.initializing=Creating directories...
 ReportCaseUco.noCaseOpen=Unable to open currect case
 ReportCaseUco.noDataSourceSelected=No data source selected for CASE-UCO report
 ReportCaseUco.notInitialized=CASE-UCO settings panel has not been initialized
-ReportCaseUco.processing=Saving files in CASE-UCO format...
 ReportCaseUco.querying=Querying files...
 ReportCaseUco.srcModuleName.text=CASE-UCO Report
 ReportCaseUco.unableToCreateDirectories=Unable to create directory for CASE-UCO report
diff --git a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java b/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java
index e9e63afe24..15d68a5bf0 100644
--- a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java
@@ -100,12 +100,13 @@ class AddTaggedHashesToHashDbConfigPanel extends javax.swing.JPanel {
             // There may not be a case open when configuring report modules for Command Line execution
             tagNames = Case.getCurrentCaseThrows().getServices().getTagsManager().getTagNamesInUse();
         } catch (TskCoreException ex) {
-            Logger.getLogger(AddTaggedHashesToHashDbConfigPanel.class.getName()).log(Level.SEVERE, "Failed to get tag names", ex);
+            Logger.getLogger(AddTaggedHashesToHashDbConfigPanel.class.getName()).log(Level.WARNING, "Failed to get tag names", ex);
             // ELTODO remove all these JOptionPane.showMessageDialog(this, "Error getting tag names for case.", "Tag Names Not Found", JOptionPane.ERROR_MESSAGE);
+            // import javax.swing.JOptionPane;
+            // import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
         } catch (NoCurrentCaseException ex) {
             // There may not be a case open when configuring report modules for Command Line execution
             Logger.getLogger(AddTaggedHashesToHashDbConfigPanel.class.getName()).log(Level.WARNING, "Exception while getting open case.", ex);
-            // ELTODO JOptionPane.showMessageDialog(this, "Error getting tag names for case.", "Exception while getting open case.", JOptionPane.ERROR_MESSAGE);
         }
 
         // Mark the tag names as unselected. Note that tagNameSelections is a

From a1286e5fa1f601e4858c00313db23e52a08b40a5 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Tue, 27 Aug 2019 15:46:32 -0400
Subject: [PATCH 089/192] Removed pop ups or other GUI related features that
 require user interaction

---
 .../modules/stix/Bundle.properties-MERGED     |  2 +-
 .../modules/stix/STIXReportModule.java        | 33 +++++--------------
 .../modules/stix/StixArtifactData.java        |  3 --
 ...PortableCaseInterestingItemsListPanel.java |  3 +-
 .../report/PortableCaseReportModule.java      |  3 +-
 .../report/PortableCaseTagsListPanel.java     |  3 +-
 .../autopsy/report/ReportGenerator.java       |  2 +-
 .../report/caseuco/CaseUcoFormatExporter.java |  5 ++-
 .../taggedhashes/AddTaggedHashesToHashDb.java | 16 ++++-----
 .../AddTaggedHashesToHashDbConfigPanel.java   |  5 +--
 10 files changed, 25 insertions(+), 50 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/modules/stix/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/modules/stix/Bundle.properties-MERGED
index ff84899352..17df690225 100755
--- a/Core/src/org/sleuthkit/autopsy/modules/stix/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/modules/stix/Bundle.properties-MERGED
@@ -6,7 +6,6 @@ STIXReportModule.getDesc.text=Generate a report by running a collection of STIX
 STIXReportModule.progress.readSTIX=Parsing STIX files
 STIXReportModule.srcModuleName.text=STIX Report
 STIXReportModuleConfigPanel.jLabel2.text=Select a STIX file or directory of STIX files
-STIXReportModuleConfigPanel.jTextField1.text=
 STIXReportModuleConfigPanel.jButton1.text=Choose file
 STIXReportModuleConfigPanel.jCheckBox1.text=Include results for false indicators in output file
 STIXReportModule.notifyMsg.unableToOpenReportFile=Unable to complete STIX report.
@@ -16,3 +15,4 @@ STIXReportModule.progress.couldNotOpenFileDir=Could not open file/directory {0}
 STIXReportModule.notifyMsg.tooManyArtifactsgt1000=Too many STIX-related artifacts generated for "{0}". Only saving first 1000.
 STIXReportModule.notifyErr.noFildDirProvided=No STIX file/directory provided
 STIXReportModule.progress.noFildDirProvided=No STIX file/directory provided
+STIXReportModuleConfigPanel.jStixFileTextField.text=
diff --git a/Core/src/org/sleuthkit/autopsy/modules/stix/STIXReportModule.java b/Core/src/org/sleuthkit/autopsy/modules/stix/STIXReportModule.java
index f2dfe4e18f..75334d55d7 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/stix/STIXReportModule.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/stix/STIXReportModule.java
@@ -54,7 +54,6 @@ import org.openide.util.NbBundle.Messages;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
 import org.sleuthkit.autopsy.coreutils.Logger;
-import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
 import org.sleuthkit.autopsy.report.GeneralReportModule;
 import org.sleuthkit.autopsy.report.NoReportModuleSettings;
 import org.sleuthkit.autopsy.report.ReportModuleSettings;
@@ -116,8 +115,6 @@ public class STIXReportModule implements GeneralReportModule {
 
         if (stixFileName == null) {
             logger.log(Level.SEVERE, "STIXReportModuleConfigPanel.stixFile not initialized "); //NON-NLS
-            MessageNotifyUtil.Message.error(
-                    NbBundle.getMessage(this.getClass(), "STIXReportModule.notifyErr.noFildDirProvided"));
             progressPanel.complete(ReportStatus.ERROR);
             progressPanel.updateStatusLabel(
                     NbBundle.getMessage(this.getClass(), "STIXReportModule.progress.noFildDirProvided"));
@@ -126,8 +123,6 @@ public class STIXReportModule implements GeneralReportModule {
         }
         if (stixFileName.isEmpty()) {
             logger.log(Level.SEVERE, "No STIX file/directory provided "); //NON-NLS
-            MessageNotifyUtil.Message.error(
-                    NbBundle.getMessage(this.getClass(), "STIXReportModule.notifyErr.noFildDirProvided"));
             progressPanel.complete(ReportStatus.ERROR);
             progressPanel.updateStatusLabel(
                     NbBundle.getMessage(this.getClass(), "STIXReportModule.progress.noFildDirProvided"));
@@ -138,9 +133,6 @@ public class STIXReportModule implements GeneralReportModule {
 
         if (!stixFile.exists()) {
             logger.log(Level.SEVERE, String.format("Unable to open STIX file/directory %s", stixFileName)); //NON-NLS
-            MessageNotifyUtil.Message.error(NbBundle.getMessage(this.getClass(),
-                    "STIXReportModule.notifyMsg.unableToOpenFileDir",
-                    stixFileName));
             progressPanel.complete(ReportStatus.ERROR);
             progressPanel.updateStatusLabel(
                     NbBundle.getMessage(this.getClass(), "STIXReportModule.progress.couldNotOpenFileDir", stixFileName));
@@ -172,9 +164,7 @@ public class STIXReportModule implements GeneralReportModule {
                 } catch (TskCoreException | JAXBException ex) {
                     String errMsg = String.format("Unable to process STIX file %s", file);
                     logger.log(Level.SEVERE, errMsg, ex); //NON-NLS
-                    MessageNotifyUtil.Notify.show("STIXReportModule", //NON-NLS
-                            errMsg,
-                            MessageNotifyUtil.MessageType.ERROR);
+                    progressPanel.updateStatusLabel(NbBundle.getMessage(this.getClass(), errMsg));
                     hadErrors = true;
                     break;
                 }
@@ -195,10 +185,6 @@ public class STIXReportModule implements GeneralReportModule {
             }
         } catch (IOException ex) {
             logger.log(Level.SEVERE, "Unable to complete STIX report.", ex); //NON-NLS
-            MessageNotifyUtil.Notify.show("STIXReportModule", //NON-NLS
-                    NbBundle.getMessage(this.getClass(),
-                            "STIXReportModule.notifyMsg.unableToOpenReportFile"),
-                    MessageNotifyUtil.MessageType.ERROR);
             progressPanel.complete(ReportStatus.ERROR);
             progressPanel.updateStatusLabel(
                     NbBundle.getMessage(this.getClass(), "STIXReportModule.progress.completedWithErrors"));
@@ -234,7 +220,7 @@ public class STIXReportModule implements GeneralReportModule {
         registryFileData = EvalRegistryObj.copyRegistryFiles();
 
         // Process the indicators
-        processIndicators(stix, output);
+        processIndicators(stix, output, progressPanel);
         progressPanel.increment();
 
     }
@@ -282,7 +268,7 @@ public class STIXReportModule implements GeneralReportModule {
      * @param stix STIXPackage
      * @param output
      */
-    private void processIndicators(STIXPackage stix, BufferedWriter output) throws TskCoreException {
+    private void processIndicators(STIXPackage stix, BufferedWriter output, ReportProgressPanel progressPanel) throws TskCoreException {
         if (stix.getIndicators() != null) {
             List<IndicatorBaseType> s = stix.getIndicators().getIndicators();
             for (IndicatorBaseType t : s) {
@@ -295,7 +281,7 @@ public class STIXReportModule implements GeneralReportModule {
                                 writeResultsToFile(ind, result.getDescription(), result.isTrue(), output);
                             }
                             if (result.isTrue()) {
-                                saveResultsAsArtifacts(ind, result);
+                                saveResultsAsArtifacts(ind, result, progressPanel);
                             }
                         } else if (ind.getObservable().getObservableComposition() != null) {
                             ObservableResult result = evaluateObservableComposition(ind.getObservable().getObservableComposition(), "  ");
@@ -304,7 +290,7 @@ public class STIXReportModule implements GeneralReportModule {
                                 writeResultsToFile(ind, result.getDescription(), result.isTrue(), output);
                             }
                             if (result.isTrue()) {
-                                saveResultsAsArtifacts(ind, result);
+                                saveResultsAsArtifacts(ind, result, progressPanel);
                             }
                         }
                     }
@@ -321,7 +307,7 @@ public class STIXReportModule implements GeneralReportModule {
      *
      * @throws TskCoreException
      */
-    private void saveResultsAsArtifacts(Indicator ind, ObservableResult result) throws TskCoreException {
+    private void saveResultsAsArtifacts(Indicator ind, ObservableResult result, ReportProgressPanel progressPanel) throws TskCoreException {
 
         if (result.getArtifacts() == null) {
             return;
@@ -347,11 +333,8 @@ public class STIXReportModule implements GeneralReportModule {
             // for a single observable because the condition was not restrictive enough
             count++;
             if (count > 1000) {
-                MessageNotifyUtil.Notify.show("STIXReportModule", //NON-NLS
-                        NbBundle.getMessage(this.getClass(),
-                                "STIXReportModule.notifyMsg.tooManyArtifactsgt1000",
-                                ind.getId()),
-                        MessageNotifyUtil.MessageType.INFO);
+                progressPanel.updateStatusLabel(NbBundle.getMessage(this.getClass(), 
+                                "STIXReportModule.notifyMsg.tooManyArtifactsgt1000"));
                 break;
             }
         }
diff --git a/Core/src/org/sleuthkit/autopsy/modules/stix/StixArtifactData.java b/Core/src/org/sleuthkit/autopsy/modules/stix/StixArtifactData.java
index de1f76e2fd..3cc86a0187 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/stix/StixArtifactData.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/stix/StixArtifactData.java
@@ -26,7 +26,6 @@ import org.openide.util.NbBundle.Messages;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
 import org.sleuthkit.autopsy.coreutils.Logger;
-import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.Blackboard;
 import org.sleuthkit.datamodel.BlackboardArtifact;
@@ -76,7 +75,6 @@ class StixArtifactData {
             blackboard = Case.getCurrentCaseThrows().getSleuthkitCase().getBlackboard();
         } catch (NoCurrentCaseException ex) {
             logger.log(Level.SEVERE, "Exception while getting open case.", ex); //NON-NLS
-            MessageNotifyUtil.Notify.error(Bundle.StixArtifactData_noOpenCase_errMsg(), ex.getLocalizedMessage());
             return;
         }
 
@@ -100,7 +98,6 @@ class StixArtifactData {
                 blackboard.postArtifact(bba, MODULE_NAME);
             } catch (Blackboard.BlackboardException ex) {
                 logger.log(Level.SEVERE, "Unable to index blackboard artifact " + bba.getArtifactID(), ex); //NON-NLS
-                MessageNotifyUtil.Notify.error(Bundle.StixArtifactData_indexError_message(), bba.getDisplayName());
             }
         }
     }
diff --git a/Core/src/org/sleuthkit/autopsy/report/PortableCaseInterestingItemsListPanel.java b/Core/src/org/sleuthkit/autopsy/report/PortableCaseInterestingItemsListPanel.java
index b2623a80c9..32e2e84ae6 100644
--- a/Core/src/org/sleuthkit/autopsy/report/PortableCaseInterestingItemsListPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/PortableCaseInterestingItemsListPanel.java
@@ -116,8 +116,9 @@ class PortableCaseInterestingItemsListPanel extends javax.swing.JPanel {
             setCounts = callback.getSetCountMap();
             setNames.addAll(setCounts.keySet());
         } catch (TskCoreException ex) {
-            Logger.getLogger(ReportWizardPortableCaseOptionsVisualPanel.class.getName()).log(Level.WARNING, "Failed to get interesting item set names", ex); // NON-NLS
+            Logger.getLogger(ReportWizardPortableCaseOptionsVisualPanel.class.getName()).log(Level.SEVERE, "Failed to get interesting item set names", ex); // NON-NLS
         } catch (NoCurrentCaseException ex) {
+            // There may not be a case open when configuring report modules for Command Line execution
             Logger.getLogger(ReportWizardPortableCaseOptionsVisualPanel.class.getName()).log(Level.WARNING, "Exception while getting open case.", ex); // NON-NLS
         }
         Collections.sort(setNames);
diff --git a/Core/src/org/sleuthkit/autopsy/report/PortableCaseReportModule.java b/Core/src/org/sleuthkit/autopsy/report/PortableCaseReportModule.java
index 9e3c515001..46b0c4fb4f 100644
--- a/Core/src/org/sleuthkit/autopsy/report/PortableCaseReportModule.java
+++ b/Core/src/org/sleuthkit/autopsy/report/PortableCaseReportModule.java
@@ -38,7 +38,6 @@ import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
 import org.sleuthkit.autopsy.coreutils.FileUtil;
 import org.sleuthkit.autopsy.coreutils.Logger;
-import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
 import org.sleuthkit.autopsy.coreutils.PlatformUtil;
 import org.sleuthkit.autopsy.datamodel.ContentUtils;
 import org.sleuthkit.autopsy.coreutils.FileTypeUtils.FileTypeCategory;
@@ -153,7 +152,7 @@ class PortableCaseReportModule implements ReportModule {
         } else {
             logger.log(Level.SEVERE, logWarning, ex);
         }
-        MessageNotifyUtil.Message.error(dialogWarning);
+        progressPanel.updateStatusLabel(dialogWarning);
         progressPanel.setIndeterminate(false);
         progressPanel.complete(ReportProgressPanel.ReportStatus.ERROR);
         cleanup();
diff --git a/Core/src/org/sleuthkit/autopsy/report/PortableCaseTagsListPanel.java b/Core/src/org/sleuthkit/autopsy/report/PortableCaseTagsListPanel.java
index c1199cac04..834c091801 100644
--- a/Core/src/org/sleuthkit/autopsy/report/PortableCaseTagsListPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/PortableCaseTagsListPanel.java
@@ -119,8 +119,9 @@ class PortableCaseTagsListPanel extends javax.swing.JPanel {
                 }
             }
         } catch (TskCoreException ex) {
-            Logger.getLogger(ReportWizardPortableCaseOptionsVisualPanel.class.getName()).log(Level.WARNING, "Failed to get tag names", ex); // NON-NLS
+            Logger.getLogger(ReportWizardPortableCaseOptionsVisualPanel.class.getName()).log(Level.SEVERE, "Failed to get tag names", ex); // NON-NLS
         } catch (NoCurrentCaseException ex) {
+            // There may not be a case open when configuring report modules for Command Line execution
             Logger.getLogger(ReportWizardPortableCaseOptionsVisualPanel.class.getName()).log(Level.WARNING, "Exception while getting open case.", ex); // NON-NLS
         }
 
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
index d902240c5b..b2d73a9e60 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
@@ -42,7 +42,7 @@ import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
 import org.sleuthkit.autopsy.coreutils.Logger;
-import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
+import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil; // ELTODO do we need to remove this?
 import org.sleuthkit.autopsy.report.ReportProgressPanel.ReportStatus;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.SleuthkitCase;
diff --git a/Core/src/org/sleuthkit/autopsy/report/caseuco/CaseUcoFormatExporter.java b/Core/src/org/sleuthkit/autopsy/report/caseuco/CaseUcoFormatExporter.java
index 459262eacf..aae92dfb9c 100755
--- a/Core/src/org/sleuthkit/autopsy/report/caseuco/CaseUcoFormatExporter.java
+++ b/Core/src/org/sleuthkit/autopsy/report/caseuco/CaseUcoFormatExporter.java
@@ -41,7 +41,6 @@ import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
 import org.sleuthkit.autopsy.casemodule.services.TagsManager;
 import org.sleuthkit.autopsy.coreutils.Logger;
-import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
 import org.sleuthkit.autopsy.datamodel.ContentUtils;
 import org.sleuthkit.autopsy.ingest.IngestManager;
 import org.sleuthkit.autopsy.report.ReportProgressPanel;
@@ -103,14 +102,14 @@ public final class CaseUcoFormatExporter {
             Files.createDirectories(Paths.get(reportFile.getParent()));
         } catch (IOException ex) {
             logger.log(Level.SEVERE, "Unable to create directory for CASE-UCO report", ex); //NON-NLS
-            MessageNotifyUtil.Message.error(Bundle.ReportCaseUco_unableToCreateDirectories());
+            progressPanel.updateStatusLabel(Bundle.ReportCaseUco_unableToCreateDirectories());
             progressPanel.complete(ReportProgressPanel.ReportStatus.ERROR);
             return;
         }
 
         // Check if ingest has finished
         if (IngestManager.getInstance().isIngestRunning()) {
-            MessageNotifyUtil.Message.warn(Bundle.ReportCaseUco_ingestWarning());
+            progressPanel.updateStatusLabel(Bundle.ReportCaseUco_ingestWarning());
         }
 
         JsonGenerator jsonGenerator = null;
diff --git a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDb.java b/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDb.java
index acd3d8d94c..b6b85e7425 100644
--- a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDb.java
+++ b/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDb.java
@@ -22,15 +22,12 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
 import org.sleuthkit.autopsy.coreutils.Logger;
-import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import org.openide.util.NbBundle.Messages;
 import org.openide.util.lookup.ServiceProvider;
-import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
 import org.sleuthkit.autopsy.casemodule.services.TagsManager;
-import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
 import org.sleuthkit.autopsy.modules.hashdatabase.HashDbManager.HashDb;
 import org.sleuthkit.autopsy.report.GeneralReportModule;
 import org.sleuthkit.autopsy.report.NoReportModuleSettings;
@@ -123,7 +120,8 @@ public class AddTaggedHashesToHashDb implements GeneralReportModule {
             openCase = Case.getCurrentCaseThrows();
         } catch (NoCurrentCaseException ex) {
             Logger.getLogger(AddTaggedHashesToHashDb.class.getName()).log(Level.SEVERE, "Exception while getting open case.", ex);
-            JOptionPane.showMessageDialog(WindowManager.getDefault().getMainWindow(), "No open Case", "Exception while getting open case.", JOptionPane.ERROR_MESSAGE);
+            progressPanel.updateStatusLabel("Exception while getting open case.");
+            progressPanel.complete(ReportProgressPanel.ReportStatus.ERROR);
             return;
         }
         progressPanel.setIndeterminate(true);
@@ -133,7 +131,7 @@ public class AddTaggedHashesToHashDb implements GeneralReportModule {
         HashDb hashSet = configPanel.getSelectedHashDatabase();
         if (hashSet == null) {
             logger.log(Level.WARNING, "No hash set selected for export."); //NON-NLS
-            MessageNotifyUtil.Message.error(Bundle.AddTaggedHashesToHashDb_error_noHashSetsSelected());
+            progressPanel.updateStatusLabel(Bundle.AddTaggedHashesToHashDb_error_noHashSetsSelected());
             progressPanel.setIndeterminate(false);
             progressPanel.complete(ReportProgressPanel.ReportStatus.ERROR);
             return;
@@ -145,7 +143,7 @@ public class AddTaggedHashesToHashDb implements GeneralReportModule {
         List<TagName> tagNames = configPanel.getSelectedTagNames();
         if (tagNames.isEmpty()) {
             logger.log(Level.WARNING, "No tags selected for export."); //NON-NLS
-            MessageNotifyUtil.Message.error(Bundle.AddTaggedHashesToHashDb_error_noTagsSelected());
+            progressPanel.updateStatusLabel(Bundle.AddTaggedHashesToHashDb_error_noTagsSelected());
             progressPanel.setIndeterminate(false);
             progressPanel.complete(ReportProgressPanel.ReportStatus.ERROR);
             return;
@@ -172,14 +170,14 @@ public class AddTaggedHashesToHashDb implements GeneralReportModule {
                                 failedExports.add(tag.getContent().getName());
                             }
                         } else {
-                            JOptionPane.showMessageDialog(WindowManager.getDefault().getMainWindow(), "Unable to add the " + (tags.size() > 1 ? "files" : "file") + " to the hash set. Hashes have not been calculated. Please configure and run an appropriate ingest module.", "Add to Hash Set Error", JOptionPane.ERROR_MESSAGE);
+                            progressPanel.updateStatusLabel("Unable to add the " + (tags.size() > 1 ? "files" : "file") + " to the hash set. Hashes have not been calculated. Please configure and run an appropriate ingest module.");
                             break;
                         }
                     }
                 }
             } catch (TskCoreException ex) {
                 Logger.getLogger(AddTaggedHashesToHashDb.class.getName()).log(Level.SEVERE, "Error adding to hash set", ex);
-                JOptionPane.showMessageDialog(WindowManager.getDefault().getMainWindow(), "Error getting selected tags for case.", "Hash Export Error", JOptionPane.ERROR_MESSAGE);
+                progressPanel.updateStatusLabel("Error getting selected tags for case.");
             }
         }
         if (!failedExports.isEmpty()) {
@@ -193,7 +191,7 @@ public class AddTaggedHashesToHashDb implements GeneralReportModule {
                     errorMessage.append(".");
                 }
             }
-            JOptionPane.showMessageDialog(WindowManager.getDefault().getMainWindow(), errorMessage.toString(), "Hash Export Error", JOptionPane.ERROR_MESSAGE);
+            progressPanel.updateStatusLabel(errorMessage.toString());
         }
         
         progressPanel.setIndeterminate(false);
diff --git a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java b/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java
index 15d68a5bf0..c7346b0515 100644
--- a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java
@@ -100,10 +100,7 @@ class AddTaggedHashesToHashDbConfigPanel extends javax.swing.JPanel {
             // There may not be a case open when configuring report modules for Command Line execution
             tagNames = Case.getCurrentCaseThrows().getServices().getTagsManager().getTagNamesInUse();
         } catch (TskCoreException ex) {
-            Logger.getLogger(AddTaggedHashesToHashDbConfigPanel.class.getName()).log(Level.WARNING, "Failed to get tag names", ex);
-            // ELTODO remove all these JOptionPane.showMessageDialog(this, "Error getting tag names for case.", "Tag Names Not Found", JOptionPane.ERROR_MESSAGE);
-            // import javax.swing.JOptionPane;
-            // import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
+            Logger.getLogger(AddTaggedHashesToHashDbConfigPanel.class.getName()).log(Level.SEVERE, "Failed to get tag names", ex);
         } catch (NoCurrentCaseException ex) {
             // There may not be a case open when configuring report modules for Command Line execution
             Logger.getLogger(AddTaggedHashesToHashDbConfigPanel.class.getName()).log(Level.WARNING, "Exception while getting open case.", ex);

From 24176b513cfd3b377b8a841853719063b3f63cc1 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Wed, 28 Aug 2019 16:18:09 -0400
Subject: [PATCH 090/192] Refactorred ReportGenerator

---
 .../autopsy/report/ReportGenerator.java       | 160 ++++++++++++++++--
 .../autopsy/report/ReportVisualPanel1.java    |   6 +
 .../autopsy/report/ReportWizardAction.java    |  81 ++-------
 .../autopsy/report/ReportWizardPanel1.java    |  13 +-
 4 files changed, 166 insertions(+), 94 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
index b2d73a9e60..35be337a8c 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
@@ -29,7 +29,9 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.ExecutionException;
 import java.util.logging.Level;
@@ -57,10 +59,12 @@ class ReportGenerator {
      * Progress reportGenerationPanel that can be used to check for
      * cancellation.
      */
-    private ReportProgressPanel progressPanel;
-
+    private ReportProgressPanel progressPanel = null;
+    private ReportGenerationPanel reportGenerationPanel = null;
+    
     private static final String REPORT_PATH_FMT_STR = "%s" + File.separator + "%s %s %s" + File.separator;
-    private final ReportGenerationPanel reportGenerationPanel = new ReportGenerationPanel();
+
+    private final String configName;
 
     static final String REPORTS_DIR = "Reports"; //NON-NLS
 
@@ -71,6 +75,7 @@ class ReportGenerator {
      * way. MessageNotifyUtil used to display bubble notification.
      */
     private void displayReportErrors() {
+        // ELTODO 
         if (!errorList.isEmpty()) {
             String errorString = "";
             for (String error : errorList) {
@@ -83,9 +88,128 @@ class ReportGenerator {
 
     /**
      * Creates a report generator.
+     *
+     * ReportGenerator() { this.errorList = new ArrayList<>(); }
      */
-    ReportGenerator() {
+    public ReportGenerator(String configName, ReportProgressLogger progress) {
         this.errorList = new ArrayList<>();
+        this.progressPanel = progress;
+        this.reportGenerationPanel = null;
+        this.configName = configName;
+    }
+
+    public ReportGenerator(String configName, ReportGenerationPanel panel) {
+        this.errorList = new ArrayList<>();
+        this.reportGenerationPanel = panel;
+        this.progressPanel = null;
+        this.configName = configName;
+    }
+
+    public void generateReports() {
+        ReportingConfig config = null;
+        try {
+            config = ReportingConfigLoader.loadConfig(configName);
+        } catch (ReportConfigException ex) {
+            // ELTODO log these in appropriate pannel or logger
+            logger.log(Level.SEVERE, "Unable to load reporting configuration " + configName + ". Exiting", ex);
+            return;
+        }
+
+        if (config == null) {
+            logger.log(Level.SEVERE, "Unable to load reporting configuration {0}. Exiting", configName);
+            return;
+        }
+
+        // load all report modules 
+        Map<String, ReportModule> modules = new HashMap<>();
+        for (TableReportModule module : ReportModuleLoader.getTableReportModules()) {
+            modules.put(module.getClass().getCanonicalName(), module);
+        }
+
+        for (GeneralReportModule module : ReportModuleLoader.getGeneralReportModules()) {
+            modules.put(module.getClass().getCanonicalName(), module);
+        }
+
+        for (FileReportModule module : ReportModuleLoader.getFileReportModules()) {
+            modules.put(module.getClass().getCanonicalName(), module);
+        }
+
+        // special case for PortableCaseReportModule
+        modules.put(PortableCaseReportModule.class.getCanonicalName(), new PortableCaseReportModule());
+
+        // generate reports for enabled modules
+        for (Map.Entry<String, ReportModuleConfig> entry : config.getModuleConfigs().entrySet()) {
+            ReportModuleConfig moduleConfig = entry.getValue();
+            if (moduleConfig == null || !moduleConfig.isEnabled()) {
+                continue;
+            }
+
+            // found enabled module
+            String moduleName = entry.getKey();
+            ReportModule module = modules.get(moduleName);
+            if (module == null) {
+                logger.log(Level.SEVERE, "Report module {0} not found", moduleName);
+                continue;
+            }
+            
+            // get persisted module settings
+            ReportModuleSettings settings = moduleConfig.getModuleSettings();
+            if (settings == null) {
+                // use default configuration for this module
+                settings = module.getDefaultConfiguration();
+            }
+
+            // set module configuration
+            module.setConfiguration(settings);
+
+            try {
+                // generate report according to report module type
+                if (module instanceof GeneralReportModule) {
+
+                    // generate report
+                    generateGeneralReport((GeneralReportModule) module);
+
+                } else if (module instanceof TableReportModule) {
+                    
+                    // get table report settings
+                    TableReportSettings tableSettings = config.getTableReportSettings();
+                    if (tableSettings == null) {
+                        logger.log(Level.SEVERE, "No table report settings for report module {0}", moduleName);
+                        continue;
+                    }
+
+                    generateTableReport((TableReportModule) module, tableSettings); //NON-NLS
+
+                } else if (module instanceof FileReportModule) {
+
+                    // get file report settings
+                    FileReportSettings fileSettings = config.getFileReportSettings();
+                    if (fileSettings == null) {
+                        logger.log(Level.SEVERE, "No file report settings for report module {0}", moduleName);
+                        continue;
+                    }
+
+                    generateFileListReport((FileReportModule) module, fileSettings); //NON-NLS
+
+                } else if (module instanceof PortableCaseReportModule) {
+                    // get report settings
+                    if (settings instanceof NoReportModuleSettings) {
+                        settings = new PortableCaseReportModuleSettings();
+                    } else if (!(settings instanceof PortableCaseReportModuleSettings)) {
+                        logger.log(Level.SEVERE, "Invalid settings for report module {0}", moduleName);
+                        continue;                        
+                    }
+
+                    generatePortableCaseReport((PortableCaseReportModule) module, (PortableCaseReportModuleSettings) settings);
+
+                } else {
+                    logger.log(Level.SEVERE, "Report module {0} has unsupported report module type", moduleName);
+                    continue;
+                }
+            } catch (IOException e) {
+                logger.log(Level.SEVERE, "Exception while running report module {0}: {1}", new Object[]{moduleName, e.getMessage()});
+            }
+        }
     }
 
     /**
@@ -93,6 +217,10 @@ class ReportGenerator {
      * parent dialog.
      */
     private void displayProgressPanel() {
+        if (reportGenerationPanel == null) {
+            return;
+        }
+
         final JDialog dialog = new JDialog((JFrame) WindowManager.getDefault().getMainWindow(), true);
         dialog.setDefaultCloseOperation(JDialog.DO_NOTHING_ON_CLOSE);
         dialog.setTitle(NbBundle.getMessage(this.getClass(), "ReportGenerator.displayProgress.title.text"));
@@ -120,7 +248,7 @@ class ReportGenerator {
     /**
      * Run the GeneralReportModules using a SwingWorker.
      */
-    void generateGeneralReport(GeneralReportModule generalReportModule) throws IOException {
+    private void generateGeneralReport(GeneralReportModule generalReportModule) throws IOException {
         if (generalReportModule != null) {
             String reportDir = createReportDirectory(generalReportModule);
             setupProgressPanel(generalReportModule, reportDir);
@@ -137,7 +265,7 @@ class ReportGenerator {
      *
      * @param tableReportSettings settings for the table report
      */
-    void generateTableReport(TableReportModule tableReport, TableReportSettings tableReportSettings) throws IOException {
+    private void generateTableReport(TableReportModule tableReport, TableReportSettings tableReportSettings) throws IOException {
         if (tableReport != null && tableReportSettings != null && null != tableReportSettings.getArtifactSelections()) {
             String reportDir = createReportDirectory(tableReport);
             setupProgressPanel(tableReport, reportDir);
@@ -160,7 +288,7 @@ class ReportGenerator {
      *
      * @param fileReportSettings settings for the file report
      */
-    void generateFileListReport(FileReportModule fileReportModule, FileReportSettings fileReportSettings) throws IOException {
+    private void generateFileListReport(FileReportModule fileReportModule, FileReportSettings fileReportSettings) throws IOException {
         if (fileReportModule != null && fileReportSettings != null && null != fileReportSettings.getFileProperties()) {
             String reportDir = createReportDirectory(fileReportModule);
             List<FileReportDataTypes> enabled = new ArrayList<>();
@@ -217,7 +345,7 @@ class ReportGenerator {
     /**
      * Run the Portable Case Report Module
      */
-    void generatePortableCaseReport(PortableCaseReportModule portableCaseReportModule, PortableCaseReportModuleSettings settings) throws IOException {
+    private void generatePortableCaseReport(PortableCaseReportModule portableCaseReportModule, PortableCaseReportModuleSettings settings) throws IOException {
         if (portableCaseReportModule != null) {
             String reportDir = createReportDirectory(portableCaseReportModule);
             setupProgressPanel(portableCaseReportModule, reportDir);
@@ -251,13 +379,15 @@ class ReportGenerator {
     }
 
     private void setupProgressPanel(ReportModule module, String reportDir) {
-        String reportFilePath = module.getRelativeFilePath();
-        if (reportFilePath == null) {
-            this.progressPanel = reportGenerationPanel.addReport(module.getName(), null);
-        } else if (reportFilePath.isEmpty()) {
-            this.progressPanel = reportGenerationPanel.addReport(module.getName(), reportDir);
-        } else {
-            this.progressPanel = reportGenerationPanel.addReport(module.getName(), reportDir + reportFilePath);
+        if (reportGenerationPanel != null) {
+            String reportFilePath = module.getRelativeFilePath();
+            if (reportFilePath == null) {
+                this.progressPanel = reportGenerationPanel.addReport(module.getName(), null);
+            } else if (reportFilePath.isEmpty()) {
+                this.progressPanel = reportGenerationPanel.addReport(module.getName(), reportDir);
+            } else {
+                this.progressPanel = reportGenerationPanel.addReport(module.getName(), reportDir + reportFilePath);
+            }
         }
     }
 
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
index 2b54e1b1db..b2006749c6 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
@@ -227,6 +227,12 @@ final class ReportVisualPanel1 extends JPanel implements ListSelectionListener {
             ReportModuleSettings settings = module.getConfiguration();
             moduleConfigs.put(module.getClass().getCanonicalName(), new ReportModuleConfig(module, false, settings));
         }
+        
+        // set "enabled" flag for the selected module
+        ReportModule mod = getSelectedModule();
+        ReportModuleConfig config = moduleConfigs.get(mod.getClass().getCanonicalName());
+        config.setEnabled(true);
+        
         return moduleConfigs;
     }
 
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
index 161a713642..f9e03b367b 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
@@ -76,67 +76,17 @@ public final class ReportWizardAction extends CallableSystemAction implements Pr
         wiz.setTitleFormat(new MessageFormat("{0} {1}"));
         wiz.setTitle(NbBundle.getMessage(ReportWizardAction.class, "ReportWizardAction.reportWiz.title"));
         if (DialogDisplayer.getDefault().notify(wiz) == WizardDescriptor.FINISH_OPTION) {
-            ReportGenerator generator = new ReportGenerator(); //NON-NLS
-            TableReportModule tableReport = (TableReportModule) wiz.getProperty("tableModule");
-            GeneralReportModule generalReport = (GeneralReportModule) wiz.getProperty("generalModule");
-            FileReportModule fileReport = (FileReportModule) wiz.getProperty("fileModule");
-            PortableCaseReportModule portableCaseReport = (PortableCaseReportModule) wiz.getProperty("portableCaseModule");  // NON-NLS
-            try {
-                if (tableReport != null) {
-                    // get table report settings
-                    TableReportSettings settings = (TableReportSettings) wiz.getProperty("tableReportSettings");
-                    if (settings == null) {
-                        NotifyDescriptor descriptor = new NotifyDescriptor.Message(NbBundle.getMessage(ReportWizardAction.class, "ReportGenerator.errList.noReportSettings"), NotifyDescriptor.ERROR_MESSAGE);
-                        DialogDisplayer.getDefault().notify(descriptor);
-                        return;
-                    }
+            
+            // save reporting configuration
+            saveReportingConfiguration(configName, wiz);
                     
-                    // save reporting configuration
-                    saveReportingConfiguration(configName, wiz);
-                    
-                    if (runReports) {
-                        generator.generateTableReport(tableReport, settings); //NON-NLS
-                    }
-                } else if (generalReport != null) {                    
-                    // save reporting configuration
-                    saveReportingConfiguration(configName, wiz);
-                    
-                    if (runReports) {
-                        generator.generateGeneralReport(generalReport);
-                    }
-                } else if (fileReport != null) {
-                    // get file report settings
-                    FileReportSettings settings = (FileReportSettings) wiz.getProperty("fileReportSettings");
-                    if (settings == null) {
-                        NotifyDescriptor descriptor = new NotifyDescriptor.Message(NbBundle.getMessage(ReportWizardAction.class, "ReportGenerator.errList.noReportSettings"), NotifyDescriptor.ERROR_MESSAGE);
-                        DialogDisplayer.getDefault().notify(descriptor);
-                        return;
-                    }
-                    // save reporting configuration
-                    saveReportingConfiguration(configName, wiz);
-                    
-                    if (runReports) {
-                        generator.generateFileListReport(fileReport, settings); //NON-NLS
-                    }
-                } else if (portableCaseReport != null) {
-                    // get table report settings
-                    PortableCaseReportModuleSettings settings = (PortableCaseReportModuleSettings) wiz.getProperty("portableCaseReportSettings");
-                    if (settings == null) {
-                        NotifyDescriptor descriptor = new NotifyDescriptor.Message(NbBundle.getMessage(ReportWizardAction.class, "ReportGenerator.errList.noReportSettings"), NotifyDescriptor.ERROR_MESSAGE);
-                        DialogDisplayer.getDefault().notify(descriptor);
-                        return;
-                    }
-                    
-                    // save reporting configuration
-                    saveReportingConfiguration(configName, wiz);
-                    
-                    if (runReports) {
-                        generator.generatePortableCaseReport(portableCaseReport, settings);
-                    }
-                }
-            } catch (IOException e) {
-                NotifyDescriptor descriptor = new NotifyDescriptor.Message(e.getMessage(), NotifyDescriptor.ERROR_MESSAGE);
-                DialogDisplayer.getDefault().notify(descriptor);
+            if (runReports) {
+                ReportGenerator generator = new ReportGenerator(configName, new ReportGenerationPanel()); //NON-NLS
+                generator.generateReports();
+                
+                // ELTODO remove
+                generator = new ReportGenerator(configName, new ReportProgressLogger()); //NON-NLS
+                generator.generateReports();
             }
         }
     }
@@ -152,17 +102,10 @@ public final class ReportWizardAction extends CallableSystemAction implements Pr
         // update portable case settings
         ReportModuleConfig config = moduleConfigs.get(PortableCaseReportModule.class.getCanonicalName());
         PortableCaseReportModuleSettings portableCaseReportSettings = (PortableCaseReportModuleSettings) wiz.getProperty("portableCaseReportSettings");
-        if (config != null) {
+        if (portableCaseReportSettings != null) {
             config.setModuleSettings(portableCaseReportSettings);
-        } else {
-            PortableCaseReportModule portableCaseReport = (PortableCaseReportModule) wiz.getProperty("portableCaseModule");  // NON-NLS
-            if (portableCaseReport != null) {
-                config = new ReportModuleConfig(portableCaseReport, true, portableCaseReportSettings);
-            }
-        }
-        if (config != null) {
             moduleConfigs.put(PortableCaseReportModule.class.getCanonicalName(), config);
-        }
+        }        
         
         // set module configs
         reportingConfig.setModuleConfigs(moduleConfigs);
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java
index c39efacdb6..a5d141b5e7 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java
@@ -109,20 +109,13 @@ class ReportWizardPanel1 implements WizardDescriptor.FinishablePanel<WizardDescr
 
     @Override
     public void storeSettings(WizardDescriptor wiz) {
-        TableReportModule module = getComponent().getTableModule();
-        GeneralReportModule general = getComponent().getGeneralModule();
-        PortableCaseReportModule portable = getComponent().getPortableCaseModule();
-        wiz.putProperty("tableModule", module); //NON-NLS
-        wiz.putProperty("generalModule", general); //NON-NLS
-        wiz.putProperty("fileModule", getComponent().getFileModule()); //NON-NLS
-        wiz.putProperty("portableCaseModule", portable); //NON-NLS
         wiz.putProperty("moduleConfigs", getComponent().getUpdatedModuleConfigs()); //NON-NLS
 
         // Store preferences that WizardIterator will use to determine what 
         // panels need to be shown
         Preferences prefs = NbPreferences.forModule(ReportWizardPanel1.class);
-        prefs.putBoolean("tableModule", module != null); //NON-NLS
-        prefs.putBoolean("generalModule", general != null); //NON-NLS
-        prefs.putBoolean("portableCaseModule", portable != null); //NON-NLS
+        prefs.putBoolean("tableModule", getComponent().getTableModule() != null); //NON-NLS
+        prefs.putBoolean("generalModule", getComponent().getGeneralModule() != null); //NON-NLS
+        prefs.putBoolean("portableCaseModule", getComponent().getPortableCaseModule() != null); //NON-NLS
     }
 }

From b19357b6106c85069873450c7b5dedc547e77b38 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Wed, 28 Aug 2019 16:40:20 -0400
Subject: [PATCH 091/192] Removed UI interactions from ReportGenerator

---
 .../autopsy/report/ReportGenerationPanel.java | 12 ++++---
 .../autopsy/report/ReportGenerator.java       | 34 ++++++++-----------
 .../autopsy/report/ReportProgressDialog.java  | 24 ++++++++-----
 3 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.java b/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.java
index 53c17b3543..a3d661cff3 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.java
@@ -53,6 +53,11 @@ class ReportGenerationPanel extends javax.swing.JPanel {
         constraints.gridy = 0;
         constraints.weightx = 1.0;
         glue = Box.createVerticalGlue();
+        progressPanel = new ReportProgressDialog();
+    }
+    
+    ReportProgressDialog getProgressPanel() {
+        return progressPanel;
     }
 
     /**
@@ -61,16 +66,14 @@ class ReportGenerationPanel extends javax.swing.JPanel {
      *
      * @param reportName The report name.
      * @param reportPath The report file path
-     *
-     * @return The report generation progress panel.
      */
-    ReportProgressDialog addReport(String reportName, String reportPath) {
+    void addReport(String reportName, String reportPath) {
         /*
          * Remove the "glue."
          */
         reportPanel.remove(glue);
 
-        progressPanel = new ReportProgressDialog(reportName, reportPath);
+        progressPanel.setLabels(reportName, reportPath);
         constraints.weighty = 0.0;
         constraints.anchor = GridBagConstraints.NORTH;
         reportPanel.add(progressPanel, constraints);
@@ -98,7 +101,6 @@ class ReportGenerationPanel extends javax.swing.JPanel {
                 });
             }
         });
-        return progressPanel;
     }
 
     /**
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
index 35be337a8c..9660008f1c 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
@@ -44,7 +44,6 @@ import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
 import org.sleuthkit.autopsy.coreutils.Logger;
-import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil; // ELTODO do we need to remove this?
 import org.sleuthkit.autopsy.report.ReportProgressPanel.ReportStatus;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.SleuthkitCase;
@@ -75,21 +74,17 @@ class ReportGenerator {
      * way. MessageNotifyUtil used to display bubble notification.
      */
     private void displayReportErrors() {
-        // ELTODO 
         if (!errorList.isEmpty()) {
             String errorString = "";
             for (String error : errorList) {
                 errorString += error + "\n";
             }
-            MessageNotifyUtil.Notify.error(
-                    NbBundle.getMessage(this.getClass(), "ReportGenerator.notifyErr.errsDuringRptGen"), errorString);
+            progressPanel.updateStatusLabel(errorString);
         }
     }
 
     /**
      * Creates a report generator.
-     *
-     * ReportGenerator() { this.errorList = new ArrayList<>(); }
      */
     public ReportGenerator(String configName, ReportProgressLogger progress) {
         this.errorList = new ArrayList<>();
@@ -101,7 +96,7 @@ class ReportGenerator {
     public ReportGenerator(String configName, ReportGenerationPanel panel) {
         this.errorList = new ArrayList<>();
         this.reportGenerationPanel = panel;
-        this.progressPanel = null;
+        this.progressPanel = panel.getProgressPanel();
         this.configName = configName;
     }
 
@@ -110,13 +105,14 @@ class ReportGenerator {
         try {
             config = ReportingConfigLoader.loadConfig(configName);
         } catch (ReportConfigException ex) {
-            // ELTODO log these in appropriate pannel or logger
             logger.log(Level.SEVERE, "Unable to load reporting configuration " + configName + ". Exiting", ex);
+            progressPanel.updateStatusLabel("Unable to load reporting configuration " + configName + ". Exiting");
             return;
         }
 
         if (config == null) {
             logger.log(Level.SEVERE, "Unable to load reporting configuration {0}. Exiting", configName);
+            progressPanel.updateStatusLabel("Unable to load reporting configuration " + configName + ". Exiting");
             return;
         }
 
@@ -149,6 +145,7 @@ class ReportGenerator {
             ReportModule module = modules.get(moduleName);
             if (module == null) {
                 logger.log(Level.SEVERE, "Report module {0} not found", moduleName);
+                progressPanel.updateStatusLabel("Report module " + moduleName + " not found");
                 continue;
             }
             
@@ -175,6 +172,7 @@ class ReportGenerator {
                     TableReportSettings tableSettings = config.getTableReportSettings();
                     if (tableSettings == null) {
                         logger.log(Level.SEVERE, "No table report settings for report module {0}", moduleName);
+                        progressPanel.updateStatusLabel("No table report settings for report module " + moduleName);
                         continue;
                     }
 
@@ -186,6 +184,7 @@ class ReportGenerator {
                     FileReportSettings fileSettings = config.getFileReportSettings();
                     if (fileSettings == null) {
                         logger.log(Level.SEVERE, "No file report settings for report module {0}", moduleName);
+                        progressPanel.updateStatusLabel("No file report settings for report module " + moduleName);
                         continue;
                     }
 
@@ -197,6 +196,7 @@ class ReportGenerator {
                         settings = new PortableCaseReportModuleSettings();
                     } else if (!(settings instanceof PortableCaseReportModuleSettings)) {
                         logger.log(Level.SEVERE, "Invalid settings for report module {0}", moduleName);
+                        progressPanel.updateStatusLabel("Invalid settings for report module " + moduleName);
                         continue;                        
                     }
 
@@ -204,10 +204,12 @@ class ReportGenerator {
 
                 } else {
                     logger.log(Level.SEVERE, "Report module {0} has unsupported report module type", moduleName);
+                    progressPanel.updateStatusLabel("Report module " + moduleName + " has unsupported report module type");
                     continue;
                 }
             } catch (IOException e) {
                 logger.log(Level.SEVERE, "Exception while running report module {0}: {1}", new Object[]{moduleName, e.getMessage()});
+                progressPanel.updateStatusLabel("Exception while running report module " + moduleName);
             }
         }
     }
@@ -369,10 +371,7 @@ class ReportGenerator {
             absFiles = skCase.findAllFilesWhere("meta_type != " + TskData.TSK_FS_META_TYPE_ENUM.TSK_FS_META_TYPE_DIR.getValue()); //NON-NLS
             return absFiles;
         } catch (TskCoreException | NoCurrentCaseException ex) {
-            MessageNotifyUtil.Notify.show(
-                    NbBundle.getMessage(this.getClass(), "ReportGenerator.errors.reportErrorTitle"),
-                    NbBundle.getMessage(this.getClass(), "ReportGenerator.errors.reportErrorText") + ex.getLocalizedMessage(),
-                    MessageNotifyUtil.MessageType.ERROR);
+            progressPanel.updateStatusLabel(NbBundle.getMessage(this.getClass(), "ReportGenerator.errors.reportErrorText") + ex.getLocalizedMessage());
             logger.log(Level.SEVERE, "failed to generate reports. Unable to get all files in the image.", ex); //NON-NLS
             return Collections.<AbstractFile>emptyList();
         }
@@ -382,11 +381,11 @@ class ReportGenerator {
         if (reportGenerationPanel != null) {
             String reportFilePath = module.getRelativeFilePath();
             if (reportFilePath == null) {
-                this.progressPanel = reportGenerationPanel.addReport(module.getName(), null);
+                reportGenerationPanel.addReport(module.getName(), null);
             } else if (reportFilePath.isEmpty()) {
-                this.progressPanel = reportGenerationPanel.addReport(module.getName(), reportDir);
+                reportGenerationPanel.addReport(module.getName(), reportDir);
             } else {
-                this.progressPanel = reportGenerationPanel.addReport(module.getName(), reportDir + reportFilePath);
+                reportGenerationPanel.addReport(module.getName(), reportDir + reportFilePath);
             }
         }
     }
@@ -431,10 +430,7 @@ class ReportGenerator {
             try {
                 get();
             } catch (InterruptedException | ExecutionException ex) {
-                MessageNotifyUtil.Notify.show(
-                        NbBundle.getMessage(this.getClass(), "ReportGenerator.errors.reportErrorTitle"),
-                        NbBundle.getMessage(this.getClass(), "ReportGenerator.errors.reportErrorText") + ex.getLocalizedMessage(),
-                        MessageNotifyUtil.MessageType.ERROR);
+                progressPanel.updateStatusLabel(NbBundle.getMessage(this.getClass(), "ReportGenerator.errors.reportErrorText") + ex.getLocalizedMessage());
                 logger.log(Level.SEVERE, "failed to generate reports", ex); //NON-NLS
             } // catch and ignore if we were cancelled
             catch (java.util.concurrent.CancellationException ex) {
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportProgressDialog.java b/Core/src/org/sleuthkit/autopsy/report/ReportProgressDialog.java
index ddb32686e9..face4174dd 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportProgressDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportProgressDialog.java
@@ -41,20 +41,28 @@ public class ReportProgressDialog extends javax.swing.JPanel implements ReportPr
     private static final Color GREEN = new Color(50, 205, 50);
     private static final Color RED = new Color(178, 34, 34);
     private volatile ReportProgressPanel.ReportStatus status;
-    
+
     /**
      * Constructs a panel used by report generation module to show progress.
+     */
+    ReportProgressDialog() {
+        initComponents();
+        reportProgressBar.setIndeterminate(true);
+        reportProgressBar.setMaximum(100);
+        statusMessageLabel.setText(NbBundle.getMessage(this.getClass(), "ReportProgressDialog.progress.queuing"));
+        status = ReportStatus.QUEUING;
+        reportLabel.setText("");
+        pathLabel.setText(""); //NON-NLS
+    }
+
+    /**
+     * Sets label text.
      *
      * @param reportName The name of the report being generated.
      * @param reportPath The path to the report file.
      */
-    ReportProgressDialog(String reportName, String reportPath) {
-        initComponents();
-        reportProgressBar.setIndeterminate(true);
-        reportProgressBar.setMaximum(100);
+    void setLabels(String reportName, String reportPath) {
         reportLabel.setText(reportName);
-        statusMessageLabel.setText(NbBundle.getMessage(this.getClass(), "ReportProgressDialog.progress.queuing"));
-        status = ReportStatus.QUEUING;
         if (null != reportPath) {
             pathLabel.setText("<html><u>" + shortenPath(reportPath) + "</u></html>"); //NON-NLS
             pathLabel.setToolTipText(reportPath);
@@ -170,7 +178,7 @@ public class ReportProgressDialog extends javax.swing.JPanel implements ReportPr
      * indeterminate.
      *
      * @param indeterminate True if the progress bar should be set to
-     *                      indeterminate.
+     * indeterminate.
      */
     @Override
     public void setIndeterminate(boolean indeterminate) {

From b90c61c310a8ba7fc530a1d87bb8c6f089e933c7 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Wed, 28 Aug 2019 17:17:54 -0400
Subject: [PATCH 092/192] Codde cleanup

---
 Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java | 4 ----
 .../org/sleuthkit/autopsy/report/ReportWizardAction.java   | 7 +------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
index 9660008f1c..d50990e4cc 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
@@ -54,10 +54,6 @@ class ReportGenerator {
 
     private static final Logger logger = Logger.getLogger(ReportGenerator.class.getName());
 
-    /**
-     * Progress reportGenerationPanel that can be used to check for
-     * cancellation.
-     */
     private ReportProgressPanel progressPanel = null;
     private ReportGenerationPanel reportGenerationPanel = null;
     
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
index f9e03b367b..8542f65fe7 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
@@ -26,7 +26,6 @@ import java.awt.Component;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.beans.PropertyChangeEvent;
-import java.io.IOException;
 import java.text.MessageFormat;
 import java.util.EnumSet;
 import java.util.Map;
@@ -34,7 +33,6 @@ import java.util.logging.Level;
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import org.openide.DialogDisplayer;
-import org.openide.NotifyDescriptor;
 import org.openide.WizardDescriptor;
 import org.openide.awt.ActionID;
 import org.openide.awt.ActionReference;
@@ -81,12 +79,9 @@ public final class ReportWizardAction extends CallableSystemAction implements Pr
             saveReportingConfiguration(configName, wiz);
                     
             if (runReports) {
+                // generate reports
                 ReportGenerator generator = new ReportGenerator(configName, new ReportGenerationPanel()); //NON-NLS
                 generator.generateReports();
-                
-                // ELTODO remove
-                generator = new ReportGenerator(configName, new ReportProgressLogger()); //NON-NLS
-                generator.generateReports();
             }
         }
     }

From 92ad2de2f36f4b666aedf22948c8df43eb01be24 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Fri, 30 Aug 2019 10:00:39 -0400
Subject: [PATCH 093/192] Added report configuration to command line options
 panel

---
 .../commandlineingest/Bundle.properties       |  4 +++
 .../Bundle.properties-MERGED                  |  4 +++
 .../CommandLineIngestSettingsPanel.form       | 31 ++++++++++++++++-
 .../CommandLineIngestSettingsPanel.java       | 34 +++++++++++++++++--
 4 files changed, 70 insertions(+), 3 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/Bundle.properties b/Core/src/org/sleuthkit/autopsy/commandlineingest/Bundle.properties
index d7807fc24f..81ce425798 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/Bundle.properties
@@ -7,3 +7,7 @@ CommandLineIngestSettingsPanel.bnEditIngestSettings.text=Ingest Module Settings
 CommandLinePanel.jLabel1.text=Ingest is running from command line
 CommandLineStartupWindow.title.text=Running in Command Line Mode
 CommandLineIngestSettingsPanel.jLabelBaselineConfig.text=Configure Baseline Configuration for Command Line Ingest:
+CommandLineIngestSettingsPanel.bnEditReportSettings.actionCommand=Report Module Settings
+CommandLineIngestSettingsPanel.bnEditReportSettings.text=Report Module Settings
+CommandLineIngestSettingsPanel.jLabelReportConfig.text=Configure Report Generation for Command Line Ingest:
+CommandLineIngestSettingsPanel.bnEditReportSettings.toolTipText=Report generation settings for the command line processing mode context.
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/commandlineingest/Bundle.properties-MERGED
index d7807fc24f..81ce425798 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/Bundle.properties-MERGED
@@ -7,3 +7,7 @@ CommandLineIngestSettingsPanel.bnEditIngestSettings.text=Ingest Module Settings
 CommandLinePanel.jLabel1.text=Ingest is running from command line
 CommandLineStartupWindow.title.text=Running in Command Line Mode
 CommandLineIngestSettingsPanel.jLabelBaselineConfig.text=Configure Baseline Configuration for Command Line Ingest:
+CommandLineIngestSettingsPanel.bnEditReportSettings.actionCommand=Report Module Settings
+CommandLineIngestSettingsPanel.bnEditReportSettings.text=Report Module Settings
+CommandLineIngestSettingsPanel.jLabelReportConfig.text=Configure Report Generation for Command Line Ingest:
+CommandLineIngestSettingsPanel.bnEditReportSettings.toolTipText=Report generation settings for the command line processing mode context.
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.form b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.form
index cce9c639b9..1582dba4d5 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.form
@@ -50,6 +50,8 @@
                       <Group type="103" groupAlignment="0" attributes="0">
                           <Component id="bnEditIngestSettings" alignment="0" min="-2" pref="155" max="-2" attributes="0"/>
                           <Component id="jLabelBaselineConfig" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Component id="jLabelReportConfig" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Component id="bnEditReportSettings" alignment="0" min="-2" pref="155" max="-2" attributes="0"/>
                       </Group>
                       <EmptySpace pref="1362" max="32767" attributes="0"/>
                   </Group>
@@ -62,7 +64,11 @@
                       <Component id="jLabelBaselineConfig" min="-2" max="-2" attributes="0"/>
                       <EmptySpace type="unrelated" max="-2" attributes="0"/>
                       <Component id="bnEditIngestSettings" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace pref="442" max="32767" attributes="0"/>
+                      <EmptySpace type="separate" max="-2" attributes="0"/>
+                      <Component id="jLabelReportConfig" min="-2" max="-2" attributes="0"/>
+                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                      <Component id="bnEditReportSettings" min="-2" max="-2" attributes="0"/>
+                      <EmptySpace pref="376" max="32767" attributes="0"/>
                   </Group>
               </Group>
             </DimensionLayout>
@@ -91,6 +97,29 @@
                 </Property>
               </Properties>
             </Component>
+            <Component class="javax.swing.JLabel" name="jLabelReportConfig">
+              <Properties>
+                <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+                  <ResourceString bundle="org/sleuthkit/autopsy/commandlineingest/Bundle.properties" key="CommandLineIngestSettingsPanel.jLabelReportConfig.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                </Property>
+              </Properties>
+            </Component>
+            <Component class="javax.swing.JButton" name="bnEditReportSettings">
+              <Properties>
+                <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+                  <ResourceString bundle="org/sleuthkit/autopsy/commandlineingest/Bundle.properties" key="CommandLineIngestSettingsPanel.bnEditReportSettings.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/commandlineingest/Bundle.properties" key="CommandLineIngestSettingsPanel.bnEditReportSettings.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                </Property>
+                <Property name="actionCommand" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+                  <ResourceString bundle="org/sleuthkit/autopsy/commandlineingest/Bundle.properties" key="CommandLineIngestSettingsPanel.bnEditReportSettings.actionCommand" 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="bnEditReportSettingsActionPerformed"/>
+              </Events>
+            </Component>
           </SubComponents>
         </Container>
       </SubComponents>
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.java
index f17f2fcc21..0a76cdae2f 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.java
@@ -26,6 +26,7 @@ import org.sleuthkit.autopsy.ingest.IngestJobSettings;
 import org.sleuthkit.autopsy.ingest.IngestJobSettingsPanel;
 import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.coreutils.Logger;
+import static org.sleuthkit.autopsy.report.ReportWizardAction.doReportWizard;
 
 /**
  * Configuration panel for auto ingest settings.
@@ -36,6 +37,10 @@ public class CommandLineIngestSettingsPanel extends javax.swing.JPanel {
     private final CommandLineIngestSettingsPanelController controller;
     private static final long serialVersionUID = 1L;
     private static final Logger logger = Logger.getLogger(CommandLineIngestSettingsPanel.class.getName());
+    
+    private static final String REPORTING_CONFIGURATION_NAME = "CommandLineIngest";
+    private static final boolean DISPLAY_CASE_SPECIFIC_DATA = false; // do not try to display case specific data as there is likely no case open
+    private static final boolean RUN_REPORTS = false; // do not generate reports as part of running the report wizard
 
     /**
      * Creates new form AutoIngestSettingsPanel
@@ -90,6 +95,8 @@ public class CommandLineIngestSettingsPanel extends javax.swing.JPanel {
         nodePanel = new javax.swing.JPanel();
         bnEditIngestSettings = new javax.swing.JButton();
         jLabelBaselineConfig = new javax.swing.JLabel();
+        jLabelReportConfig = new javax.swing.JLabel();
+        bnEditReportSettings = new javax.swing.JButton();
 
         nodeScrollPane.setMinimumSize(new java.awt.Dimension(0, 0));
 
@@ -106,6 +113,17 @@ public class CommandLineIngestSettingsPanel extends javax.swing.JPanel {
 
         org.openide.awt.Mnemonics.setLocalizedText(jLabelBaselineConfig, org.openide.util.NbBundle.getMessage(CommandLineIngestSettingsPanel.class, "CommandLineIngestSettingsPanel.jLabelBaselineConfig.text")); // NOI18N
 
+        org.openide.awt.Mnemonics.setLocalizedText(jLabelReportConfig, org.openide.util.NbBundle.getMessage(CommandLineIngestSettingsPanel.class, "CommandLineIngestSettingsPanel.jLabelReportConfig.text")); // NOI18N
+
+        org.openide.awt.Mnemonics.setLocalizedText(bnEditReportSettings, org.openide.util.NbBundle.getMessage(CommandLineIngestSettingsPanel.class, "CommandLineIngestSettingsPanel.bnEditReportSettings.text")); // NOI18N
+        bnEditReportSettings.setToolTipText(org.openide.util.NbBundle.getMessage(CommandLineIngestSettingsPanel.class, "CommandLineIngestSettingsPanel.bnEditReportSettings.toolTipText")); // NOI18N
+        bnEditReportSettings.setActionCommand(org.openide.util.NbBundle.getMessage(CommandLineIngestSettingsPanel.class, "CommandLineIngestSettingsPanel.bnEditReportSettings.actionCommand")); // NOI18N
+        bnEditReportSettings.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                bnEditReportSettingsActionPerformed(evt);
+            }
+        });
+
         javax.swing.GroupLayout nodePanelLayout = new javax.swing.GroupLayout(nodePanel);
         nodePanel.setLayout(nodePanelLayout);
         nodePanelLayout.setHorizontalGroup(
@@ -114,7 +132,9 @@ public class CommandLineIngestSettingsPanel extends javax.swing.JPanel {
                 .addContainerGap()
                 .addGroup(nodePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addComponent(bnEditIngestSettings, javax.swing.GroupLayout.PREFERRED_SIZE, 155, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(jLabelBaselineConfig))
+                    .addComponent(jLabelBaselineConfig)
+                    .addComponent(jLabelReportConfig)
+                    .addComponent(bnEditReportSettings, javax.swing.GroupLayout.PREFERRED_SIZE, 155, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addContainerGap(1362, Short.MAX_VALUE))
         );
         nodePanelLayout.setVerticalGroup(
@@ -124,7 +144,11 @@ public class CommandLineIngestSettingsPanel extends javax.swing.JPanel {
                 .addComponent(jLabelBaselineConfig)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                 .addComponent(bnEditIngestSettings)
-                .addContainerGap(442, Short.MAX_VALUE))
+                .addGap(18, 18, 18)
+                .addComponent(jLabelReportConfig)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addComponent(bnEditReportSettings)
+                .addContainerGap(376, Short.MAX_VALUE))
         );
 
         nodeScrollPane.setViewportView(nodePanel);
@@ -145,9 +169,15 @@ public class CommandLineIngestSettingsPanel extends javax.swing.JPanel {
         displayIngestJobSettingsPanel();
     }//GEN-LAST:event_bnEditIngestSettingsActionPerformed
 
+    private void bnEditReportSettingsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnEditReportSettingsActionPerformed
+        doReportWizard(REPORTING_CONFIGURATION_NAME, DISPLAY_CASE_SPECIFIC_DATA, RUN_REPORTS);
+    }//GEN-LAST:event_bnEditReportSettingsActionPerformed
+
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JButton bnEditIngestSettings;
+    private javax.swing.JButton bnEditReportSettings;
     private javax.swing.JLabel jLabelBaselineConfig;
+    private javax.swing.JLabel jLabelReportConfig;
     private javax.swing.JPanel nodePanel;
     private javax.swing.JScrollPane nodeScrollPane;
     // End of variables declaration//GEN-END:variables

From 15faf78cb28479e580c75596b4364519a9e939e9 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Fri, 30 Aug 2019 10:01:10 -0400
Subject: [PATCH 094/192] Bug fixes

---
 .../sleuthkit/autopsy/report/ArtifactSelectionDialog.java  | 7 ++++---
 .../sleuthkit/autopsy/report/PortableCaseReportModule.java | 4 ++--
 .../autopsy/report/PortableCaseReportModuleSettings.java   | 2 +-
 .../org/sleuthkit/autopsy/report/ReportVisualPanel2.java   | 3 ++-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/ArtifactSelectionDialog.java b/Core/src/org/sleuthkit/autopsy/report/ArtifactSelectionDialog.java
index a01853aa37..a6b658bd52 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ArtifactSelectionDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ArtifactSelectionDialog.java
@@ -49,8 +49,8 @@ public class ArtifactSelectionDialog extends javax.swing.JDialog {
 
     private ArtifactModel model;
     private ArtifactRenderer renderer;
-    private Map<BlackboardArtifact.Type, Boolean> artifactTypeSelections;
-    private List<BlackboardArtifact.Type> artifactTypes;
+    private Map<BlackboardArtifact.Type, Boolean> artifactTypeSelections = new HashMap<>();
+    private List<BlackboardArtifact.Type> artifactTypes = new ArrayList<>();
 
     /**
      * Creates new form ArtifactSelectionDialog
@@ -95,7 +95,8 @@ public class ArtifactSelectionDialog extends javax.swing.JDialog {
         } catch (TskCoreException ex) {
             Logger.getLogger(ArtifactSelectionDialog.class.getName()).log(Level.SEVERE, "Error getting list of artifacts in use: {0}", ex.getLocalizedMessage()); //NON-NLS
         } catch (NoCurrentCaseException ex) {
-            Logger.getLogger(ArtifactSelectionDialog.class.getName()).log(Level.SEVERE, "Exception while getting open case.", ex.getLocalizedMessage()); //NON-NLS
+            // There may not be a case open, for example when configuring Command Line reports
+            Logger.getLogger(ArtifactSelectionDialog.class.getName()).log(Level.WARNING, "Exception while getting open case.", ex.getLocalizedMessage()); //NON-NLS
         }
     }
 
diff --git a/Core/src/org/sleuthkit/autopsy/report/PortableCaseReportModule.java b/Core/src/org/sleuthkit/autopsy/report/PortableCaseReportModule.java
index 46b0c4fb4f..ca7913578c 100644
--- a/Core/src/org/sleuthkit/autopsy/report/PortableCaseReportModule.java
+++ b/Core/src/org/sleuthkit/autopsy/report/PortableCaseReportModule.java
@@ -77,7 +77,7 @@ class PortableCaseReportModule implements ReportModule {
     
     private Case currentCase = null;
     private SleuthkitCase portableSkCase = null;
-    private final String caseName;
+    private String caseName;
     private File caseFolder = null;
     private File copiedFilesFolder = null;
     
@@ -100,7 +100,6 @@ class PortableCaseReportModule implements ReportModule {
     private final Map<Long, BlackboardArtifact> oldArtifactIdToNewArtifact = new HashMap<>();
     
     PortableCaseReportModule() {
-        caseName = Case.getCurrentCase().getDisplayName() + " (Portable)"; // NON-NLS
     }
 
     @NbBundle.Messages({
@@ -209,6 +208,7 @@ class PortableCaseReportModule implements ReportModule {
         // Save the current case object
         try {
             currentCase = Case.getCurrentCaseThrows();
+            caseName = currentCase.getDisplayName() + " (Portable)"; // NON-NLS
         } catch (NoCurrentCaseException ex) {
             handleError("Current case has been closed",
                     Bundle.PortableCaseReportModule_generateReport_caseClosed(), null, progressPanel); // NON-NLS
diff --git a/Core/src/org/sleuthkit/autopsy/report/PortableCaseReportModuleSettings.java b/Core/src/org/sleuthkit/autopsy/report/PortableCaseReportModuleSettings.java
index 09692ff022..d52f426536 100755
--- a/Core/src/org/sleuthkit/autopsy/report/PortableCaseReportModuleSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/report/PortableCaseReportModuleSettings.java
@@ -114,7 +114,7 @@ class PortableCaseReportModuleSettings implements ReportModuleSettings {
     }
 
     boolean isValid() {
-        return ((!setNames.isEmpty()) || (!tagNames.isEmpty()));
+        return ((allTagsSelected || allSetsSelected || (!tagNames.isEmpty()) || (!setNames.isEmpty())));
     }
 
     List<String> getSelectedSetNames() {
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java
index 6cff8d3e14..c636314c5a 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java
@@ -291,7 +291,6 @@ final class ReportVisualPanel2 extends JPanel {
             tagStates.put(tag, (selected ? Boolean.TRUE : Boolean.FALSE));
         }
         tagsList.repaint();
-        wizPanel.setFinish(selected);
     }
 
     /**
@@ -414,10 +413,12 @@ final class ReportVisualPanel2 extends JPanel {
 
     private void selectAllButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_selectAllButtonActionPerformed
         setAllTaggedResultsSelected(true);
+        wizPanel.setFinish(true);
     }//GEN-LAST:event_selectAllButtonActionPerformed
 
     private void deselectAllButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_deselectAllButtonActionPerformed
         setAllTaggedResultsSelected(false);
+        wizPanel.setFinish(false);
     }//GEN-LAST:event_deselectAllButtonActionPerformed
 
     private void advancedButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_advancedButtonActionPerformed

From 40aee7e839d7385f123b335a70eaca164162d82b Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Fri, 30 Aug 2019 15:27:30 -0400
Subject: [PATCH 095/192] Refactored ReportGenerator. Bug fixes

---
 .../autopsy/report/ReportGenerator.java       | 331 ++++++++----------
 .../autopsy/report/ReportProgressLogger.java  |   4 +-
 .../autopsy/report/ReportWizardAction.java    |  65 +++-
 3 files changed, 206 insertions(+), 194 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
index d50990e4cc..d6c4f78bdd 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
@@ -33,11 +33,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.concurrent.ExecutionException;
 import java.util.logging.Level;
 import javax.swing.JDialog;
 import javax.swing.JFrame;
-import javax.swing.SwingWorker;
 import org.openide.filesystems.FileUtil;
 import org.openide.util.NbBundle;
 import org.openide.windows.WindowManager;
@@ -50,13 +48,13 @@ import org.sleuthkit.datamodel.SleuthkitCase;
 import org.sleuthkit.datamodel.TskCoreException;
 import org.sleuthkit.datamodel.TskData;
 
-class ReportGenerator {
+public class ReportGenerator {
 
     private static final Logger logger = Logger.getLogger(ReportGenerator.class.getName());
 
     private ReportProgressPanel progressPanel = null;
     private ReportGenerationPanel reportGenerationPanel = null;
-    
+
     private static final String REPORT_PATH_FMT_STR = "%s" + File.separator + "%s %s %s" + File.separator;
 
     private final String configName;
@@ -67,7 +65,7 @@ class ReportGenerator {
 
     /**
      * Displays the list of errors during report generation in user-friendly
-     * way. MessageNotifyUtil used to display bubble notification.
+     * way.
      */
     private void displayReportErrors() {
         if (!errorList.isEmpty()) {
@@ -80,7 +78,11 @@ class ReportGenerator {
     }
 
     /**
-     * Creates a report generator.
+     * Creates a report generator. This constructor uses a logger instead of UI
+     * panel.
+     *
+     * @param configName Name of the reporting configuration to use
+     * @param progress Fully instantiated progress logger
      */
     public ReportGenerator(String configName, ReportProgressLogger progress) {
         this.errorList = new ArrayList<>();
@@ -89,6 +91,13 @@ class ReportGenerator {
         this.configName = configName;
     }
 
+    /**
+     * Creates a report generator. This constructor uses UI panel to display
+     * progress.
+     *
+     * @param configName Name of the reporting configuration to use
+     * @param panel Fully instantiated progress panel
+     */
     public ReportGenerator(String configName, ReportGenerationPanel panel) {
         this.errorList = new ArrayList<>();
         this.reportGenerationPanel = panel;
@@ -96,6 +105,10 @@ class ReportGenerator {
         this.configName = configName;
     }
 
+    /**
+     * Generate reports according to previously specified reporting
+     * configuration.
+     */
     public void generateReports() {
         ReportingConfig config = null;
         try {
@@ -112,101 +125,106 @@ class ReportGenerator {
             return;
         }
 
-        // load all report modules 
-        Map<String, ReportModule> modules = new HashMap<>();
-        for (TableReportModule module : ReportModuleLoader.getTableReportModules()) {
-            modules.put(module.getClass().getCanonicalName(), module);
-        }
-
-        for (GeneralReportModule module : ReportModuleLoader.getGeneralReportModules()) {
-            modules.put(module.getClass().getCanonicalName(), module);
-        }
-
-        for (FileReportModule module : ReportModuleLoader.getFileReportModules()) {
-            modules.put(module.getClass().getCanonicalName(), module);
-        }
-
-        // special case for PortableCaseReportModule
-        modules.put(PortableCaseReportModule.class.getCanonicalName(), new PortableCaseReportModule());
-
-        // generate reports for enabled modules
-        for (Map.Entry<String, ReportModuleConfig> entry : config.getModuleConfigs().entrySet()) {
-            ReportModuleConfig moduleConfig = entry.getValue();
-            if (moduleConfig == null || !moduleConfig.isEnabled()) {
-                continue;
+        try {
+            // load all report modules 
+            Map<String, ReportModule> modules = new HashMap<>();
+            for (TableReportModule module : ReportModuleLoader.getTableReportModules()) {
+                modules.put(module.getClass().getCanonicalName(), module);
             }
 
-            // found enabled module
-            String moduleName = entry.getKey();
-            ReportModule module = modules.get(moduleName);
-            if (module == null) {
-                logger.log(Level.SEVERE, "Report module {0} not found", moduleName);
-                progressPanel.updateStatusLabel("Report module " + moduleName + " not found");
-                continue;
-            }
-            
-            // get persisted module settings
-            ReportModuleSettings settings = moduleConfig.getModuleSettings();
-            if (settings == null) {
-                // use default configuration for this module
-                settings = module.getDefaultConfiguration();
+            for (GeneralReportModule module : ReportModuleLoader.getGeneralReportModules()) {
+                modules.put(module.getClass().getCanonicalName(), module);
             }
 
-            // set module configuration
-            module.setConfiguration(settings);
+            for (FileReportModule module : ReportModuleLoader.getFileReportModules()) {
+                modules.put(module.getClass().getCanonicalName(), module);
+            }
 
-            try {
-                // generate report according to report module type
-                if (module instanceof GeneralReportModule) {
+            // special case for PortableCaseReportModule
+            modules.put(PortableCaseReportModule.class.getCanonicalName(), new PortableCaseReportModule());
 
-                    // generate report
-                    generateGeneralReport((GeneralReportModule) module);
-
-                } else if (module instanceof TableReportModule) {
-                    
-                    // get table report settings
-                    TableReportSettings tableSettings = config.getTableReportSettings();
-                    if (tableSettings == null) {
-                        logger.log(Level.SEVERE, "No table report settings for report module {0}", moduleName);
-                        progressPanel.updateStatusLabel("No table report settings for report module " + moduleName);
-                        continue;
-                    }
-
-                    generateTableReport((TableReportModule) module, tableSettings); //NON-NLS
-
-                } else if (module instanceof FileReportModule) {
-
-                    // get file report settings
-                    FileReportSettings fileSettings = config.getFileReportSettings();
-                    if (fileSettings == null) {
-                        logger.log(Level.SEVERE, "No file report settings for report module {0}", moduleName);
-                        progressPanel.updateStatusLabel("No file report settings for report module " + moduleName);
-                        continue;
-                    }
-
-                    generateFileListReport((FileReportModule) module, fileSettings); //NON-NLS
-
-                } else if (module instanceof PortableCaseReportModule) {
-                    // get report settings
-                    if (settings instanceof NoReportModuleSettings) {
-                        settings = new PortableCaseReportModuleSettings();
-                    } else if (!(settings instanceof PortableCaseReportModuleSettings)) {
-                        logger.log(Level.SEVERE, "Invalid settings for report module {0}", moduleName);
-                        progressPanel.updateStatusLabel("Invalid settings for report module " + moduleName);
-                        continue;                        
-                    }
-
-                    generatePortableCaseReport((PortableCaseReportModule) module, (PortableCaseReportModuleSettings) settings);
-
-                } else {
-                    logger.log(Level.SEVERE, "Report module {0} has unsupported report module type", moduleName);
-                    progressPanel.updateStatusLabel("Report module " + moduleName + " has unsupported report module type");
+            // generate reports for enabled modules
+            for (Map.Entry<String, ReportModuleConfig> entry : config.getModuleConfigs().entrySet()) {
+                ReportModuleConfig moduleConfig = entry.getValue();
+                if (moduleConfig == null || !moduleConfig.isEnabled()) {
                     continue;
                 }
-            } catch (IOException e) {
-                logger.log(Level.SEVERE, "Exception while running report module {0}: {1}", new Object[]{moduleName, e.getMessage()});
-                progressPanel.updateStatusLabel("Exception while running report module " + moduleName);
+
+                // found enabled module
+                String moduleName = entry.getKey();
+                ReportModule module = modules.get(moduleName);
+                if (module == null) {
+                    logger.log(Level.SEVERE, "Report module {0} not found", moduleName);
+                    progressPanel.updateStatusLabel("Report module " + moduleName + " not found");
+                    continue;
+                }
+
+                // get persisted module settings
+                ReportModuleSettings settings = moduleConfig.getModuleSettings();
+                if (settings == null) {
+                    // use default configuration for this module
+                    settings = module.getDefaultConfiguration();
+                }
+
+                // set module configuration
+                module.setConfiguration(settings);
+
+                try {
+                    // generate report according to report module type
+                    if (module instanceof GeneralReportModule) {
+
+                        // generate report
+                        generateGeneralReport((GeneralReportModule) module);
+
+                    } else if (module instanceof TableReportModule) {
+
+                        // get table report settings
+                        TableReportSettings tableSettings = config.getTableReportSettings();
+                        if (tableSettings == null) {
+                            logger.log(Level.SEVERE, "No table report settings for report module {0}", moduleName);
+                            progressPanel.updateStatusLabel("No table report settings for report module " + moduleName);
+                            continue;
+                        }
+
+                        generateTableReport((TableReportModule) module, tableSettings); //NON-NLS
+
+                    } else if (module instanceof FileReportModule) {
+
+                        // get file report settings
+                        FileReportSettings fileSettings = config.getFileReportSettings();
+                        if (fileSettings == null) {
+                            logger.log(Level.SEVERE, "No file report settings for report module {0}", moduleName);
+                            progressPanel.updateStatusLabel("No file report settings for report module " + moduleName);
+                            continue;
+                        }
+
+                        generateFileListReport((FileReportModule) module, fileSettings); //NON-NLS
+
+                    } else if (module instanceof PortableCaseReportModule) {
+                        // get report settings
+                        if (settings instanceof NoReportModuleSettings) {
+                            settings = new PortableCaseReportModuleSettings();
+                        } else if (!(settings instanceof PortableCaseReportModuleSettings)) {
+                            logger.log(Level.SEVERE, "Invalid settings for report module {0}", moduleName);
+                            progressPanel.updateStatusLabel("Invalid settings for report module " + moduleName);
+                            continue;
+                        }
+
+                        generatePortableCaseReport((PortableCaseReportModule) module, (PortableCaseReportModuleSettings) settings);
+
+                    } else {
+                        logger.log(Level.SEVERE, "Report module {0} has unsupported report module type", moduleName);
+                        progressPanel.updateStatusLabel("Report module " + moduleName + " has unsupported report module type");
+                        continue;
+                    }
+                } catch (IOException e) {
+                    logger.log(Level.SEVERE, "Exception while running report module {0}: {1}", new Object[]{moduleName, e.getMessage()});
+                    progressPanel.updateStatusLabel("Exception while running report module " + moduleName);
+                }
             }
+        } finally {
+            displayReportErrors();
+            errorList.clear();
         }
     }
 
@@ -250,10 +268,7 @@ class ReportGenerator {
         if (generalReportModule != null) {
             String reportDir = createReportDirectory(generalReportModule);
             setupProgressPanel(generalReportModule, reportDir);
-            ReportWorker worker = new ReportWorker(() -> {
-                generalReportModule.generateReport(reportDir, progressPanel);
-            });
-            worker.execute();
+            generalReportModule.generateReport(reportDir, progressPanel);
             displayProgressPanel();
         }
     }
@@ -267,16 +282,13 @@ class ReportGenerator {
         if (tableReport != null && tableReportSettings != null && null != tableReportSettings.getArtifactSelections()) {
             String reportDir = createReportDirectory(tableReport);
             setupProgressPanel(tableReport, reportDir);
-            ReportWorker worker = new ReportWorker(() -> {
-                tableReport.startReport(reportDir);
-                TableReportGenerator generator = new TableReportGenerator(tableReportSettings, progressPanel, tableReport);
-                generator.execute();
-                tableReport.endReport();
-                // finish progress, wrap up
-                progressPanel.complete(ReportProgressPanel.ReportStatus.COMPLETE);
-                errorList = generator.getErrorList();
-            });
-            worker.execute();
+            tableReport.startReport(reportDir);
+            TableReportGenerator generator = new TableReportGenerator(tableReportSettings, progressPanel, tableReport);
+            generator.execute();
+            tableReport.endReport();
+            // finish progress, wrap up
+            progressPanel.complete(ReportProgressPanel.ReportStatus.COMPLETE);
+            errorList = generator.getErrorList();
             displayProgressPanel();
         }
     }
@@ -296,46 +308,43 @@ class ReportGenerator {
                 }
             }
             setupProgressPanel(fileReportModule, reportDir);
-            ReportWorker worker = new ReportWorker(() -> {
-                if (progressPanel.getStatus() != ReportStatus.CANCELED) {
-                    progressPanel.start();
+            if (progressPanel.getStatus() != ReportStatus.CANCELED) {
+                progressPanel.start();
+                progressPanel.updateStatusLabel(
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.progress.queryingDb.text"));
+            }
+
+            List<AbstractFile> files = getFiles();
+            int numFiles = files.size();
+            if (progressPanel.getStatus() != ReportStatus.CANCELED) {
+                fileReportModule.startReport(reportDir);
+                fileReportModule.startTable(enabled);
+            }
+            progressPanel.setIndeterminate(false);
+            progressPanel.setMaximumProgress(numFiles);
+
+            int i = 0;
+            // Add files to report.
+            for (AbstractFile file : files) {
+                // Check to see if any reports have been cancelled.
+                if (progressPanel.getStatus() == ReportStatus.CANCELED) {
+                    return;
+                } else {
+                    fileReportModule.addRow(file, enabled);
+                    progressPanel.increment();
+                }
+
+                if ((i % 100) == 0) {
                     progressPanel.updateStatusLabel(
-                            NbBundle.getMessage(this.getClass(), "ReportGenerator.progress.queryingDb.text"));
+                            NbBundle.getMessage(this.getClass(), "ReportGenerator.progress.processingFile.text",
+                                    file.getName()));
                 }
+                i++;
+            }
 
-                List<AbstractFile> files = getFiles();
-                int numFiles = files.size();
-                if (progressPanel.getStatus() != ReportStatus.CANCELED) {
-                    fileReportModule.startReport(reportDir);
-                    fileReportModule.startTable(enabled);
-                }
-                progressPanel.setIndeterminate(false);
-                progressPanel.setMaximumProgress(numFiles);
-
-                int i = 0;
-                // Add files to report.
-                for (AbstractFile file : files) {
-                    // Check to see if any reports have been cancelled.
-                    if (progressPanel.getStatus() == ReportStatus.CANCELED) {
-                        return;
-                    } else {
-                        fileReportModule.addRow(file, enabled);
-                        progressPanel.increment();
-                    }
-
-                    if ((i % 100) == 0) {
-                        progressPanel.updateStatusLabel(
-                                NbBundle.getMessage(this.getClass(), "ReportGenerator.progress.processingFile.text",
-                                        file.getName()));
-                    }
-                    i++;
-                }
-
-                fileReportModule.endTable();
-                fileReportModule.endReport();
-                progressPanel.complete(ReportStatus.COMPLETE);
-            });
-            worker.execute();
+            fileReportModule.endTable();
+            fileReportModule.endReport();
+            progressPanel.complete(ReportStatus.COMPLETE);
             displayProgressPanel();
         }
     }
@@ -347,10 +356,7 @@ class ReportGenerator {
         if (portableCaseReportModule != null) {
             String reportDir = createReportDirectory(portableCaseReportModule);
             setupProgressPanel(portableCaseReportModule, reportDir);
-            ReportWorker worker = new ReportWorker(() -> {
-                portableCaseReportModule.generateReport(reportDir, settings, progressPanel);
-            });
-            worker.execute();
+            portableCaseReportModule.generateReport(reportDir, settings, progressPanel);
             displayProgressPanel();
         }
     }
@@ -406,35 +412,4 @@ class ReportGenerator {
         }
         return reportPath;
     }
-
-    private class ReportWorker extends SwingWorker<Void, Void> {
-
-        private final Runnable doInBackground;
-
-        private ReportWorker(Runnable doInBackground) {
-            this.doInBackground = doInBackground;
-        }
-
-        @Override
-        protected Void doInBackground() throws Exception {
-            doInBackground.run();
-            return null;
-        }
-
-        @Override
-        protected void done() {
-            try {
-                get();
-            } catch (InterruptedException | ExecutionException ex) {
-                progressPanel.updateStatusLabel(NbBundle.getMessage(this.getClass(), "ReportGenerator.errors.reportErrorText") + ex.getLocalizedMessage());
-                logger.log(Level.SEVERE, "failed to generate reports", ex); //NON-NLS
-            } // catch and ignore if we were cancelled
-            catch (java.util.concurrent.CancellationException ex) {
-            } finally {
-                displayReportErrors();
-                errorList.clear();
-            }
-        }
-
-    }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportProgressLogger.java b/Core/src/org/sleuthkit/autopsy/report/ReportProgressLogger.java
index 210fdc2815..5f0011b9d5 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportProgressLogger.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportProgressLogger.java
@@ -24,12 +24,12 @@ import org.sleuthkit.autopsy.coreutils.Logger;
 /**
  * Writes progress and status messages to the application log.
  */
-class ReportProgressLogger implements ReportProgressPanel {
+public class ReportProgressLogger implements ReportProgressPanel {
 
     private static final Logger logger = Logger.getLogger(ReportProgressLogger.class.getName());
     private volatile ReportProgressPanel.ReportStatus status;
 
-    ReportProgressLogger() {
+    public ReportProgressLogger() {
         status = ReportStatus.QUEUING;
     }
 
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
index 8542f65fe7..2dc81cab99 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
@@ -29,9 +29,11 @@ import java.beans.PropertyChangeEvent;
 import java.text.MessageFormat;
 import java.util.EnumSet;
 import java.util.Map;
+import java.util.concurrent.ExecutionException;
 import java.util.logging.Level;
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
+import javax.swing.SwingWorker;
 import org.openide.DialogDisplayer;
 import org.openide.WizardDescriptor;
 import org.openide.awt.ActionID;
@@ -49,7 +51,8 @@ import org.sleuthkit.autopsy.coreutils.Logger;
 @ActionID(category = "Tools", id = "org.sleuthkit.autopsy.report.ReportWizardAction")
 @ActionRegistration(displayName = "#CTL_ReportWizardAction", lazy = false)
 @ActionReferences(value = {
-    @ActionReference(path = "Menu/Tools", position = 301, separatorAfter = 399),
+    @ActionReference(path = "Menu/Tools", position = 301, separatorAfter = 399)
+    ,
     @ActionReference(path = "Toolbars/Case", position = 105)})
 public final class ReportWizardAction extends CallableSystemAction implements Presenter.Toolbar, ActionListener {
 
@@ -59,14 +62,17 @@ public final class ReportWizardAction extends CallableSystemAction implements Pr
     private static final boolean RUN_REPORTS = true;
     private final JButton toolbarButton = new JButton();
     private static final String ACTION_NAME = NbBundle.getMessage(ReportWizardAction.class, "ReportWizardAction.actionName.text");
+    private static ReportGenerationPanel panel;
 
     /**
      * When the Generate Report button or menu item is selected, open the
      * reporting wizard. When the wizard is finished, create a ReportGenerator
      * with the wizard information, and start all necessary reports.
+     *
      * @param configName Name of the reporting configuration to use
-     * @param displayCaseSpecificData Flag whether to use case specific data in UI panels or to use all possible result types
-     * @param runReports Flag whether to produce report(s) 
+     * @param displayCaseSpecificData Flag whether to use case specific data in
+     * UI panels or to use all possible result types
+     * @param runReports Flag whether to produce report(s)
      */
     @SuppressWarnings("unchecked")
     public static void doReportWizard(String configName, boolean displayCaseSpecificData, boolean runReports) {
@@ -74,37 +80,41 @@ public final class ReportWizardAction extends CallableSystemAction implements Pr
         wiz.setTitleFormat(new MessageFormat("{0} {1}"));
         wiz.setTitle(NbBundle.getMessage(ReportWizardAction.class, "ReportWizardAction.reportWiz.title"));
         if (DialogDisplayer.getDefault().notify(wiz) == WizardDescriptor.FINISH_OPTION) {
-            
+
             // save reporting configuration
             saveReportingConfiguration(configName, wiz);
-                    
+
             if (runReports) {
-                // generate reports
-                ReportGenerator generator = new ReportGenerator(configName, new ReportGenerationPanel()); //NON-NLS
-                generator.generateReports();
+                // generate reports in a separate thread
+                ReportWorker worker = new ReportWorker(() -> {
+                    panel = new ReportGenerationPanel();
+                    ReportGenerator generator = new ReportGenerator(configName, panel); //NON-NLS
+                    generator.generateReports();
+                });
+                worker.execute();
             }
         }
     }
-    
+
     private static void saveReportingConfiguration(String configName, WizardDescriptor wiz) {
 
         ReportingConfig reportingConfig = new ReportingConfig(configName);
         reportingConfig.setFileReportSettings((FileReportSettings) wiz.getProperty("fileReportSettings"));
         reportingConfig.setTableReportSettings((TableReportSettings) wiz.getProperty("tableReportSettings"));
-        
+
         Map<String, ReportModuleConfig> moduleConfigs = (Map<String, ReportModuleConfig>) wiz.getProperty("moduleConfigs");
-        
+
         // update portable case settings
         ReportModuleConfig config = moduleConfigs.get(PortableCaseReportModule.class.getCanonicalName());
         PortableCaseReportModuleSettings portableCaseReportSettings = (PortableCaseReportModuleSettings) wiz.getProperty("portableCaseReportSettings");
         if (portableCaseReportSettings != null) {
             config.setModuleSettings(portableCaseReportSettings);
             moduleConfigs.put(PortableCaseReportModule.class.getCanonicalName(), config);
-        }        
-        
+        }
+
         // set module configs
         reportingConfig.setModuleConfigs(moduleConfigs);
-        
+
         try {
             // save reporting configuration
             ReportingConfigLoader.saveConfig(reportingConfig);
@@ -170,4 +180,31 @@ public final class ReportWizardAction extends CallableSystemAction implements Pr
         super.setEnabled(value);
         toolbarButton.setEnabled(value);
     }
+
+    private static class ReportWorker extends SwingWorker<Void, Void> {
+
+        private final Runnable doInBackground;
+
+        private ReportWorker(Runnable doInBackground) {
+            this.doInBackground = doInBackground;
+        }
+
+        @Override
+        protected Void doInBackground() throws Exception {
+            doInBackground.run();
+            return null;
+        }
+
+        @Override
+        protected void done() {
+            try {
+                get();
+            } catch (InterruptedException | ExecutionException ex) {
+                panel.getProgressPanel().updateStatusLabel(NbBundle.getMessage(this.getClass(), "ReportGenerator.errors.reportErrorText") + ex.getLocalizedMessage());
+                logger.log(Level.SEVERE, "failed to generate reports", ex); //NON-NLS
+            } // catch and ignore if we were cancelled
+            catch (java.util.concurrent.CancellationException ex) {
+            }
+        }
+    }
 }

From eec7b7b5eb4fbf5ca91a02eda58872860a99ca7a Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Fri, 30 Aug 2019 15:28:19 -0400
Subject: [PATCH 096/192] Added report generation to command line ingest

---
 .../commandlineingest/CommandLineCommand.java |  3 +-
 .../CommandLineIngestManager.java             | 30 +++++++++++++++++--
 .../CommandLineIngestSettingsPanel.java       |  2 +-
 .../CommandLineOptionProcessor.java           | 23 +++++++++++++-
 4 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java
index f262244417..8888ac72de 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineCommand.java
@@ -33,7 +33,8 @@ class CommandLineCommand {
         CREATE_CASE,
         ADD_DATA_SOURCE,
         RUN_INGEST,
-        LIST_ALL_DATA_SOURCES;
+        LIST_ALL_DATA_SOURCES,
+        GENERATE_REPORTS;
     }
 
     /**
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
index eb65945849..b64d4dda05 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
@@ -60,13 +60,15 @@ import org.sleuthkit.autopsy.ingest.IngestModuleError;
 import org.sleuthkit.autopsy.ingest.IngestProfiles;
 import org.sleuthkit.autopsy.modules.interestingitems.FilesSet;
 import org.sleuthkit.autopsy.modules.interestingitems.FilesSetsManager;
+import org.sleuthkit.autopsy.report.ReportProgressLogger;
+import org.sleuthkit.autopsy.report.ReportGenerator;
 import org.sleuthkit.datamodel.Content;
 import org.sleuthkit.datamodel.TskCoreException;
 
 /**
  * Allows Autopsy to be invoked with a command line arguments. Causes Autopsy to
- * create a case, add a specified data source, run ingest on that data source,
- * produce a CASE/UCO report and exit.
+ * create a case, add a specified data source, run ingest on that data source, 
+ * list all data source in a case, generate reports.
  */
 public class CommandLineIngestManager {
 
@@ -265,6 +267,30 @@ public class CommandLineIngestManager {
                                     return;
                                 }
                                 break;
+
+                            case GENERATE_REPORTS:
+                                try {
+                                    LOGGER.log(Level.INFO, "Processing 'Generate Reports' command");
+                                    System.out.println("Processing 'Generate Reports' command");
+                                    Map<String, String> inputs = command.getInputs();
+
+                                    // open the case, if it hasn't been already opened by previous command
+                                    if (caseForJob == null) {
+                                        String caseDirPath = inputs.get(CommandLineCommand.InputType.CASE_FOLDER_PATH.name());
+                                        openCase(caseDirPath);
+                                    }
+
+                                    // generate reports
+                                    ReportGenerator generator = new ReportGenerator(CommandLineIngestSettingsPanel.REPORTING_CONFIGURATION_NAME, new ReportProgressLogger()); //NON-NLS
+                                    generator.generateReports();
+                                } catch (CaseActionException ex) {
+                                    String caseDirPath = command.getInputs().get(CommandLineCommand.InputType.CASE_FOLDER_PATH.name());
+                                    LOGGER.log(Level.SEVERE, "Error opening case in case directory: " + caseDirPath, ex);
+                                    System.err.println("Error opening case in case directory: " + caseDirPath);
+                                    // Do not process any other commands
+                                    return;
+                                }
+                                break;
                             default:
                                 break;
                         }
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.java
index 0a76cdae2f..4f0cf7dc75 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.java
@@ -38,7 +38,7 @@ public class CommandLineIngestSettingsPanel extends javax.swing.JPanel {
     private static final long serialVersionUID = 1L;
     private static final Logger logger = Logger.getLogger(CommandLineIngestSettingsPanel.class.getName());
     
-    private static final String REPORTING_CONFIGURATION_NAME = "CommandLineIngest";
+    static final String REPORTING_CONFIGURATION_NAME = "CommandLineIngest";
     private static final boolean DISPLAY_CASE_SPECIFIC_DATA = false; // do not try to display case specific data as there is likely no case open
     private static final boolean RUN_REPORTS = false; // do not generate reports as part of running the report wizard
 
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
index 49017406eb..981fceffcb 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineOptionProcessor.java
@@ -49,6 +49,7 @@ public class CommandLineOptionProcessor extends OptionProcessor {
     private final Option runIngestCommandOption = Option.withoutArgument('r', "runIngest");
     private final Option ingestProfileOption = Option.requiredArgument('p', "ingestProfile");
     private final Option listAllDataSourcesCommandOption = Option.withoutArgument('l', "listAllDataSources");
+    private final Option generateReportsOption = Option.withoutArgument('g', "generateReports");
 
     private boolean runFromCommandLine = false;
 
@@ -67,6 +68,7 @@ public class CommandLineOptionProcessor extends OptionProcessor {
         set.add(runIngestCommandOption);
         set.add(ingestProfileOption);
         set.add(listAllDataSourcesCommandOption);
+        set.add(generateReportsOption);
         return set;
     }
 
@@ -78,7 +80,8 @@ public class CommandLineOptionProcessor extends OptionProcessor {
 
         // input arguments must contain at least one command
         if (!(values.containsKey(createCaseCommandOption) || values.containsKey(addDataSourceCommandOption)
-                || values.containsKey(runIngestCommandOption) || values.containsKey(listAllDataSourcesCommandOption))) {
+                || values.containsKey(runIngestCommandOption) || values.containsKey(listAllDataSourcesCommandOption)
+                || values.containsKey(generateReportsOption))) {
             // not running from command line
             logger.log(Level.INFO, "No command line commands passed in as inputs. Not running from command line."); //NON-NLS
             System.err.println("No command line commands passed in as inputs. Not running from command line.");
@@ -315,6 +318,24 @@ public class CommandLineOptionProcessor extends OptionProcessor {
             commands.add(newCommand);
             runFromCommandLine = true;
         }
+        
+        // Add "GENERATE_REPORTS" command, if present
+        if (values.containsKey(generateReportsOption)) {
+
+            // 'caseDir' must only be specified if the case is not being created during the current run
+            if (!values.containsKey(createCaseCommandOption) && caseDir.isEmpty()) {
+                // new case is not being created during this run, so 'caseDir' should have been specified
+                logger.log(Level.SEVERE, "'caseDir' argument is empty");
+                System.err.println("'caseDir' argument is empty");
+                runFromCommandLine = false;
+                return;
+            }
+
+            CommandLineCommand newCommand = new CommandLineCommand(CommandLineCommand.CommandType.GENERATE_REPORTS);
+            newCommand.addInputValue(CommandLineCommand.InputType.CASE_FOLDER_PATH.name(), caseDir);
+            commands.add(newCommand);
+            runFromCommandLine = true;
+        }        
     }
 
     /**

From 9b39e9c6031daf4af2927012d345f9f4b4b268d0 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Tue, 3 Sep 2019 10:53:17 -0400
Subject: [PATCH 097/192] Changes and bug fixes to run reports from command
 line

---
 .../autopsy/report/Bundle.properties-MERGED   |  2 +
 ...PortableCaseInterestingItemsListPanel.java | 42 +--------
 .../report/PortableCaseReportModule.java      | 93 ++++++++++++++++++-
 .../autopsy/report/TableReportGenerator.java  |  4 +-
 4 files changed, 95 insertions(+), 46 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties-MERGED
index 80fc69d11d..8b6676312d 100755
--- a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties-MERGED
@@ -33,6 +33,8 @@ PortableCaseReportModule.generateReport.errorCopyingInterestingResults=Error cop
 PortableCaseReportModule.generateReport.errorCopyingTags=Error copying tags
 # {0} - attribute type name
 PortableCaseReportModule.generateReport.errorLookingUpAttrType=Error looking up attribute type {0}
+PortableCaseReportModule.generateReport.errorReadingSets=Error while reading interesting items sets from case database
+PortableCaseReportModule.generateReport.errorReadingTags=Error while reading tags from case database
 PortableCaseReportModule.generateReport.interestingItemError=Error loading intersting items
 PortableCaseReportModule.generateReport.noContentToCopy=No interesting files, results, or tagged items to copy
 # {0} - output folder
diff --git a/Core/src/org/sleuthkit/autopsy/report/PortableCaseInterestingItemsListPanel.java b/Core/src/org/sleuthkit/autopsy/report/PortableCaseInterestingItemsListPanel.java
index 32e2e84ae6..18be7e8934 100644
--- a/Core/src/org/sleuthkit/autopsy/report/PortableCaseInterestingItemsListPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/PortableCaseInterestingItemsListPanel.java
@@ -23,8 +23,6 @@ import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -35,7 +33,6 @@ import java.util.logging.Level;
 import javax.swing.JCheckBox;
 import javax.swing.JLabel;
 import javax.swing.JList;
-import javax.swing.JOptionPane;
 import javax.swing.ListCellRenderer;
 import javax.swing.ListModel;
 import javax.swing.event.ListDataListener;
@@ -43,9 +40,9 @@ import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
 import org.sleuthkit.autopsy.coreutils.Logger;
+import org.sleuthkit.autopsy.report.PortableCaseReportModule.GetInterestingItemSetNamesCallback;
 import org.sleuthkit.datamodel.BlackboardArtifact;
 import org.sleuthkit.datamodel.BlackboardAttribute;
-import org.sleuthkit.datamodel.CaseDbAccessManager;
 import org.sleuthkit.datamodel.TskCoreException;
 
 /**
@@ -220,43 +217,6 @@ class PortableCaseInterestingItemsListPanel extends javax.swing.JPanel {
             }
         }
         return selectedSetNames;
-    }    
-    
-    /**
-     * Processes the result sets from the interesting item set name query.
-     */
-    private static class GetInterestingItemSetNamesCallback implements CaseDbAccessManager.CaseDbAccessQueryCallback {
-
-        private static final java.util.logging.Logger logger = java.util.logging.Logger.getLogger(GetInterestingItemSetNamesCallback.class.getName());
-        private final Map<String, Long> setCounts = new HashMap<>();
-        
-        @Override
-        public void process(ResultSet rs) {
-            try {
-                while (rs.next()) {
-                    try {
-                        Long setCount = rs.getLong("set_count"); // NON-NLS
-                        String setName = rs.getString("set_name"); // NON-NLS
-
-                        setCounts.put(setName, setCount);
-                        
-                    } catch (SQLException ex) {
-                        logger.log(Level.WARNING, "Unable to get data_source_obj_id or value from result set", ex); // NON-NLS
-                    }
-                }
-            } catch (SQLException ex) {
-                logger.log(Level.WARNING, "Failed to get next result for values by datasource", ex); // NON-NLS
-            }
-        }   
-        
-        /**
-         * Gets the counts for each interesting items set
-         * 
-         * @return A map from each set name to the number of items in it
-         */
-        Map<String, Long> getSetCountMap() {
-            return setCounts;
-        }
     }
 
     /**
diff --git a/Core/src/org/sleuthkit/autopsy/report/PortableCaseReportModule.java b/Core/src/org/sleuthkit/autopsy/report/PortableCaseReportModule.java
index ca7913578c..9d3e9a77c0 100644
--- a/Core/src/org/sleuthkit/autopsy/report/PortableCaseReportModule.java
+++ b/Core/src/org/sleuthkit/autopsy/report/PortableCaseReportModule.java
@@ -77,7 +77,7 @@ class PortableCaseReportModule implements ReportModule {
     
     private Case currentCase = null;
     private SleuthkitCase portableSkCase = null;
-    private String caseName;
+    private String caseName = "";
     private File caseFolder = null;
     private File copiedFilesFolder = null;
     
@@ -171,6 +171,8 @@ class PortableCaseReportModule implements ReportModule {
         "PortableCaseReportModule.generateReport.outputDirIsNotDir=Output folder {0} is not a folder",
         "PortableCaseReportModule.generateReport.caseClosed=Current case has been closed",
         "PortableCaseReportModule.generateReport.interestingItemError=Error loading intersting items",
+        "PortableCaseReportModule.generateReport.errorReadingTags=Error while reading tags from case database",
+        "PortableCaseReportModule.generateReport.errorReadingSets=Error while reading interesting items sets from case database",
         "PortableCaseReportModule.generateReport.noContentToCopy=No interesting files, results, or tagged items to copy",
         "PortableCaseReportModule.generateReport.errorCopyingTags=Error copying tags",
         "PortableCaseReportModule.generateReport.errorCopyingFiles=Error copying tagged files",
@@ -216,8 +218,32 @@ class PortableCaseReportModule implements ReportModule {
         } 
         
         // Check that there will be something to copy
-        List<TagName> tagNames = options.getSelectedTagNames();
-        List<String> setNames = options.getSelectedSetNames();
+        List<TagName> tagNames;
+        if (options.isAllTagsSelected()) {
+            try {
+                tagNames = Case.getCurrentCaseThrows().getServices().getTagsManager().getTagNamesInUse();
+            } catch (NoCurrentCaseException | TskCoreException ex) {
+                handleError("Unable to get all tags", 
+                    Bundle.PortableCaseReportModule_generateReport_errorReadingTags(), ex, progressPanel); // NON-NLS
+                return;
+            }
+        } else {
+            tagNames = options.getSelectedTagNames();
+        }
+        
+        List<String> setNames;
+        if (options.isAllSetsSelected()) {
+            try {
+                setNames = getAllInterestingItemsSets();
+            } catch (NoCurrentCaseException | TskCoreException ex) {
+                handleError("Unable to get all interesting items sets", 
+                    Bundle.PortableCaseReportModule_generateReport_errorReadingSets(), ex, progressPanel); // NON-NLS
+                return;
+            }
+        } else {
+            setNames = options.getSelectedSetNames();
+        }
+        
         if (tagNames.isEmpty() && setNames.isEmpty()) {  
             handleError("No content to copy", 
                     Bundle.PortableCaseReportModule_generateReport_noContentToCopy(), null, progressPanel); // NON-NLS
@@ -392,6 +418,30 @@ class PortableCaseReportModule implements ReportModule {
         progressPanel.complete(ReportProgressPanel.ReportStatus.COMPLETE);
         
     }
+    
+    private List<String> getAllInterestingItemsSets() throws NoCurrentCaseException, TskCoreException {
+
+        // Get the set names in use for the current case.
+        List<String> setNames = new ArrayList<>();
+        Map<String, Long> setCounts;
+
+        // There may not be a case open when configuring report modules for Command Line execution
+        // Get all SET_NAMEs from interesting item artifacts
+        String innerSelect = "SELECT (value_text) AS set_name FROM blackboard_attributes WHERE (artifact_type_id = '"
+                + BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT.getTypeID() + "' OR artifact_type_id = '"
+                + BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT.getTypeID() + "') AND attribute_type_id = '"
+                + BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME.getTypeID() + "'"; // NON-NLS
+
+        // Get the count of each SET_NAME
+        String query = "set_name, count(1) AS set_count FROM (" + innerSelect + ") set_names GROUP BY set_name"; // NON-NLS
+
+        GetInterestingItemSetNamesCallback callback = new GetInterestingItemSetNamesCallback();
+        Case.getCurrentCaseThrows().getSleuthkitCase().getCaseDbAccessManager().select(query, callback);
+        setCounts = callback.getSetCountMap();
+        setNames.addAll(setCounts.keySet());
+        return setNames;
+    }
+            
 
     /**
      * Create the case directory and case database. 
@@ -988,4 +1038,41 @@ class PortableCaseReportModule implements ReportModule {
 
         return exeFile;
     }
+    
+    /**
+     * Processes the result sets from the interesting item set name query.
+     */
+    static class GetInterestingItemSetNamesCallback implements CaseDbAccessManager.CaseDbAccessQueryCallback {
+
+        private static final java.util.logging.Logger logger = java.util.logging.Logger.getLogger(GetInterestingItemSetNamesCallback.class.getName());
+        private final Map<String, Long> setCounts = new HashMap<>();
+        
+        @Override
+        public void process(ResultSet rs) {
+            try {
+                while (rs.next()) {
+                    try {
+                        Long setCount = rs.getLong("set_count"); // NON-NLS
+                        String setName = rs.getString("set_name"); // NON-NLS
+
+                        setCounts.put(setName, setCount);
+                        
+                    } catch (SQLException ex) {
+                        logger.log(Level.WARNING, "Unable to get data_source_obj_id or value from result set", ex); // NON-NLS
+                    }
+                }
+            } catch (SQLException ex) {
+                logger.log(Level.WARNING, "Failed to get next result for values by datasource", ex); // NON-NLS
+            }
+        }   
+        
+        /**
+         * Gets the counts for each interesting items set
+         * 
+         * @return A map from each set name to the number of items in it
+         */
+        Map<String, Long> getSetCountMap() {
+            return setCounts;
+        }
+    }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
index 34f25c67db..60790c4673 100644
--- a/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
@@ -85,8 +85,8 @@ class TableReportGenerator {
     private void getAllExistingTags() throws NoCurrentCaseException, TskCoreException {
         List<String> tagNames = new ArrayList<>();
 
-        // get all possible tag names
-        List<TagName> tagNamesInUse = Case.getCurrentCaseThrows().getServices().getTagsManager().getAllTagNames();
+        // get all tag names from this case
+        List<TagName> tagNamesInUse = Case.getCurrentCaseThrows().getServices().getTagsManager().getTagNamesInUse();
 
         String notableString = "";
         for (TagName tagName : tagNamesInUse) {

From 85280d47cf9161c971e3e8968a3762fff1756ca7 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Tue, 3 Sep 2019 14:27:51 -0400
Subject: [PATCH 098/192] Bug fix in report selection

---
 .../sleuthkit/autopsy/report/ReportVisualPanel1.java   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
index b2006749c6..c7eaff63d4 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
@@ -116,6 +116,8 @@ final class ReportVisualPanel1 extends JPanel implements ListSelectionListener {
         swap(modules, indexOfHTMLReportModule, 0);
         
         // set module configurations
+        selectedIndex = 0;
+        int indx = 0;
         for (ReportModule module : modules) {
             ReportModuleSettings settings = null;
             if (moduleConfigs != null) {
@@ -124,6 +126,12 @@ final class ReportVisualPanel1 extends JPanel implements ListSelectionListener {
                 if (config != null) {
                     // there is an existing configuration for this module
                     settings = config.getModuleSettings();
+                    
+                    // check if this module is enabled
+                    if (config.isEnabled()) {
+                        // make sure this module is the selected module in the UI panel
+                        selectedIndex = indx;
+                    }
                 }
             }
             if (settings == null) {
@@ -132,12 +140,12 @@ final class ReportVisualPanel1 extends JPanel implements ListSelectionListener {
             }
             // set module configuration
             module.setConfiguration(settings);
+            indx++;
         }
 
         modulesJList.getSelectionModel().addListSelectionListener(this);
         modulesJList.setCellRenderer(new ModuleCellRenderer());
         modulesJList.setListData(modules.toArray(new ReportModule[modules.size()]));
-        selectedIndex = 0;
         modulesJList.setSelectedIndex(selectedIndex);
     }
 

From a28bb4ee26cff8b5f6680032d18bb145a1f4e0bb Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Tue, 3 Sep 2019 15:19:10 -0400
Subject: [PATCH 099/192] Bug fix in displaying progress dialog panel

---
 Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java  | 6 +-----
 .../org/sleuthkit/autopsy/report/ReportWizardAction.java    | 5 +++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
index d6c4f78bdd..625a6a233b 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
@@ -232,7 +232,7 @@ public class ReportGenerator {
      * Display the progress panels to the user, and add actions to close the
      * parent dialog.
      */
-    private void displayProgressPanel() {
+    void displayProgressPanel() {
         if (reportGenerationPanel == null) {
             return;
         }
@@ -269,7 +269,6 @@ public class ReportGenerator {
             String reportDir = createReportDirectory(generalReportModule);
             setupProgressPanel(generalReportModule, reportDir);
             generalReportModule.generateReport(reportDir, progressPanel);
-            displayProgressPanel();
         }
     }
 
@@ -289,7 +288,6 @@ public class ReportGenerator {
             // finish progress, wrap up
             progressPanel.complete(ReportProgressPanel.ReportStatus.COMPLETE);
             errorList = generator.getErrorList();
-            displayProgressPanel();
         }
     }
 
@@ -345,7 +343,6 @@ public class ReportGenerator {
             fileReportModule.endTable();
             fileReportModule.endReport();
             progressPanel.complete(ReportStatus.COMPLETE);
-            displayProgressPanel();
         }
     }
 
@@ -357,7 +354,6 @@ public class ReportGenerator {
             String reportDir = createReportDirectory(portableCaseReportModule);
             setupProgressPanel(portableCaseReportModule, reportDir);
             portableCaseReportModule.generateReport(reportDir, settings, progressPanel);
-            displayProgressPanel();
         }
     }
 
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
index 2dc81cab99..331be72b55 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
@@ -86,12 +86,13 @@ public final class ReportWizardAction extends CallableSystemAction implements Pr
 
             if (runReports) {
                 // generate reports in a separate thread
+                panel = new ReportGenerationPanel();
+                ReportGenerator generator = new ReportGenerator(configName, panel); //NON-NLS
                 ReportWorker worker = new ReportWorker(() -> {
-                    panel = new ReportGenerationPanel();
-                    ReportGenerator generator = new ReportGenerator(configName, panel); //NON-NLS
                     generator.generateReports();
                 });
                 worker.execute();
+                generator.displayProgressPanel();
             }
         }
     }

From 796e54b2dadbef57e28b099e922f131233fd509d Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Wed, 4 Sep 2019 13:06:03 -0400
Subject: [PATCH 100/192] Bug fix in portable case

---
 .../sleuthkit/autopsy/report/PortableCaseReportModule.java  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Core/src/org/sleuthkit/autopsy/report/PortableCaseReportModule.java b/Core/src/org/sleuthkit/autopsy/report/PortableCaseReportModule.java
index 9d3e9a77c0..33c7a16a91 100644
--- a/Core/src/org/sleuthkit/autopsy/report/PortableCaseReportModule.java
+++ b/Core/src/org/sleuthkit/autopsy/report/PortableCaseReportModule.java
@@ -120,6 +120,12 @@ class PortableCaseReportModule implements ReportModule {
 
     @Override
     public String getRelativeFilePath() {
+        try {
+            caseName = Case.getCurrentCaseThrows().getDisplayName() + " (Portable)"; // NON-NLS
+        } catch (NoCurrentCaseException ex) {
+            // a case may not be open yet
+            return "";
+        }
         return caseName;
     }
     

From 2e16a2a1b4e86f1627a152875287ec78db544641 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Thu, 5 Sep 2019 16:05:48 -0400
Subject: [PATCH 101/192] Refactored 'report' package into exposed-public
 package and non-exposed packages

---
 .../CommandLineIngestManager.java             |   4 +-
 .../CommandLineIngestSettingsPanel.java       |   2 +-
 Core/src/org/sleuthkit/autopsy/core/layer.xml |  36 +-
 .../autopsy/report/Bundle.properties          | 276 +-------------
 .../autopsy/report/Bundle.properties-MERGED   | 340 +-----------------
 .../autopsy/report/Bundle_ja.properties       | 241 -------------
 .../report/GeneralReportModuleAdapter.java    |   1 +
 .../report/NoReportModuleSettings.java        |   2 +
 .../autopsy/report/ReportBranding.java        |   2 +
 .../autopsy/report/ReportModule.java          |   2 +-
 .../ArtifactSelectionDialog.form              |  10 +-
 .../ArtifactSelectionDialog.java              |   4 +-
 .../report/infrastructure/Bundle.properties   | 200 +++++++++++
 .../infrastructure/Bundle.properties-MERGED   | 211 +++++++++++
 .../infrastructure/Bundle_ja.properties       | 177 +++++++++
 .../FileReportModule.java                     |   6 +-
 .../FileReportSettings.java                   |   3 +-
 ...PortableCaseInterestingItemsListPanel.form |   8 +-
 ...PortableCaseInterestingItemsListPanel.java |   5 +-
 .../PortableCaseTagsListPanel.form            |   8 +-
 .../PortableCaseTagsListPanel.java            |   3 +-
 .../ReportBrandingProviderI.java              |   4 +-
 .../ReportConfigException.java                |   2 +-
 .../ReportGenerationPanel.form                |   6 +-
 .../ReportGenerationPanel.java                |   3 +-
 .../{ => infrastructure}/ReportGenerator.java |  12 +-
 .../ReportModuleConfig.java                   |   5 +-
 .../ReportModuleLoader.java                   |   3 +-
 .../ReportProgressDialog.form                 |   8 +-
 .../ReportProgressDialog.java                 |   5 +-
 .../ReportProgressLogger.java                 |   3 +-
 .../ReportVisualPanel1.form                   |   2 +-
 .../ReportVisualPanel1.java                   |   7 +-
 .../ReportVisualPanel2.form                   |  14 +-
 .../ReportVisualPanel2.java                   |   3 +-
 .../ReportWizardAction.java                   |   8 +-
 .../ReportWizardFileOptionsPanel.java         |   3 +-
 .../ReportWizardFileOptionsVisualPanel.form   |   6 +-
 .../ReportWizardFileOptionsVisualPanel.java   |   4 +-
 .../ReportWizardIterator.java                 |   5 +-
 .../ReportWizardPanel1.java                   |   3 +-
 .../ReportWizardPanel2.java                   |   3 +-
 .../ReportWizardPortableCaseOptionsPanel.java |   2 +-
 ...tWizardPortableCaseOptionsVisualPanel.form |   6 +-
 ...tWizardPortableCaseOptionsVisualPanel.java |   7 +-
 .../{ => infrastructure}/ReportingConfig.java |   2 +-
 .../ReportingConfigLoader.java                |   3 +-
 .../TableReportGenerator.java                 |   4 +-
 .../TableReportModule.java                    |   5 +-
 .../TableReportSettings.java                  |   2 +-
 .../autopsy/report/modules/Bundle.properties  |  76 ++++
 .../report/modules/Bundle.properties-MERGED   | 129 +++++++
 .../report/modules/Bundle_ja.properties       |  64 ++++
 .../{ => modules}/FileReportDataTypes.java    |   4 +-
 .../FileReportModuleSettings.java             |   4 +-
 .../report/{ => modules}/FileReportText.java  |   6 +-
 .../HTMLReportModuleSettings.java             |   4 +-
 .../PortableCaseReportModule.java             |  14 +-
 .../PortableCaseReportModuleSettings.java     |  29 +-
 .../report/{ => modules}/ReportBodyFile.java  |   4 +-
 .../report/{ => modules}/ReportExcel.java     |   3 +-
 .../ReportFileTextConfigurationPanel.form     |   4 +-
 .../ReportFileTextConfigurationPanel.java     |   2 +-
 .../report/{ => modules}/ReportHTML.java      |  10 +-
 .../ReportHTMLConfigurationPanel.form         |   8 +-
 .../ReportHTMLConfigurationPanel.java         |   2 +-
 .../report/{ => modules}/ReportKML.java       |   7 +-
 67 files changed, 1061 insertions(+), 990 deletions(-)
 rename Core/src/org/sleuthkit/autopsy/report/{ => infrastructure}/ArtifactSelectionDialog.form (84%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => infrastructure}/ArtifactSelectionDialog.java (99%)
 create mode 100755 Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle.properties
 create mode 100755 Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle.properties-MERGED
 create mode 100755 Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle_ja.properties
 rename Core/src/org/sleuthkit/autopsy/report/{ => infrastructure}/FileReportModule.java (89%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => infrastructure}/FileReportSettings.java (93%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => infrastructure}/PortableCaseInterestingItemsListPanel.form (90%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => infrastructure}/PortableCaseInterestingItemsListPanel.java (98%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => infrastructure}/PortableCaseTagsListPanel.form (90%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => infrastructure}/PortableCaseTagsListPanel.java (99%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => infrastructure}/ReportBrandingProviderI.java (95%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => infrastructure}/ReportConfigException.java (96%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => infrastructure}/ReportGenerationPanel.form (88%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => infrastructure}/ReportGenerationPanel.java (98%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => infrastructure}/ReportGenerator.java (96%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => infrastructure}/ReportModuleConfig.java (93%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => infrastructure}/ReportModuleLoader.java (95%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => infrastructure}/ReportProgressDialog.form (86%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => infrastructure}/ReportProgressDialog.java (98%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => infrastructure}/ReportProgressLogger.java (97%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => infrastructure}/ReportVisualPanel1.form (96%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => infrastructure}/ReportVisualPanel1.java (97%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => infrastructure}/ReportVisualPanel2.form (85%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => infrastructure}/ReportVisualPanel2.java (99%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => infrastructure}/ReportWizardAction.java (95%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => infrastructure}/ReportWizardFileOptionsPanel.java (95%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => infrastructure}/ReportWizardFileOptionsVisualPanel.form (87%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => infrastructure}/ReportWizardFileOptionsVisualPanel.java (98%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => infrastructure}/ReportWizardIterator.java (96%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => infrastructure}/ReportWizardPanel1.java (96%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => infrastructure}/ReportWizardPanel2.java (96%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => infrastructure}/ReportWizardPortableCaseOptionsPanel.java (98%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => infrastructure}/ReportWizardPortableCaseOptionsVisualPanel.form (90%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => infrastructure}/ReportWizardPortableCaseOptionsVisualPanel.java (96%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => infrastructure}/ReportingConfig.java (97%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => infrastructure}/ReportingConfigLoader.java (98%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => infrastructure}/TableReportGenerator.java (99%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => infrastructure}/TableReportModule.java (96%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => infrastructure}/TableReportSettings.java (98%)
 create mode 100755 Core/src/org/sleuthkit/autopsy/report/modules/Bundle.properties
 create mode 100755 Core/src/org/sleuthkit/autopsy/report/modules/Bundle.properties-MERGED
 create mode 100755 Core/src/org/sleuthkit/autopsy/report/modules/Bundle_ja.properties
 rename Core/src/org/sleuthkit/autopsy/report/{ => modules}/FileReportDataTypes.java (98%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => modules}/FileReportModuleSettings.java (93%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => modules}/FileReportText.java (96%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => modules}/HTMLReportModuleSettings.java (94%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => modules}/PortableCaseReportModule.java (98%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => modules}/PortableCaseReportModuleSettings.java (84%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => modules}/ReportBodyFile.java (98%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => modules}/ReportExcel.java (99%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => modules}/ReportFileTextConfigurationPanel.form (87%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => modules}/ReportFileTextConfigurationPanel.java (99%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => modules}/ReportHTML.java (99%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => modules}/ReportHTMLConfigurationPanel.form (81%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => modules}/ReportHTMLConfigurationPanel.java (99%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => modules}/ReportKML.java (99%)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
index b64d4dda05..8a6d7a7644 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
@@ -60,8 +60,8 @@ import org.sleuthkit.autopsy.ingest.IngestModuleError;
 import org.sleuthkit.autopsy.ingest.IngestProfiles;
 import org.sleuthkit.autopsy.modules.interestingitems.FilesSet;
 import org.sleuthkit.autopsy.modules.interestingitems.FilesSetsManager;
-import org.sleuthkit.autopsy.report.ReportProgressLogger;
-import org.sleuthkit.autopsy.report.ReportGenerator;
+import org.sleuthkit.autopsy.report.infrastructure.ReportProgressLogger;
+import org.sleuthkit.autopsy.report.infrastructure.ReportGenerator;
 import org.sleuthkit.datamodel.Content;
 import org.sleuthkit.datamodel.TskCoreException;
 
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.java
index 4f0cf7dc75..ad754eefba 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.java
@@ -26,7 +26,7 @@ import org.sleuthkit.autopsy.ingest.IngestJobSettings;
 import org.sleuthkit.autopsy.ingest.IngestJobSettingsPanel;
 import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.coreutils.Logger;
-import static org.sleuthkit.autopsy.report.ReportWizardAction.doReportWizard;
+import static org.sleuthkit.autopsy.report.infrastructure.ReportWizardAction.doReportWizard;
 
 /**
  * Configuration panel for auto ingest settings.
diff --git a/Core/src/org/sleuthkit/autopsy/core/layer.xml b/Core/src/org/sleuthkit/autopsy/core/layer.xml
index 4706ea1b1d..ed4b8cc55d 100644
--- a/Core/src/org/sleuthkit/autopsy/core/layer.xml
+++ b/Core/src/org/sleuthkit/autopsy/core/layer.xml
@@ -220,8 +220,8 @@
                     <attr name="originalFile" stringvalue="Actions/Tools/org-sleuthkit-autopsy-ingest-RunIngestAction.instance"/>
                 </file>
             </folder>
-            <!--<file name="org-sleuthkit-autopsy-report-ReportWizardAction.shadow">
-                <attr name="originalFile" stringvalue="Actions/Tools/org-sleuthkit-autopsy-report-ReportWizardAction.instance"/>
+            <!--<file name="org-sleuthkit-autopsy-report-infrastructure-ReportWizardAction.shadow">
+                <attr name="originalFile" stringvalue="Actions/Tools/org-sleuthkit-autopsy-report-infrastructure-ReportWizardAction.instance"/>
                 <attr name="position" intvalue="100"/>
             </file>-->
             <!--<file name="Separator1.instance_hidden"/>
@@ -311,29 +311,29 @@
             <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.directorytree.FileSearchProvider"/>
             <attr name="position" intvalue="250"/>
         </file>
-        <file name="org-sleuthkit-autopsy-report-ReportHTML.instance">
-            <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.TableReportModule"/>
-            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.ReportHTML.getDefault"/>
+        <file name="org-sleuthkit-autopsy-report-modules-ReportHTML.instance">
+            <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.infrastructure.TableReportModule"/>
+            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.modules.ReportHTML.getDefault"/>
             <attr name="position" intvalue="900"/>
         </file>
-        <file name="org-sleuthkit-autopsy-report-ReportExcel.instance">
-            <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.TableReportModule"/>
-            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.ReportExcel.getDefault"/>
+        <file name="org-sleuthkit-autopsy-report-modules-ReportExcel.instance">
+            <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.infrastructure.TableReportModule"/>
+            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.modules.ReportExcel.getDefault"/>
             <attr name="position" intvalue="901"/>
         </file>
-        <file name="org-sleuthkit-autopsy-report-ReportBodyFile.instance">
+        <file name="org-sleuthkit-autopsy-report-modules-ReportBodyFile.instance">
             <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.GeneralReportModule"/>
-            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.ReportBodyFile.getDefault"/>
+            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.modules.ReportBodyFile.getDefault"/>
             <attr name="position" intvalue="902"/>
         </file>
-        <file name="org-sleuthkit-autopsy-report-FileReportText.instance">
-            <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.FileReportModule"/>
-            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.FileReportText.getDefault"/>
+        <file name="org-sleuthkit-autopsy-report-modules-FileReportText.instance">
+            <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.infrastructure.FileReportModule"/>
+            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.modules.FileReportText.getDefault"/>
             <attr name="position" intvalue="903"/>
         </file>
-        <file name="org-sleuthkit-autopsy-report-ReportKML.instance">
+        <file name="org-sleuthkit-autopsy-report-modules-ReportKML.instance">
             <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.GeneralReportModule"/>
-            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.ReportKML.getDefault"/>
+            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.modules.ReportKML.getDefault"/>
             <attr name="position" intvalue="904"/>
         </file>
         <file name="org-sleuthkit-autopsy-modules-stix-STIXReportModule.instance">
@@ -391,9 +391,9 @@
                 <attr name="position" intvalue="10000"/>
             </file>
             <!--
-            <file name="org-sleuthkit-autopsy-report-ReportWizardAction.shadow">
-                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.report.Bundle#Toolbars/Reports/org-sleuthkit-autopsy-report-ReportWizardAction.shadow"/>
-                <attr name="originalFile" stringvalue="Actions/Tools/org-sleuthkit-autopsy-report-ReportWizardAction.instance"/>
+            <file name="org-sleuthkit-autopsy-report-infrastructure-ReportWizardAction.shadow">
+                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.report.Bundle#Toolbars/Reports/org-sleuthkit-autopsy-report-infrastructure-ReportWizardAction.shadow"/>
+                <attr name="originalFile" stringvalue="Actions/Tools/org-sleuthkit-autopsy-report-infrastructure-ReportWizardAction.instance"/>
                 <attr name="position" intvalue="103"/>
             </file>
             <file name="org-sleuthkit-autopsy-casemodule-CaseCloseAction.instance">
diff --git a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties
index a1ea9222d5..2a296c830d 100644
--- a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties
@@ -1,278 +1,4 @@
 OpenIDE-Module-Name=Report
-CTL_ReportWizardAction=Run Report
-ArtifactSelectionDialog.titleLabel.text=Select which result types you would like to report on:
-ArtifactSelectionDialog.okButton.text=OK
-ReportVisualPanel1.reportModulesLabel.text=Report Modules:
-ReportVisualPanel1.invalidModuleWarning=Encountered an invalid Report Module ({0})
 DefaultReportConfigurationPanel.infoLabel.text=This report will be configured on the next screen.
-ReportVisualPanel2.dataLabel.text=Select which data to report on:
-ReportVisualPanel2.deselectAllButton.text=Deselect All
-ReportVisualPanel2.selectAllButton.text=Select All
-ReportVisualPanel2.advancedButton.text=Result Types
-ArtifactSelectionDialog.deselectAllButton.text=Deselect All
-ArtifactSelectionDialog.selectAllButton.text=Select All
-ReportGenerationPanel.closeButton.text=Close
-ReportGenerationPanel.titleLabel.text=Report Generation Progress
-ReportVisualPanel2.allResultsRadioButton.text=All Results
-ReportWizardFileOptionsVisualPanel.selectAllButton.text=Select All
-ReportWizardFileOptionsVisualPanel.deselectAllButton.text=Deselect All
-ReportWizardFileOptionsVisualPanel.jLabel1.text=Select items to include in File Report:
-ArtifactSelectionDialog.dlgTitle.text=Result Type Selection
-FileReportDataTypes.filename.text=Name
-FileReportDataTypes.fileExt.text=File Extension
-FileReportDataTypes.fileType.text=File Type
-FileReportDataTypes.isDel.text=Is Deleted
-FileReportDataTypes.aTime.text=Last Accessed
-FileReportDataTypes.crTime.text=File Created
-FileReportDataTypes.mTime.text=Last Modified
-FileReportDataTypes.size.text=Size
-FileReportDataTypes.address.text=Address
-FileReportDataTypes.hash.text=Hash Value
-FileReportDataTypes.knownStatus.text=Known Status
-FileReportDataTypes.perms.text=Permissions
-FileReportDataTypes.path.text=Full Path
-FileReportText.getName.text=Files - Text
-FileReportText.getDesc.text=A delimited text file containing information about individual files in the case.
-ReportBodyFile.progress.querying=Querying files...
-ReportBodyFile.ingestWarning.text=Warning, this report was run before ingest services completed\!
-ReportBodyFile.progress.loading=Loading files...
-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
-ReportKML.progress.querying=Querying files...
-ReportKML.progress.loading=Loading files...
-ReportKML.getName.text=Google Earth KML
-ReportKML.getDesc.text=KML format report with coordinates for relevant files. This format can be used for google earth views.
-ReportKML.getFilePath.text=ReportKML.kml
 ReportBranding.defaultReportTitle.text=Autopsy Forensic Report
-ReportBranding.defaultReportFooter.text=Powered by Autopsy Open Source Digital Forensics Platform - www.sleuthkit.org
-ReportExcel.numAartifacts.text=Number of artifacts:
-ReportExcel.getName.text=Excel Report
-ReportExcel.getDesc.text=A report about results and tagged items in Excel (XLS) format.
-ReportExcel.sheetName.text=Summary
-ReportExcel.cellVal.summary=Summary
-ReportExcel.cellVal.caseName=Case Name:
-ReportExcel.cellVal.caseNum=Case Number:
-ReportExcel.cellVal.examiner=Examiner:
-ReportExcel.cellVal.numImages=Number of Images:
-ReportGenerationPanel.confDlg.sureToClose.msg=Are you sure you'd like to close the dialog?\nAll reports will be canceled.
-ReportGenerationPanel.confDlg.title.closing=Closing
-ReportGenerationPanel.confDlg.cancelReport.msg=Are you sure you'd like to cancel the report?
-ReportGenerator.displayProgress.title.text=Report Generation Progress...
-ReportGenerator.progress.queryingDb.text=Querying database...
-ReportGenerator.progress.processingFile.text=Now processing {0}
-ReportGenerator.artifactTable.taggedResults.text=Contains results that were tagged with one of the following:
-ReportGenerator.progress.processing=Now processing {0}...
-ReportGenerator.msgShow.skippingArtType.title=Skipping artifact type {0} in reports
-ReportGenerator.msgShow.skippingArtType.msg=Unknown columns to report on
-ReportGenerator.makeContTagTab.taggedFiles.msg=Contains files that were tagged with one of the following:
-ReportGenerator.makeBbArtTagTab.taggedRes.msg=This report only includes results tagged with:
-ReportGenerator.tagTable.header.resultType=Result Type
-ReportGenerator.tagTable.header.tag=Tag
-ReportGenerator.tagTable.header.comment=Comment
-ReportGenerator.tagTable.header.srcFile=Source File
-ReportGenerator.progress.createdThumb.text=Creating thumbnails...
-ReportGenerator.htmlOutput.header.file=File
-ReportGenerator.htmlOutput.header.tag=Tag
-ReportGenerator.htmlOutput.header.comment=Comment
-ReportGenerator.htmlOutput.header.timeModified=Modified Time
-ReportGenerator.htmlOutput.header.timeChanged=Changed Time
-ReportGenerator.htmlOutput.header.timeAccessed=Accessed Time
-ReportGenerator.htmlOutput.header.timeCreated=Created Time
-ReportGenerator.htmlOutput.header.size=Size (Bytes)
-ReportGenerator.htmlOutput.header.hash=Hash
-ReportGenerator.thumbnailTable.name=Tagged Images
-ReportGenerator.thumbnailTable.desc=Contains thumbnails of images that are associated with tagged files and results.
-ReportGenerator.writeKwHits.userSrchs=User Searches
-ReportGenerator.progress.processingList=Now processing {0} ({1})...
-ReportGenerator.artTableColHdr.url=URL
-ReportGenerator.artTableColHdr.title=Title
-ReportGenerator.artTableColHdr.dateCreated=Date Created
-ReportGenerator.artTableColHdr.program=Program
-ReportGenerator.artTableColHdr.urlDomainDecoded=URL Domain
-ReportGenerator.artTableColHdr.srcFile=Source File
-ReportGenerator.artTableColHdr.dateTime=Date/Time
-ReportGenerator.artTableColHdr.name=Name
-ReportGenerator.artTableColHdr.value=Value
-ReportGenerator.artTableColHdr.dateAccessed=Date Accessed
-ReportGenerator.artTableColHdr.referrer=Referrer
-ReportGenerator.artTableColHdr.dest=Destination
-ReportGenerator.artTableColHdr.sourceUrl=Source URL
-ReportGenerator.artTableColHdr.path=Path
-ReportGenerator.artTableColHdr.progName=Program Name
-ReportGenerator.artTableColHdr.instDateTime=Install Date/Time
-ReportGenerator.artTableColHdr.preview=Preview
-ReportGenerator.artTableColHdr.file=File
-ReportGenerator.artTableColHdr.size=Size
-ReportGenerator.artTableColHdr.deviceId=Device ID
-ReportGenerator.artTableColHdr.text=Text
-ReportGenerator.artTableColHdr.domain=Domain
-ReportGenerator.artTableColHdr.dateTaken=Date Taken
-ReportGenerator.artTableColHdr.devManufacturer=Device Manufacturer
-ReportGenerator.artTableColHdr.devMake=Device Make
-ReportGenerator.artTableColHdr.devModel=Device Model
-ReportGenerator.artTableColHdr.latitude=Latitude
-ReportGenerator.artTableColHdr.longitude=Longitude
-ReportGenerator.artTableColHdr.latitudeStart=Starting Latitude
-ReportGenerator.artTableColHdr.longitudeStart=Starting Longitude
-ReportGenerator.artTableColHdr.latitudeEnd=Ending Latitude
-ReportGenerator.artTableColHdr.longitudeEnd=Ending Longitude
-ReportGenerator.artTableColHdr.associatedArtifact=Associated Artifact
-ReportGenerator.artTableColHdr.count=Count
-ReportGenerator.artTableColHdr.personName=Person Name
-ReportGenerator.artTableColHdr.phoneNumber=Phone Number
-ReportGenerator.artTableColHdr.phoneNumHome=Phone Number (Home)
-ReportGenerator.artTableColHdr.phoneNumOffice=Phone Number (Office)
-ReportGenerator.artTableColHdr.phoneNumMobile=Phone Number (Mobile)
-ReportGenerator.artTableColHdr.email=Email
-ReportGenerator.artTableColHdr.msgType=Message Type
-ReportGenerator.artTableColHdr.direction=Direction
-ReportGenerator.artTableColHdr.readStatus=Read Status
-ReportGenerator.artTableColHdr.fromPhoneNum=From Phone Number
-ReportGenerator.artTableColHdr.fromEmail=From Email
-ReportGenerator.artTableColHdr.toPhoneNum=To Phone Number
-ReportGenerator.artTableColHdr.toEmail=To Email
-ReportGenerator.artTableColHdr.subject=Subject
-ReportGenerator.artTableColHdr.tskEmailTo=E-Mail To
-ReportGenerator.artTableColHdr.tskEmailCc=E-Mail CC
-ReportGenerator.artTableColHdr.tskEmailBcc=E-Mail BCC
-ReportGenerator.artTableColHdr.tskEmailFrom=E-Mail From
-ReportGenerator.artTableColHdr.tskMsgId=Message ID
-ReportGenerator.artTableColHdr.tskDateTimeRcvd=Date Received
-ReportGenerator.artTableColHdr.tskDateTimeSent=Date Sent
-ReportGenerator.artTableColHdr.tskSubject=Subject
-ReportGenerator.artTableColHdr.tskSetName=Set Name
-ReportGenerator.artTableColHdr.tskInterestingFilesCategory=Rule
-ReportGenerator.artTableColHdr.tskGpsRouteCategory=Category
-ReportGenerator.artTableColHdr.tskPath=Path
-ReportGenerator.artTableColHdr.calendarEntryType=Calendar Entry Type
-ReportGenerator.artTableColHdr.description=Description
-ReportGenerator.artTableColHdr.startDateTime=Start Date/Time
-ReportGenerator.artTableColHdr.endDateTime=End Date/Time
-ReportGenerator.artTableColHdr.location=Location
-ReportGenerator.artTableColHdr.shortCut=Short Cut
-ReportGenerator.artTableColHdr.deviceName=Device Name
-ReportGenerator.artTableColHdr.deviceAddress=Device Address
-ReportGenerator.artTableColHdr.altitude=Altitude
-ReportGenerator.artTableColHdr.locationAddress=Location Address
-ReportGenerator.artTableColHdr.category=Category
-ReportGenerator.artTableColHdr.userId=User ID
-ReportGenerator.artTableColHdr.userName=User Name
-ReportGenerator.artTableColHdr.password=Password
-ReportGenerator.artTableColHdr.appName=App Name
-ReportGenerator.artTableColHdr.appPath=App Path
-ReportGenerator.artTableColHdr.replytoAddress=ReplyTo Address
-ReportGenerator.artTableColHdr.mailServer=Mail Server
-ReportGenerator.artTableColHdr.tags=Tags
-ReportGenerator.artTableColHdr.localPath=Local path
-ReportGenerator.artTableColHdr.remotePath=Remote path
-ReportGenerator.errors.reportErrorTitle=Error generating report
-ReportGenerator.errors.reportErrorText=Error generating report: 
-ReportHTML.addThumbRows.dataType.title=Tagged Images - {0}
-ReportHTML.addThumbRows.dataType.msg=Tagged Results and Contents that contain images.
-ReportHTML.thumbLink.tags=Tags:
-ReportHTML.getName.text=HTML Report
-ReportHTML.getDesc.text=A report about results and tagged items in HTML format.
-ReportHTML.writeIndex.title=for case {0}
-ReportHTML.writeIndex.noFrames.msg=Your browser is not compatible with our frame setup.
-ReportHTML.writeIndex.noFrames.seeNav=Please see <a href\="content\nav.html">the navigation page</a> for artifact links,
-ReportHTML.writeIndex.seeSum=and <a href\="content\summary.html">the summary page</a> for a case summary.
-ReportHTML.writeNav.title=Report Navigation
-ReportHTML.writeNav.h1=Report Navigation
-ReportHTML.writeNav.summary=Case Summary
-ReportHTML.writeSum.title=Case Summary
-ReportHTML.writeSum.warningMsg=<span>Warning, this report was run before ingest services completed\!</span>
-#
-# autopsy/test/scripts/regression.py._html_report_diff() uses reportGenOn.text, caseName, caseNum, 
-# examiner as a regex signature to skip report.html and summary.html
-#
-ReportHTML.writeSum.reportGenOn.text=HTML Report Generated on {0}
-ReportHTML.writeSum.imageInfoHeading=<h2>Image Information:</h2>
-ReportHTML.writeSum.softwareInfoHeading=<h2>Software Information:</h2>
-ReportHTML.writeSum.ingestHistoryHeading=<h2>Ingest History:</h2>
-ReportHTML.writeSum.modulesEnabledHeading=Enabled Modules:
-ReportHTML.writeSum.autopsyVersion=Autopsy Version:
-ReportHTML.writeSum.timezone=Timezone:
-ReportHTML.writeSum.path=Path:
-ReportProgressDialog.progress.queuing=Queuing...
-ReportProgressDialog.initPathLabel.noFile=<html><u>No report file</u></html>
-ReportProgressDialog.start.cancelButton.text=Cancel
-ReportProgressDialog.start.progress.text=Starting report...
-ReportProgressDialog.complete.processLbl.text=Complete
-ReportProgressDialog.complete.processLb2.text=Completed with error
-ReportProgressDialog.complete.cancelButton.text=Complete
-ReportProgressDialog.cancel.cancelButton.toolTipText=Canceled
-ReportProgressDialog.cancel.procLbl.text=Canceled
-ReportVisualPanel1.getName.text=Select and Configure Report Modules
-ReportVisualPanel2.getName.text=Configure Report
-ReportWizardAction.actionName.text=Generate Report
-ReportWizardAction.reportWiz.title=Generate Report
-ReportWizardAction.toolBarButton.text=Generate Report
-ReportWizardFileOptionsPanel.finishButton.text=Finish
-ReportWizardFileOptionsVisualPanel.getName.text=Configure File Report
-ReportWizardPanel1.nextButton.text=Next >
-ReportWizardPanel1.finishButton.text=Finish
-ReportWizardPanel2.finishButton.text=Finish
-ReportWizardPanel2.nextButton.text=Next >
-ReportBodyFile.generateReport.srcModuleName.text=TSK Body File
-ReportExcel.endReport.srcModuleName.text=Excel Report
-ReportHTML.writeIndex.srcModuleName.text=HTML Report
-ReportKML.genReport.srcModuleName.text=Geospatial Data
-ReportKML.genReport.reportName=KML Report
-ReportGenerator.artTableColHdr.extension.text=Extension
-ReportGenerator.artTableColHdr.mimeType.text=MIME Type
-ReportGenerator.artTableColHdr.processorArchitecture.text=Processor Architecture
-ReportGenerator.artTableColHdr.osName.text=Operating System Name
-ReportGenerator.artTableColHdr.osInstallDate.text=Install Date
-ReportGenerator.errList.failedMakeRptFolder=Failed to make report folder, may be unable to generate reports.
-ReportGenerator.notifyErr.errsDuringRptGen=Errors during report generation:
-ReportGenerator.errList.failedGetAllTagsArtifacts=Failed get all possible tag names and artifact types.
-ReportGenerator.errList.noReportSettings=Report settings have not been configured.
-ReportGenerator.errList.failedGetContentTags=Failed to get content tags.
-ReportGenerator.errList.failedGetBBArtifactTags=Failed to get blackboard artifact tags.
-ReportGenerator.errList.errGetContentFromBBArtifact=Error while getting content from a blackboard artifact to report on.
-ReportGenerator.errList.failedGetBBAttribs=Failed to get Blackboard Attributes when generating report.
-ReportGenerator.errList.failedGetBBArtifacts=Failed to get Blackboard Artifacts when generating report.
-ReportGenerator.errList.failedQueryKWLists=Failed to query keyword lists.
-ReportGenerator.errList.failedGetAbstractFileByID=Failed to get Abstract File by ID.
-ReportGenerator.errList.failedQueryKWs=Failed to query keywords.
-ReportGenerator.errList.failedQueryHashsetLists=Failed to query hashset lists.
-ReportGenerator.errList.failedGetAbstractFileFromID=Failed to get Abstract File from ID.
-ReportGenerator.errList.failedQueryHashsetHits=Failed to query hashsets hits.
-ReportGenerator.errList.coreExceptionWhileGenRptRow=Core exception while generating row data for artifact report.
-ReportKML.latLongStartPoint={0};{1};;{2} (Start)\n
-ReportKML.latLongEndPoint={0};{1};;{2} (End)\n
-ReportGenerationPanel.cancelButton.actionCommand=Cancel
-ReportGenerationPanel.cancelButton.text=Cancel
-ReportHTMLConfigurationPanel.headerTextField.text=
-ReportHTMLConfigurationPanel.footerTextField.text=
-ReportHTMLConfigurationPanel.headerLabel.text=Header:
-ReportHTMLConfigurationPanel.footerLabel.text=Footer:
-CreatePortableCasePanel.selectAllButton.text=Select All
-CreatePortableCasePanel.deselectAllButton.text=Deselect All
-CreatePortableCasePanel.outputFolderTextField.text=jTextField1
-CreatePortableCasePanel.chooseOutputFolderButton.text=Choose folder
-CreatePortableCasePanel.jLabel1.text=Export files tagged as:
-CreatePortableCasePanel.jLabel2.text=Select output folder:
-CreatePortableCasePanel.errorLabel.text_1=Windows only
-ReportWizardPortableCaseOptionsVisualPanel.errorLabel.text=Windows only
-ReportWizardPortableCaseOptionsVisualPanel.compressCheckbox.text=Package case into an archive:
-PortableCaseTagsListPanel.deselectButton.text=Deselect All
-PortableCaseTagsListPanel.selectButton.text=Select All
-PortableCaseInterestingItemsListPanel.selectButton.text=Select All
-PortableCaseInterestingItemsListPanel.deselectButton.text=Deselect All
-ReportFileTextConfigurationPanel.tabDelimitedButton.text=Tab delimited
-ReportFileTextConfigurationPanel.commaDelimitedButton.text=Comma delimited
-PortableCaseTagsListPanel.descLabel.text=Include the following tags:
-PortableCaseInterestingItemsListPanel.descLabel.text=Include Interesting Items from these sets:
-ReportWizardPortableCaseOptionsVisualPanel.compressCheckbox.toolTipText=
-ReportProgressDialog.separationLabel.text=:
-ReportProgressDialog.pathLabel.text=pathLabel
-ReportProgressDialog.reportLabel.text=reportLabel
-ReportProgressDialog.statusMessageLabel.text=processingLabel
-ReportVisualPanel2.specificTaggedResultsRadioButton.text=Specific Tagged Results
-ReportVisualPanel2.allTaggedResultsRadioButton.text=All Tagged Results
-ArtifactSelectionDialog.titleLabel.toolTipText=
-PortableCaseTagsListPanel.jAllTagsCheckBox.text=All Tagged Results
-PortableCaseInterestingItemsListPanel.jAllSetsCheckBox.text=All Interesting Items
+ReportBranding.defaultReportFooter.text=Powered by Autopsy Open Source Digital Forensics Platform - www.sleuthkit.org
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties-MERGED
index 8b6676312d..2a296c830d 100755
--- a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties-MERGED
@@ -1,342 +1,4 @@
 OpenIDE-Module-Name=Report
-CTL_ReportWizardAction=Run Report
-ArtifactSelectionDialog.titleLabel.text=Select which result types you would like to report on:
-ArtifactSelectionDialog.okButton.text=OK
-PortableCaseInterestingItemsListPanel.error.errorLoadingTags=Error loading interesting item set names
-PortableCaseInterestingItemsListPanel.error.errorTitle=Error getting intesting item set names for case
-PortableCaseInterestingItemsListPanel.error.noOpenCase=There is no case open
-PortableCaseReportModule.compressCase.canceled=Compression canceled by user
-PortableCaseReportModule.compressCase.errorCompressingCase=Error compressing case
-# {0} - Temp folder path
-PortableCaseReportModule.compressCase.errorCreatingTempFolder=Could not create temporary folder {0}
-PortableCaseReportModule.compressCase.errorFinding7zip=Could not locate 7-Zip executable
-# {0} - File name
-PortableCaseReportModule.copyContentToPortableCase.copyingFile=Copying file {0}
-# {0} - case folder
-PortableCaseReportModule.createCase.caseDirExists=Case folder {0} already exists
-PortableCaseReportModule.createCase.errorCreatingCase=Error creating case
-# {0} - folder
-PortableCaseReportModule.createCase.errorCreatingFolder=Error creating folder {0}
-PortableCaseReportModule.createCase.errorStoringMaxIds=Error storing maximum database IDs
-PortableCaseReportModule.generateReport.caseClosed=Current case has been closed
-PortableCaseReportModule.generateReport.compressingCase=Compressing case...
-# {0} - tag name
-PortableCaseReportModule.generateReport.copyingArtifacts=Copying artifacts tagged as {0}...
-# {0} - tag name
-PortableCaseReportModule.generateReport.copyingFiles=Copying files tagged as {0}...
-PortableCaseReportModule.generateReport.copyingTags=Copying tags...
-PortableCaseReportModule.generateReport.creatingCase=Creating portable case database...
-PortableCaseReportModule.generateReport.errorCopyingArtifacts=Error copying tagged artifacts
-PortableCaseReportModule.generateReport.errorCopyingFiles=Error copying tagged files
-PortableCaseReportModule.generateReport.errorCopyingInterestingFiles=Error copying interesting files
-PortableCaseReportModule.generateReport.errorCopyingInterestingResults=Error copying interesting results
-PortableCaseReportModule.generateReport.errorCopyingTags=Error copying tags
-# {0} - attribute type name
-PortableCaseReportModule.generateReport.errorLookingUpAttrType=Error looking up attribute type {0}
-PortableCaseReportModule.generateReport.errorReadingSets=Error while reading interesting items sets from case database
-PortableCaseReportModule.generateReport.errorReadingTags=Error while reading tags from case database
-PortableCaseReportModule.generateReport.interestingItemError=Error loading intersting items
-PortableCaseReportModule.generateReport.noContentToCopy=No interesting files, results, or tagged items to copy
-# {0} - output folder
-PortableCaseReportModule.generateReport.outputDirDoesNotExist=Output folder {0} does not exist
-# {0} - output folder
-PortableCaseReportModule.generateReport.outputDirIsNotDir=Output folder {0} is not a folder
-PortableCaseReportModule.generateReport.verifying=Verifying selected parameters...
-PortableCaseReportModule.getDescription.description=Copies selected items to a new single-user case that can be easily shared
-PortableCaseReportModule.getName.name=Portable Case
-PortableCaseTagsListPanel.error.errorLoadingTags=Error loading tags
-PortableCaseTagsListPanel.error.errorTitle=Error getting tag names for case
-PortableCaseTagsListPanel.error.noOpenCase=There is no case open
-ReportExcel.exceptionMessage.dataTooLarge=Value is too long to fit into an Excel cell. 
-ReportExcel.exceptionMessage.errorText=Error showing data into an Excel cell.
-ReportExcel.writeSummary.caseName=Case Name:
-ReportExcel.writeSummary.caseNotes=Case Notes:
-ReportExcel.writeSummary.caseNum=Case Number:
-ReportExcel.writeSummary.examiner=Examiner:
-ReportExcel.writeSummary.numImages=Number of Images:
-ReportExcel.writeSummary.sheetName=Summary
-ReportExcel.writeSummary.summary=Summary
-ReportGenerator.artTableColHdr.comment=Comment
-ReportGenerator.errList.noOpenCase=No open case available.
-ReportGenerator.tagTable.header.userName=User Name
-ReportHTML.writeSum.case=Case:
-ReportHTML.writeSum.caseNotes=Notes:
-ReportHTML.writeSum.caseNumber=Case Number:
-ReportHTML.writeSum.caseNumImages=Number of Images:
-ReportHTML.writeSum.examiner=Examiner:
-ReportVisualPanel1.reportModulesLabel.text=Report Modules:
-ReportVisualPanel1.invalidModuleWarning=Encountered an invalid Report Module ({0})
 DefaultReportConfigurationPanel.infoLabel.text=This report will be configured on the next screen.
-ReportVisualPanel2.dataLabel.text=Select which data to report on:
-ReportVisualPanel2.deselectAllButton.text=Deselect All
-ReportVisualPanel2.selectAllButton.text=Select All
-ReportVisualPanel2.advancedButton.text=Result Types
-ArtifactSelectionDialog.deselectAllButton.text=Deselect All
-ArtifactSelectionDialog.selectAllButton.text=Select All
-ReportGenerationPanel.closeButton.text=Close
-ReportGenerationPanel.titleLabel.text=Report Generation Progress
-ReportVisualPanel2.allResultsRadioButton.text=All Results
-ReportWizardFileOptionsVisualPanel.selectAllButton.text=Select All
-ReportWizardFileOptionsVisualPanel.deselectAllButton.text=Deselect All
-ReportWizardFileOptionsVisualPanel.jLabel1.text=Select items to include in File Report:
-ArtifactSelectionDialog.dlgTitle.text=Result Type Selection
-FileReportDataTypes.filename.text=Name
-FileReportDataTypes.fileExt.text=File Extension
-FileReportDataTypes.fileType.text=File Type
-FileReportDataTypes.isDel.text=Is Deleted
-FileReportDataTypes.aTime.text=Last Accessed
-FileReportDataTypes.crTime.text=File Created
-FileReportDataTypes.mTime.text=Last Modified
-FileReportDataTypes.size.text=Size
-FileReportDataTypes.address.text=Address
-FileReportDataTypes.hash.text=Hash Value
-FileReportDataTypes.knownStatus.text=Known Status
-FileReportDataTypes.perms.text=Permissions
-FileReportDataTypes.path.text=Full Path
-FileReportText.getName.text=Files - Text
-FileReportText.getDesc.text=A delimited text file containing information about individual files in the case.
-ReportBodyFile.progress.querying=Querying files...
-ReportBodyFile.ingestWarning.text=Warning, this report was run before ingest services completed\!
-ReportBodyFile.progress.loading=Loading files...
-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
-ReportKML.progress.querying=Querying files...
-ReportKML.progress.loading=Loading files...
-ReportKML.getName.text=Google Earth KML
-ReportKML.getDesc.text=KML format report with coordinates for relevant files. This format can be used for google earth views.
-ReportKML.getFilePath.text=ReportKML.kml
 ReportBranding.defaultReportTitle.text=Autopsy Forensic Report
-ReportBranding.defaultReportFooter.text=Powered by Autopsy Open Source Digital Forensics Platform - www.sleuthkit.org
-ReportExcel.numAartifacts.text=Number of artifacts:
-ReportExcel.getName.text=Excel Report
-ReportExcel.getDesc.text=A report about results and tagged items in Excel (XLS) format.
-ReportExcel.sheetName.text=Summary
-ReportExcel.cellVal.summary=Summary
-ReportExcel.cellVal.caseName=Case Name:
-ReportExcel.cellVal.caseNum=Case Number:
-ReportExcel.cellVal.examiner=Examiner:
-ReportExcel.cellVal.numImages=Number of Images:
-ReportGenerationPanel.confDlg.sureToClose.msg=Are you sure you'd like to close the dialog?\nAll reports will be canceled.
-ReportGenerationPanel.confDlg.title.closing=Closing
-ReportGenerationPanel.confDlg.cancelReport.msg=Are you sure you'd like to cancel the report?
-ReportGenerator.displayProgress.title.text=Report Generation Progress...
-ReportGenerator.progress.queryingDb.text=Querying database...
-ReportGenerator.progress.processingFile.text=Now processing {0}
-ReportGenerator.artifactTable.taggedResults.text=Contains results that were tagged with one of the following:
-ReportGenerator.progress.processing=Now processing {0}...
-ReportGenerator.msgShow.skippingArtType.title=Skipping artifact type {0} in reports
-ReportGenerator.msgShow.skippingArtType.msg=Unknown columns to report on
-ReportGenerator.makeContTagTab.taggedFiles.msg=Contains files that were tagged with one of the following:
-ReportGenerator.makeBbArtTagTab.taggedRes.msg=This report only includes results tagged with:
-ReportGenerator.tagTable.header.resultType=Result Type
-ReportGenerator.tagTable.header.tag=Tag
-ReportGenerator.tagTable.header.comment=Comment
-ReportGenerator.tagTable.header.srcFile=Source File
-ReportGenerator.progress.createdThumb.text=Creating thumbnails...
-ReportGenerator.htmlOutput.header.file=File
-ReportGenerator.htmlOutput.header.tag=Tag
-ReportGenerator.htmlOutput.header.comment=Comment
-ReportGenerator.htmlOutput.header.timeModified=Modified Time
-ReportGenerator.htmlOutput.header.timeChanged=Changed Time
-ReportGenerator.htmlOutput.header.timeAccessed=Accessed Time
-ReportGenerator.htmlOutput.header.timeCreated=Created Time
-ReportGenerator.htmlOutput.header.size=Size (Bytes)
-ReportGenerator.htmlOutput.header.hash=Hash
-ReportGenerator.thumbnailTable.name=Tagged Images
-ReportGenerator.thumbnailTable.desc=Contains thumbnails of images that are associated with tagged files and results.
-ReportGenerator.writeKwHits.userSrchs=User Searches
-ReportGenerator.progress.processingList=Now processing {0} ({1})...
-ReportGenerator.artTableColHdr.url=URL
-ReportGenerator.artTableColHdr.title=Title
-ReportGenerator.artTableColHdr.dateCreated=Date Created
-ReportGenerator.artTableColHdr.program=Program
-ReportGenerator.artTableColHdr.urlDomainDecoded=URL Domain
-ReportGenerator.artTableColHdr.srcFile=Source File
-ReportGenerator.artTableColHdr.dateTime=Date/Time
-ReportGenerator.artTableColHdr.name=Name
-ReportGenerator.artTableColHdr.value=Value
-ReportGenerator.artTableColHdr.dateAccessed=Date Accessed
-ReportGenerator.artTableColHdr.referrer=Referrer
-ReportGenerator.artTableColHdr.dest=Destination
-ReportGenerator.artTableColHdr.sourceUrl=Source URL
-ReportGenerator.artTableColHdr.path=Path
-ReportGenerator.artTableColHdr.progName=Program Name
-ReportGenerator.artTableColHdr.instDateTime=Install Date/Time
-ReportGenerator.artTableColHdr.preview=Preview
-ReportGenerator.artTableColHdr.file=File
-ReportGenerator.artTableColHdr.size=Size
-ReportGenerator.artTableColHdr.deviceId=Device ID
-ReportGenerator.artTableColHdr.text=Text
-ReportGenerator.artTableColHdr.domain=Domain
-ReportGenerator.artTableColHdr.dateTaken=Date Taken
-ReportGenerator.artTableColHdr.devManufacturer=Device Manufacturer
-ReportGenerator.artTableColHdr.devMake=Device Make
-ReportGenerator.artTableColHdr.devModel=Device Model
-ReportGenerator.artTableColHdr.latitude=Latitude
-ReportGenerator.artTableColHdr.longitude=Longitude
-ReportGenerator.artTableColHdr.latitudeStart=Starting Latitude
-ReportGenerator.artTableColHdr.longitudeStart=Starting Longitude
-ReportGenerator.artTableColHdr.latitudeEnd=Ending Latitude
-ReportGenerator.artTableColHdr.longitudeEnd=Ending Longitude
-ReportGenerator.artTableColHdr.associatedArtifact=Associated Artifact
-ReportGenerator.artTableColHdr.count=Count
-ReportGenerator.artTableColHdr.personName=Person Name
-ReportGenerator.artTableColHdr.phoneNumber=Phone Number
-ReportGenerator.artTableColHdr.phoneNumHome=Phone Number (Home)
-ReportGenerator.artTableColHdr.phoneNumOffice=Phone Number (Office)
-ReportGenerator.artTableColHdr.phoneNumMobile=Phone Number (Mobile)
-ReportGenerator.artTableColHdr.email=Email
-ReportGenerator.artTableColHdr.msgType=Message Type
-ReportGenerator.artTableColHdr.direction=Direction
-ReportGenerator.artTableColHdr.readStatus=Read Status
-ReportGenerator.artTableColHdr.fromPhoneNum=From Phone Number
-ReportGenerator.artTableColHdr.fromEmail=From Email
-ReportGenerator.artTableColHdr.toPhoneNum=To Phone Number
-ReportGenerator.artTableColHdr.toEmail=To Email
-ReportGenerator.artTableColHdr.subject=Subject
-ReportGenerator.artTableColHdr.tskEmailTo=E-Mail To
-ReportGenerator.artTableColHdr.tskEmailCc=E-Mail CC
-ReportGenerator.artTableColHdr.tskEmailBcc=E-Mail BCC
-ReportGenerator.artTableColHdr.tskEmailFrom=E-Mail From
-ReportGenerator.artTableColHdr.tskMsgId=Message ID
-ReportGenerator.artTableColHdr.tskDateTimeRcvd=Date Received
-ReportGenerator.artTableColHdr.tskDateTimeSent=Date Sent
-ReportGenerator.artTableColHdr.tskSubject=Subject
-ReportGenerator.artTableColHdr.tskSetName=Set Name
-ReportGenerator.artTableColHdr.tskInterestingFilesCategory=Rule
-ReportGenerator.artTableColHdr.tskGpsRouteCategory=Category
-ReportGenerator.artTableColHdr.tskPath=Path
-ReportGenerator.artTableColHdr.calendarEntryType=Calendar Entry Type
-ReportGenerator.artTableColHdr.description=Description
-ReportGenerator.artTableColHdr.startDateTime=Start Date/Time
-ReportGenerator.artTableColHdr.endDateTime=End Date/Time
-ReportGenerator.artTableColHdr.location=Location
-ReportGenerator.artTableColHdr.shortCut=Short Cut
-ReportGenerator.artTableColHdr.deviceName=Device Name
-ReportGenerator.artTableColHdr.deviceAddress=Device Address
-ReportGenerator.artTableColHdr.altitude=Altitude
-ReportGenerator.artTableColHdr.locationAddress=Location Address
-ReportGenerator.artTableColHdr.category=Category
-ReportGenerator.artTableColHdr.userId=User ID
-ReportGenerator.artTableColHdr.userName=User Name
-ReportGenerator.artTableColHdr.password=Password
-ReportGenerator.artTableColHdr.appName=App Name
-ReportGenerator.artTableColHdr.appPath=App Path
-ReportGenerator.artTableColHdr.replytoAddress=ReplyTo Address
-ReportGenerator.artTableColHdr.mailServer=Mail Server
-ReportGenerator.artTableColHdr.tags=Tags
-ReportGenerator.artTableColHdr.localPath=Local path
-ReportGenerator.artTableColHdr.remotePath=Remote path
-ReportGenerator.errors.reportErrorTitle=Error generating report
-ReportGenerator.errors.reportErrorText=Error generating report: 
-ReportHTML.addThumbRows.dataType.title=Tagged Images - {0}
-ReportHTML.addThumbRows.dataType.msg=Tagged Results and Contents that contain images.
-ReportHTML.thumbLink.tags=Tags:
-ReportHTML.getName.text=HTML Report
-ReportHTML.getDesc.text=A report about results and tagged items in HTML format.
-ReportHTML.writeIndex.title=for case {0}
-ReportHTML.writeIndex.noFrames.msg=Your browser is not compatible with our frame setup.
-ReportHTML.writeIndex.noFrames.seeNav=Please see <a href\="content\nav.html">the navigation page</a> for artifact links,
-ReportHTML.writeIndex.seeSum=and <a href\="content\summary.html">the summary page</a> for a case summary.
-ReportHTML.writeNav.title=Report Navigation
-ReportHTML.writeNav.h1=Report Navigation
-ReportHTML.writeNav.summary=Case Summary
-ReportHTML.writeSum.title=Case Summary
-ReportHTML.writeSum.warningMsg=<span>Warning, this report was run before ingest services completed\!</span>
-#
-# autopsy/test/scripts/regression.py._html_report_diff() uses reportGenOn.text, caseName, caseNum, 
-# examiner as a regex signature to skip report.html and summary.html
-#
-ReportHTML.writeSum.reportGenOn.text=HTML Report Generated on {0}
-ReportHTML.writeSum.imageInfoHeading=<h2>Image Information:</h2>
-ReportHTML.writeSum.softwareInfoHeading=<h2>Software Information:</h2>
-ReportHTML.writeSum.ingestHistoryHeading=<h2>Ingest History:</h2>
-ReportHTML.writeSum.modulesEnabledHeading=Enabled Modules:
-ReportHTML.writeSum.autopsyVersion=Autopsy Version:
-ReportHTML.writeSum.timezone=Timezone:
-ReportHTML.writeSum.path=Path:
-ReportProgressDialog.progress.queuing=Queuing...
-ReportProgressDialog.initPathLabel.noFile=<html><u>No report file</u></html>
-ReportProgressDialog.start.cancelButton.text=Cancel
-ReportProgressDialog.start.progress.text=Starting report...
-ReportProgressDialog.complete.processLbl.text=Complete
-ReportProgressDialog.complete.processLb2.text=Completed with error
-ReportProgressDialog.complete.cancelButton.text=Complete
-ReportProgressDialog.cancel.cancelButton.toolTipText=Canceled
-ReportProgressDialog.cancel.procLbl.text=Canceled
-ReportVisualPanel1.getName.text=Select and Configure Report Modules
-ReportVisualPanel2.getName.text=Configure Report
-ReportWizardAction.actionName.text=Generate Report
-ReportWizardAction.reportWiz.title=Generate Report
-ReportWizardAction.toolBarButton.text=Generate Report
-ReportWizardFileOptionsPanel.finishButton.text=Finish
-ReportWizardFileOptionsVisualPanel.getName.text=Configure File Report
-ReportWizardPanel1.nextButton.text=Next >
-ReportWizardPanel1.finishButton.text=Finish
-ReportWizardPanel2.finishButton.text=Finish
-ReportWizardPanel2.nextButton.text=Next >
-ReportBodyFile.generateReport.srcModuleName.text=TSK Body File
-ReportExcel.endReport.srcModuleName.text=Excel Report
-ReportHTML.writeIndex.srcModuleName.text=HTML Report
-ReportKML.genReport.srcModuleName.text=Geospatial Data
-ReportKML.genReport.reportName=KML Report
-ReportGenerator.artTableColHdr.extension.text=Extension
-ReportGenerator.artTableColHdr.mimeType.text=MIME Type
-ReportGenerator.artTableColHdr.processorArchitecture.text=Processor Architecture
-ReportGenerator.artTableColHdr.osName.text=Operating System Name
-ReportGenerator.artTableColHdr.osInstallDate.text=Install Date
-ReportGenerator.errList.failedMakeRptFolder=Failed to make report folder, may be unable to generate reports.
-ReportGenerator.notifyErr.errsDuringRptGen=Errors during report generation:
-ReportGenerator.errList.failedGetAllTagsArtifacts=Failed get all possible tag names and artifact types.
-ReportGenerator.errList.noReportSettings=Report settings have not been configured.
-ReportGenerator.errList.failedGetContentTags=Failed to get content tags.
-ReportGenerator.errList.failedGetBBArtifactTags=Failed to get blackboard artifact tags.
-ReportGenerator.errList.errGetContentFromBBArtifact=Error while getting content from a blackboard artifact to report on.
-ReportGenerator.errList.failedGetBBAttribs=Failed to get Blackboard Attributes when generating report.
-ReportGenerator.errList.failedGetBBArtifacts=Failed to get Blackboard Artifacts when generating report.
-ReportGenerator.errList.failedQueryKWLists=Failed to query keyword lists.
-ReportGenerator.errList.failedGetAbstractFileByID=Failed to get Abstract File by ID.
-ReportGenerator.errList.failedQueryKWs=Failed to query keywords.
-ReportGenerator.errList.failedQueryHashsetLists=Failed to query hashset lists.
-ReportGenerator.errList.failedGetAbstractFileFromID=Failed to get Abstract File from ID.
-ReportGenerator.errList.failedQueryHashsetHits=Failed to query hashsets hits.
-ReportGenerator.errList.coreExceptionWhileGenRptRow=Core exception while generating row data for artifact report.
-ReportKML.latLongStartPoint={0};{1};;{2} (Start)\n
-ReportKML.latLongEndPoint={0};{1};;{2} (End)\n
-ReportGenerationPanel.cancelButton.actionCommand=Cancel
-ReportGenerationPanel.cancelButton.text=Cancel
-ReportHTMLConfigurationPanel.headerTextField.text=
-ReportHTMLConfigurationPanel.footerTextField.text=
-ReportHTMLConfigurationPanel.headerLabel.text=Header:
-ReportHTMLConfigurationPanel.footerLabel.text=Footer:
-CreatePortableCasePanel.selectAllButton.text=Select All
-CreatePortableCasePanel.deselectAllButton.text=Deselect All
-CreatePortableCasePanel.outputFolderTextField.text=jTextField1
-CreatePortableCasePanel.chooseOutputFolderButton.text=Choose folder
-CreatePortableCasePanel.jLabel1.text=Export files tagged as:
-CreatePortableCasePanel.jLabel2.text=Select output folder:
-CreatePortableCasePanel.errorLabel.text_1=Windows only
-ReportWizardPortableCaseOptionsVisualPanel.errorLabel.text=Windows only
-ReportWizardPortableCaseOptionsVisualPanel.compressCheckbox.text=Package case into an archive:
-PortableCaseTagsListPanel.deselectButton.text=Deselect All
-PortableCaseTagsListPanel.selectButton.text=Select All
-PortableCaseInterestingItemsListPanel.selectButton.text=Select All
-PortableCaseInterestingItemsListPanel.deselectButton.text=Deselect All
-ReportFileTextConfigurationPanel.tabDelimitedButton.text=Tab delimited
-ReportFileTextConfigurationPanel.commaDelimitedButton.text=Comma delimited
-PortableCaseTagsListPanel.descLabel.text=Include the following tags:
-PortableCaseInterestingItemsListPanel.descLabel.text=Include Interesting Items from these sets:
-ReportWizardPortableCaseOptionsVisualPanel.compressCheckbox.toolTipText=
-ReportProgressDialog.separationLabel.text=:
-ReportProgressDialog.pathLabel.text=pathLabel
-ReportProgressDialog.reportLabel.text=reportLabel
-ReportProgressDialog.statusMessageLabel.text=processingLabel
-ReportVisualPanel2.specificTaggedResultsRadioButton.text=Specific Tagged Results
-ReportVisualPanel2.allTaggedResultsRadioButton.text=All Tagged Results
-ArtifactSelectionDialog.titleLabel.toolTipText=
-PortableCaseTagsListPanel.jAllTagsCheckBox.text=All Tagged Results
-PortableCaseInterestingItemsListPanel.jAllSetsCheckBox.text=All Interesting Items
-ReportWizardPortableCaseOptionsVisualPanel.getName.title=Choose Portable Case settings
-TableReportGenerator.StatusColumn.Header=Review Status
+ReportBranding.defaultReportFooter.text=Powered by Autopsy Open Source Digital Forensics Platform - www.sleuthkit.org
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/report/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/report/Bundle_ja.properties
index e64fe2a502..3e5659464f 100644
--- a/Core/src/org/sleuthkit/autopsy/report/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/report/Bundle_ja.properties
@@ -1,245 +1,4 @@
 OpenIDE-Module-Name=\u30ec\u30dd\u30fc\u30c8
-CTL_ReportWizardAction=\u30ec\u30dd\u30fc\u30c8\u3092\u5b9f\u884c
-ArtifactSelectionDialog.titleLabel.text=\u3069\u306e\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u306b\u3064\u3044\u3066\u30ec\u30dd\u30fc\u30c8\u3059\u308b\u304b\u9078\u629e\u3057\u3066\u4e0b\u3055\u3044\uff1a
-ArtifactSelectionDialog.okButton.text=OK
-ReportVisualPanel1.reportModulesLabel.text=\u30ec\u30dd\u30fc\u30c8\u30e2\u30b8\u30e5\u30fc\u30eb\uff1a
 DefaultReportConfigurationPanel.infoLabel.text=\u3053\u306e\u30ec\u30dd\u30fc\u30c8\u306f\u6b21\u306e\u30b9\u30af\u30ea\u30fc\u30f3\u3067\u8a2d\u5b9a\u3055\u308c\u307e\u3059\u3002
-ReportVisualPanel2.dataLabel.text=\u3069\u306e\u30c7\u30fc\u30bf\u306b\u3064\u3044\u3066\u30ec\u30dd\u30fc\u30c8\u3059\u308b\u304b\u9078\u629e\u3057\u3066\u4e0b\u3055\u3044\uff1a
-ReportVisualPanel2.deselectAllButton.text=\u5168\u3066\u9078\u629e\u89e3\u9664
-ReportVisualPanel2.selectAllButton.text=\u5168\u3066\u9078\u629e
-ReportVisualPanel2.advancedButton.text=\u30c7\u30fc\u30bf\u30bf\u30a4\u30d7
-ArtifactSelectionDialog.deselectAllButton.text=\u5168\u3066\u9078\u629e\u89e3\u9664
-ArtifactSelectionDialog.selectAllButton.text=\u5168\u3066\u9078\u629e
-ReportGenerationPanel.closeButton.text=\u9589\u3058\u308b
-ReportGenerationPanel.titleLabel.text=\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u30d7\u30ed\u30b0\u30ec\u30b9
-ReportVisualPanel2.allResultsRadioButton.text=\u5168\u3066\u306e\u7d50\u679c
-ReportWizardFileOptionsVisualPanel.selectAllButton.text=\u5168\u3066\u9078\u629e
-ReportWizardFileOptionsVisualPanel.deselectAllButton.text=\u5168\u3066\u9078\u629e\u89e3\u9664
-ReportWizardFileOptionsVisualPanel.jLabel1.text=\u30d5\u30a1\u30a4\u30eb\u30ec\u30dd\u30fc\u30c8\u306b\u542b\u3081\u308b\u30a2\u30a4\u30c6\u30e0\u3092\u9078\u629e\u3057\u3066\u4e0b\u3055\u3044\uff1a
-ArtifactSelectionDialog.dlgTitle.text=\u30a2\u30c9\u30d0\u30f3\u30b9\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u9078\u629e
-FileReportDataTypes.filename.text=\u540d\u524d
-FileReportDataTypes.fileExt.text=\u30d5\u30a1\u30a4\u30eb\u62e1\u5f35\u5b50
-FileReportDataTypes.fileType.text=\u30d5\u30a1\u30a4\u30eb\u30bf\u30a4\u30d7
-FileReportDataTypes.isDel.text=\u306f\u524a\u9664\u3055\u308c\u307e\u3057\u305f
-FileReportDataTypes.aTime.text=\u6700\u5f8c\u306e\u30a2\u30af\u30bb\u30b9
-FileReportDataTypes.crTime.text=\u4f5c\u6210\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb
-FileReportDataTypes.mTime.text=\u6700\u5f8c\u306e\u4fee\u6b63
-FileReportDataTypes.size.text=\u30b5\u30a4\u30ba
-FileReportDataTypes.address.text=\u30a2\u30c9\u30ec\u30b9
-FileReportDataTypes.hash.text=\u30cf\u30c3\u30b7\u30e5\u5024
-FileReportDataTypes.knownStatus.text=\u65e2\u77e5\u30b9\u30c6\u30fc\u30bf\u30b9
-FileReportDataTypes.perms.text=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3
-FileReportDataTypes.path.text=\u30d5\u30eb\u30d1\u30b9
-FileReportText.getName.text=\u30d5\u30a1\u30a4\u30eb - \u30c6\u30ad\u30b9\u30c8
-FileReportText.getDesc.text=\u30b1\u30fc\u30b9\u306e\u500b\u5225\u30d5\u30a1\u30a4\u30eb\u306b\u3064\u3044\u3066\u306e\u60c5\u5831\u3092\u6301\u3064\u3001\u30bf\u30d6\u533a\u5207\u308a\u30c6\u30ad\u30b9\u30c8\u30d5\u30a1\u30a4\u30eb\u3002
-ReportBodyFile.progress.querying=\u30d5\u30a1\u30a4\u30eb\u306e\u30af\u30a8\u30ea\u3092\u5b9f\u884c\u4e2d\u2026
-ReportBodyFile.ingestWarning.text=\u8b66\u544a\u3001\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30b5\u30fc\u30d3\u30b9\u304c\u5b8c\u4e86\u3059\u308b\u524d\u306b\u30ec\u30dd\u30fc\u30c8\u304c\u5b9f\u884c\u3055\u308c\u307e\u3057\u305f\uff01
-ReportBodyFile.progress.loading=\u30d5\u30a1\u30a4\u30eb\u306e\u8aad\u307f\u8fbc\u307f\u4e2d\u2026
-ReportBodyFile.progress.processing={0}\u3092\u51e6\u7406\u4e2d\u2026
-ReportBodyFile.getName.text=TSK\u30dc\u30c7\u30a3\u30d5\u30a1\u30a4\u30eb
-ReportBodyFile.getDesc.text=\u5404\u30d5\u30a1\u30a4\u30eb\u306eMAC\u30bf\u30a4\u30e0\u3092\u542b\u3080\u3001\u30dc\u30c7\u30a3\u30d5\u30a1\u30a4\u30eb\u5f62\u5f0f\u30ec\u30dd\u30fc\u30c8\u3002\u30bf\u30a4\u30e0\u30e9\u30a4\u30f3\u30d3\u30e5\u30fc\u306b\u3053\u306e\u5f62\u5f0f\u3092\u4f7f\u7528\u3067\u304d\u307e\u3059\u3002
-ReportBodyFile.getFilePath.text=BodyFile.txt
 ReportBranding.defaultReportTitle.text=Autopsy\u30d5\u30a9\u30ec\u30f3\u30b8\u30c3\u30af\u30ec\u30dd\u30fc\u30c8
 ReportBranding.defaultReportFooter.text=Autopsy\u30aa\u30fc\u30d7\u30f3\u30bd\u30fc\u30b9\u30fb\u30c7\u30b8\u30bf\u30eb\u30fb\u30d5\u30a9\u30ec\u30f3\u30b8\u30c3\u30af\u30fb\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u306b\u3088\u308a\u63d0\u4f9b - www.sleuthkit.org
-ReportExcel.numAartifacts.text=\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u6570\uff1a
-ReportExcel.getName.text=\u7d50\u679c - Excel
-ReportExcel.getDesc.text=\u7d50\u679c\u306b\u95a2\u3059\u308b\u30ec\u30dd\u30fc\u30c8\u3002Excel(XLS)\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u3067\u30a2\u30a4\u30c6\u30e0\u306e\u30bf\u30b0\u4ed8\u3051\u304c\u3055\u308c\u3066\u3044\u307e\u3059\u3002
-ReportExcel.sheetName.text=\u30b5\u30de\u30ea\u30fc
-ReportExcel.cellVal.summary=\u30b5\u30de\u30ea\u30fc
-ReportExcel.cellVal.caseName=\u30b1\u30fc\u30b9\u540d\uff1a
-ReportExcel.cellVal.caseNum=\u30b1\u30fc\u30b9\u756a\u53f7\uff1a
-ReportExcel.cellVal.examiner=\u8abf\u67fb\u62c5\u5f53\u8005\uff1a
-ReportExcel.cellVal.numImages=\u30a4\u30e1\u30fc\u30b8\u6570\uff1a
-ReportGenerationPanel.confDlg.sureToClose.msg=\u3053\u306e\u30c0\u30a4\u30a2\u30ed\u30b0\u3092\u672c\u5f53\u306b\u9589\u3058\u307e\u3059\u304b\uff1f\n\u5168\u3066\u306e\u30ec\u30dd\u30fc\u30c8\u304c\u30ad\u30e3\u30f3\u30bb\u30eb\u3055\u308c\u307e\u3059\u3002
-ReportGenerationPanel.confDlg.title.closing=\u9589\u3058\u3066\u3044\u307e\u3059
-ReportGenerator.displayProgress.title.text=\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u30d7\u30ed\u30b0\u30ec\u30b9\u2026
-ReportGenerator.progress.queryingDb.text=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u30af\u30a8\u30ea\u3092\u5b9f\u884c\u4e2d\u2026
-ReportGenerator.progress.processingFile.text={0}\u3092\u51e6\u7406\u4e2d
-ReportGenerator.artifactTable.taggedResults.text=\u6b21\u306e\u4e2d\u306e\u4e00\u3064\u3067\u30bf\u30b0\u3055\u308c\u305f\u7d50\u679c\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059\uff1a
-ReportGenerator.progress.processing={0}\u3092\u51e6\u7406\u4e2d\u2026
-ReportGenerator.msgShow.skippingArtType.title=\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u30bf\u30a4\u30d7{0}\u3092\u30ec\u30dd\u30fc\u30c8\u3067\u30b9\u30ad\u30c3\u30d7\u3057\u3066\u3044\u307e\u3059
-ReportGenerator.msgShow.skippingArtType.msg=\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u3059\u308b\u306e\u306b\u4e0d\u660e\u306a\u30b3\u30e9\u30e0
-ReportGenerator.msgShow.skippingArtRow.title=\u30bf\u30a4\u30d7{0}\u306e\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u884c\u3092\u30ec\u30dd\u30fc\u30c8\u3067\u30b9\u30ad\u30c3\u30d7\u3057\u3066\u3044\u307e\u3059
-ReportGenerator.msgShow.skippingArtRow.msg=\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u3059\u308b\u306e\u306b\u4e0d\u660e\u306a\u30b3\u30e9\u30e0
-ReportGenerator.makeContTagTab.taggedFiles.msg=\u306e\u4e2d\u306e\u4e00\u3064\u3067\u30bf\u30b0\u3055\u308c\u305f\u7d50\u679c\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059\uff1a
-ReportGenerator.makeBbArtTagTab.taggedRes.msg=\u3053\u306e\u30ec\u30dd\u30fc\u30c8\u306b\u306f\u6b21\u3067\u30bf\u30b0\u3055\u308c\u305f\u7d50\u679c\u3057\u304b\u542b\u307e\u308c\u307e\u305b\u3093\uff1a
-ReportGenerator.tagTable.header.resultType=\u7d50\u679c\u30bf\u30a4\u30d7
-ReportGenerator.tagTable.header.tag=\u30bf\u30b0
-ReportGenerator.tagTable.header.comment=\u30b3\u30e1\u30f3\u30c8
-ReportGenerator.tagTable.header.srcFile=\u30bd\u30fc\u30b9\u30d5\u30a1\u30a4\u30eb
-ReportGenerator.progress.createdThumb.text=\u30b5\u30e0\u30cd\u30a4\u30eb\u3092\u4f5c\u6210\u4e2d\u2026
-ReportGenerator.thumbnailTable.name=\u30b5\u30e0\u30cd\u30a4\u30eb
-ReportGenerator.thumbnailTable.desc=\u30bf\u30b0\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\u3084\u7d50\u679c\u306b\u95a2\u9023\u3059\u308b\u30a4\u30e1\u30fc\u30b8\u306e\u30b5\u30e0\u30cd\u30a4\u30eb\u304c\u542b\u307e\u308c\u307e\u3059\u3002
-ReportGenerator.writeKwHits.userSrchs=\u30e6\u30fc\u30b6\u691c\u7d22
-ReportGenerator.progress.processingList={0} ({1})\u3092\u51e6\u7406\u4e2d\u2026
-ReportGenerator.artTableColHdr.url=URL
-ReportGenerator.artTableColHdr.title=\u30bf\u30a4\u30c8\u30eb
-ReportGenerator.artTableColHdr.dateCreated=\u4f5c\u6210\u65e5\u4ed8
-ReportGenerator.artTableColHdr.program=\u30d7\u30ed\u30b0\u30e9\u30e0
-ReportGenerator.artTableColHdr.srcFile=\u30bd\u30fc\u30b9\u30d5\u30a1\u30a4\u30eb
-ReportGenerator.artTableColHdr.dateTime=\u65e5\u4ed8\uff0f\u6642\u523b
-ReportGenerator.artTableColHdr.name=\u540d\u524d
-ReportGenerator.artTableColHdr.value=\u30d0\u30ea\u30e5\u30fc
-ReportGenerator.artTableColHdr.dateAccessed=\u30a2\u30af\u30bb\u30b9\u65e5\u4ed8
-ReportGenerator.artTableColHdr.referrer=\u30ea\u30d5\u30a1\u30e9
-ReportGenerator.artTableColHdr.dest=\u30c7\u30b9\u30c6\u30a3\u30cd\u30fc\u30b7\u30e7\u30f3
-ReportGenerator.artTableColHdr.sourceUrl=\u30bd\u30fc\u30b9URL
-ReportGenerator.artTableColHdr.path=\u30d1\u30b9
-ReportGenerator.artTableColHdr.progName=\u30d7\u30ed\u30b0\u30e9\u30e0\u540d
-ReportGenerator.artTableColHdr.instDateTime=\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u65e5\u4ed8\uff0f\u6642\u523b
-ReportGenerator.artTableColHdr.preview=\u30d7\u30ec\u30d3\u30e5\u30fc
-ReportGenerator.artTableColHdr.file=\u30d5\u30a1\u30a4\u30eb
-ReportGenerator.artTableColHdr.size=\u30b5\u30a4\u30ba
-ReportGenerator.artTableColHdr.deviceId=\u6a5f\u5668ID
-ReportGenerator.artTableColHdr.text=\u30c6\u30ad\u30b9\u30c8
-ReportGenerator.artTableColHdr.domain=\u30c9\u30e1\u30a4\u30f3
-ReportGenerator.artTableColHdr.devManufacturer=\u6a5f\u5668\u30e1\u30fc\u30ab\u30fc
-ReportGenerator.artTableColHdr.devModel=\u6a5f\u5668\u30e2\u30c7\u30eb
-ReportGenerator.artTableColHdr.personName=\u4eba\u540d
-ReportGenerator.artTableColHdr.phoneNumber=\u96fb\u8a71\u756a\u53f7
-ReportGenerator.artTableColHdr.phoneNumHome=\u96fb\u8a71\u756a\u53f7\uff08\u81ea\u5b85\uff09
-ReportGenerator.artTableColHdr.phoneNumOffice=\u96fb\u8a71\u756a\u53f7\uff08\u4f1a\u793e\uff09
-ReportGenerator.artTableColHdr.phoneNumMobile=\u96fb\u8a71\u756a\u53f7\uff08\u643a\u5e2f\uff09
-ReportGenerator.artTableColHdr.email=Email
-ReportGenerator.artTableColHdr.msgType=\u30e1\u30c3\u30bb\u30fc\u30b8\u30bf\u30a4\u30d7
-ReportGenerator.artTableColHdr.latitude=\u7def\u5ea6
-ReportGenerator.artTableColHdr.longitude=\u7d4c\u5ea6
-ReportGenerator.artTableColHdr.dateTaken=\u64ae\u5f71\u65e5\u4ed8
-ReportGenerator.artTableColHdr.subject=\u30b5\u30d6\u30b8\u30a7\u30af\u30c8
-ReportGenerator.artTableColHdr.calendarEntryType=\u30ab\u30ec\u30f3\u30c0\u30fc\u30a8\u30f3\u30c8\u30ea\u30bf\u30a4\u30d7
-ReportGenerator.artTableColHdr.description=\u8aac\u660e
-ReportGenerator.artTableColHdr.startDateTime=\u958b\u59cb\u65e5\u4ed8\uff0f\u6642\u523b
-ReportGenerator.artTableColHdr.shortCut=\u30b7\u30e7\u30fc\u30c8\u30ab\u30c3\u30c8
-ReportGenerator.artTableColHdr.endDateTime=\u4fee\u4e86\u65e5\u4ed8\uff0f\u6642\u523b
-ReportGenerator.artTableColHdr.location=\u30ed\u30b1\u30fc\u30b7\u30e7\u30f3
-ReportGenerator.artTableColHdr.deviceName=\u6a5f\u5668\u540d
-ReportGenerator.artTableColHdr.deviceAddress=\u6a5f\u5668\u30a2\u30c9\u30ec\u30b9
-ReportGenerator.artTableColHdr.altitude=\u6a19\u9ad8
-ReportGenerator.artTableColHdr.locationAddress=\u30ed\u30b1\u30fc\u30b7\u30e7\u30f3\u30a2\u30c9\u30ec\u30b9
-ReportGenerator.artTableColHdr.category=\u30ab\u30c6\u30b4\u30ea\u30fc
-ReportGenerator.artTableColHdr.userId=\u30e6\u30fc\u30b6ID
-ReportGenerator.artTableColHdr.password=\u30d1\u30b9\u30ef\u30fc\u30c9
-ReportGenerator.artTableColHdr.replytoAddress=\u8fd4\u4fe1\u30a2\u30c9\u30ec\u30b9
-ReportGenerator.artTableColHdr.mailServer=\u30e1\u30fc\u30eb\u30b5\u30fc\u30d0
-ReportGenerator.artTableColHdr.tags=\u30bf\u30b0
-ReportHTML.addThumbRows.dataType.title=\u30bf\u30b0\u4ed8\u3051\u3055\u308c\u305f\u30a4\u30e1\u30fc\u30b8 - {0}
-ReportHTML.addThumbRows.dataType.msg=\u30a4\u30e1\u30fc\u30b8\u3092\u542b\u3080\u30bf\u30b0\u4ed8\u3051\u3055\u308c\u305f\u7d50\u679c\u304a\u3088\u3073\u30b3\u30f3\u30c6\u30f3\u30c4\u3002
-ReportHTML.thumbLink.tags=\u30bf\u30b0\uff1a
-ReportHTML.getName.text=\u7d50\u679c - HTML
-ReportHTML.getDesc.text=HTML\u5f62\u5f0f\u306e\u7d50\u679c\u304a\u3088\u3073\u30bf\u30b0\u4ed8\u3051\u3055\u308c\u305f\u30a2\u30a4\u30c6\u30e0\u306e\u30ec\u30dd\u30fc\u30c8
-ReportHTML.writeIndex.title=\u30b1\u30fc\u30b9{0}\u306eAutopsy\u30ec\u30dd\u30fc\u30c8
-ReportHTML.writeNav.title=\u30ec\u30dd\u30fc\u30c8\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3
-ReportHTML.writeNav.h1=\u30ec\u30dd\u30fc\u30c8\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3
-ReportHTML.writeNav.summary=\u30b1\u30fc\u30b9\u30b5\u30de\u30ea\u30fc
-ReportHTML.writeSum.title=\u30b1\u30fc\u30b9\u30b5\u30de\u30ea\u30fc
-ReportHTML.writeSum.caseName=\u30b1\u30fc\u30b9\uff1a
-ReportHTML.writeSum.caseNum=\u30b1\u30fc\u30b9\u756a\u53f7\uff1a
-ReportHTML.writeSum.examiner=\u8abf\u67fb\u62c5\u5f53\u8005\uff1a
-ReportHTML.writeSum.numImages=\u30a4\u30e1\u30fc\u30b8\u6570\uff1a
-ReportHTML.writeSum.path=\u30d1\u30b9\uff1a
-ReportProgressPanel.start.cancelButton.text=\u30ad\u30e3\u30f3\u30bb\u30eb
-ReportProgressPanel.complete.processLbl.text=\u5b8c\u4e86
-ReportProgressPanel.complete.cancelButton.text=\u5b8c\u4e86
-ReportProgressPanel.cancel.cancelButton.toolTipText=\u30ad\u30e3\u30f3\u30bb\u30eb\u3055\u308c\u307e\u3057\u305f
-ReportWizardAction.actionName.text=\u30ec\u30dd\u30fc\u30c8\u3092\u751f\u6210
-ReportWizardAction.reportWiz.title=\u30ec\u30dd\u30fc\u30c8\u3092\u751f\u6210
-ReportWizardAction.toolBarButton.text=\u30ec\u30dd\u30fc\u30c8\u3092\u751f\u6210
-ReportWizardPanel1.nextButton.text=\u6b21 >
-ReportWizardPanel2.nextButton.text=\u6b21 >
-ReportGenerator.artTableColHdr.direction=\u65b9\u5411
-ReportGenerator.artTableColHdr.fromEmail=\u9001\u4fe1\u5143E\u30e1\u30fc\u30eb
-ReportGenerator.artTableColHdr.toEmail=\u9001\u4fe1\u5148E\u30e1\u30fc\u30eb
-ReportGenerator.artTableColHdr.fromPhoneNum=\u767a\u4fe1\u8005\u96fb\u8a71\u756a\u53f7
-ReportGenerator.artTableColHdr.toPhoneNum=\u7740\u4fe1\u8005\u96fb\u8a71\u756a\u53f7
-ReportGenerator.artTableColHdr.appName=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u540d
-ReportGenerator.artTableColHdr.appPath=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30d1\u30b9
-ReportHTML.writeIndex.noFrames.msg=\u4f7f\u7528\u3057\u3066\u3044\u308b\u30d6\u30e9\u30a6\u30b6\u306f\u5f0a\u793e\u306e\u30d5\u30ec\u30fc\u30e0\u30bb\u30c3\u30c8\u30a2\u30c3\u30d7\u3068\u306e\u4e92\u63db\u6027\u304c\u3042\u308a\u307e\u305b\u3093\u3002
-ReportHTML.writeIndex.noFrames.seeNav=\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u30ea\u30f3\u30af\u306f\u4e0b\u8a18\u306e\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u30da\u30fc\u30b8</a>\u3092\u3054\u89a7\u4e0b\u3055\u3044<a href\="nav.html">
-ReportHTML.writeIndex.seeSum=\u307e\u305f\u3001\u30b1\u30fc\u30b9\u30b5\u30de\u30ea\u30fc\u306f\u4e0b\u8a18\u306e\u30b5\u30de\u30ea\u30fc\u30da\u30fc\u30b8</a>\u3092\u3054\u89a7\u4e0b\u3055\u3044\u3002<a href\="summary.html">
-ReportHTML.writeSum.warningMsg=<span>\u8b66\u544a\u3001\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30b5\u30fc\u30d3\u30b9\u304c\u5b8c\u4e86\u3059\u308b\u524d\u306b\u30ec\u30dd\u30fc\u30c8\u304c\u5b9f\u884c\u3055\u308c\u307e\u3057\u305f\uff01</span>
-ReportHTML.writeSum.noExaminer=<i>\u8abf\u67fb\u62c5\u5f53\u8005\u7121\u3057</i>
-ReportHTML.writeSum.imageInfoHeading=<h2>\u30a4\u30e1\u30fc\u30b8\u60c5\u5831\uff1a</h2>
-ReportHTML.writeSum.timezone=\u30bf\u30a4\u30e0\u30be\u30fc\u30f3\uff1a
-ReportProgressPanel.progress.queuing=\u30ad\u30e5\u30fc\u30a4\u30f3\u30b0\u2026
-ReportProgressPanel.initPathLabel.noFile=<html><u>\u30ec\u30dd\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb\u7121\u3057</u></html>
-ReportProgressPanel.start.progress.text=\u30ec\u30dd\u30fc\u30c8\u958b\u59cb\u4e2d\u2026
-ReportProgressPanel.cancel.procLbl.text=\u30ad\u30e3\u30f3\u30bb\u30eb\u3055\u308c\u307e\u3057\u305f
-ReportVisualPanel1.getName.text=\u30ec\u30dd\u30fc\u30c8\u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u9078\u629e\u304a\u3088\u3073\u8a2d\u5b9a
-ReportVisualPanel2.getName.text=\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u30ec\u30dd\u30fc\u30c8\u3092\u8a2d\u5b9a
-ReportWizardFileOptionsPanel.finishButton.text=\u7d42\u4e86
-ReportWizardFileOptionsVisualPanel.getName.text=\u30d5\u30a1\u30a4\u30eb\u30ec\u30dd\u30fc\u30c8\u3092\u8a2d\u5b9a
-ReportWizardPanel1.finishButton.text=\u7d42\u4e86
-ReportWizardPanel2.finishButton.text=\u7d42\u4e86
-ReportHTML.writeSum.reportGenOn.text={0}\u306bHTML\u30ec\u30dd\u30fc\u30c8\u306f\u751f\u6210\u3055\u308c\u307e\u3057\u305f
-ReportHTML.writeSum.noCaseNum=<i>\u30b1\u30fc\u30b9\u756a\u53f7\u304c\u3042\u308a\u307e\u305b\u3093</i>
-ReportGenerator.errors.reportErrorTitle=\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
-ReportGenerator.errors.reportErrorText=\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\uff1a
-ReportKML.getDesc.text=\u95a2\u9023\u30d5\u30a1\u30a4\u30eb\u306e\u5ea7\u6a19\u3092\u542b\u3080KML\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u306e\u30ec\u30dd\u30fc\u30c8\u3002\u3053\u306e\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u306fGoogle Earth\u30d3\u30e5\u30fc\u306b\u4f7f\u7528\u3067\u304d\u307e\u3059\u3002
-ReportKML.getName.text=Google Earth/KML
-ReportKML.progress.loading=\u30d5\u30a1\u30a4\u30eb\u306e\u8aad\u307f\u8fbc\u307f\u4e2d\u2026
-ReportKML.progress.querying=\u30d5\u30a1\u30a4\u30eb\u306e\u30af\u30a8\u30ea\u3092\u5b9f\u884c\u4e2d\u2026
-ReportBodyFile.generateReport.srcModuleName.text=TSK\u30dc\u30c7\u30a3\u30d5\u30a1\u30a4\u30eb
-ReportExcel.endReport.srcModuleName.text=Excel\u30ec\u30dd\u30fc\u30c8
-ReportGenerator.artTableColHdr.extension.text=\u62e1\u5f35\u5b50
-ReportGenerator.artTableColHdr.mimeType.text=MIME\u30bf\u30a4\u30d7
-ReportHTML.writeIndex.srcModuleName.text=HTML\u30ec\u30dd\u30fc\u30c8
-ReportKML.genReport.reportName=KML\u30ec\u30dd\u30fc\u30c8
-ReportGenerator.artTableColHdr.associatedArtifact=\u95a2\u4fc2\u3059\u308b\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8
-ReportGenerator.artTableColHdr.count=\u30ab\u30a6\u30f3\u30c8
-ReportGenerator.artTableColHdr.devMake=\u6a5f\u5668\u578b\u540d
-ReportGenerator.artTableColHdr.latitudeEnd=\u5230\u7740\u7def\u5ea6
-ReportGenerator.artTableColHdr.latitudeStart=\u51fa\u767a\u7def\u5ea6
-ReportGenerator.artTableColHdr.localPath=\u30ed\u30fc\u30ab\u30eb\u30d1\u30b9
-ReportGenerator.artTableColHdr.longitudeEnd=\u5230\u7740\u7d4c\u5ea6
-ReportGenerator.artTableColHdr.longitudeStart=\u51fa\u767a\u7d4c\u5ea6
-ReportGenerator.artTableColHdr.osInstallDate.text=\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u65e5\u4ed8
-ReportGenerator.artTableColHdr.osName.text=\u30aa\u30da\u30ec\u30fc\u30c6\u30a3\u30f3\u30b0\u30b7\u30b9\u30c6\u30e0\u540d
-ReportGenerator.artTableColHdr.processorArchitecture.text=\u30d7\u30ed\u30bb\u30c3\u30b5\u30a2\u30fc\u30ad\u30c6\u30af\u30c1\u30e3
-ReportGenerator.artTableColHdr.readStatus=\u8aad\u307f\u53d6\u308a\u4e2d\u30b9\u30c6\u30fc\u30bf\u30b9
-ReportGenerator.artTableColHdr.remotePath=\u30ea\u30e2\u30fc\u30c8\u30d1\u30b9
-ReportGenerator.artTableColHdr.tskDateTimeRcvd=\u53d7\u4fe1\u65e5
-ReportGenerator.artTableColHdr.tskDateTimeSent=\u9001\u4fe1\u65e5
-ReportGenerator.artTableColHdr.tskEmailBcc=E-Mail BCC
-ReportGenerator.artTableColHdr.tskEmailCc=E-Mail CC
-ReportGenerator.artTableColHdr.tskEmailFrom=E-Mail\u9001\u4fe1\u5143
-ReportGenerator.artTableColHdr.tskEmailTo=E-Mail\u9001\u4fe1\u5148
-ReportGenerator.artTableColHdr.tskGpsRouteCategory=\u30ab\u30c6\u30b4\u30ea
-ReportGenerator.artTableColHdr.tskInterestingFilesCategory=\u30eb\u30fc\u30eb
-ReportGenerator.artTableColHdr.tskMsgId=\u30e1\u30c3\u30bb\u30fc\u30b8ID
-ReportGenerator.artTableColHdr.tskPath=\u30d1\u30b9
-ReportGenerator.artTableColHdr.tskSetName=\u30bb\u30c3\u30c8\u540d
-ReportGenerator.artTableColHdr.tskSubject=\u30b5\u30d6\u30b8\u30a7\u30af\u30c8
-ReportGenerator.artTableColHdr.urlDomainDecoded=URL\u30c9\u30e1\u30a4\u30f3
-ReportGenerator.artTableColHdr.userName=\u30e6\u30fc\u30b6\u540d
-ReportGenerator.errList.coreExceptionWhileGenRptRow=\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u30ec\u30dd\u30fc\u30c8\u7528\u30ed\u30fc\u30c7\u30fc\u30bf\u306e\u751f\u6210\u4e2d\u306b\u30b3\u30a2\u30a8\u30af\u30bb\u30d7\u30b7\u30e7\u30f3\uff08\u4f8b\u5916\uff09\u304c\u691c\u51fa\u3055\u308c\u307e\u3057\u305f
-ReportGenerator.errList.errGetContentFromBBArtifact=Blackboard\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u304b\u3089\u30ec\u30dd\u30fc\u30c8\u7528\u306e\u30b3\u30f3\u30c6\u30f3\u30c4\u3092\u53d6\u5f97\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
-ReportGenerator.errList.failedGetAbstractFileByID=ID\u306b\u57fa\u3065\u304d\u30a2\u30d6\u30b9\u30c8\u30e9\u30af\u30c8\u30d5\u30a1\u30a4\u30eb\u3092\u53d6\u5f97\u3059\u308b\u306e\u3092\u5931\u6557\u3057\u307e\u3057\u305f
-ReportGenerator.errList.failedGetBBArtifacts=\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u4e2d\u306bBlackboard\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u306e\u53d6\u5f97\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
-ReportGenerator.errList.failedGetBBArtifactTags=Blackboard\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u30bf\u30b0\u306e\u53d6\u5f97\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
-ReportGenerator.errList.failedGetBBAttribs=\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u4e2d\u306bBlackboard\u5c5e\u6027\u306e\u53d6\u5f97\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
-ReportGenerator.errList.failedGetContentTags=\u30b3\u30f3\u30c6\u30f3\u30c4\u30bf\u30b0\u306e\u53d6\u5f97\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
-ReportGenerator.errList.failedMakeRptFolder=\u30ec\u30dd\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0\u306e\u4f5c\u6210\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u304c\u3067\u304d\u306a\u3044\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002
-ReportGenerator.errList.failedQueryHashsetHits=\u30cf\u30c3\u30b7\u30e5\u30bb\u30c3\u30c8\u30d2\u30c3\u30c8\u3092\u30af\u30a8\u30ea\u3059\u308b\u306e\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
-ReportGenerator.errList.failedQueryHashsetLists=\u30cf\u30c3\u30b7\u30e5\u30bb\u30c3\u30c8\u30ea\u30b9\u30c8\u3092\u30af\u30a8\u30ea\u3059\u308b\u306e\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
-ReportGenerator.errList.failedQueryKWLists=\u30ad\u30fc\u30ef\u30fc\u30c9\u30ea\u30b9\u30c8\u3092\u30af\u30a8\u30ea\u3059\u308b\u306e\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
-ReportGenerator.errList.failedQueryKWs=\u30ad\u30fc\u30ef\u30fc\u30c9\u3092\u30af\u30a8\u30ea\u3059\u308b\u306e\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
-ReportGenerator.htmlOutput.header.comment=\u30b3\u30e1\u30f3\u30c8
-ReportGenerator.htmlOutput.header.file=\u30d5\u30a1\u30a4\u30eb
-ReportGenerator.htmlOutput.header.hash=\u30cf\u30c3\u30b7\u30e5
-ReportGenerator.htmlOutput.header.size=\u30b5\u30a4\u30ba\uff08\u30d0\u30a4\u30c8\uff09
-ReportGenerator.htmlOutput.header.tag=\u30bf\u30b0
-ReportGenerator.htmlOutput.header.timeAccessed=\u30a2\u30af\u30bb\u30b9\u65e5\u6642
-ReportGenerator.htmlOutput.header.timeCreated=\u4f5c\u6210\u65e5\u6642
-ReportGenerator.htmlOutput.header.timeModified=\u4fee\u6b63\u65e5\u6642
-ReportGenerator.notifyErr.errsDuringRptGen=\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u4e2d\u306e\u30a8\u30e9\u30fc\uff1a
-ReportGenerator.errList.failedGetAbstractFileFromID=ID\u306b\u57fa\u3065\u304d\u30a2\u30d6\u30b9\u30c8\u30e9\u30af\u30c8\u30d5\u30a1\u30a4\u30eb\u3092\u53d6\u5f97\u3059\u308b\u306e\u3092\u5931\u6557\u3057\u307e\u3057\u305f
-ReportKML.getFilePath.text=\u30ec\u30dd\u30fc\u30c8KML.kml
-ReportVisualPanel1.invalidModuleWarning=\u7121\u52b9\u306a\u30ec\u30dd\u30fc\u30c8\u30e2\u30b8\u30e5\u30fc\u30eb({0})\u306b\u906d\u9047\u3057\u307e\u3057\u305f
-ReportGenerationPanel.confDlg.cancelReport.msg=\u672c\u5f53\u306b\u30ec\u30dd\u30fc\u30c8\u3092\u30ad\u30e3\u30f3\u30bb\u30eb\u3057\u307e\u3059\u304b\uff1f
-ReportProgressPanel.complete.processLb2.text=\u5b8c\u4e86\u3057\u307e\u3057\u305f\u304c\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
-ReportGenerationPanel.cancelButton.actionCommand=\u30ad\u30e3\u30f3\u30bb\u30eb
-ReportGenerationPanel.cancelButton.text=\u30ad\u30e3\u30f3\u30bb\u30eb
-ReportProgressDialog.separationLabel.text=:
-ReportProgressDialog.pathLabel.text=\u30d1\u30b9\u30e9\u30d9\u30eb
-ReportProgressDialog.reportLabel.text=\u30ec\u30dd\u30fc\u30c8\u30e9\u30d9\u30eb
-ReportProgressDialog.statusMessageLabel.text=\u30d7\u30ed\u30bb\u30b7\u30f3\u30b0\u30e9\u30d9\u30eb
diff --git a/Core/src/org/sleuthkit/autopsy/report/GeneralReportModuleAdapter.java b/Core/src/org/sleuthkit/autopsy/report/GeneralReportModuleAdapter.java
index f66b1c69a2..fb06c39e6a 100644
--- a/Core/src/org/sleuthkit/autopsy/report/GeneralReportModuleAdapter.java
+++ b/Core/src/org/sleuthkit/autopsy/report/GeneralReportModuleAdapter.java
@@ -19,6 +19,7 @@
 package org.sleuthkit.autopsy.report;
 
 import javax.swing.JPanel;
+import org.sleuthkit.autopsy.report.ReportProgressPanel;
 
 /**
  * An adapter that provides no-op implementations of various GeneralReportModule
diff --git a/Core/src/org/sleuthkit/autopsy/report/NoReportModuleSettings.java b/Core/src/org/sleuthkit/autopsy/report/NoReportModuleSettings.java
index ad5fd9a09f..e647829487 100755
--- a/Core/src/org/sleuthkit/autopsy/report/NoReportModuleSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/report/NoReportModuleSettings.java
@@ -18,6 +18,8 @@
  */
 package org.sleuthkit.autopsy.report;
 
+import org.sleuthkit.autopsy.report.ReportModuleSettings;
+
 /**
  * Implementation of the ReportModuleSettings interface for use by report
  * modules that do not have settings.
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportBranding.java b/Core/src/org/sleuthkit/autopsy/report/ReportBranding.java
index 66970eae9b..c5ad6ce4a6 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportBranding.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportBranding.java
@@ -18,6 +18,8 @@
  */
 package org.sleuthkit.autopsy.report;
 
+import org.sleuthkit.autopsy.report.infrastructure.ReportBrandingProviderI;
+import org.sleuthkit.autopsy.report.infrastructure.ReportGenerator;
 import java.io.File;
 import java.io.IOException;
 import java.util.logging.Level;
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportModule.java b/Core/src/org/sleuthkit/autopsy/report/ReportModule.java
index f6a072f2fa..fb881e42a1 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportModule.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportModule.java
@@ -27,7 +27,7 @@ import javax.swing.JPanel;
 /**
  * Interface for report modules that plug in to the reporting infrastructure.
  */
-interface ReportModule {
+public interface ReportModule {
 
     /**
      * Get the name of the report this module generates.
diff --git a/Core/src/org/sleuthkit/autopsy/report/ArtifactSelectionDialog.form b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ArtifactSelectionDialog.form
similarity index 84%
rename from Core/src/org/sleuthkit/autopsy/report/ArtifactSelectionDialog.form
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ArtifactSelectionDialog.form
index 7afc432836..2296bf28b8 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ArtifactSelectionDialog.form
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ArtifactSelectionDialog.form
@@ -95,7 +95,7 @@
     <Component class="javax.swing.JButton" name="okButton">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ArtifactSelectionDialog.okButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ArtifactSelectionDialog.okButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -105,17 +105,17 @@
     <Component class="javax.swing.JLabel" name="titleLabel">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ArtifactSelectionDialog.titleLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ArtifactSelectionDialog.titleLabel.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/report/Bundle.properties" key="ArtifactSelectionDialog.titleLabel.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ArtifactSelectionDialog.titleLabel.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JButton" name="selectAllButton">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ArtifactSelectionDialog.selectAllButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ArtifactSelectionDialog.selectAllButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -125,7 +125,7 @@
     <Component class="javax.swing.JButton" name="deselectAllButton">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ArtifactSelectionDialog.deselectAllButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ArtifactSelectionDialog.deselectAllButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
diff --git a/Core/src/org/sleuthkit/autopsy/report/ArtifactSelectionDialog.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ArtifactSelectionDialog.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/report/ArtifactSelectionDialog.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ArtifactSelectionDialog.java
index a6b658bd52..96e9caebe3 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ArtifactSelectionDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ArtifactSelectionDialog.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
 import java.awt.Component;
 import java.awt.event.MouseAdapter;
@@ -45,7 +45,7 @@ import org.sleuthkit.datamodel.TskCoreException;
  * Allow examiner to select artifacts on which to report.
  */
 @SuppressWarnings("PMD.SingularField") // UI widgets cause lots of false positives
-public class ArtifactSelectionDialog extends javax.swing.JDialog {
+class ArtifactSelectionDialog extends javax.swing.JDialog {
 
     private ArtifactModel model;
     private ArtifactRenderer renderer;
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle.properties b/Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle.properties
new file mode 100755
index 0000000000..8f0d8dae6b
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle.properties
@@ -0,0 +1,200 @@
+OpenIDE-Module-Name=Report
+CTL_ReportWizardAction=Run Report
+ReportWizardFileOptionsVisualPanel.jLabel1.text=Select items to include in File Report:
+ReportWizardFileOptionsVisualPanel.deselectAllButton.text=Deselect All
+ReportWizardFileOptionsVisualPanel.selectAllButton.text=Select All
+ReportWizardPortableCaseOptionsVisualPanel.errorLabel.text=Windows only
+ReportWizardPortableCaseOptionsVisualPanel.compressCheckbox.toolTipText=
+ReportWizardPortableCaseOptionsVisualPanel.compressCheckbox.text=Package case into an archive:
+ReportProgressDialog.reportLabel.text=reportLabel
+ReportProgressDialog.statusMessageLabel.text=processingLabel
+ReportProgressDialog.separationLabel.text=:
+ReportProgressDialog.pathLabel.text=pathLabel
+PortableCaseTagsListPanel.jAllTagsCheckBox.text=All Tagged Results
+PortableCaseTagsListPanel.deselectButton.text=Deselect All
+PortableCaseTagsListPanel.selectButton.text=Select All
+PortableCaseTagsListPanel.descLabel.text=Include the following tags:
+ReportGenerationPanel.cancelButton.actionCommand=Cancel
+ReportGenerationPanel.cancelButton.text=Cancel
+ReportGenerationPanel.closeButton.text=Close
+PortableCaseInterestingItemsListPanel.deselectButton.text=Deselect All
+PortableCaseInterestingItemsListPanel.selectButton.text=Select All
+PortableCaseInterestingItemsListPanel.descLabel.text=Include Interesting Items from these sets:
+PortableCaseInterestingItemsListPanel.jAllSetsCheckBox.text=All Interesting Items
+ReportVisualPanel2.allTaggedResultsRadioButton.text=All Tagged Results
+ReportVisualPanel2.advancedButton.text=Result Types
+ReportVisualPanel2.deselectAllButton.text=Deselect All
+ReportVisualPanel2.selectAllButton.text=Select All
+ReportVisualPanel2.dataLabel.text=Select which data to report on:
+ReportVisualPanel2.allResultsRadioButton.text=All Results
+ReportVisualPanel2.specificTaggedResultsRadioButton.text=Specific Tagged Results
+ReportVisualPanel1.reportModulesLabel.text=Report Modules:
+ArtifactSelectionDialog.okButton.text=OK
+ArtifactSelectionDialog.deselectAllButton.text=Deselect All
+ArtifactSelectionDialog.selectAllButton.text=Select All
+ArtifactSelectionDialog.titleLabel.toolTipText=
+ArtifactSelectionDialog.titleLabel.text=Select which result types you would like to report on:
+ArtifactSelectionDialog.dlgTitle.text=Result Type Selection
+ReportVisualPanel1.invalidModuleWarning=Encountered an invalid Report Module ({0})
+ReportGenerationPanel.titleLabel.text=Report Generation Progress
+ReportGenerationPanel.confDlg.sureToClose.msg=Are you sure you'd like to close the dialog?\nAll reports will be canceled.
+ReportGenerationPanel.confDlg.title.closing=Closing
+ReportGenerationPanel.confDlg.cancelReport.msg=Are you sure you'd like to cancel the report?
+ReportGenerator.displayProgress.title.text=Report Generation Progress...
+ReportGenerator.progress.queryingDb.text=Querying database...
+ReportGenerator.progress.processingFile.text=Now processing {0}
+ReportGenerator.artifactTable.taggedResults.text=Contains results that were tagged with one of the following:
+ReportGenerator.progress.processing=Now processing {0}...
+ReportGenerator.msgShow.skippingArtType.title=Skipping artifact type {0} in reports
+ReportGenerator.msgShow.skippingArtType.msg=Unknown columns to report on
+ReportGenerator.makeContTagTab.taggedFiles.msg=Contains files that were tagged with one of the following:
+ReportGenerator.makeBbArtTagTab.taggedRes.msg=This report only includes results tagged with:
+ReportGenerator.tagTable.header.resultType=Result Type
+ReportGenerator.tagTable.header.tag=Tag
+ReportGenerator.tagTable.header.comment=Comment
+ReportGenerator.tagTable.header.srcFile=Source File
+ReportGenerator.progress.createdThumb.text=Creating thumbnails...
+ReportGenerator.htmlOutput.header.file=File
+ReportGenerator.htmlOutput.header.tag=Tag
+ReportGenerator.htmlOutput.header.comment=Comment
+ReportGenerator.htmlOutput.header.timeModified=Modified Time
+ReportGenerator.htmlOutput.header.timeChanged=Changed Time
+ReportGenerator.htmlOutput.header.timeAccessed=Accessed Time
+ReportGenerator.htmlOutput.header.timeCreated=Created Time
+ReportGenerator.htmlOutput.header.size=Size (Bytes)
+ReportGenerator.htmlOutput.header.hash=Hash
+ReportGenerator.thumbnailTable.name=Tagged Images
+ReportGenerator.thumbnailTable.desc=Contains thumbnails of images that are associated with tagged files and results.
+ReportGenerator.writeKwHits.userSrchs=User Searches
+ReportGenerator.progress.processingList=Now processing {0} ({1})...
+ReportGenerator.artTableColHdr.url=URL
+ReportGenerator.artTableColHdr.title=Title
+ReportGenerator.artTableColHdr.dateCreated=Date Created
+ReportGenerator.artTableColHdr.program=Program
+ReportGenerator.artTableColHdr.urlDomainDecoded=URL Domain
+ReportGenerator.artTableColHdr.srcFile=Source File
+ReportGenerator.artTableColHdr.dateTime=Date/Time
+ReportGenerator.artTableColHdr.name=Name
+ReportGenerator.artTableColHdr.value=Value
+ReportGenerator.artTableColHdr.dateAccessed=Date Accessed
+ReportGenerator.artTableColHdr.referrer=Referrer
+ReportGenerator.artTableColHdr.dest=Destination
+ReportGenerator.artTableColHdr.sourceUrl=Source URL
+ReportGenerator.artTableColHdr.path=Path
+ReportGenerator.artTableColHdr.progName=Program Name
+ReportGenerator.artTableColHdr.instDateTime=Install Date/Time
+ReportGenerator.artTableColHdr.preview=Preview
+ReportGenerator.artTableColHdr.file=File
+ReportGenerator.artTableColHdr.size=Size
+ReportGenerator.artTableColHdr.deviceId=Device ID
+ReportGenerator.artTableColHdr.text=Text
+ReportGenerator.artTableColHdr.domain=Domain
+ReportGenerator.artTableColHdr.dateTaken=Date Taken
+ReportGenerator.artTableColHdr.devManufacturer=Device Manufacturer
+ReportGenerator.artTableColHdr.devMake=Device Make
+ReportGenerator.artTableColHdr.devModel=Device Model
+ReportGenerator.artTableColHdr.latitude=Latitude
+ReportGenerator.artTableColHdr.longitude=Longitude
+ReportGenerator.artTableColHdr.latitudeStart=Starting Latitude
+ReportGenerator.artTableColHdr.longitudeStart=Starting Longitude
+ReportGenerator.artTableColHdr.latitudeEnd=Ending Latitude
+ReportGenerator.artTableColHdr.longitudeEnd=Ending Longitude
+ReportGenerator.artTableColHdr.associatedArtifact=Associated Artifact
+ReportGenerator.artTableColHdr.count=Count
+ReportGenerator.artTableColHdr.personName=Person Name
+ReportGenerator.artTableColHdr.phoneNumber=Phone Number
+ReportGenerator.artTableColHdr.phoneNumHome=Phone Number (Home)
+ReportGenerator.artTableColHdr.phoneNumOffice=Phone Number (Office)
+ReportGenerator.artTableColHdr.phoneNumMobile=Phone Number (Mobile)
+ReportGenerator.artTableColHdr.email=Email
+ReportGenerator.artTableColHdr.msgType=Message Type
+ReportGenerator.artTableColHdr.direction=Direction
+ReportGenerator.artTableColHdr.readStatus=Read Status
+ReportGenerator.artTableColHdr.fromPhoneNum=From Phone Number
+ReportGenerator.artTableColHdr.fromEmail=From Email
+ReportGenerator.artTableColHdr.toPhoneNum=To Phone Number
+ReportGenerator.artTableColHdr.toEmail=To Email
+ReportGenerator.artTableColHdr.subject=Subject
+ReportGenerator.artTableColHdr.tskEmailTo=E-Mail To
+ReportGenerator.artTableColHdr.tskEmailCc=E-Mail CC
+ReportGenerator.artTableColHdr.tskEmailBcc=E-Mail BCC
+ReportGenerator.artTableColHdr.tskEmailFrom=E-Mail From
+ReportGenerator.artTableColHdr.tskMsgId=Message ID
+ReportGenerator.artTableColHdr.tskDateTimeRcvd=Date Received
+ReportGenerator.artTableColHdr.tskDateTimeSent=Date Sent
+ReportGenerator.artTableColHdr.tskSubject=Subject
+ReportGenerator.artTableColHdr.tskSetName=Set Name
+ReportGenerator.artTableColHdr.tskInterestingFilesCategory=Rule
+ReportGenerator.artTableColHdr.tskGpsRouteCategory=Category
+ReportGenerator.artTableColHdr.tskPath=Path
+ReportGenerator.artTableColHdr.calendarEntryType=Calendar Entry Type
+ReportGenerator.artTableColHdr.description=Description
+ReportGenerator.artTableColHdr.startDateTime=Start Date/Time
+ReportGenerator.artTableColHdr.endDateTime=End Date/Time
+ReportGenerator.artTableColHdr.location=Location
+ReportGenerator.artTableColHdr.shortCut=Short Cut
+ReportGenerator.artTableColHdr.deviceName=Device Name
+ReportGenerator.artTableColHdr.deviceAddress=Device Address
+ReportGenerator.artTableColHdr.altitude=Altitude
+ReportGenerator.artTableColHdr.locationAddress=Location Address
+ReportGenerator.artTableColHdr.category=Category
+ReportGenerator.artTableColHdr.userId=User ID
+ReportGenerator.artTableColHdr.userName=User Name
+ReportGenerator.artTableColHdr.password=Password
+ReportGenerator.artTableColHdr.appName=App Name
+ReportGenerator.artTableColHdr.appPath=App Path
+ReportGenerator.artTableColHdr.replytoAddress=ReplyTo Address
+ReportGenerator.artTableColHdr.mailServer=Mail Server
+ReportGenerator.artTableColHdr.tags=Tags
+ReportGenerator.artTableColHdr.localPath=Local path
+ReportGenerator.artTableColHdr.remotePath=Remote path
+ReportGenerator.errors.reportErrorTitle=Error generating report
+ReportGenerator.errors.reportErrorText=Error generating report: 
+ReportProgressDialog.progress.queuing=Queuing...
+ReportProgressDialog.initPathLabel.noFile=<html><u>No report file</u></html>
+ReportProgressDialog.start.cancelButton.text=Cancel
+ReportProgressDialog.start.progress.text=Starting report...
+ReportProgressDialog.complete.processLbl.text=Complete
+ReportProgressDialog.complete.processLb2.text=Completed with error
+ReportProgressDialog.complete.cancelButton.text=Complete
+ReportProgressDialog.cancel.cancelButton.toolTipText=Canceled
+ReportProgressDialog.cancel.procLbl.text=Canceled
+ReportVisualPanel1.getName.text=Select and Configure Report Modules
+ReportVisualPanel2.getName.text=Configure Report
+ReportWizardAction.actionName.text=Generate Report
+ReportWizardAction.reportWiz.title=Generate Report
+ReportWizardAction.toolBarButton.text=Generate Report
+ReportWizardFileOptionsPanel.finishButton.text=Finish
+ReportWizardFileOptionsVisualPanel.getName.text=Configure File Report
+ReportWizardPanel1.nextButton.text=Next >
+ReportWizardPanel1.finishButton.text=Finish
+ReportWizardPanel2.finishButton.text=Finish
+ReportWizardPanel2.nextButton.text=Next >
+ReportGenerator.artTableColHdr.extension.text=Extension
+ReportGenerator.artTableColHdr.mimeType.text=MIME Type
+ReportGenerator.artTableColHdr.processorArchitecture.text=Processor Architecture
+ReportGenerator.artTableColHdr.osName.text=Operating System Name
+ReportGenerator.artTableColHdr.osInstallDate.text=Install Date
+ReportGenerator.errList.failedMakeRptFolder=Failed to make report folder, may be unable to generate reports.
+ReportGenerator.notifyErr.errsDuringRptGen=Errors during report generation:
+ReportGenerator.errList.failedGetAllTagsArtifacts=Failed get all possible tag names and artifact types.
+ReportGenerator.errList.noReportSettings=Report settings have not been configured.
+ReportGenerator.errList.failedGetContentTags=Failed to get content tags.
+ReportGenerator.errList.failedGetBBArtifactTags=Failed to get blackboard artifact tags.
+ReportGenerator.errList.errGetContentFromBBArtifact=Error while getting content from a blackboard artifact to report on.
+ReportGenerator.errList.failedGetBBAttribs=Failed to get Blackboard Attributes when generating report.
+ReportGenerator.errList.failedGetBBArtifacts=Failed to get Blackboard Artifacts when generating report.
+ReportGenerator.errList.failedQueryKWLists=Failed to query keyword lists.
+ReportGenerator.errList.failedGetAbstractFileByID=Failed to get Abstract File by ID.
+ReportGenerator.errList.failedQueryKWs=Failed to query keywords.
+ReportGenerator.errList.failedQueryHashsetLists=Failed to query hashset lists.
+ReportGenerator.errList.failedGetAbstractFileFromID=Failed to get Abstract File from ID.
+ReportGenerator.errList.failedQueryHashsetHits=Failed to query hashsets hits.
+ReportGenerator.errList.coreExceptionWhileGenRptRow=Core exception while generating row data for artifact report.
+CreatePortableCasePanel.selectAllButton.text=Select All
+CreatePortableCasePanel.deselectAllButton.text=Deselect All
+CreatePortableCasePanel.outputFolderTextField.text=jTextField1
+CreatePortableCasePanel.chooseOutputFolderButton.text=Choose folder
+CreatePortableCasePanel.jLabel1.text=Export files tagged as:
+CreatePortableCasePanel.jLabel2.text=Select output folder:
+CreatePortableCasePanel.errorLabel.text_1=Windows only
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle.properties-MERGED
new file mode 100755
index 0000000000..9de9b638d0
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle.properties-MERGED
@@ -0,0 +1,211 @@
+OpenIDE-Module-Name=Report
+CTL_ReportWizardAction=Run Report
+PortableCaseInterestingItemsListPanel.error.errorLoadingTags=Error loading interesting item set names
+PortableCaseInterestingItemsListPanel.error.errorTitle=Error getting intesting item set names for case
+PortableCaseInterestingItemsListPanel.error.noOpenCase=There is no case open
+PortableCaseTagsListPanel.error.errorLoadingTags=Error loading tags
+PortableCaseTagsListPanel.error.errorTitle=Error getting tag names for case
+PortableCaseTagsListPanel.error.noOpenCase=There is no case open
+ReportGenerator.artTableColHdr.comment=Comment
+ReportGenerator.errList.noOpenCase=No open case available.
+ReportGenerator.tagTable.header.userName=User Name
+ReportWizardFileOptionsVisualPanel.jLabel1.text=Select items to include in File Report:
+ReportWizardFileOptionsVisualPanel.deselectAllButton.text=Deselect All
+ReportWizardFileOptionsVisualPanel.selectAllButton.text=Select All
+ReportWizardPortableCaseOptionsVisualPanel.errorLabel.text=Windows only
+ReportWizardPortableCaseOptionsVisualPanel.compressCheckbox.toolTipText=
+ReportWizardPortableCaseOptionsVisualPanel.compressCheckbox.text=Package case into an archive:
+ReportProgressDialog.reportLabel.text=reportLabel
+ReportProgressDialog.statusMessageLabel.text=processingLabel
+ReportProgressDialog.separationLabel.text=:
+ReportProgressDialog.pathLabel.text=pathLabel
+PortableCaseTagsListPanel.jAllTagsCheckBox.text=All Tagged Results
+PortableCaseTagsListPanel.deselectButton.text=Deselect All
+PortableCaseTagsListPanel.selectButton.text=Select All
+PortableCaseTagsListPanel.descLabel.text=Include the following tags:
+ReportGenerationPanel.cancelButton.actionCommand=Cancel
+ReportGenerationPanel.cancelButton.text=Cancel
+ReportGenerationPanel.closeButton.text=Close
+PortableCaseInterestingItemsListPanel.deselectButton.text=Deselect All
+PortableCaseInterestingItemsListPanel.selectButton.text=Select All
+PortableCaseInterestingItemsListPanel.descLabel.text=Include Interesting Items from these sets:
+PortableCaseInterestingItemsListPanel.jAllSetsCheckBox.text=All Interesting Items
+ReportVisualPanel2.allTaggedResultsRadioButton.text=All Tagged Results
+ReportVisualPanel2.advancedButton.text=Result Types
+ReportVisualPanel2.deselectAllButton.text=Deselect All
+ReportVisualPanel2.selectAllButton.text=Select All
+ReportVisualPanel2.dataLabel.text=Select which data to report on:
+ReportVisualPanel2.allResultsRadioButton.text=All Results
+ReportVisualPanel2.specificTaggedResultsRadioButton.text=Specific Tagged Results
+ReportVisualPanel1.reportModulesLabel.text=Report Modules:
+ArtifactSelectionDialog.okButton.text=OK
+ArtifactSelectionDialog.deselectAllButton.text=Deselect All
+ArtifactSelectionDialog.selectAllButton.text=Select All
+ArtifactSelectionDialog.titleLabel.toolTipText=
+ArtifactSelectionDialog.titleLabel.text=Select which result types you would like to report on:
+ArtifactSelectionDialog.dlgTitle.text=Result Type Selection
+ReportVisualPanel1.invalidModuleWarning=Encountered an invalid Report Module ({0})
+ReportGenerationPanel.titleLabel.text=Report Generation Progress
+ReportGenerationPanel.confDlg.sureToClose.msg=Are you sure you'd like to close the dialog?\nAll reports will be canceled.
+ReportGenerationPanel.confDlg.title.closing=Closing
+ReportGenerationPanel.confDlg.cancelReport.msg=Are you sure you'd like to cancel the report?
+ReportGenerator.displayProgress.title.text=Report Generation Progress...
+ReportGenerator.progress.queryingDb.text=Querying database...
+ReportGenerator.progress.processingFile.text=Now processing {0}
+ReportGenerator.artifactTable.taggedResults.text=Contains results that were tagged with one of the following:
+ReportGenerator.progress.processing=Now processing {0}...
+ReportGenerator.msgShow.skippingArtType.title=Skipping artifact type {0} in reports
+ReportGenerator.msgShow.skippingArtType.msg=Unknown columns to report on
+ReportGenerator.makeContTagTab.taggedFiles.msg=Contains files that were tagged with one of the following:
+ReportGenerator.makeBbArtTagTab.taggedRes.msg=This report only includes results tagged with:
+ReportGenerator.tagTable.header.resultType=Result Type
+ReportGenerator.tagTable.header.tag=Tag
+ReportGenerator.tagTable.header.comment=Comment
+ReportGenerator.tagTable.header.srcFile=Source File
+ReportGenerator.progress.createdThumb.text=Creating thumbnails...
+ReportGenerator.htmlOutput.header.file=File
+ReportGenerator.htmlOutput.header.tag=Tag
+ReportGenerator.htmlOutput.header.comment=Comment
+ReportGenerator.htmlOutput.header.timeModified=Modified Time
+ReportGenerator.htmlOutput.header.timeChanged=Changed Time
+ReportGenerator.htmlOutput.header.timeAccessed=Accessed Time
+ReportGenerator.htmlOutput.header.timeCreated=Created Time
+ReportGenerator.htmlOutput.header.size=Size (Bytes)
+ReportGenerator.htmlOutput.header.hash=Hash
+ReportGenerator.thumbnailTable.name=Tagged Images
+ReportGenerator.thumbnailTable.desc=Contains thumbnails of images that are associated with tagged files and results.
+ReportGenerator.writeKwHits.userSrchs=User Searches
+ReportGenerator.progress.processingList=Now processing {0} ({1})...
+ReportGenerator.artTableColHdr.url=URL
+ReportGenerator.artTableColHdr.title=Title
+ReportGenerator.artTableColHdr.dateCreated=Date Created
+ReportGenerator.artTableColHdr.program=Program
+ReportGenerator.artTableColHdr.urlDomainDecoded=URL Domain
+ReportGenerator.artTableColHdr.srcFile=Source File
+ReportGenerator.artTableColHdr.dateTime=Date/Time
+ReportGenerator.artTableColHdr.name=Name
+ReportGenerator.artTableColHdr.value=Value
+ReportGenerator.artTableColHdr.dateAccessed=Date Accessed
+ReportGenerator.artTableColHdr.referrer=Referrer
+ReportGenerator.artTableColHdr.dest=Destination
+ReportGenerator.artTableColHdr.sourceUrl=Source URL
+ReportGenerator.artTableColHdr.path=Path
+ReportGenerator.artTableColHdr.progName=Program Name
+ReportGenerator.artTableColHdr.instDateTime=Install Date/Time
+ReportGenerator.artTableColHdr.preview=Preview
+ReportGenerator.artTableColHdr.file=File
+ReportGenerator.artTableColHdr.size=Size
+ReportGenerator.artTableColHdr.deviceId=Device ID
+ReportGenerator.artTableColHdr.text=Text
+ReportGenerator.artTableColHdr.domain=Domain
+ReportGenerator.artTableColHdr.dateTaken=Date Taken
+ReportGenerator.artTableColHdr.devManufacturer=Device Manufacturer
+ReportGenerator.artTableColHdr.devMake=Device Make
+ReportGenerator.artTableColHdr.devModel=Device Model
+ReportGenerator.artTableColHdr.latitude=Latitude
+ReportGenerator.artTableColHdr.longitude=Longitude
+ReportGenerator.artTableColHdr.latitudeStart=Starting Latitude
+ReportGenerator.artTableColHdr.longitudeStart=Starting Longitude
+ReportGenerator.artTableColHdr.latitudeEnd=Ending Latitude
+ReportGenerator.artTableColHdr.longitudeEnd=Ending Longitude
+ReportGenerator.artTableColHdr.associatedArtifact=Associated Artifact
+ReportGenerator.artTableColHdr.count=Count
+ReportGenerator.artTableColHdr.personName=Person Name
+ReportGenerator.artTableColHdr.phoneNumber=Phone Number
+ReportGenerator.artTableColHdr.phoneNumHome=Phone Number (Home)
+ReportGenerator.artTableColHdr.phoneNumOffice=Phone Number (Office)
+ReportGenerator.artTableColHdr.phoneNumMobile=Phone Number (Mobile)
+ReportGenerator.artTableColHdr.email=Email
+ReportGenerator.artTableColHdr.msgType=Message Type
+ReportGenerator.artTableColHdr.direction=Direction
+ReportGenerator.artTableColHdr.readStatus=Read Status
+ReportGenerator.artTableColHdr.fromPhoneNum=From Phone Number
+ReportGenerator.artTableColHdr.fromEmail=From Email
+ReportGenerator.artTableColHdr.toPhoneNum=To Phone Number
+ReportGenerator.artTableColHdr.toEmail=To Email
+ReportGenerator.artTableColHdr.subject=Subject
+ReportGenerator.artTableColHdr.tskEmailTo=E-Mail To
+ReportGenerator.artTableColHdr.tskEmailCc=E-Mail CC
+ReportGenerator.artTableColHdr.tskEmailBcc=E-Mail BCC
+ReportGenerator.artTableColHdr.tskEmailFrom=E-Mail From
+ReportGenerator.artTableColHdr.tskMsgId=Message ID
+ReportGenerator.artTableColHdr.tskDateTimeRcvd=Date Received
+ReportGenerator.artTableColHdr.tskDateTimeSent=Date Sent
+ReportGenerator.artTableColHdr.tskSubject=Subject
+ReportGenerator.artTableColHdr.tskSetName=Set Name
+ReportGenerator.artTableColHdr.tskInterestingFilesCategory=Rule
+ReportGenerator.artTableColHdr.tskGpsRouteCategory=Category
+ReportGenerator.artTableColHdr.tskPath=Path
+ReportGenerator.artTableColHdr.calendarEntryType=Calendar Entry Type
+ReportGenerator.artTableColHdr.description=Description
+ReportGenerator.artTableColHdr.startDateTime=Start Date/Time
+ReportGenerator.artTableColHdr.endDateTime=End Date/Time
+ReportGenerator.artTableColHdr.location=Location
+ReportGenerator.artTableColHdr.shortCut=Short Cut
+ReportGenerator.artTableColHdr.deviceName=Device Name
+ReportGenerator.artTableColHdr.deviceAddress=Device Address
+ReportGenerator.artTableColHdr.altitude=Altitude
+ReportGenerator.artTableColHdr.locationAddress=Location Address
+ReportGenerator.artTableColHdr.category=Category
+ReportGenerator.artTableColHdr.userId=User ID
+ReportGenerator.artTableColHdr.userName=User Name
+ReportGenerator.artTableColHdr.password=Password
+ReportGenerator.artTableColHdr.appName=App Name
+ReportGenerator.artTableColHdr.appPath=App Path
+ReportGenerator.artTableColHdr.replytoAddress=ReplyTo Address
+ReportGenerator.artTableColHdr.mailServer=Mail Server
+ReportGenerator.artTableColHdr.tags=Tags
+ReportGenerator.artTableColHdr.localPath=Local path
+ReportGenerator.artTableColHdr.remotePath=Remote path
+ReportGenerator.errors.reportErrorTitle=Error generating report
+ReportGenerator.errors.reportErrorText=Error generating report: 
+ReportProgressDialog.progress.queuing=Queuing...
+ReportProgressDialog.initPathLabel.noFile=<html><u>No report file</u></html>
+ReportProgressDialog.start.cancelButton.text=Cancel
+ReportProgressDialog.start.progress.text=Starting report...
+ReportProgressDialog.complete.processLbl.text=Complete
+ReportProgressDialog.complete.processLb2.text=Completed with error
+ReportProgressDialog.complete.cancelButton.text=Complete
+ReportProgressDialog.cancel.cancelButton.toolTipText=Canceled
+ReportProgressDialog.cancel.procLbl.text=Canceled
+ReportVisualPanel1.getName.text=Select and Configure Report Modules
+ReportVisualPanel2.getName.text=Configure Report
+ReportWizardAction.actionName.text=Generate Report
+ReportWizardAction.reportWiz.title=Generate Report
+ReportWizardAction.toolBarButton.text=Generate Report
+ReportWizardFileOptionsPanel.finishButton.text=Finish
+ReportWizardFileOptionsVisualPanel.getName.text=Configure File Report
+ReportWizardPanel1.nextButton.text=Next >
+ReportWizardPanel1.finishButton.text=Finish
+ReportWizardPanel2.finishButton.text=Finish
+ReportWizardPanel2.nextButton.text=Next >
+ReportGenerator.artTableColHdr.extension.text=Extension
+ReportGenerator.artTableColHdr.mimeType.text=MIME Type
+ReportGenerator.artTableColHdr.processorArchitecture.text=Processor Architecture
+ReportGenerator.artTableColHdr.osName.text=Operating System Name
+ReportGenerator.artTableColHdr.osInstallDate.text=Install Date
+ReportGenerator.errList.failedMakeRptFolder=Failed to make report folder, may be unable to generate reports.
+ReportGenerator.notifyErr.errsDuringRptGen=Errors during report generation:
+ReportGenerator.errList.failedGetAllTagsArtifacts=Failed get all possible tag names and artifact types.
+ReportGenerator.errList.noReportSettings=Report settings have not been configured.
+ReportGenerator.errList.failedGetContentTags=Failed to get content tags.
+ReportGenerator.errList.failedGetBBArtifactTags=Failed to get blackboard artifact tags.
+ReportGenerator.errList.errGetContentFromBBArtifact=Error while getting content from a blackboard artifact to report on.
+ReportGenerator.errList.failedGetBBAttribs=Failed to get Blackboard Attributes when generating report.
+ReportGenerator.errList.failedGetBBArtifacts=Failed to get Blackboard Artifacts when generating report.
+ReportGenerator.errList.failedQueryKWLists=Failed to query keyword lists.
+ReportGenerator.errList.failedGetAbstractFileByID=Failed to get Abstract File by ID.
+ReportGenerator.errList.failedQueryKWs=Failed to query keywords.
+ReportGenerator.errList.failedQueryHashsetLists=Failed to query hashset lists.
+ReportGenerator.errList.failedGetAbstractFileFromID=Failed to get Abstract File from ID.
+ReportGenerator.errList.failedQueryHashsetHits=Failed to query hashsets hits.
+ReportGenerator.errList.coreExceptionWhileGenRptRow=Core exception while generating row data for artifact report.
+CreatePortableCasePanel.selectAllButton.text=Select All
+CreatePortableCasePanel.deselectAllButton.text=Deselect All
+CreatePortableCasePanel.outputFolderTextField.text=jTextField1
+CreatePortableCasePanel.chooseOutputFolderButton.text=Choose folder
+CreatePortableCasePanel.jLabel1.text=Export files tagged as:
+CreatePortableCasePanel.jLabel2.text=Select output folder:
+CreatePortableCasePanel.errorLabel.text_1=Windows only
+ReportWizardPortableCaseOptionsVisualPanel.getName.title=Choose Portable Case settings
+TableReportGenerator.StatusColumn.Header=Review Status
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle_ja.properties
new file mode 100755
index 0000000000..88d1470d98
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle_ja.properties
@@ -0,0 +1,177 @@
+CTL_ReportWizardAction=\u30ec\u30dd\u30fc\u30c8\u3092\u5b9f\u884c
+ReportWizardFileOptionsVisualPanel.selectAllButton.text=\u5168\u3066\u9078\u629e
+ReportWizardFileOptionsVisualPanel.jLabel1.text=\u30d5\u30a1\u30a4\u30eb\u30ec\u30dd\u30fc\u30c8\u306b\u542b\u3081\u308b\u30a2\u30a4\u30c6\u30e0\u3092\u9078\u629e\u3057\u3066\u4e0b\u3055\u3044\uff1a
+ReportWizardFileOptionsVisualPanel.deselectAllButton.text=\u5168\u3066\u9078\u629e\u89e3\u9664
+ReportProgressDialog.pathLabel.text=\u30d1\u30b9\u30e9\u30d9\u30eb
+ReportProgressDialog.reportLabel.text=\u30ec\u30dd\u30fc\u30c8\u30e9\u30d9\u30eb
+ReportProgressDialog.statusMessageLabel.text=\u30d7\u30ed\u30bb\u30b7\u30f3\u30b0\u30e9\u30d9\u30eb
+ReportProgressDialog.separationLabel.text=:
+ReportGenerationPanel.closeButton.text=\u9589\u3058\u308b
+ReportGenerationPanel.cancelButton.actionCommand=\u30ad\u30e3\u30f3\u30bb\u30eb
+ReportGenerationPanel.cancelButton.text=\u30ad\u30e3\u30f3\u30bb\u30eb
+ReportVisualPanel2.allResultsRadioButton.text=\u5168\u3066\u306e\u7d50\u679c
+ReportVisualPanel2.advancedButton.text=\u30c7\u30fc\u30bf\u30bf\u30a4\u30d7
+ReportVisualPanel2.deselectAllButton.text=\u5168\u3066\u9078\u629e\u89e3\u9664
+ReportVisualPanel2.selectAllButton.text=\u5168\u3066\u9078\u629e
+ReportVisualPanel2.dataLabel.text=\u3069\u306e\u30c7\u30fc\u30bf\u306b\u3064\u3044\u3066\u30ec\u30dd\u30fc\u30c8\u3059\u308b\u304b\u9078\u629e\u3057\u3066\u4e0b\u3055\u3044\uff1a
+ReportVisualPanel1.reportModulesLabel.text=\u30ec\u30dd\u30fc\u30c8\u30e2\u30b8\u30e5\u30fc\u30eb\uff1a
+ArtifactSelectionDialog.deselectAllButton.text=\u5168\u3066\u9078\u629e\u89e3\u9664
+ArtifactSelectionDialog.selectAllButton.text=\u5168\u3066\u9078\u629e
+ArtifactSelectionDialog.titleLabel.text=\u3069\u306e\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u306b\u3064\u3044\u3066\u30ec\u30dd\u30fc\u30c8\u3059\u308b\u304b\u9078\u629e\u3057\u3066\u4e0b\u3055\u3044\uff1a
+ArtifactSelectionDialog.okButton.text=OK
+ReportGenerationPanel.titleLabel.text=\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u30d7\u30ed\u30b0\u30ec\u30b9
+ArtifactSelectionDialog.dlgTitle.text=\u30a2\u30c9\u30d0\u30f3\u30b9\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u9078\u629e
+ReportGenerationPanel.confDlg.sureToClose.msg=\u3053\u306e\u30c0\u30a4\u30a2\u30ed\u30b0\u3092\u672c\u5f53\u306b\u9589\u3058\u307e\u3059\u304b\uff1f\n\u5168\u3066\u306e\u30ec\u30dd\u30fc\u30c8\u304c\u30ad\u30e3\u30f3\u30bb\u30eb\u3055\u308c\u307e\u3059\u3002
+ReportGenerationPanel.confDlg.title.closing=\u9589\u3058\u3066\u3044\u307e\u3059
+ReportGenerator.displayProgress.title.text=\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u30d7\u30ed\u30b0\u30ec\u30b9\u2026
+ReportGenerator.progress.queryingDb.text=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u30af\u30a8\u30ea\u3092\u5b9f\u884c\u4e2d\u2026
+ReportGenerator.progress.processingFile.text={0}\u3092\u51e6\u7406\u4e2d
+ReportGenerator.artifactTable.taggedResults.text=\u6b21\u306e\u4e2d\u306e\u4e00\u3064\u3067\u30bf\u30b0\u3055\u308c\u305f\u7d50\u679c\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059\uff1a
+ReportGenerator.progress.processing={0}\u3092\u51e6\u7406\u4e2d\u2026
+ReportGenerator.msgShow.skippingArtType.title=\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u30bf\u30a4\u30d7{0}\u3092\u30ec\u30dd\u30fc\u30c8\u3067\u30b9\u30ad\u30c3\u30d7\u3057\u3066\u3044\u307e\u3059
+ReportGenerator.msgShow.skippingArtType.msg=\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u3059\u308b\u306e\u306b\u4e0d\u660e\u306a\u30b3\u30e9\u30e0
+ReportGenerator.msgShow.skippingArtRow.title=\u30bf\u30a4\u30d7{0}\u306e\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u884c\u3092\u30ec\u30dd\u30fc\u30c8\u3067\u30b9\u30ad\u30c3\u30d7\u3057\u3066\u3044\u307e\u3059
+ReportGenerator.msgShow.skippingArtRow.msg=\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u3059\u308b\u306e\u306b\u4e0d\u660e\u306a\u30b3\u30e9\u30e0
+ReportGenerator.makeContTagTab.taggedFiles.msg=\u306e\u4e2d\u306e\u4e00\u3064\u3067\u30bf\u30b0\u3055\u308c\u305f\u7d50\u679c\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059\uff1a
+ReportGenerator.makeBbArtTagTab.taggedRes.msg=\u3053\u306e\u30ec\u30dd\u30fc\u30c8\u306b\u306f\u6b21\u3067\u30bf\u30b0\u3055\u308c\u305f\u7d50\u679c\u3057\u304b\u542b\u307e\u308c\u307e\u305b\u3093\uff1a
+ReportGenerator.tagTable.header.resultType=\u7d50\u679c\u30bf\u30a4\u30d7
+ReportGenerator.tagTable.header.tag=\u30bf\u30b0
+ReportGenerator.tagTable.header.comment=\u30b3\u30e1\u30f3\u30c8
+ReportGenerator.tagTable.header.srcFile=\u30bd\u30fc\u30b9\u30d5\u30a1\u30a4\u30eb
+ReportGenerator.progress.createdThumb.text=\u30b5\u30e0\u30cd\u30a4\u30eb\u3092\u4f5c\u6210\u4e2d\u2026
+ReportGenerator.thumbnailTable.name=\u30b5\u30e0\u30cd\u30a4\u30eb
+ReportGenerator.thumbnailTable.desc=\u30bf\u30b0\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\u3084\u7d50\u679c\u306b\u95a2\u9023\u3059\u308b\u30a4\u30e1\u30fc\u30b8\u306e\u30b5\u30e0\u30cd\u30a4\u30eb\u304c\u542b\u307e\u308c\u307e\u3059\u3002
+ReportGenerator.writeKwHits.userSrchs=\u30e6\u30fc\u30b6\u691c\u7d22
+ReportGenerator.progress.processingList={0} ({1})\u3092\u51e6\u7406\u4e2d\u2026
+ReportGenerator.artTableColHdr.url=URL
+ReportGenerator.artTableColHdr.title=\u30bf\u30a4\u30c8\u30eb
+ReportGenerator.artTableColHdr.dateCreated=\u4f5c\u6210\u65e5\u4ed8
+ReportGenerator.artTableColHdr.program=\u30d7\u30ed\u30b0\u30e9\u30e0
+ReportGenerator.artTableColHdr.srcFile=\u30bd\u30fc\u30b9\u30d5\u30a1\u30a4\u30eb
+ReportGenerator.artTableColHdr.dateTime=\u65e5\u4ed8\uff0f\u6642\u523b
+ReportGenerator.artTableColHdr.name=\u540d\u524d
+ReportGenerator.artTableColHdr.value=\u30d0\u30ea\u30e5\u30fc
+ReportGenerator.artTableColHdr.dateAccessed=\u30a2\u30af\u30bb\u30b9\u65e5\u4ed8
+ReportGenerator.artTableColHdr.referrer=\u30ea\u30d5\u30a1\u30e9
+ReportGenerator.artTableColHdr.dest=\u30c7\u30b9\u30c6\u30a3\u30cd\u30fc\u30b7\u30e7\u30f3
+ReportGenerator.artTableColHdr.sourceUrl=\u30bd\u30fc\u30b9URL
+ReportGenerator.artTableColHdr.path=\u30d1\u30b9
+ReportGenerator.artTableColHdr.progName=\u30d7\u30ed\u30b0\u30e9\u30e0\u540d
+ReportGenerator.artTableColHdr.instDateTime=\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u65e5\u4ed8\uff0f\u6642\u523b
+ReportGenerator.artTableColHdr.preview=\u30d7\u30ec\u30d3\u30e5\u30fc
+ReportGenerator.artTableColHdr.file=\u30d5\u30a1\u30a4\u30eb
+ReportGenerator.artTableColHdr.size=\u30b5\u30a4\u30ba
+ReportGenerator.artTableColHdr.deviceId=\u6a5f\u5668ID
+ReportGenerator.artTableColHdr.text=\u30c6\u30ad\u30b9\u30c8
+ReportGenerator.artTableColHdr.domain=\u30c9\u30e1\u30a4\u30f3
+ReportGenerator.artTableColHdr.devManufacturer=\u6a5f\u5668\u30e1\u30fc\u30ab\u30fc
+ReportGenerator.artTableColHdr.devModel=\u6a5f\u5668\u30e2\u30c7\u30eb
+ReportGenerator.artTableColHdr.personName=\u4eba\u540d
+ReportGenerator.artTableColHdr.phoneNumber=\u96fb\u8a71\u756a\u53f7
+ReportGenerator.artTableColHdr.phoneNumHome=\u96fb\u8a71\u756a\u53f7\uff08\u81ea\u5b85\uff09
+ReportGenerator.artTableColHdr.phoneNumOffice=\u96fb\u8a71\u756a\u53f7\uff08\u4f1a\u793e\uff09
+ReportGenerator.artTableColHdr.phoneNumMobile=\u96fb\u8a71\u756a\u53f7\uff08\u643a\u5e2f\uff09
+ReportGenerator.artTableColHdr.email=Email
+ReportGenerator.artTableColHdr.msgType=\u30e1\u30c3\u30bb\u30fc\u30b8\u30bf\u30a4\u30d7
+ReportGenerator.artTableColHdr.latitude=\u7def\u5ea6
+ReportGenerator.artTableColHdr.longitude=\u7d4c\u5ea6
+ReportGenerator.artTableColHdr.dateTaken=\u64ae\u5f71\u65e5\u4ed8
+ReportGenerator.artTableColHdr.subject=\u30b5\u30d6\u30b8\u30a7\u30af\u30c8
+ReportGenerator.artTableColHdr.calendarEntryType=\u30ab\u30ec\u30f3\u30c0\u30fc\u30a8\u30f3\u30c8\u30ea\u30bf\u30a4\u30d7
+ReportGenerator.artTableColHdr.description=\u8aac\u660e
+ReportGenerator.artTableColHdr.startDateTime=\u958b\u59cb\u65e5\u4ed8\uff0f\u6642\u523b
+ReportGenerator.artTableColHdr.shortCut=\u30b7\u30e7\u30fc\u30c8\u30ab\u30c3\u30c8
+ReportGenerator.artTableColHdr.endDateTime=\u4fee\u4e86\u65e5\u4ed8\uff0f\u6642\u523b
+ReportGenerator.artTableColHdr.location=\u30ed\u30b1\u30fc\u30b7\u30e7\u30f3
+ReportGenerator.artTableColHdr.deviceName=\u6a5f\u5668\u540d
+ReportGenerator.artTableColHdr.deviceAddress=\u6a5f\u5668\u30a2\u30c9\u30ec\u30b9
+ReportGenerator.artTableColHdr.altitude=\u6a19\u9ad8
+ReportGenerator.artTableColHdr.locationAddress=\u30ed\u30b1\u30fc\u30b7\u30e7\u30f3\u30a2\u30c9\u30ec\u30b9
+ReportGenerator.artTableColHdr.category=\u30ab\u30c6\u30b4\u30ea\u30fc
+ReportGenerator.artTableColHdr.userId=\u30e6\u30fc\u30b6ID
+ReportGenerator.artTableColHdr.password=\u30d1\u30b9\u30ef\u30fc\u30c9
+ReportGenerator.artTableColHdr.replytoAddress=\u8fd4\u4fe1\u30a2\u30c9\u30ec\u30b9
+ReportGenerator.artTableColHdr.mailServer=\u30e1\u30fc\u30eb\u30b5\u30fc\u30d0
+ReportGenerator.artTableColHdr.tags=\u30bf\u30b0
+ReportProgressPanel.start.cancelButton.text=\u30ad\u30e3\u30f3\u30bb\u30eb
+ReportProgressPanel.complete.processLbl.text=\u5b8c\u4e86
+ReportProgressPanel.complete.cancelButton.text=\u5b8c\u4e86
+ReportProgressPanel.cancel.cancelButton.toolTipText=\u30ad\u30e3\u30f3\u30bb\u30eb\u3055\u308c\u307e\u3057\u305f
+ReportWizardAction.actionName.text=\u30ec\u30dd\u30fc\u30c8\u3092\u751f\u6210
+ReportWizardAction.reportWiz.title=\u30ec\u30dd\u30fc\u30c8\u3092\u751f\u6210
+ReportWizardAction.toolBarButton.text=\u30ec\u30dd\u30fc\u30c8\u3092\u751f\u6210
+ReportWizardPanel1.nextButton.text=\u6b21 >
+ReportWizardPanel2.nextButton.text=\u6b21 >
+ReportGenerator.artTableColHdr.direction=\u65b9\u5411
+ReportGenerator.artTableColHdr.fromEmail=\u9001\u4fe1\u5143E\u30e1\u30fc\u30eb
+ReportGenerator.artTableColHdr.toEmail=\u9001\u4fe1\u5148E\u30e1\u30fc\u30eb
+ReportGenerator.artTableColHdr.fromPhoneNum=\u767a\u4fe1\u8005\u96fb\u8a71\u756a\u53f7
+ReportGenerator.artTableColHdr.toPhoneNum=\u7740\u4fe1\u8005\u96fb\u8a71\u756a\u53f7
+ReportGenerator.artTableColHdr.appName=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u540d
+ReportGenerator.artTableColHdr.appPath=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30d1\u30b9
+ReportProgressPanel.progress.queuing=\u30ad\u30e5\u30fc\u30a4\u30f3\u30b0\u2026
+ReportProgressPanel.initPathLabel.noFile=<html><u>\u30ec\u30dd\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb\u7121\u3057</u></html>
+ReportProgressPanel.start.progress.text=\u30ec\u30dd\u30fc\u30c8\u958b\u59cb\u4e2d\u2026
+ReportProgressPanel.cancel.procLbl.text=\u30ad\u30e3\u30f3\u30bb\u30eb\u3055\u308c\u307e\u3057\u305f
+ReportVisualPanel1.getName.text=\u30ec\u30dd\u30fc\u30c8\u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u9078\u629e\u304a\u3088\u3073\u8a2d\u5b9a
+ReportVisualPanel2.getName.text=\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u30ec\u30dd\u30fc\u30c8\u3092\u8a2d\u5b9a
+ReportWizardFileOptionsPanel.finishButton.text=\u7d42\u4e86
+ReportWizardFileOptionsVisualPanel.getName.text=\u30d5\u30a1\u30a4\u30eb\u30ec\u30dd\u30fc\u30c8\u3092\u8a2d\u5b9a
+ReportWizardPanel1.finishButton.text=\u7d42\u4e86
+ReportWizardPanel2.finishButton.text=\u7d42\u4e86
+ReportGenerator.errors.reportErrorTitle=\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
+ReportGenerator.errors.reportErrorText=\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\uff1a
+ReportGenerator.artTableColHdr.extension.text=\u62e1\u5f35\u5b50
+ReportGenerator.artTableColHdr.mimeType.text=MIME\u30bf\u30a4\u30d7
+ReportGenerator.artTableColHdr.associatedArtifact=\u95a2\u4fc2\u3059\u308b\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8
+ReportGenerator.artTableColHdr.count=\u30ab\u30a6\u30f3\u30c8
+ReportGenerator.artTableColHdr.devMake=\u6a5f\u5668\u578b\u540d
+ReportGenerator.artTableColHdr.latitudeEnd=\u5230\u7740\u7def\u5ea6
+ReportGenerator.artTableColHdr.latitudeStart=\u51fa\u767a\u7def\u5ea6
+ReportGenerator.artTableColHdr.localPath=\u30ed\u30fc\u30ab\u30eb\u30d1\u30b9
+ReportGenerator.artTableColHdr.longitudeEnd=\u5230\u7740\u7d4c\u5ea6
+ReportGenerator.artTableColHdr.longitudeStart=\u51fa\u767a\u7d4c\u5ea6
+ReportGenerator.artTableColHdr.osInstallDate.text=\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u65e5\u4ed8
+ReportGenerator.artTableColHdr.osName.text=\u30aa\u30da\u30ec\u30fc\u30c6\u30a3\u30f3\u30b0\u30b7\u30b9\u30c6\u30e0\u540d
+ReportGenerator.artTableColHdr.processorArchitecture.text=\u30d7\u30ed\u30bb\u30c3\u30b5\u30a2\u30fc\u30ad\u30c6\u30af\u30c1\u30e3
+ReportGenerator.artTableColHdr.readStatus=\u8aad\u307f\u53d6\u308a\u4e2d\u30b9\u30c6\u30fc\u30bf\u30b9
+ReportGenerator.artTableColHdr.remotePath=\u30ea\u30e2\u30fc\u30c8\u30d1\u30b9
+ReportGenerator.artTableColHdr.tskDateTimeRcvd=\u53d7\u4fe1\u65e5
+ReportGenerator.artTableColHdr.tskDateTimeSent=\u9001\u4fe1\u65e5
+ReportGenerator.artTableColHdr.tskEmailBcc=E-Mail BCC
+ReportGenerator.artTableColHdr.tskEmailCc=E-Mail CC
+ReportGenerator.artTableColHdr.tskEmailFrom=E-Mail\u9001\u4fe1\u5143
+ReportGenerator.artTableColHdr.tskEmailTo=E-Mail\u9001\u4fe1\u5148
+ReportGenerator.artTableColHdr.tskGpsRouteCategory=\u30ab\u30c6\u30b4\u30ea
+ReportGenerator.artTableColHdr.tskInterestingFilesCategory=\u30eb\u30fc\u30eb
+ReportGenerator.artTableColHdr.tskMsgId=\u30e1\u30c3\u30bb\u30fc\u30b8ID
+ReportGenerator.artTableColHdr.tskPath=\u30d1\u30b9
+ReportGenerator.artTableColHdr.tskSetName=\u30bb\u30c3\u30c8\u540d
+ReportGenerator.artTableColHdr.tskSubject=\u30b5\u30d6\u30b8\u30a7\u30af\u30c8
+ReportGenerator.artTableColHdr.urlDomainDecoded=URL\u30c9\u30e1\u30a4\u30f3
+ReportGenerator.artTableColHdr.userName=\u30e6\u30fc\u30b6\u540d
+ReportGenerator.errList.coreExceptionWhileGenRptRow=\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u30ec\u30dd\u30fc\u30c8\u7528\u30ed\u30fc\u30c7\u30fc\u30bf\u306e\u751f\u6210\u4e2d\u306b\u30b3\u30a2\u30a8\u30af\u30bb\u30d7\u30b7\u30e7\u30f3\uff08\u4f8b\u5916\uff09\u304c\u691c\u51fa\u3055\u308c\u307e\u3057\u305f
+ReportGenerator.errList.errGetContentFromBBArtifact=Blackboard\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u304b\u3089\u30ec\u30dd\u30fc\u30c8\u7528\u306e\u30b3\u30f3\u30c6\u30f3\u30c4\u3092\u53d6\u5f97\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
+ReportGenerator.errList.failedGetAbstractFileByID=ID\u306b\u57fa\u3065\u304d\u30a2\u30d6\u30b9\u30c8\u30e9\u30af\u30c8\u30d5\u30a1\u30a4\u30eb\u3092\u53d6\u5f97\u3059\u308b\u306e\u3092\u5931\u6557\u3057\u307e\u3057\u305f
+ReportGenerator.errList.failedGetBBArtifacts=\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u4e2d\u306bBlackboard\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u306e\u53d6\u5f97\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
+ReportGenerator.errList.failedGetBBArtifactTags=Blackboard\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u30bf\u30b0\u306e\u53d6\u5f97\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
+ReportGenerator.errList.failedGetBBAttribs=\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u4e2d\u306bBlackboard\u5c5e\u6027\u306e\u53d6\u5f97\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
+ReportGenerator.errList.failedGetContentTags=\u30b3\u30f3\u30c6\u30f3\u30c4\u30bf\u30b0\u306e\u53d6\u5f97\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
+ReportGenerator.errList.failedMakeRptFolder=\u30ec\u30dd\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0\u306e\u4f5c\u6210\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u304c\u3067\u304d\u306a\u3044\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002
+ReportGenerator.errList.failedQueryHashsetHits=\u30cf\u30c3\u30b7\u30e5\u30bb\u30c3\u30c8\u30d2\u30c3\u30c8\u3092\u30af\u30a8\u30ea\u3059\u308b\u306e\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
+ReportGenerator.errList.failedQueryHashsetLists=\u30cf\u30c3\u30b7\u30e5\u30bb\u30c3\u30c8\u30ea\u30b9\u30c8\u3092\u30af\u30a8\u30ea\u3059\u308b\u306e\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
+ReportGenerator.errList.failedQueryKWLists=\u30ad\u30fc\u30ef\u30fc\u30c9\u30ea\u30b9\u30c8\u3092\u30af\u30a8\u30ea\u3059\u308b\u306e\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
+ReportGenerator.errList.failedQueryKWs=\u30ad\u30fc\u30ef\u30fc\u30c9\u3092\u30af\u30a8\u30ea\u3059\u308b\u306e\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
+ReportGenerator.htmlOutput.header.comment=\u30b3\u30e1\u30f3\u30c8
+ReportGenerator.htmlOutput.header.file=\u30d5\u30a1\u30a4\u30eb
+ReportGenerator.htmlOutput.header.hash=\u30cf\u30c3\u30b7\u30e5
+ReportGenerator.htmlOutput.header.size=\u30b5\u30a4\u30ba\uff08\u30d0\u30a4\u30c8\uff09
+ReportGenerator.htmlOutput.header.tag=\u30bf\u30b0
+ReportGenerator.htmlOutput.header.timeAccessed=\u30a2\u30af\u30bb\u30b9\u65e5\u6642
+ReportGenerator.htmlOutput.header.timeCreated=\u4f5c\u6210\u65e5\u6642
+ReportGenerator.htmlOutput.header.timeModified=\u4fee\u6b63\u65e5\u6642
+ReportGenerator.notifyErr.errsDuringRptGen=\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u4e2d\u306e\u30a8\u30e9\u30fc\uff1a
+ReportGenerator.errList.failedGetAbstractFileFromID=ID\u306b\u57fa\u3065\u304d\u30a2\u30d6\u30b9\u30c8\u30e9\u30af\u30c8\u30d5\u30a1\u30a4\u30eb\u3092\u53d6\u5f97\u3059\u308b\u306e\u3092\u5931\u6557\u3057\u307e\u3057\u305f
+ReportVisualPanel1.invalidModuleWarning=\u7121\u52b9\u306a\u30ec\u30dd\u30fc\u30c8\u30e2\u30b8\u30e5\u30fc\u30eb({0})\u306b\u906d\u9047\u3057\u307e\u3057\u305f
+ReportGenerationPanel.confDlg.cancelReport.msg=\u672c\u5f53\u306b\u30ec\u30dd\u30fc\u30c8\u3092\u30ad\u30e3\u30f3\u30bb\u30eb\u3057\u307e\u3059\u304b\uff1f
+ReportProgressPanel.complete.processLb2.text=\u5b8c\u4e86\u3057\u307e\u3057\u305f\u304c\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
diff --git a/Core/src/org/sleuthkit/autopsy/report/FileReportModule.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/FileReportModule.java
similarity index 89%
rename from Core/src/org/sleuthkit/autopsy/report/FileReportModule.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/FileReportModule.java
index cff2ab6a4f..f3ef9de415 100644
--- a/Core/src/org/sleuthkit/autopsy/report/FileReportModule.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/FileReportModule.java
@@ -16,8 +16,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
+import org.sleuthkit.autopsy.report.modules.FileReportDataTypes;
+import org.sleuthkit.autopsy.report.ReportModule;
 import java.util.List;
 import org.sleuthkit.datamodel.AbstractFile;
 
@@ -26,7 +28,7 @@ import org.sleuthkit.datamodel.AbstractFile;
  *
  * @author jwallace
  */
-interface FileReportModule extends ReportModule {
+public interface FileReportModule extends ReportModule {
 
     /**
      * Initialize the report which will be stored at the given path.
diff --git a/Core/src/org/sleuthkit/autopsy/report/FileReportSettings.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/FileReportSettings.java
similarity index 93%
rename from Core/src/org/sleuthkit/autopsy/report/FileReportSettings.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/FileReportSettings.java
index e70ef7608f..e665463b34 100755
--- a/Core/src/org/sleuthkit/autopsy/report/FileReportSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/FileReportSettings.java
@@ -16,8 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
+import org.sleuthkit.autopsy.report.modules.FileReportDataTypes;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/Core/src/org/sleuthkit/autopsy/report/PortableCaseInterestingItemsListPanel.form b/Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseInterestingItemsListPanel.form
similarity index 90%
rename from Core/src/org/sleuthkit/autopsy/report/PortableCaseInterestingItemsListPanel.form
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseInterestingItemsListPanel.form
index 6deb5d86d2..9fbe01c27b 100644
--- a/Core/src/org/sleuthkit/autopsy/report/PortableCaseInterestingItemsListPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseInterestingItemsListPanel.form
@@ -90,14 +90,14 @@
         <Component class="javax.swing.JLabel" name="descLabel">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="PortableCaseInterestingItemsListPanel.descLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="PortableCaseInterestingItemsListPanel.descLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JButton" name="selectButton">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="PortableCaseInterestingItemsListPanel.selectButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="PortableCaseInterestingItemsListPanel.selectButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
             <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[87, 23]"/>
@@ -113,7 +113,7 @@
         <Component class="javax.swing.JButton" name="deselectButton">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="PortableCaseInterestingItemsListPanel.deselectButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="PortableCaseInterestingItemsListPanel.deselectButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
           <Events>
@@ -123,7 +123,7 @@
         <Component class="javax.swing.JCheckBox" name="jAllSetsCheckBox">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="PortableCaseInterestingItemsListPanel.jAllSetsCheckBox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="PortableCaseInterestingItemsListPanel.jAllSetsCheckBox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
           <Events>
diff --git a/Core/src/org/sleuthkit/autopsy/report/PortableCaseInterestingItemsListPanel.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseInterestingItemsListPanel.java
similarity index 98%
rename from Core/src/org/sleuthkit/autopsy/report/PortableCaseInterestingItemsListPanel.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseInterestingItemsListPanel.java
index 18be7e8934..01cabf1c01 100644
--- a/Core/src/org/sleuthkit/autopsy/report/PortableCaseInterestingItemsListPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseInterestingItemsListPanel.java
@@ -16,8 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
+import org.sleuthkit.autopsy.report.modules.PortableCaseReportModuleSettings;
 import java.awt.Component;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
@@ -40,7 +41,7 @@ import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
 import org.sleuthkit.autopsy.coreutils.Logger;
-import org.sleuthkit.autopsy.report.PortableCaseReportModule.GetInterestingItemSetNamesCallback;
+import org.sleuthkit.autopsy.report.modules.PortableCaseReportModule.GetInterestingItemSetNamesCallback;
 import org.sleuthkit.datamodel.BlackboardArtifact;
 import org.sleuthkit.datamodel.BlackboardAttribute;
 import org.sleuthkit.datamodel.TskCoreException;
diff --git a/Core/src/org/sleuthkit/autopsy/report/PortableCaseTagsListPanel.form b/Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseTagsListPanel.form
similarity index 90%
rename from Core/src/org/sleuthkit/autopsy/report/PortableCaseTagsListPanel.form
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseTagsListPanel.form
index 5ed74d5489..0757f14756 100644
--- a/Core/src/org/sleuthkit/autopsy/report/PortableCaseTagsListPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseTagsListPanel.form
@@ -89,14 +89,14 @@
         <Component class="javax.swing.JLabel" name="descLabel">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="PortableCaseTagsListPanel.descLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="PortableCaseTagsListPanel.descLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JButton" name="selectButton">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="PortableCaseTagsListPanel.selectButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="PortableCaseTagsListPanel.selectButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
             <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[87, 23]"/>
@@ -112,7 +112,7 @@
         <Component class="javax.swing.JButton" name="deselectButton">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="PortableCaseTagsListPanel.deselectButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="PortableCaseTagsListPanel.deselectButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
           <Events>
@@ -122,7 +122,7 @@
         <Component class="javax.swing.JCheckBox" name="jAllTagsCheckBox">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="PortableCaseTagsListPanel.jAllTagsCheckBox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="PortableCaseTagsListPanel.jAllTagsCheckBox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
           <Events>
diff --git a/Core/src/org/sleuthkit/autopsy/report/PortableCaseTagsListPanel.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseTagsListPanel.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/report/PortableCaseTagsListPanel.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseTagsListPanel.java
index 834c091801..01c5e4a591 100644
--- a/Core/src/org/sleuthkit/autopsy/report/PortableCaseTagsListPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseTagsListPanel.java
@@ -16,8 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
+import org.sleuthkit.autopsy.report.modules.PortableCaseReportModuleSettings;
 import java.awt.Component;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportBrandingProviderI.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportBrandingProviderI.java
similarity index 95%
rename from Core/src/org/sleuthkit/autopsy/report/ReportBrandingProviderI.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportBrandingProviderI.java
index 7c495823e5..3e6dcbd5e3 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportBrandingProviderI.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportBrandingProviderI.java
@@ -16,12 +16,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
 /**
  * Interface to implement by reports to add on custom branding, logos, etc
  */
-interface ReportBrandingProviderI {
+public interface ReportBrandingProviderI {
 
     /**
      * Get the generator logo path on the local disk (previously set or
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportConfigException.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportConfigException.java
similarity index 96%
rename from Core/src/org/sleuthkit/autopsy/report/ReportConfigException.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportConfigException.java
index 4d97f5b957..4966182860 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportConfigException.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportConfigException.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
 /**
  * Instances of this exception class are thrown when there is an error during
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.form b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportGenerationPanel.form
similarity index 88%
rename from Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.form
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportGenerationPanel.form
index 86a4cbe37d..b76dccdb54 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportGenerationPanel.form
@@ -65,7 +65,7 @@
           </FontInfo>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportGenerationPanel.closeButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportGenerationPanel.closeButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -80,10 +80,10 @@
           </FontInfo>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportGenerationPanel.cancelButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportGenerationPanel.cancelButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
         <Property name="actionCommand" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportGenerationPanel.cancelButton.actionCommand" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportGenerationPanel.cancelButton.actionCommand" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportGenerationPanel.java
similarity index 98%
rename from Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportGenerationPanel.java
index a3d661cff3..ec391d6d93 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportGenerationPanel.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
 import java.awt.*;
 import java.awt.event.ActionListener;
@@ -25,6 +25,7 @@ import javax.swing.Box;
 import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 import org.openide.util.NbBundle;
+import org.sleuthkit.autopsy.report.ReportProgressPanel;
 import org.sleuthkit.autopsy.report.ReportProgressPanel.ReportStatus;
 
 /**
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportGenerator.java
similarity index 96%
rename from Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportGenerator.java
index 625a6a233b..49f9801df7 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportGenerator.java
@@ -16,8 +16,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
+import org.sleuthkit.autopsy.report.modules.FileReportDataTypes;
+import org.sleuthkit.autopsy.report.modules.PortableCaseReportModuleSettings;
+import org.sleuthkit.autopsy.report.modules.PortableCaseReportModule;
+import org.sleuthkit.autopsy.report.NoReportModuleSettings;
+import org.sleuthkit.autopsy.report.ReportModule;
+import org.sleuthkit.autopsy.report.ReportModuleSettings;
+import org.sleuthkit.autopsy.report.GeneralReportModule;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.WindowAdapter;
@@ -42,6 +49,7 @@ import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
 import org.sleuthkit.autopsy.coreutils.Logger;
+import org.sleuthkit.autopsy.report.ReportProgressPanel;
 import org.sleuthkit.autopsy.report.ReportProgressPanel.ReportStatus;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.SleuthkitCase;
@@ -59,7 +67,7 @@ public class ReportGenerator {
 
     private final String configName;
 
-    static final String REPORTS_DIR = "Reports"; //NON-NLS
+    public static final String REPORTS_DIR = "Reports"; //NON-NLS
 
     private List<String> errorList;
 
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportModuleConfig.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportModuleConfig.java
similarity index 93%
rename from Core/src/org/sleuthkit/autopsy/report/ReportModuleConfig.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportModuleConfig.java
index 5b7d12fde6..644a7bf220 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportModuleConfig.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportModuleConfig.java
@@ -16,8 +16,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
+import org.sleuthkit.autopsy.report.NoReportModuleSettings;
+import org.sleuthkit.autopsy.report.ReportModule;
+import org.sleuthkit.autopsy.report.ReportModuleSettings;
 import java.io.Serializable;
 
 /**
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportModuleLoader.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportModuleLoader.java
similarity index 95%
rename from Core/src/org/sleuthkit/autopsy/report/ReportModuleLoader.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportModuleLoader.java
index f772761eac..f62c7945b7 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportModuleLoader.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportModuleLoader.java
@@ -16,8 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
+import org.sleuthkit.autopsy.report.GeneralReportModule;
 import java.util.ArrayList;
 import java.util.List;
 import org.openide.util.Lookup;
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportProgressDialog.form b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportProgressDialog.form
similarity index 86%
rename from Core/src/org/sleuthkit/autopsy/report/ReportProgressDialog.form
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportProgressDialog.form
index 8979a5d188..08cd8ec3f4 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportProgressDialog.form
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportProgressDialog.form
@@ -79,7 +79,7 @@
           </FontInfo>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportProgressDialog.reportLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportProgressDialog.reportLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
@@ -91,7 +91,7 @@
           </FontInfo>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportProgressDialog.pathLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportProgressDialog.pathLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
         <Property name="verticalAlignment" type="int" value="1"/>
       </Properties>
@@ -104,14 +104,14 @@
           </FontInfo>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportProgressDialog.separationLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportProgressDialog.separationLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JLabel" name="statusMessageLabel">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportProgressDialog.statusMessageLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportProgressDialog.statusMessageLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportProgressDialog.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportProgressDialog.java
similarity index 98%
rename from Core/src/org/sleuthkit/autopsy/report/ReportProgressDialog.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportProgressDialog.java
index face4174dd..d98c6b1056 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportProgressDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportProgressDialog.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
 import org.openide.util.NbBundle;
 import java.awt.Color;
@@ -29,12 +29,13 @@ import java.io.File;
 import java.io.IOException;
 import java.util.logging.Level;
 import org.sleuthkit.autopsy.coreutils.Logger;
+import org.sleuthkit.autopsy.report.ReportProgressPanel;
 
 /**
  * A panel used by a report generation module to show progress.
  */
 @SuppressWarnings("PMD.SingularField") // UI widgets cause lots of false positives
-public class ReportProgressDialog extends javax.swing.JPanel implements ReportProgressPanel {
+class ReportProgressDialog extends javax.swing.JPanel implements ReportProgressPanel {
 
     private static final long serialVersionUID = 1L;
     private static final Logger logger = Logger.getLogger(ReportProgressDialog.class.getName());
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportProgressLogger.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportProgressLogger.java
similarity index 97%
rename from Core/src/org/sleuthkit/autopsy/report/ReportProgressLogger.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportProgressLogger.java
index 5f0011b9d5..d37c63117a 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportProgressLogger.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportProgressLogger.java
@@ -16,10 +16,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
 import java.util.logging.Level;
 import org.sleuthkit.autopsy.coreutils.Logger;
+import org.sleuthkit.autopsy.report.ReportProgressPanel;
 
 /**
  * Writes progress and status messages to the application log.
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.form b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel1.form
similarity index 96%
rename from Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.form
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel1.form
index 7ec90408ea..7728350704 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.form
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel1.form
@@ -59,7 +59,7 @@
     <Component class="javax.swing.JLabel" name="reportModulesLabel">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportVisualPanel1.reportModulesLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportVisualPanel1.reportModulesLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel1.java
similarity index 97%
rename from Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel1.java
index c7eaff63d4..3e6926298f 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel1.java
@@ -16,8 +16,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
+import org.sleuthkit.autopsy.report.modules.PortableCaseReportModule;
+import org.sleuthkit.autopsy.report.modules.ReportHTML;
+import org.sleuthkit.autopsy.report.ReportModule;
+import org.sleuthkit.autopsy.report.ReportModuleSettings;
+import org.sleuthkit.autopsy.report.GeneralReportModule;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.util.ArrayList;
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.form b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel2.form
similarity index 85%
rename from Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.form
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel2.form
index 1c704cf6cb..039ef97c70 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.form
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel2.form
@@ -86,7 +86,7 @@
           <ComponentRef name="optionsButtonGroup"/>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportVisualPanel2.specificTaggedResultsRadioButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportVisualPanel2.specificTaggedResultsRadioButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
@@ -96,7 +96,7 @@
           <ComponentRef name="optionsButtonGroup"/>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportVisualPanel2.allResultsRadioButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportVisualPanel2.allResultsRadioButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -106,14 +106,14 @@
     <Component class="javax.swing.JLabel" name="dataLabel">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportVisualPanel2.dataLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportVisualPanel2.dataLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JButton" name="selectAllButton">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportVisualPanel2.selectAllButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportVisualPanel2.selectAllButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -123,7 +123,7 @@
     <Component class="javax.swing.JButton" name="deselectAllButton">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportVisualPanel2.deselectAllButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportVisualPanel2.deselectAllButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -155,7 +155,7 @@
     <Component class="javax.swing.JButton" name="advancedButton">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportVisualPanel2.advancedButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportVisualPanel2.advancedButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -168,7 +168,7 @@
           <ComponentRef name="optionsButtonGroup"/>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportVisualPanel2.allTaggedResultsRadioButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportVisualPanel2.allTaggedResultsRadioButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel2.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel2.java
index c636314c5a..aa5c2ed59f 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel2.java
@@ -16,8 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
+import org.sleuthkit.autopsy.report.infrastructure.TableReportSettings;
 import java.awt.Component;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardAction.java
similarity index 95%
rename from Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardAction.java
index 331be72b55..0960839dcd 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardAction.java
@@ -20,8 +20,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
+import org.sleuthkit.autopsy.report.modules.PortableCaseReportModuleSettings;
+import org.sleuthkit.autopsy.report.modules.PortableCaseReportModule;
 import java.awt.Component;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -48,7 +50,7 @@ import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.core.RuntimeProperties;
 import org.sleuthkit.autopsy.coreutils.Logger;
 
-@ActionID(category = "Tools", id = "org.sleuthkit.autopsy.report.ReportWizardAction")
+@ActionID(category = "Tools", id = "org.sleuthkit.autopsy.report.infrastructure.ReportWizardAction")
 @ActionRegistration(displayName = "#CTL_ReportWizardAction", lazy = false)
 @ActionReferences(value = {
     @ActionReference(path = "Menu/Tools", position = 301, separatorAfter = 399)
@@ -165,7 +167,7 @@ public final class ReportWizardAction extends CallableSystemAction implements Pr
      */
     @Override
     public Component getToolbarPresenter() {
-        ImageIcon icon = new ImageIcon(getClass().getResource("images/btn_icon_generate_report.png")); //NON-NLS
+        ImageIcon icon = new ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/report/images/btn_icon_generate_report.png")); //NON-NLS
         toolbarButton.setIcon(icon);
         toolbarButton.setText(NbBundle.getMessage(this.getClass(), "ReportWizardAction.toolBarButton.text"));
         return toolbarButton;
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsPanel.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardFileOptionsPanel.java
similarity index 95%
rename from Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsPanel.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardFileOptionsPanel.java
index de95271485..56bf293c16 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardFileOptionsPanel.java
@@ -16,8 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
+import org.sleuthkit.autopsy.report.infrastructure.FileReportSettings;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import javax.swing.JButton;
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsVisualPanel.form b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardFileOptionsVisualPanel.form
similarity index 87%
rename from Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsVisualPanel.form
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardFileOptionsVisualPanel.form
index e7d1d1ce34..fe58752c5f 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsVisualPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardFileOptionsVisualPanel.form
@@ -77,7 +77,7 @@
     <Component class="javax.swing.JButton" name="selectAllButton">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportWizardFileOptionsVisualPanel.selectAllButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportWizardFileOptionsVisualPanel.selectAllButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -87,7 +87,7 @@
     <Component class="javax.swing.JButton" name="deselectAllButton">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportWizardFileOptionsVisualPanel.deselectAllButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportWizardFileOptionsVisualPanel.deselectAllButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -97,7 +97,7 @@
     <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/report/Bundle.properties" key="ReportWizardFileOptionsVisualPanel.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportWizardFileOptionsVisualPanel.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsVisualPanel.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardFileOptionsVisualPanel.java
similarity index 98%
rename from Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsVisualPanel.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardFileOptionsVisualPanel.java
index 19edc56528..6d2cd657a4 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsVisualPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardFileOptionsVisualPanel.java
@@ -16,8 +16,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
+import org.sleuthkit.autopsy.report.modules.FileReportDataTypes;
+import org.sleuthkit.autopsy.report.infrastructure.FileReportSettings;
 import java.awt.Component;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardIterator.java
similarity index 96%
rename from Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardIterator.java
index 631c5a4ab3..d5b86e69ca 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardIterator.java
@@ -16,8 +16,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
+import org.sleuthkit.autopsy.report.infrastructure.ReportingConfigLoader;
+import org.sleuthkit.autopsy.report.infrastructure.ReportConfigException;
+import org.sleuthkit.autopsy.report.infrastructure.ReportingConfig;
 import java.awt.Component;
 import java.util.Arrays;
 import java.util.List;
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPanel1.java
similarity index 96%
rename from Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPanel1.java
index a5d141b5e7..628284c8ea 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPanel1.java
@@ -16,8 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
+import org.sleuthkit.autopsy.report.infrastructure.ReportModuleConfig;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.Map;
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPanel2.java
similarity index 96%
rename from Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPanel2.java
index c7ed85c0cf..1435f7aa42 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPanel2.java
@@ -16,8 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
+import org.sleuthkit.autopsy.report.infrastructure.TableReportSettings;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import javax.swing.JButton;
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPortableCaseOptionsPanel.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPortableCaseOptionsPanel.java
similarity index 98%
rename from Core/src/org/sleuthkit/autopsy/report/ReportWizardPortableCaseOptionsPanel.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPortableCaseOptionsPanel.java
index 2fbe656d58..f0263566e3 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPortableCaseOptionsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPortableCaseOptionsPanel.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPortableCaseOptionsVisualPanel.form b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPortableCaseOptionsVisualPanel.form
similarity index 90%
rename from Core/src/org/sleuthkit/autopsy/report/ReportWizardPortableCaseOptionsVisualPanel.form
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPortableCaseOptionsVisualPanel.form
index ed370c19b5..9359e187d4 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPortableCaseOptionsVisualPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPortableCaseOptionsVisualPanel.form
@@ -76,10 +76,10 @@
         <Component class="javax.swing.JCheckBox" name="compressCheckbox">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportWizardPortableCaseOptionsVisualPanel.compressCheckbox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportWizardPortableCaseOptionsVisualPanel.compressCheckbox.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/report/Bundle.properties" key="ReportWizardPortableCaseOptionsVisualPanel.compressCheckbox.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportWizardPortableCaseOptionsVisualPanel.compressCheckbox.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
           <Events>
@@ -92,7 +92,7 @@
               <Color blue="0" green="0" red="ff" type="rgb"/>
             </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportWizardPortableCaseOptionsVisualPanel.errorLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportWizardPortableCaseOptionsVisualPanel.errorLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPortableCaseOptionsVisualPanel.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPortableCaseOptionsVisualPanel.java
similarity index 96%
rename from Core/src/org/sleuthkit/autopsy/report/ReportWizardPortableCaseOptionsVisualPanel.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPortableCaseOptionsVisualPanel.java
index f56ae7db1b..bc8ab94f22 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPortableCaseOptionsVisualPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPortableCaseOptionsVisualPanel.java
@@ -16,13 +16,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
+import org.sleuthkit.autopsy.report.modules.PortableCaseReportModuleSettings;
+import org.sleuthkit.autopsy.report.modules.PortableCaseReportModule;
+import org.sleuthkit.autopsy.report.ReportModuleSettings;
 import java.awt.GridLayout;
 import java.util.Map;
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.PlatformUtil;
-import org.sleuthkit.autopsy.report.PortableCaseReportModuleSettings.ChunkSize;
+import org.sleuthkit.autopsy.report.modules.PortableCaseReportModuleSettings.ChunkSize;
 
 /**
  * The UI portion of the Portable Case config panel
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportingConfig.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportingConfig.java
similarity index 97%
rename from Core/src/org/sleuthkit/autopsy/report/ReportingConfig.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportingConfig.java
index b6b9ebf154..dd04332b6d 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportingConfig.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportingConfig.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
 import java.io.Serializable;
 import java.util.HashMap;
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportingConfigLoader.java
similarity index 98%
rename from Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportingConfigLoader.java
index ef40bf4eb9..6ab57f8578 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportingConfigLoader.java
@@ -16,8 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
+import org.sleuthkit.autopsy.report.ReportModuleSettings;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
diff --git a/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportGenerator.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportGenerator.java
index 60790c4673..64073a77c1 100644
--- a/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportGenerator.java
@@ -16,8 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
+import org.sleuthkit.autopsy.report.modules.ReportHTML;
 import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multimaps;
@@ -45,6 +46,7 @@ import org.sleuthkit.autopsy.casemodule.services.TagsManager;
 import org.sleuthkit.autopsy.coreutils.ImageUtils;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.datamodel.ContentUtils;
+import org.sleuthkit.autopsy.report.ReportProgressPanel;
 import static org.sleuthkit.autopsy.casemodule.services.TagsManager.getNotableTagLabel;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.Account;
diff --git a/Core/src/org/sleuthkit/autopsy/report/TableReportModule.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportModule.java
similarity index 96%
rename from Core/src/org/sleuthkit/autopsy/report/TableReportModule.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportModule.java
index 3e9a39a46d..1e906a180b 100644
--- a/Core/src/org/sleuthkit/autopsy/report/TableReportModule.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportModule.java
@@ -16,8 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
+import org.sleuthkit.autopsy.report.ReportModule;
 import java.util.List;
 
 /**
@@ -29,7 +30,7 @@ import java.util.List;
  * The data sent consists of user-chosen fields such as Blackboard Artifacts and
  * File/Result Tags.
  */
-interface TableReportModule extends ReportModule {
+public interface TableReportModule extends ReportModule {
 
     /**
      * Start the report. Open any output streams, initialize member variables,
diff --git a/Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportSettings.java
similarity index 98%
rename from Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportSettings.java
index b33595db68..a5e9168daa 100755
--- a/Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportSettings.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/Bundle.properties b/Core/src/org/sleuthkit/autopsy/report/modules/Bundle.properties
new file mode 100755
index 0000000000..9e8e239a7a
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/Bundle.properties
@@ -0,0 +1,76 @@
+OpenIDE-Module-Name=Report
+ReportHTMLConfigurationPanel.headerLabel.text=Header:
+ReportHTMLConfigurationPanel.footerTextField.text=
+ReportHTMLConfigurationPanel.headerTextField.text=
+ReportHTMLConfigurationPanel.footerLabel.text=Footer:
+ReportFileTextConfigurationPanel.tabDelimitedButton.text=Tab delimited
+ReportFileTextConfigurationPanel.commaDelimitedButton.text=Comma delimited
+FileReportText.getName.text=Files - Text
+FileReportText.getDesc.text=A delimited text file containing information about individual files in the case.
+ReportBodyFile.progress.querying=Querying files...
+ReportBodyFile.ingestWarning.text=Warning, this report was run before ingest services completed\!
+ReportBodyFile.progress.loading=Loading files...
+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
+ReportKML.progress.querying=Querying files...
+ReportKML.progress.loading=Loading files...
+ReportKML.getName.text=Google Earth KML
+ReportKML.getDesc.text=KML format report with coordinates for relevant files. This format can be used for google earth views.
+ReportKML.getFilePath.text=ReportKML.kml
+ReportExcel.numAartifacts.text=Number of artifacts:
+ReportExcel.getName.text=Excel Report
+ReportExcel.getDesc.text=A report about results and tagged items in Excel (XLS) format.
+ReportExcel.sheetName.text=Summary
+ReportExcel.cellVal.summary=Summary
+ReportExcel.cellVal.caseName=Case Name:
+ReportExcel.cellVal.caseNum=Case Number:
+ReportExcel.cellVal.examiner=Examiner:
+ReportExcel.cellVal.numImages=Number of Images:
+ReportHTML.addThumbRows.dataType.title=Tagged Images - {0}
+ReportHTML.addThumbRows.dataType.msg=Tagged Results and Contents that contain images.
+ReportHTML.thumbLink.tags=Tags:
+ReportHTML.getName.text=HTML Report
+ReportHTML.getDesc.text=A report about results and tagged items in HTML format.
+ReportHTML.writeIndex.title=for case {0}
+ReportHTML.writeIndex.noFrames.msg=Your browser is not compatible with our frame setup.
+ReportHTML.writeIndex.noFrames.seeNav=Please see <a href\="content\nav.html">the navigation page</a> for artifact links,
+ReportHTML.writeIndex.seeSum=and <a href\="content\summary.html">the summary page</a> for a case summary.
+ReportHTML.writeNav.title=Report Navigation
+ReportHTML.writeNav.h1=Report Navigation
+ReportHTML.writeNav.summary=Case Summary
+ReportHTML.writeSum.title=Case Summary
+ReportHTML.writeSum.warningMsg=<span>Warning, this report was run before ingest services completed\!</span>
+#
+# autopsy/test/scripts/regression.py._html_report_diff() uses reportGenOn.text, caseName, caseNum, 
+# examiner as a regex signature to skip report.html and summary.html
+#
+ReportHTML.writeSum.reportGenOn.text=HTML Report Generated on {0}
+ReportHTML.writeSum.imageInfoHeading=<h2>Image Information:</h2>
+ReportHTML.writeSum.softwareInfoHeading=<h2>Software Information:</h2>
+ReportHTML.writeSum.ingestHistoryHeading=<h2>Ingest History:</h2>
+ReportHTML.writeSum.modulesEnabledHeading=Enabled Modules:
+ReportHTML.writeSum.autopsyVersion=Autopsy Version:
+ReportHTML.writeSum.timezone=Timezone:
+ReportHTML.writeSum.path=Path:
+ReportBodyFile.generateReport.srcModuleName.text=TSK Body File
+ReportExcel.endReport.srcModuleName.text=Excel Report
+ReportHTML.writeIndex.srcModuleName.text=HTML Report
+ReportKML.genReport.srcModuleName.text=Geospatial Data
+ReportKML.genReport.reportName=KML Report
+ReportKML.latLongStartPoint={0};{1};;{2} (Start)\n
+ReportKML.latLongEndPoint={0};{1};;{2} (End)\n
+FileReportDataTypes.filename.text=Name
+FileReportDataTypes.fileExt.text=File Extension
+FileReportDataTypes.fileType.text=File Type
+FileReportDataTypes.isDel.text=Is Deleted
+FileReportDataTypes.aTime.text=Last Accessed
+FileReportDataTypes.crTime.text=File Created
+FileReportDataTypes.mTime.text=Last Modified
+FileReportDataTypes.size.text=Size
+FileReportDataTypes.address.text=Address
+FileReportDataTypes.hash.text=Hash Value
+FileReportDataTypes.knownStatus.text=Known Status
+FileReportDataTypes.perms.text=Permissions
+FileReportDataTypes.path.text=Full Path
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/report/modules/Bundle.properties-MERGED
new file mode 100755
index 0000000000..db4f1b4a4a
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/Bundle.properties-MERGED
@@ -0,0 +1,129 @@
+OpenIDE-Module-Name=Report
+PortableCaseReportModule.compressCase.canceled=Compression canceled by user
+PortableCaseReportModule.compressCase.errorCompressingCase=Error compressing case
+# {0} - Temp folder path
+PortableCaseReportModule.compressCase.errorCreatingTempFolder=Could not create temporary folder {0}
+PortableCaseReportModule.compressCase.errorFinding7zip=Could not locate 7-Zip executable
+# {0} - File name
+PortableCaseReportModule.copyContentToPortableCase.copyingFile=Copying file {0}
+# {0} - case folder
+PortableCaseReportModule.createCase.caseDirExists=Case folder {0} already exists
+PortableCaseReportModule.createCase.errorCreatingCase=Error creating case
+# {0} - folder
+PortableCaseReportModule.createCase.errorCreatingFolder=Error creating folder {0}
+PortableCaseReportModule.createCase.errorStoringMaxIds=Error storing maximum database IDs
+PortableCaseReportModule.generateReport.caseClosed=Current case has been closed
+PortableCaseReportModule.generateReport.compressingCase=Compressing case...
+# {0} - tag name
+PortableCaseReportModule.generateReport.copyingArtifacts=Copying artifacts tagged as {0}...
+# {0} - tag name
+PortableCaseReportModule.generateReport.copyingFiles=Copying files tagged as {0}...
+PortableCaseReportModule.generateReport.copyingTags=Copying tags...
+PortableCaseReportModule.generateReport.creatingCase=Creating portable case database...
+PortableCaseReportModule.generateReport.errorCopyingArtifacts=Error copying tagged artifacts
+PortableCaseReportModule.generateReport.errorCopyingFiles=Error copying tagged files
+PortableCaseReportModule.generateReport.errorCopyingInterestingFiles=Error copying interesting files
+PortableCaseReportModule.generateReport.errorCopyingInterestingResults=Error copying interesting results
+PortableCaseReportModule.generateReport.errorCopyingTags=Error copying tags
+# {0} - attribute type name
+PortableCaseReportModule.generateReport.errorLookingUpAttrType=Error looking up attribute type {0}
+PortableCaseReportModule.generateReport.errorReadingSets=Error while reading interesting items sets from case database
+PortableCaseReportModule.generateReport.errorReadingTags=Error while reading tags from case database
+PortableCaseReportModule.generateReport.interestingItemError=Error loading intersting items
+PortableCaseReportModule.generateReport.noContentToCopy=No interesting files, results, or tagged items to copy
+# {0} - output folder
+PortableCaseReportModule.generateReport.outputDirDoesNotExist=Output folder {0} does not exist
+# {0} - output folder
+PortableCaseReportModule.generateReport.outputDirIsNotDir=Output folder {0} is not a folder
+PortableCaseReportModule.generateReport.verifying=Verifying selected parameters...
+PortableCaseReportModule.getDescription.description=Copies selected items to a new single-user case that can be easily shared
+PortableCaseReportModule.getName.name=Portable Case
+ReportExcel.exceptionMessage.dataTooLarge=Value is too long to fit into an Excel cell. 
+ReportExcel.exceptionMessage.errorText=Error showing data into an Excel cell.
+ReportExcel.writeSummary.caseName=Case Name:
+ReportExcel.writeSummary.caseNotes=Case Notes:
+ReportExcel.writeSummary.caseNum=Case Number:
+ReportExcel.writeSummary.examiner=Examiner:
+ReportExcel.writeSummary.numImages=Number of Images:
+ReportExcel.writeSummary.sheetName=Summary
+ReportExcel.writeSummary.summary=Summary
+ReportHTML.writeSum.case=Case:
+ReportHTML.writeSum.caseNotes=Notes:
+ReportHTML.writeSum.caseNumber=Case Number:
+ReportHTML.writeSum.caseNumImages=Number of Images:
+ReportHTML.writeSum.examiner=Examiner:
+ReportHTMLConfigurationPanel.headerLabel.text=Header:
+ReportHTMLConfigurationPanel.footerTextField.text=
+ReportHTMLConfigurationPanel.headerTextField.text=
+ReportHTMLConfigurationPanel.footerLabel.text=Footer:
+ReportFileTextConfigurationPanel.tabDelimitedButton.text=Tab delimited
+ReportFileTextConfigurationPanel.commaDelimitedButton.text=Comma delimited
+FileReportText.getName.text=Files - Text
+FileReportText.getDesc.text=A delimited text file containing information about individual files in the case.
+ReportBodyFile.progress.querying=Querying files...
+ReportBodyFile.ingestWarning.text=Warning, this report was run before ingest services completed\!
+ReportBodyFile.progress.loading=Loading files...
+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
+ReportKML.progress.querying=Querying files...
+ReportKML.progress.loading=Loading files...
+ReportKML.getName.text=Google Earth KML
+ReportKML.getDesc.text=KML format report with coordinates for relevant files. This format can be used for google earth views.
+ReportKML.getFilePath.text=ReportKML.kml
+ReportExcel.numAartifacts.text=Number of artifacts:
+ReportExcel.getName.text=Excel Report
+ReportExcel.getDesc.text=A report about results and tagged items in Excel (XLS) format.
+ReportExcel.sheetName.text=Summary
+ReportExcel.cellVal.summary=Summary
+ReportExcel.cellVal.caseName=Case Name:
+ReportExcel.cellVal.caseNum=Case Number:
+ReportExcel.cellVal.examiner=Examiner:
+ReportExcel.cellVal.numImages=Number of Images:
+ReportHTML.addThumbRows.dataType.title=Tagged Images - {0}
+ReportHTML.addThumbRows.dataType.msg=Tagged Results and Contents that contain images.
+ReportHTML.thumbLink.tags=Tags:
+ReportHTML.getName.text=HTML Report
+ReportHTML.getDesc.text=A report about results and tagged items in HTML format.
+ReportHTML.writeIndex.title=for case {0}
+ReportHTML.writeIndex.noFrames.msg=Your browser is not compatible with our frame setup.
+ReportHTML.writeIndex.noFrames.seeNav=Please see <a href\="content\nav.html">the navigation page</a> for artifact links,
+ReportHTML.writeIndex.seeSum=and <a href\="content\summary.html">the summary page</a> for a case summary.
+ReportHTML.writeNav.title=Report Navigation
+ReportHTML.writeNav.h1=Report Navigation
+ReportHTML.writeNav.summary=Case Summary
+ReportHTML.writeSum.title=Case Summary
+ReportHTML.writeSum.warningMsg=<span>Warning, this report was run before ingest services completed\!</span>
+#
+# autopsy/test/scripts/regression.py._html_report_diff() uses reportGenOn.text, caseName, caseNum, 
+# examiner as a regex signature to skip report.html and summary.html
+#
+ReportHTML.writeSum.reportGenOn.text=HTML Report Generated on {0}
+ReportHTML.writeSum.imageInfoHeading=<h2>Image Information:</h2>
+ReportHTML.writeSum.softwareInfoHeading=<h2>Software Information:</h2>
+ReportHTML.writeSum.ingestHistoryHeading=<h2>Ingest History:</h2>
+ReportHTML.writeSum.modulesEnabledHeading=Enabled Modules:
+ReportHTML.writeSum.autopsyVersion=Autopsy Version:
+ReportHTML.writeSum.timezone=Timezone:
+ReportHTML.writeSum.path=Path:
+ReportBodyFile.generateReport.srcModuleName.text=TSK Body File
+ReportExcel.endReport.srcModuleName.text=Excel Report
+ReportHTML.writeIndex.srcModuleName.text=HTML Report
+ReportKML.genReport.srcModuleName.text=Geospatial Data
+ReportKML.genReport.reportName=KML Report
+ReportKML.latLongStartPoint={0};{1};;{2} (Start)\n
+ReportKML.latLongEndPoint={0};{1};;{2} (End)\n
+FileReportDataTypes.filename.text=Name
+FileReportDataTypes.fileExt.text=File Extension
+FileReportDataTypes.fileType.text=File Type
+FileReportDataTypes.isDel.text=Is Deleted
+FileReportDataTypes.aTime.text=Last Accessed
+FileReportDataTypes.crTime.text=File Created
+FileReportDataTypes.mTime.text=Last Modified
+FileReportDataTypes.size.text=Size
+FileReportDataTypes.address.text=Address
+FileReportDataTypes.hash.text=Hash Value
+FileReportDataTypes.knownStatus.text=Known Status
+FileReportDataTypes.perms.text=Permissions
+FileReportDataTypes.path.text=Full Path
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/report/modules/Bundle_ja.properties
new file mode 100755
index 0000000000..1dc936e5d3
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/Bundle_ja.properties
@@ -0,0 +1,64 @@
+FileReportDataTypes.filename.text=\u540d\u524d
+FileReportDataTypes.fileExt.text=\u30d5\u30a1\u30a4\u30eb\u62e1\u5f35\u5b50
+FileReportDataTypes.fileType.text=\u30d5\u30a1\u30a4\u30eb\u30bf\u30a4\u30d7
+FileReportDataTypes.isDel.text=\u306f\u524a\u9664\u3055\u308c\u307e\u3057\u305f
+FileReportDataTypes.aTime.text=\u6700\u5f8c\u306e\u30a2\u30af\u30bb\u30b9
+FileReportDataTypes.crTime.text=\u4f5c\u6210\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb
+FileReportDataTypes.mTime.text=\u6700\u5f8c\u306e\u4fee\u6b63
+FileReportDataTypes.size.text=\u30b5\u30a4\u30ba
+FileReportDataTypes.address.text=\u30a2\u30c9\u30ec\u30b9
+FileReportDataTypes.hash.text=\u30cf\u30c3\u30b7\u30e5\u5024
+FileReportDataTypes.knownStatus.text=\u65e2\u77e5\u30b9\u30c6\u30fc\u30bf\u30b9
+FileReportDataTypes.perms.text=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3
+FileReportDataTypes.path.text=\u30d5\u30eb\u30d1\u30b9
+FileReportText.getName.text=\u30d5\u30a1\u30a4\u30eb - \u30c6\u30ad\u30b9\u30c8
+FileReportText.getDesc.text=\u30b1\u30fc\u30b9\u306e\u500b\u5225\u30d5\u30a1\u30a4\u30eb\u306b\u3064\u3044\u3066\u306e\u60c5\u5831\u3092\u6301\u3064\u3001\u30bf\u30d6\u533a\u5207\u308a\u30c6\u30ad\u30b9\u30c8\u30d5\u30a1\u30a4\u30eb\u3002
+ReportBodyFile.progress.querying=\u30d5\u30a1\u30a4\u30eb\u306e\u30af\u30a8\u30ea\u3092\u5b9f\u884c\u4e2d\u2026
+ReportBodyFile.ingestWarning.text=\u8b66\u544a\u3001\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30b5\u30fc\u30d3\u30b9\u304c\u5b8c\u4e86\u3059\u308b\u524d\u306b\u30ec\u30dd\u30fc\u30c8\u304c\u5b9f\u884c\u3055\u308c\u307e\u3057\u305f\uff01
+ReportBodyFile.progress.loading=\u30d5\u30a1\u30a4\u30eb\u306e\u8aad\u307f\u8fbc\u307f\u4e2d\u2026
+ReportBodyFile.progress.processing={0}\u3092\u51e6\u7406\u4e2d\u2026
+ReportBodyFile.getName.text=TSK\u30dc\u30c7\u30a3\u30d5\u30a1\u30a4\u30eb
+ReportBodyFile.getDesc.text=\u5404\u30d5\u30a1\u30a4\u30eb\u306eMAC\u30bf\u30a4\u30e0\u3092\u542b\u3080\u3001\u30dc\u30c7\u30a3\u30d5\u30a1\u30a4\u30eb\u5f62\u5f0f\u30ec\u30dd\u30fc\u30c8\u3002\u30bf\u30a4\u30e0\u30e9\u30a4\u30f3\u30d3\u30e5\u30fc\u306b\u3053\u306e\u5f62\u5f0f\u3092\u4f7f\u7528\u3067\u304d\u307e\u3059\u3002
+ReportBodyFile.getFilePath.text=BodyFile.txt
+ReportExcel.numAartifacts.text=\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u6570\uff1a
+ReportExcel.getName.text=\u7d50\u679c - Excel
+ReportExcel.getDesc.text=\u7d50\u679c\u306b\u95a2\u3059\u308b\u30ec\u30dd\u30fc\u30c8\u3002Excel(XLS)\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u3067\u30a2\u30a4\u30c6\u30e0\u306e\u30bf\u30b0\u4ed8\u3051\u304c\u3055\u308c\u3066\u3044\u307e\u3059\u3002
+ReportExcel.sheetName.text=\u30b5\u30de\u30ea\u30fc
+ReportExcel.cellVal.summary=\u30b5\u30de\u30ea\u30fc
+ReportExcel.cellVal.caseName=\u30b1\u30fc\u30b9\u540d\uff1a
+ReportExcel.cellVal.caseNum=\u30b1\u30fc\u30b9\u756a\u53f7\uff1a
+ReportExcel.cellVal.examiner=\u8abf\u67fb\u62c5\u5f53\u8005\uff1a
+ReportExcel.cellVal.numImages=\u30a4\u30e1\u30fc\u30b8\u6570\uff1a
+ReportHTML.addThumbRows.dataType.title=\u30bf\u30b0\u4ed8\u3051\u3055\u308c\u305f\u30a4\u30e1\u30fc\u30b8 - {0}
+ReportHTML.addThumbRows.dataType.msg=\u30a4\u30e1\u30fc\u30b8\u3092\u542b\u3080\u30bf\u30b0\u4ed8\u3051\u3055\u308c\u305f\u7d50\u679c\u304a\u3088\u3073\u30b3\u30f3\u30c6\u30f3\u30c4\u3002
+ReportHTML.thumbLink.tags=\u30bf\u30b0\uff1a
+ReportHTML.getName.text=\u7d50\u679c - HTML
+ReportHTML.getDesc.text=HTML\u5f62\u5f0f\u306e\u7d50\u679c\u304a\u3088\u3073\u30bf\u30b0\u4ed8\u3051\u3055\u308c\u305f\u30a2\u30a4\u30c6\u30e0\u306e\u30ec\u30dd\u30fc\u30c8
+ReportHTML.writeIndex.title=\u30b1\u30fc\u30b9{0}\u306eAutopsy\u30ec\u30dd\u30fc\u30c8
+ReportHTML.writeNav.title=\u30ec\u30dd\u30fc\u30c8\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3
+ReportHTML.writeNav.h1=\u30ec\u30dd\u30fc\u30c8\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3
+ReportHTML.writeNav.summary=\u30b1\u30fc\u30b9\u30b5\u30de\u30ea\u30fc
+ReportHTML.writeSum.title=\u30b1\u30fc\u30b9\u30b5\u30de\u30ea\u30fc
+ReportHTML.writeSum.caseName=\u30b1\u30fc\u30b9\uff1a
+ReportHTML.writeSum.caseNum=\u30b1\u30fc\u30b9\u756a\u53f7\uff1a
+ReportHTML.writeSum.examiner=\u8abf\u67fb\u62c5\u5f53\u8005\uff1a
+ReportHTML.writeSum.numImages=\u30a4\u30e1\u30fc\u30b8\u6570\uff1a
+ReportHTML.writeSum.path=\u30d1\u30b9\uff1a
+ReportHTML.writeIndex.noFrames.msg=\u4f7f\u7528\u3057\u3066\u3044\u308b\u30d6\u30e9\u30a6\u30b6\u306f\u5f0a\u793e\u306e\u30d5\u30ec\u30fc\u30e0\u30bb\u30c3\u30c8\u30a2\u30c3\u30d7\u3068\u306e\u4e92\u63db\u6027\u304c\u3042\u308a\u307e\u305b\u3093\u3002
+ReportHTML.writeIndex.noFrames.seeNav=\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u30ea\u30f3\u30af\u306f\u4e0b\u8a18\u306e\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u30da\u30fc\u30b8</a>\u3092\u3054\u89a7\u4e0b\u3055\u3044<a href\="nav.html">
+ReportHTML.writeIndex.seeSum=\u307e\u305f\u3001\u30b1\u30fc\u30b9\u30b5\u30de\u30ea\u30fc\u306f\u4e0b\u8a18\u306e\u30b5\u30de\u30ea\u30fc\u30da\u30fc\u30b8</a>\u3092\u3054\u89a7\u4e0b\u3055\u3044\u3002<a href\="summary.html">
+ReportHTML.writeSum.warningMsg=<span>\u8b66\u544a\u3001\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30b5\u30fc\u30d3\u30b9\u304c\u5b8c\u4e86\u3059\u308b\u524d\u306b\u30ec\u30dd\u30fc\u30c8\u304c\u5b9f\u884c\u3055\u308c\u307e\u3057\u305f\uff01</span>
+ReportHTML.writeSum.noExaminer=<i>\u8abf\u67fb\u62c5\u5f53\u8005\u7121\u3057</i>
+ReportHTML.writeSum.imageInfoHeading=<h2>\u30a4\u30e1\u30fc\u30b8\u60c5\u5831\uff1a</h2>
+ReportHTML.writeSum.timezone=\u30bf\u30a4\u30e0\u30be\u30fc\u30f3\uff1a
+ReportHTML.writeSum.reportGenOn.text={0}\u306bHTML\u30ec\u30dd\u30fc\u30c8\u306f\u751f\u6210\u3055\u308c\u307e\u3057\u305f
+ReportHTML.writeSum.noCaseNum=<i>\u30b1\u30fc\u30b9\u756a\u53f7\u304c\u3042\u308a\u307e\u305b\u3093</i>
+ReportKML.getDesc.text=\u95a2\u9023\u30d5\u30a1\u30a4\u30eb\u306e\u5ea7\u6a19\u3092\u542b\u3080KML\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u306e\u30ec\u30dd\u30fc\u30c8\u3002\u3053\u306e\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u306fGoogle Earth\u30d3\u30e5\u30fc\u306b\u4f7f\u7528\u3067\u304d\u307e\u3059\u3002
+ReportKML.getName.text=Google Earth/KML
+ReportKML.progress.loading=\u30d5\u30a1\u30a4\u30eb\u306e\u8aad\u307f\u8fbc\u307f\u4e2d\u2026
+ReportKML.progress.querying=\u30d5\u30a1\u30a4\u30eb\u306e\u30af\u30a8\u30ea\u3092\u5b9f\u884c\u4e2d\u2026
+ReportBodyFile.generateReport.srcModuleName.text=TSK\u30dc\u30c7\u30a3\u30d5\u30a1\u30a4\u30eb
+ReportExcel.endReport.srcModuleName.text=Excel\u30ec\u30dd\u30fc\u30c8
+ReportHTML.writeIndex.srcModuleName.text=HTML\u30ec\u30dd\u30fc\u30c8
+ReportKML.genReport.reportName=KML\u30ec\u30dd\u30fc\u30c8
+ReportKML.getFilePath.text=\u30ec\u30dd\u30fc\u30c8KML.kml
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/report/FileReportDataTypes.java b/Core/src/org/sleuthkit/autopsy/report/modules/FileReportDataTypes.java
similarity index 98%
rename from Core/src/org/sleuthkit/autopsy/report/FileReportDataTypes.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/FileReportDataTypes.java
index 621f8d17c9..0aa67c3bdb 100644
--- a/Core/src/org/sleuthkit/autopsy/report/FileReportDataTypes.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/FileReportDataTypes.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.modules;
 
 import org.openide.util.NbBundle;
 import org.sleuthkit.datamodel.AbstractFile;
@@ -30,7 +30,7 @@ import org.sleuthkit.datamodel.TskData;
  *
  * @author jwallace
  */
-enum FileReportDataTypes {
+public enum FileReportDataTypes {
 
     NAME(NbBundle.getMessage(FileReportText.class, "FileReportDataTypes.filename.text")) {
                 @Override
diff --git a/Core/src/org/sleuthkit/autopsy/report/FileReportModuleSettings.java b/Core/src/org/sleuthkit/autopsy/report/modules/FileReportModuleSettings.java
similarity index 93%
rename from Core/src/org/sleuthkit/autopsy/report/FileReportModuleSettings.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/FileReportModuleSettings.java
index 4826b9481e..c09bdb82df 100755
--- a/Core/src/org/sleuthkit/autopsy/report/FileReportModuleSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/FileReportModuleSettings.java
@@ -16,7 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.modules;
+
+import org.sleuthkit.autopsy.report.ReportModuleSettings;
 
 /**
  * Settings for the File report module.
diff --git a/Core/src/org/sleuthkit/autopsy/report/FileReportText.java b/Core/src/org/sleuthkit/autopsy/report/modules/FileReportText.java
similarity index 96%
rename from Core/src/org/sleuthkit/autopsy/report/FileReportText.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/FileReportText.java
index d938aef263..390562f0b9 100644
--- a/Core/src/org/sleuthkit/autopsy/report/FileReportText.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/FileReportText.java
@@ -16,8 +16,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.modules;
 
+import org.sleuthkit.autopsy.report.NoReportModuleSettings;
+import org.sleuthkit.autopsy.report.ReportModuleSettings;
 import java.io.BufferedWriter;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -31,10 +33,10 @@ import java.util.List;
 import java.util.logging.Level;
 import javax.swing.JPanel;
 import org.sleuthkit.autopsy.coreutils.Logger;
-
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
+import org.sleuthkit.autopsy.report.infrastructure.FileReportModule;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.TskCoreException;
 
diff --git a/Core/src/org/sleuthkit/autopsy/report/HTMLReportModuleSettings.java b/Core/src/org/sleuthkit/autopsy/report/modules/HTMLReportModuleSettings.java
similarity index 94%
rename from Core/src/org/sleuthkit/autopsy/report/HTMLReportModuleSettings.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/HTMLReportModuleSettings.java
index 5e2809a882..8da0536b2d 100755
--- a/Core/src/org/sleuthkit/autopsy/report/HTMLReportModuleSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/HTMLReportModuleSettings.java
@@ -16,7 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.modules;
+
+import org.sleuthkit.autopsy.report.ReportModuleSettings;
 
 /**
  * Settings for the HTML report module.
diff --git a/Core/src/org/sleuthkit/autopsy/report/PortableCaseReportModule.java b/Core/src/org/sleuthkit/autopsy/report/modules/PortableCaseReportModule.java
similarity index 98%
rename from Core/src/org/sleuthkit/autopsy/report/PortableCaseReportModule.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/PortableCaseReportModule.java
index 33c7a16a91..3089f60ef0 100644
--- a/Core/src/org/sleuthkit/autopsy/report/PortableCaseReportModule.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/PortableCaseReportModule.java
@@ -16,8 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.modules;
 
+import org.sleuthkit.autopsy.report.ReportModule;
 import java.util.logging.Level;
 import java.io.BufferedReader;
 import java.io.File;
@@ -41,6 +42,7 @@ import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.PlatformUtil;
 import org.sleuthkit.autopsy.datamodel.ContentUtils;
 import org.sleuthkit.autopsy.coreutils.FileTypeUtils.FileTypeCategory;
+import org.sleuthkit.autopsy.report.ReportProgressPanel;
 import org.sleuthkit.autopsy.report.caseuco.CaseUcoFormatExporter;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.BlackboardArtifact;
@@ -64,7 +66,7 @@ import org.sleuthkit.datamodel.VolumeSystem;
 /**
  * Creates a portable case from tagged files
  */
-class PortableCaseReportModule implements ReportModule {
+public class PortableCaseReportModule implements ReportModule {
     private static final Logger logger = Logger.getLogger(PortableCaseReportModule.class.getName());
     private static final String FILE_FOLDER_NAME = "PortableCaseFiles";  // NON-NLS
     private static final String UNKNOWN_FILE_TYPE_FOLDER = "Other";  // NON-NLS
@@ -99,7 +101,7 @@ class PortableCaseReportModule implements ReportModule {
     // Map of old artifact ID to new artifact
     private final Map<Long, BlackboardArtifact> oldArtifactIdToNewArtifact = new HashMap<>();
     
-    PortableCaseReportModule() {
+    public PortableCaseReportModule() {
     }
 
     @NbBundle.Messages({
@@ -190,7 +192,7 @@ class PortableCaseReportModule implements ReportModule {
         "PortableCaseReportModule.generateReport.compressingCase=Compressing case...",
     })
 
-    void generateReport(String reportPath, PortableCaseReportModuleSettings options, ReportProgressPanel progressPanel) {
+    public void generateReport(String reportPath, PortableCaseReportModuleSettings options, ReportProgressPanel progressPanel) {
         this.settings = options;
         progressPanel.setIndeterminate(true);
         progressPanel.start();
@@ -1048,7 +1050,7 @@ class PortableCaseReportModule implements ReportModule {
     /**
      * Processes the result sets from the interesting item set name query.
      */
-    static class GetInterestingItemSetNamesCallback implements CaseDbAccessManager.CaseDbAccessQueryCallback {
+    public static class GetInterestingItemSetNamesCallback implements CaseDbAccessManager.CaseDbAccessQueryCallback {
 
         private static final java.util.logging.Logger logger = java.util.logging.Logger.getLogger(GetInterestingItemSetNamesCallback.class.getName());
         private final Map<String, Long> setCounts = new HashMap<>();
@@ -1077,7 +1079,7 @@ class PortableCaseReportModule implements ReportModule {
          * 
          * @return A map from each set name to the number of items in it
          */
-        Map<String, Long> getSetCountMap() {
+        public Map<String, Long> getSetCountMap() {
             return setCounts;
         }
     }
diff --git a/Core/src/org/sleuthkit/autopsy/report/PortableCaseReportModuleSettings.java b/Core/src/org/sleuthkit/autopsy/report/modules/PortableCaseReportModuleSettings.java
similarity index 84%
rename from Core/src/org/sleuthkit/autopsy/report/PortableCaseReportModuleSettings.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/PortableCaseReportModuleSettings.java
index d52f426536..60dd96b84d 100755
--- a/Core/src/org/sleuthkit/autopsy/report/PortableCaseReportModuleSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/PortableCaseReportModuleSettings.java
@@ -16,8 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.modules;
 
+import org.sleuthkit.autopsy.report.ReportModuleSettings;
 import java.util.ArrayList;
 import java.util.List;
 import org.sleuthkit.datamodel.TagName;
@@ -25,7 +26,7 @@ import org.sleuthkit.datamodel.TagName;
 /**
  * Settings for the HTML report module.
  */
-class PortableCaseReportModuleSettings implements ReportModuleSettings {
+public class PortableCaseReportModuleSettings implements ReportModuleSettings {
 
     private static final long serialVersionUID = 1L;
 
@@ -40,7 +41,7 @@ class PortableCaseReportModuleSettings implements ReportModuleSettings {
      * Enum for storing the display name for each chunk type and the
      * parameter needed for 7-Zip.
      */
-    enum ChunkSize {
+    public enum ChunkSize {
         
         NONE("Do not split", ""), // NON-NLS
         ONE_HUNDRED_MB("Split into 100 MB chunks", "100m"),
@@ -76,7 +77,7 @@ class PortableCaseReportModuleSettings implements ReportModuleSettings {
         }
     }
 
-    PortableCaseReportModuleSettings() {
+    public PortableCaseReportModuleSettings() {
         this.compress = false;
         this.chunkSize = ChunkSize.NONE;
         this.allTagsSelected = true;
@@ -98,46 +99,46 @@ class PortableCaseReportModuleSettings implements ReportModuleSettings {
         return serialVersionUID;
     }
 
-    void updateSetNames(List<String> setNames) {
+    public void updateSetNames(List<String> setNames) {
         this.setNames.clear();
         this.setNames.addAll(setNames);
     }
 
-    void updateTagNames(List<TagName> tagNames) {
+    public void updateTagNames(List<TagName> tagNames) {
         this.tagNames.clear();
         this.tagNames.addAll(tagNames);
     }
 
-    void updateCompression(boolean compress, ChunkSize chunkSize) {
+    public void updateCompression(boolean compress, ChunkSize chunkSize) {
         this.compress = compress;
         this.chunkSize = chunkSize;
     }
 
-    boolean isValid() {
+    public boolean isValid() {
         return ((allTagsSelected || allSetsSelected || (!tagNames.isEmpty()) || (!setNames.isEmpty())));
     }
 
-    List<String> getSelectedSetNames() {
+    public List<String> getSelectedSetNames() {
         return new ArrayList<>(setNames);
     }
 
-    List<TagName> getSelectedTagNames() {
+    public List<TagName> getSelectedTagNames() {
         return new ArrayList<>(tagNames);
     }
 
-    boolean shouldCompress() {
+    public boolean shouldCompress() {
         return compress;
     }
 
-    ChunkSize getChunkSize() {
+    public ChunkSize getChunkSize() {
         return chunkSize;
     }
 
-    boolean isAllTagsSelected() {
+    public boolean isAllTagsSelected() {
         return allTagsSelected;
     }
 
-    boolean isAllSetsSelected() {
+    public boolean isAllSetsSelected() {
         return allSetsSelected;
     }
 
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportBodyFile.java b/Core/src/org/sleuthkit/autopsy/report/modules/ReportBodyFile.java
similarity index 98%
rename from Core/src/org/sleuthkit/autopsy/report/ReportBodyFile.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/ReportBodyFile.java
index 4695418117..895031b312 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportBodyFile.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/ReportBodyFile.java
@@ -20,8 +20,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.modules;
 
+import org.sleuthkit.autopsy.report.GeneralReportModule;
 import java.io.BufferedWriter;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -34,6 +35,7 @@ import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.ingest.IngestManager;
+import org.sleuthkit.autopsy.report.ReportProgressPanel;
 import org.sleuthkit.autopsy.report.ReportProgressPanel.ReportStatus;
 import org.sleuthkit.datamodel.*;
 
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportExcel.java b/Core/src/org/sleuthkit/autopsy/report/modules/ReportExcel.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/report/ReportExcel.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/ReportExcel.java
index bba8477bad..51ba30736b 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportExcel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/ReportExcel.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.modules;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -30,6 +30,7 @@ import org.openide.util.NbBundle.Messages;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
 import org.sleuthkit.autopsy.coreutils.Logger;
+import org.sleuthkit.autopsy.report.infrastructure.TableReportModule;
 import org.sleuthkit.datamodel.TskCoreException;
 
 class ReportExcel implements TableReportModule {
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportFileTextConfigurationPanel.form b/Core/src/org/sleuthkit/autopsy/report/modules/ReportFileTextConfigurationPanel.form
similarity index 87%
rename from Core/src/org/sleuthkit/autopsy/report/ReportFileTextConfigurationPanel.form
rename to Core/src/org/sleuthkit/autopsy/report/modules/ReportFileTextConfigurationPanel.form
index d0c59f7bdd..491bff6dc5 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportFileTextConfigurationPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/ReportFileTextConfigurationPanel.form
@@ -50,7 +50,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/report/Bundle.properties" key="ReportFileTextConfigurationPanel.tabDelimitedButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/Bundle.properties" key="ReportFileTextConfigurationPanel.tabDelimitedButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
@@ -60,7 +60,7 @@
           <ComponentRef name="delimiterGroup"/>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportFileTextConfigurationPanel.commaDelimitedButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/Bundle.properties" key="ReportFileTextConfigurationPanel.commaDelimitedButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportFileTextConfigurationPanel.java b/Core/src/org/sleuthkit/autopsy/report/modules/ReportFileTextConfigurationPanel.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/report/ReportFileTextConfigurationPanel.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/ReportFileTextConfigurationPanel.java
index 2fbb6e97fc..65efe092ff 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportFileTextConfigurationPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/ReportFileTextConfigurationPanel.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.modules;
 
 /**
  * Panel for configuring settings for the file text report
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java b/Core/src/org/sleuthkit/autopsy/report/modules/ReportHTML.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/report/ReportHTML.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/ReportHTML.java
index 3f2175bc42..9e18e8e2c7 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/ReportHTML.java
@@ -20,8 +20,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.modules;
 
+import org.sleuthkit.autopsy.report.NoReportModuleSettings;
+import org.sleuthkit.autopsy.report.ReportModuleSettings;
 import java.awt.image.BufferedImage;
 import java.io.BufferedWriter;
 import java.io.File;
@@ -67,6 +69,8 @@ import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.Version;
 import org.sleuthkit.autopsy.datamodel.ContentUtils.ExtractFscContentVisitor;
 import org.sleuthkit.autopsy.ingest.IngestManager;
+import org.sleuthkit.autopsy.report.ReportBranding;
+import org.sleuthkit.autopsy.report.infrastructure.TableReportModule;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.BlackboardArtifact;
 import org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE;
@@ -80,7 +84,7 @@ import org.sleuthkit.datamodel.TskCoreException;
 import org.sleuthkit.datamodel.TskData;
 import org.sleuthkit.datamodel.TskData.TSK_DB_FILES_TYPE_ENUM;
 
-class ReportHTML implements TableReportModule {
+public class ReportHTML implements TableReportModule {
 
     private static final Logger logger = Logger.getLogger(ReportHTML.class.getName());
     private static final String THUMBS_REL_PATH = "thumbs" + File.separator; //NON-NLS
@@ -88,7 +92,7 @@ class ReportHTML implements TableReportModule {
     private static final int MAX_THUMBS_PER_PAGE = 1000;
     private static final String HTML_SUBDIR = "content";
     private Case currentCase;
-    static Integer THUMBNAIL_COLUMNS = 5;
+    public static Integer THUMBNAIL_COLUMNS = 5;
 
     private Map<String, Integer> dataTypes;
     private String path;
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportHTMLConfigurationPanel.form b/Core/src/org/sleuthkit/autopsy/report/modules/ReportHTMLConfigurationPanel.form
similarity index 81%
rename from Core/src/org/sleuthkit/autopsy/report/ReportHTMLConfigurationPanel.form
rename to Core/src/org/sleuthkit/autopsy/report/modules/ReportHTMLConfigurationPanel.form
index 33a7eb0b43..518a86f75f 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportHTMLConfigurationPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/ReportHTMLConfigurationPanel.form
@@ -60,28 +60,28 @@
     <Component class="javax.swing.JLabel" name="headerLabel">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportHTMLConfigurationPanel.headerLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/Bundle.properties" key="ReportHTMLConfigurationPanel.headerLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JLabel" name="footerLabel">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportHTMLConfigurationPanel.footerLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/Bundle.properties" key="ReportHTMLConfigurationPanel.footerLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JTextField" name="headerTextField">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportHTMLConfigurationPanel.headerTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/Bundle.properties" key="ReportHTMLConfigurationPanel.headerTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JTextField" name="footerTextField">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportHTMLConfigurationPanel.footerTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/Bundle.properties" key="ReportHTMLConfigurationPanel.footerTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportHTMLConfigurationPanel.java b/Core/src/org/sleuthkit/autopsy/report/modules/ReportHTMLConfigurationPanel.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/report/ReportHTMLConfigurationPanel.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/ReportHTMLConfigurationPanel.java
index ab1d97fa43..9a0226969e 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportHTMLConfigurationPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/ReportHTMLConfigurationPanel.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.modules;
 
 /**
  * The panel shown for all TableReportModules when configuring report modules.
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportKML.java b/Core/src/org/sleuthkit/autopsy/report/modules/ReportKML.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/report/ReportKML.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/ReportKML.java
index 55f5809a7e..b7d4f4cdd3 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportKML.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/ReportKML.java
@@ -17,8 +17,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.modules;
 
+import org.sleuthkit.autopsy.report.GeneralReportModule;
 import javax.swing.JPanel;
 
 import org.openide.util.NbBundle;
@@ -44,6 +45,8 @@ import org.jdom2.output.XMLOutputter;
 import org.jdom2.CDATA;
 import org.openide.filesystems.FileUtil;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
+import org.sleuthkit.autopsy.report.ReportBranding;
+import org.sleuthkit.autopsy.report.ReportProgressPanel;
 import org.sleuthkit.datamodel.ReadContentInputStream.ReadContentInputStreamException;
 
 /**
@@ -184,7 +187,7 @@ class ReportKML implements GeneralReportModule {
         document.addContent(gpsSearchesFolder);
         document.addContent(gpsTrackpointsFolder);
 
-        ReportProgressDialog.ReportStatus result = ReportProgressPanel.ReportStatus.COMPLETE;
+        ReportProgressPanel.ReportStatus result = ReportProgressPanel.ReportStatus.COMPLETE;
 
         /**
          * In the following code, nulls are okay, and are handled when we go to

From 99e000c18223a7199076494c6a8f53e24e5760e7 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Thu, 5 Sep 2019 18:08:05 -0400
Subject: [PATCH 102/192] Refactored all reports into individual packages

---
 Core/src/org/sleuthkit/autopsy/core/layer.xml |  28 ++--
 .../infrastructure/FileReportModule.java      |   2 +-
 .../infrastructure/FileReportSettings.java    |   2 +-
 ...PortableCaseInterestingItemsListPanel.java |   4 +-
 .../PortableCaseTagsListPanel.java            |   2 +-
 .../infrastructure/ReportGenerator.java       |   6 +-
 .../infrastructure/ReportVisualPanel1.java    |   4 +-
 .../infrastructure/ReportWizardAction.java    |   4 +-
 .../ReportWizardFileOptionsVisualPanel.java   |   2 +-
 ...tWizardPortableCaseOptionsVisualPanel.java |   6 +-
 .../infrastructure/TableReportGenerator.java  |   2 +-
 .../autopsy/report/modules/Bundle.properties  |  76 -----------
 .../report/modules/Bundle.properties-MERGED   | 129 ------------------
 .../report/modules/Bundle_ja.properties       |  64 ---------
 .../report/modules/bodyfile/Bundle.properties |   8 ++
 .../modules/bodyfile/Bundle.properties-MERGED |   8 ++
 .../modules/bodyfile/Bundle_ja.properties     |   8 ++
 .../{ => bodyfile}/ReportBodyFile.java        |   2 +-
 .../{ => modules}/caseuco/Bundle.properties   |   0
 .../caseuco/Bundle.properties-MERGED          |   0
 .../caseuco/CaseUcoFormatExporter.java        |   2 +-
 .../{ => modules}/caseuco/ReportCaseUco.java  |   2 +-
 .../report/modules/excel/Bundle.properties    |  10 ++
 .../modules/excel/Bundle.properties-MERGED    |  19 +++
 .../report/modules/excel/Bundle_ja.properties |  10 ++
 .../modules/{ => excel}/ReportExcel.java      |   2 +-
 .../report/modules/file/Bundle.properties     |  21 +++
 .../modules/file/Bundle.properties-MERGED     |  21 +++
 .../report/modules/file/Bundle_ja.properties  |  15 ++
 .../{ => file}/FileReportDataTypes.java       |   2 +-
 .../{ => file}/FileReportModuleSettings.java  |   2 +-
 .../modules/{ => file}/FileReportText.java    |   2 +-
 .../ReportFileTextConfigurationPanel.form     |   4 +-
 .../ReportFileTextConfigurationPanel.java     |   2 +-
 .../report/modules/html/Bundle.properties     |  35 +++++
 .../modules/html/Bundle.properties-MERGED     |  40 ++++++
 .../report/modules/html/Bundle_ja.properties  |  25 ++++
 .../{ => html}/HTMLReportModuleSettings.java  |   2 +-
 .../report/modules/{ => html}/ReportHTML.java |   2 +-
 .../ReportHTMLConfigurationPanel.form         |   8 +-
 .../ReportHTMLConfigurationPanel.java         |   2 +-
 .../report/modules/kml/Bundle.properties      |   9 ++
 .../modules/kml/Bundle.properties-MERGED      |   9 ++
 .../report/modules/kml/Bundle_ja.properties   |   6 +
 .../report/modules/{ => kml}/ReportKML.java   |   2 +-
 .../portablecase/Bundle.properties-MERGED     |  39 ++++++
 .../PortableCaseReportModule.java             |   4 +-
 .../PortableCaseReportModuleSettings.java     |   2 +-
 .../modules/stix/Bundle.properties            |   0
 .../modules/stix/Bundle.properties-MERGED     |   0
 .../modules/stix/Bundle_ja.properties         |   0
 .../modules/stix/EvalAccountObj.java          |   2 +-
 .../modules/stix/EvalAddressObj.java          |   2 +-
 .../modules/stix/EvalDomainObj.java           |   2 +-
 .../modules/stix/EvalEmailObj.java            |   2 +-
 .../modules/stix/EvalFileObj.java             |   2 +-
 .../modules/stix/EvalNetworkShareObj.java     |   2 +-
 .../modules/stix/EvalRegistryObj.java         |   2 +-
 .../modules/stix/EvalSystemObj.java           |   2 +-
 .../{ => report}/modules/stix/EvalURIObj.java |   2 +-
 .../modules/stix/EvalURLHistoryObj.java       |   2 +-
 .../modules/stix/EvaluatableObject.java       |   2 +-
 .../modules/stix/ObservableResult.java        |   2 +-
 .../modules/stix/STIXReportModule.java        |   2 +-
 .../stix/STIXReportModuleConfigPanel.form     |   8 +-
 .../stix/STIXReportModuleConfigPanel.java     |   2 +-
 .../stix/STIXReportModuleSettings.java        |   2 +-
 .../modules/stix/StixArtifactData.java        |   2 +-
 .../taggedhashes/AddTaggedHashesToHashDb.java |   2 +-
 .../AddTaggedHashesToHashDbConfigPanel.form   |  12 +-
 .../AddTaggedHashesToHashDbConfigPanel.java   |   2 +-
 .../taggedhashes/Bundle.properties            |   0
 .../taggedhashes/Bundle.properties-MERGED     |   0
 .../HashesReportModuleSettings.java           |   2 +-
 74 files changed, 364 insertions(+), 350 deletions(-)
 delete mode 100755 Core/src/org/sleuthkit/autopsy/report/modules/Bundle.properties
 delete mode 100755 Core/src/org/sleuthkit/autopsy/report/modules/Bundle.properties-MERGED
 delete mode 100755 Core/src/org/sleuthkit/autopsy/report/modules/Bundle_ja.properties
 create mode 100755 Core/src/org/sleuthkit/autopsy/report/modules/bodyfile/Bundle.properties
 create mode 100755 Core/src/org/sleuthkit/autopsy/report/modules/bodyfile/Bundle.properties-MERGED
 create mode 100755 Core/src/org/sleuthkit/autopsy/report/modules/bodyfile/Bundle_ja.properties
 rename Core/src/org/sleuthkit/autopsy/report/modules/{ => bodyfile}/ReportBodyFile.java (99%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => modules}/caseuco/Bundle.properties (100%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => modules}/caseuco/Bundle.properties-MERGED (100%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => modules}/caseuco/CaseUcoFormatExporter.java (99%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => modules}/caseuco/ReportCaseUco.java (98%)
 create mode 100755 Core/src/org/sleuthkit/autopsy/report/modules/excel/Bundle.properties
 create mode 100755 Core/src/org/sleuthkit/autopsy/report/modules/excel/Bundle.properties-MERGED
 create mode 100755 Core/src/org/sleuthkit/autopsy/report/modules/excel/Bundle_ja.properties
 rename Core/src/org/sleuthkit/autopsy/report/modules/{ => excel}/ReportExcel.java (99%)
 create mode 100755 Core/src/org/sleuthkit/autopsy/report/modules/file/Bundle.properties
 create mode 100755 Core/src/org/sleuthkit/autopsy/report/modules/file/Bundle.properties-MERGED
 create mode 100755 Core/src/org/sleuthkit/autopsy/report/modules/file/Bundle_ja.properties
 rename Core/src/org/sleuthkit/autopsy/report/modules/{ => file}/FileReportDataTypes.java (99%)
 rename Core/src/org/sleuthkit/autopsy/report/modules/{ => file}/FileReportModuleSettings.java (96%)
 rename Core/src/org/sleuthkit/autopsy/report/modules/{ => file}/FileReportText.java (99%)
 rename Core/src/org/sleuthkit/autopsy/report/modules/{ => file}/ReportFileTextConfigurationPanel.form (90%)
 rename Core/src/org/sleuthkit/autopsy/report/modules/{ => file}/ReportFileTextConfigurationPanel.java (99%)
 create mode 100755 Core/src/org/sleuthkit/autopsy/report/modules/html/Bundle.properties
 create mode 100755 Core/src/org/sleuthkit/autopsy/report/modules/html/Bundle.properties-MERGED
 create mode 100755 Core/src/org/sleuthkit/autopsy/report/modules/html/Bundle_ja.properties
 rename Core/src/org/sleuthkit/autopsy/report/modules/{ => html}/HTMLReportModuleSettings.java (97%)
 rename Core/src/org/sleuthkit/autopsy/report/modules/{ => html}/ReportHTML.java (99%)
 rename Core/src/org/sleuthkit/autopsy/report/modules/{ => html}/ReportHTMLConfigurationPanel.form (85%)
 rename Core/src/org/sleuthkit/autopsy/report/modules/{ => html}/ReportHTMLConfigurationPanel.java (99%)
 create mode 100755 Core/src/org/sleuthkit/autopsy/report/modules/kml/Bundle.properties
 create mode 100755 Core/src/org/sleuthkit/autopsy/report/modules/kml/Bundle.properties-MERGED
 create mode 100755 Core/src/org/sleuthkit/autopsy/report/modules/kml/Bundle_ja.properties
 rename Core/src/org/sleuthkit/autopsy/report/modules/{ => kml}/ReportKML.java (99%)
 create mode 100755 Core/src/org/sleuthkit/autopsy/report/modules/portablecase/Bundle.properties-MERGED
 rename Core/src/org/sleuthkit/autopsy/report/modules/{ => portablecase}/PortableCaseReportModule.java (99%)
 rename Core/src/org/sleuthkit/autopsy/report/modules/{ => portablecase}/PortableCaseReportModuleSettings.java (98%)
 rename Core/src/org/sleuthkit/autopsy/{ => report}/modules/stix/Bundle.properties (100%)
 rename Core/src/org/sleuthkit/autopsy/{ => report}/modules/stix/Bundle.properties-MERGED (100%)
 rename Core/src/org/sleuthkit/autopsy/{ => report}/modules/stix/Bundle_ja.properties (100%)
 rename Core/src/org/sleuthkit/autopsy/{ => report}/modules/stix/EvalAccountObj.java (99%)
 rename Core/src/org/sleuthkit/autopsy/{ => report}/modules/stix/EvalAddressObj.java (99%)
 rename Core/src/org/sleuthkit/autopsy/{ => report}/modules/stix/EvalDomainObj.java (99%)
 rename Core/src/org/sleuthkit/autopsy/{ => report}/modules/stix/EvalEmailObj.java (99%)
 rename Core/src/org/sleuthkit/autopsy/{ => report}/modules/stix/EvalFileObj.java (99%)
 rename Core/src/org/sleuthkit/autopsy/{ => report}/modules/stix/EvalNetworkShareObj.java (99%)
 rename Core/src/org/sleuthkit/autopsy/{ => report}/modules/stix/EvalRegistryObj.java (99%)
 rename Core/src/org/sleuthkit/autopsy/{ => report}/modules/stix/EvalSystemObj.java (99%)
 rename Core/src/org/sleuthkit/autopsy/{ => report}/modules/stix/EvalURIObj.java (99%)
 rename Core/src/org/sleuthkit/autopsy/{ => report}/modules/stix/EvalURLHistoryObj.java (99%)
 rename Core/src/org/sleuthkit/autopsy/{ => report}/modules/stix/EvaluatableObject.java (99%)
 rename Core/src/org/sleuthkit/autopsy/{ => report}/modules/stix/ObservableResult.java (99%)
 rename Core/src/org/sleuthkit/autopsy/{ => report}/modules/stix/STIXReportModule.java (99%)
 rename Core/src/org/sleuthkit/autopsy/{ => report}/modules/stix/STIXReportModuleConfigPanel.form (84%)
 rename Core/src/org/sleuthkit/autopsy/{ => report}/modules/stix/STIXReportModuleConfigPanel.java (99%)
 rename Core/src/org/sleuthkit/autopsy/{ => report}/modules/stix/STIXReportModuleSettings.java (96%)
 rename Core/src/org/sleuthkit/autopsy/{ => report}/modules/stix/StixArtifactData.java (98%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => modules}/taggedhashes/AddTaggedHashesToHashDb.java (99%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => modules}/taggedhashes/AddTaggedHashesToHashDbConfigPanel.form (84%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => modules}/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java (99%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => modules}/taggedhashes/Bundle.properties (100%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => modules}/taggedhashes/Bundle.properties-MERGED (100%)
 rename Core/src/org/sleuthkit/autopsy/report/{ => modules}/taggedhashes/HashesReportModuleSettings.java (97%)

diff --git a/Core/src/org/sleuthkit/autopsy/core/layer.xml b/Core/src/org/sleuthkit/autopsy/core/layer.xml
index ed4b8cc55d..be38d59fa4 100644
--- a/Core/src/org/sleuthkit/autopsy/core/layer.xml
+++ b/Core/src/org/sleuthkit/autopsy/core/layer.xml
@@ -311,39 +311,39 @@
             <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.directorytree.FileSearchProvider"/>
             <attr name="position" intvalue="250"/>
         </file>
-        <file name="org-sleuthkit-autopsy-report-modules-ReportHTML.instance">
+        <file name="org-sleuthkit-autopsy-report-modules-html-ReportHTML.instance">
             <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.infrastructure.TableReportModule"/>
-            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.modules.ReportHTML.getDefault"/>
+            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.modules.html.ReportHTML.getDefault"/>
             <attr name="position" intvalue="900"/>
         </file>
-        <file name="org-sleuthkit-autopsy-report-modules-ReportExcel.instance">
+        <file name="org-sleuthkit-autopsy-report-modules-excel.ReportExcel.instance">
             <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.infrastructure.TableReportModule"/>
-            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.modules.ReportExcel.getDefault"/>
+            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.modules.excel.ReportExcel.getDefault"/>
             <attr name="position" intvalue="901"/>
         </file>
-        <file name="org-sleuthkit-autopsy-report-modules-ReportBodyFile.instance">
+        <file name="org-sleuthkit-autopsy-report-modules-bodyfile-ReportBodyFile.instance">
             <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.GeneralReportModule"/>
-            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.modules.ReportBodyFile.getDefault"/>
+            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.modules.bodyfile.ReportBodyFile.getDefault"/>
             <attr name="position" intvalue="902"/>
         </file>
-        <file name="org-sleuthkit-autopsy-report-modules-FileReportText.instance">
+        <file name="org-sleuthkit-autopsy-report-modules-file-FileReportText.instance">
             <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.infrastructure.FileReportModule"/>
-            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.modules.FileReportText.getDefault"/>
+            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.modules.file.FileReportText.getDefault"/>
             <attr name="position" intvalue="903"/>
         </file>
-        <file name="org-sleuthkit-autopsy-report-modules-ReportKML.instance">
+        <file name="org-sleuthkit-autopsy-report-modules-kml-ReportKML.instance">
             <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.GeneralReportModule"/>
-            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.modules.ReportKML.getDefault"/>
+            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.modules.kml.ReportKML.getDefault"/>
             <attr name="position" intvalue="904"/>
         </file>
-        <file name="org-sleuthkit-autopsy-modules-stix-STIXReportModule.instance">
+        <file name="org-sleuthkit-autopsy-report-modules-stix-STIXReportModule.instance">
             <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.GeneralReportModule"/>
-            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.modules.stix.STIXReportModule.getDefault"/>
+            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.modules.stix.STIXReportModule.getDefault"/>
             <attr name="position" intvalue="910"/>
         </file>
-        <file name="org-sleuthkit-autopsy-report-caseuco-ReportCaseUco.instance">
+        <file name="org-sleuthkit-autopsy-report-modules-caseuco-ReportCaseUco.instance">
             <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.GeneralReportModule"/>
-            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.caseuco.ReportCaseUco.getDefault"/>
+            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.modules.caseuco.ReportCaseUco.getDefault"/>
             <attr name="position" intvalue="911"/>
         </file>       
         <!--<folder name="JavaHelp">
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/FileReportModule.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/FileReportModule.java
index f3ef9de415..b90a82bdc1 100644
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/FileReportModule.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/FileReportModule.java
@@ -18,7 +18,7 @@
  */
 package org.sleuthkit.autopsy.report.infrastructure;
 
-import org.sleuthkit.autopsy.report.modules.FileReportDataTypes;
+import org.sleuthkit.autopsy.report.modules.file.FileReportDataTypes;
 import org.sleuthkit.autopsy.report.ReportModule;
 import java.util.List;
 import org.sleuthkit.datamodel.AbstractFile;
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/FileReportSettings.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/FileReportSettings.java
index e665463b34..37fe842305 100755
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/FileReportSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/FileReportSettings.java
@@ -18,7 +18,7 @@
  */
 package org.sleuthkit.autopsy.report.infrastructure;
 
-import org.sleuthkit.autopsy.report.modules.FileReportDataTypes;
+import org.sleuthkit.autopsy.report.modules.file.FileReportDataTypes;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseInterestingItemsListPanel.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseInterestingItemsListPanel.java
index 01cabf1c01..e4d9f319b9 100644
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseInterestingItemsListPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseInterestingItemsListPanel.java
@@ -18,7 +18,7 @@
  */
 package org.sleuthkit.autopsy.report.infrastructure;
 
-import org.sleuthkit.autopsy.report.modules.PortableCaseReportModuleSettings;
+import org.sleuthkit.autopsy.report.modules.portablecase.PortableCaseReportModuleSettings;
 import java.awt.Component;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
@@ -41,7 +41,7 @@ import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
 import org.sleuthkit.autopsy.coreutils.Logger;
-import org.sleuthkit.autopsy.report.modules.PortableCaseReportModule.GetInterestingItemSetNamesCallback;
+import org.sleuthkit.autopsy.report.modules.portablecase.PortableCaseReportModule.GetInterestingItemSetNamesCallback;
 import org.sleuthkit.datamodel.BlackboardArtifact;
 import org.sleuthkit.datamodel.BlackboardAttribute;
 import org.sleuthkit.datamodel.TskCoreException;
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseTagsListPanel.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseTagsListPanel.java
index 01c5e4a591..cb6f37c7a2 100644
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseTagsListPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseTagsListPanel.java
@@ -18,7 +18,7 @@
  */
 package org.sleuthkit.autopsy.report.infrastructure;
 
-import org.sleuthkit.autopsy.report.modules.PortableCaseReportModuleSettings;
+import org.sleuthkit.autopsy.report.modules.portablecase.PortableCaseReportModuleSettings;
 import java.awt.Component;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportGenerator.java
index 49f9801df7..c7dc4da638 100644
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportGenerator.java
@@ -18,9 +18,9 @@
  */
 package org.sleuthkit.autopsy.report.infrastructure;
 
-import org.sleuthkit.autopsy.report.modules.FileReportDataTypes;
-import org.sleuthkit.autopsy.report.modules.PortableCaseReportModuleSettings;
-import org.sleuthkit.autopsy.report.modules.PortableCaseReportModule;
+import org.sleuthkit.autopsy.report.modules.file.FileReportDataTypes;
+import org.sleuthkit.autopsy.report.modules.portablecase.PortableCaseReportModuleSettings;
+import org.sleuthkit.autopsy.report.modules.portablecase.PortableCaseReportModule;
 import org.sleuthkit.autopsy.report.NoReportModuleSettings;
 import org.sleuthkit.autopsy.report.ReportModule;
 import org.sleuthkit.autopsy.report.ReportModuleSettings;
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel1.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel1.java
index 3e6926298f..f64e8bcf55 100644
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel1.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel1.java
@@ -18,8 +18,8 @@
  */
 package org.sleuthkit.autopsy.report.infrastructure;
 
-import org.sleuthkit.autopsy.report.modules.PortableCaseReportModule;
-import org.sleuthkit.autopsy.report.modules.ReportHTML;
+import org.sleuthkit.autopsy.report.modules.portablecase.PortableCaseReportModule;
+import org.sleuthkit.autopsy.report.modules.html.ReportHTML;
 import org.sleuthkit.autopsy.report.ReportModule;
 import org.sleuthkit.autopsy.report.ReportModuleSettings;
 import org.sleuthkit.autopsy.report.GeneralReportModule;
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardAction.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardAction.java
index 0960839dcd..75335ff7ab 100644
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardAction.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardAction.java
@@ -22,8 +22,8 @@
  */
 package org.sleuthkit.autopsy.report.infrastructure;
 
-import org.sleuthkit.autopsy.report.modules.PortableCaseReportModuleSettings;
-import org.sleuthkit.autopsy.report.modules.PortableCaseReportModule;
+import org.sleuthkit.autopsy.report.modules.portablecase.PortableCaseReportModuleSettings;
+import org.sleuthkit.autopsy.report.modules.portablecase.PortableCaseReportModule;
 import java.awt.Component;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardFileOptionsVisualPanel.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardFileOptionsVisualPanel.java
index 6d2cd657a4..9465ed33d3 100644
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardFileOptionsVisualPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardFileOptionsVisualPanel.java
@@ -18,7 +18,7 @@
  */
 package org.sleuthkit.autopsy.report.infrastructure;
 
-import org.sleuthkit.autopsy.report.modules.FileReportDataTypes;
+import org.sleuthkit.autopsy.report.modules.file.FileReportDataTypes;
 import org.sleuthkit.autopsy.report.infrastructure.FileReportSettings;
 import java.awt.Component;
 import java.awt.event.MouseAdapter;
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPortableCaseOptionsVisualPanel.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPortableCaseOptionsVisualPanel.java
index bc8ab94f22..7e1bc02332 100644
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPortableCaseOptionsVisualPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPortableCaseOptionsVisualPanel.java
@@ -18,14 +18,14 @@
  */
 package org.sleuthkit.autopsy.report.infrastructure;
 
-import org.sleuthkit.autopsy.report.modules.PortableCaseReportModuleSettings;
-import org.sleuthkit.autopsy.report.modules.PortableCaseReportModule;
+import org.sleuthkit.autopsy.report.modules.portablecase.PortableCaseReportModuleSettings;
+import org.sleuthkit.autopsy.report.modules.portablecase.PortableCaseReportModule;
 import org.sleuthkit.autopsy.report.ReportModuleSettings;
 import java.awt.GridLayout;
 import java.util.Map;
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.PlatformUtil;
-import org.sleuthkit.autopsy.report.modules.PortableCaseReportModuleSettings.ChunkSize;
+import org.sleuthkit.autopsy.report.modules.portablecase.PortableCaseReportModuleSettings.ChunkSize;
 
 /**
  * The UI portion of the Portable Case config panel
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportGenerator.java
index 64073a77c1..14c9c17027 100644
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportGenerator.java
@@ -18,7 +18,7 @@
  */
 package org.sleuthkit.autopsy.report.infrastructure;
 
-import org.sleuthkit.autopsy.report.modules.ReportHTML;
+import org.sleuthkit.autopsy.report.modules.html.ReportHTML;
 import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multimaps;
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/Bundle.properties b/Core/src/org/sleuthkit/autopsy/report/modules/Bundle.properties
deleted file mode 100755
index 9e8e239a7a..0000000000
--- a/Core/src/org/sleuthkit/autopsy/report/modules/Bundle.properties
+++ /dev/null
@@ -1,76 +0,0 @@
-OpenIDE-Module-Name=Report
-ReportHTMLConfigurationPanel.headerLabel.text=Header:
-ReportHTMLConfigurationPanel.footerTextField.text=
-ReportHTMLConfigurationPanel.headerTextField.text=
-ReportHTMLConfigurationPanel.footerLabel.text=Footer:
-ReportFileTextConfigurationPanel.tabDelimitedButton.text=Tab delimited
-ReportFileTextConfigurationPanel.commaDelimitedButton.text=Comma delimited
-FileReportText.getName.text=Files - Text
-FileReportText.getDesc.text=A delimited text file containing information about individual files in the case.
-ReportBodyFile.progress.querying=Querying files...
-ReportBodyFile.ingestWarning.text=Warning, this report was run before ingest services completed\!
-ReportBodyFile.progress.loading=Loading files...
-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
-ReportKML.progress.querying=Querying files...
-ReportKML.progress.loading=Loading files...
-ReportKML.getName.text=Google Earth KML
-ReportKML.getDesc.text=KML format report with coordinates for relevant files. This format can be used for google earth views.
-ReportKML.getFilePath.text=ReportKML.kml
-ReportExcel.numAartifacts.text=Number of artifacts:
-ReportExcel.getName.text=Excel Report
-ReportExcel.getDesc.text=A report about results and tagged items in Excel (XLS) format.
-ReportExcel.sheetName.text=Summary
-ReportExcel.cellVal.summary=Summary
-ReportExcel.cellVal.caseName=Case Name:
-ReportExcel.cellVal.caseNum=Case Number:
-ReportExcel.cellVal.examiner=Examiner:
-ReportExcel.cellVal.numImages=Number of Images:
-ReportHTML.addThumbRows.dataType.title=Tagged Images - {0}
-ReportHTML.addThumbRows.dataType.msg=Tagged Results and Contents that contain images.
-ReportHTML.thumbLink.tags=Tags:
-ReportHTML.getName.text=HTML Report
-ReportHTML.getDesc.text=A report about results and tagged items in HTML format.
-ReportHTML.writeIndex.title=for case {0}
-ReportHTML.writeIndex.noFrames.msg=Your browser is not compatible with our frame setup.
-ReportHTML.writeIndex.noFrames.seeNav=Please see <a href\="content\nav.html">the navigation page</a> for artifact links,
-ReportHTML.writeIndex.seeSum=and <a href\="content\summary.html">the summary page</a> for a case summary.
-ReportHTML.writeNav.title=Report Navigation
-ReportHTML.writeNav.h1=Report Navigation
-ReportHTML.writeNav.summary=Case Summary
-ReportHTML.writeSum.title=Case Summary
-ReportHTML.writeSum.warningMsg=<span>Warning, this report was run before ingest services completed\!</span>
-#
-# autopsy/test/scripts/regression.py._html_report_diff() uses reportGenOn.text, caseName, caseNum, 
-# examiner as a regex signature to skip report.html and summary.html
-#
-ReportHTML.writeSum.reportGenOn.text=HTML Report Generated on {0}
-ReportHTML.writeSum.imageInfoHeading=<h2>Image Information:</h2>
-ReportHTML.writeSum.softwareInfoHeading=<h2>Software Information:</h2>
-ReportHTML.writeSum.ingestHistoryHeading=<h2>Ingest History:</h2>
-ReportHTML.writeSum.modulesEnabledHeading=Enabled Modules:
-ReportHTML.writeSum.autopsyVersion=Autopsy Version:
-ReportHTML.writeSum.timezone=Timezone:
-ReportHTML.writeSum.path=Path:
-ReportBodyFile.generateReport.srcModuleName.text=TSK Body File
-ReportExcel.endReport.srcModuleName.text=Excel Report
-ReportHTML.writeIndex.srcModuleName.text=HTML Report
-ReportKML.genReport.srcModuleName.text=Geospatial Data
-ReportKML.genReport.reportName=KML Report
-ReportKML.latLongStartPoint={0};{1};;{2} (Start)\n
-ReportKML.latLongEndPoint={0};{1};;{2} (End)\n
-FileReportDataTypes.filename.text=Name
-FileReportDataTypes.fileExt.text=File Extension
-FileReportDataTypes.fileType.text=File Type
-FileReportDataTypes.isDel.text=Is Deleted
-FileReportDataTypes.aTime.text=Last Accessed
-FileReportDataTypes.crTime.text=File Created
-FileReportDataTypes.mTime.text=Last Modified
-FileReportDataTypes.size.text=Size
-FileReportDataTypes.address.text=Address
-FileReportDataTypes.hash.text=Hash Value
-FileReportDataTypes.knownStatus.text=Known Status
-FileReportDataTypes.perms.text=Permissions
-FileReportDataTypes.path.text=Full Path
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/report/modules/Bundle.properties-MERGED
deleted file mode 100755
index db4f1b4a4a..0000000000
--- a/Core/src/org/sleuthkit/autopsy/report/modules/Bundle.properties-MERGED
+++ /dev/null
@@ -1,129 +0,0 @@
-OpenIDE-Module-Name=Report
-PortableCaseReportModule.compressCase.canceled=Compression canceled by user
-PortableCaseReportModule.compressCase.errorCompressingCase=Error compressing case
-# {0} - Temp folder path
-PortableCaseReportModule.compressCase.errorCreatingTempFolder=Could not create temporary folder {0}
-PortableCaseReportModule.compressCase.errorFinding7zip=Could not locate 7-Zip executable
-# {0} - File name
-PortableCaseReportModule.copyContentToPortableCase.copyingFile=Copying file {0}
-# {0} - case folder
-PortableCaseReportModule.createCase.caseDirExists=Case folder {0} already exists
-PortableCaseReportModule.createCase.errorCreatingCase=Error creating case
-# {0} - folder
-PortableCaseReportModule.createCase.errorCreatingFolder=Error creating folder {0}
-PortableCaseReportModule.createCase.errorStoringMaxIds=Error storing maximum database IDs
-PortableCaseReportModule.generateReport.caseClosed=Current case has been closed
-PortableCaseReportModule.generateReport.compressingCase=Compressing case...
-# {0} - tag name
-PortableCaseReportModule.generateReport.copyingArtifacts=Copying artifacts tagged as {0}...
-# {0} - tag name
-PortableCaseReportModule.generateReport.copyingFiles=Copying files tagged as {0}...
-PortableCaseReportModule.generateReport.copyingTags=Copying tags...
-PortableCaseReportModule.generateReport.creatingCase=Creating portable case database...
-PortableCaseReportModule.generateReport.errorCopyingArtifacts=Error copying tagged artifacts
-PortableCaseReportModule.generateReport.errorCopyingFiles=Error copying tagged files
-PortableCaseReportModule.generateReport.errorCopyingInterestingFiles=Error copying interesting files
-PortableCaseReportModule.generateReport.errorCopyingInterestingResults=Error copying interesting results
-PortableCaseReportModule.generateReport.errorCopyingTags=Error copying tags
-# {0} - attribute type name
-PortableCaseReportModule.generateReport.errorLookingUpAttrType=Error looking up attribute type {0}
-PortableCaseReportModule.generateReport.errorReadingSets=Error while reading interesting items sets from case database
-PortableCaseReportModule.generateReport.errorReadingTags=Error while reading tags from case database
-PortableCaseReportModule.generateReport.interestingItemError=Error loading intersting items
-PortableCaseReportModule.generateReport.noContentToCopy=No interesting files, results, or tagged items to copy
-# {0} - output folder
-PortableCaseReportModule.generateReport.outputDirDoesNotExist=Output folder {0} does not exist
-# {0} - output folder
-PortableCaseReportModule.generateReport.outputDirIsNotDir=Output folder {0} is not a folder
-PortableCaseReportModule.generateReport.verifying=Verifying selected parameters...
-PortableCaseReportModule.getDescription.description=Copies selected items to a new single-user case that can be easily shared
-PortableCaseReportModule.getName.name=Portable Case
-ReportExcel.exceptionMessage.dataTooLarge=Value is too long to fit into an Excel cell. 
-ReportExcel.exceptionMessage.errorText=Error showing data into an Excel cell.
-ReportExcel.writeSummary.caseName=Case Name:
-ReportExcel.writeSummary.caseNotes=Case Notes:
-ReportExcel.writeSummary.caseNum=Case Number:
-ReportExcel.writeSummary.examiner=Examiner:
-ReportExcel.writeSummary.numImages=Number of Images:
-ReportExcel.writeSummary.sheetName=Summary
-ReportExcel.writeSummary.summary=Summary
-ReportHTML.writeSum.case=Case:
-ReportHTML.writeSum.caseNotes=Notes:
-ReportHTML.writeSum.caseNumber=Case Number:
-ReportHTML.writeSum.caseNumImages=Number of Images:
-ReportHTML.writeSum.examiner=Examiner:
-ReportHTMLConfigurationPanel.headerLabel.text=Header:
-ReportHTMLConfigurationPanel.footerTextField.text=
-ReportHTMLConfigurationPanel.headerTextField.text=
-ReportHTMLConfigurationPanel.footerLabel.text=Footer:
-ReportFileTextConfigurationPanel.tabDelimitedButton.text=Tab delimited
-ReportFileTextConfigurationPanel.commaDelimitedButton.text=Comma delimited
-FileReportText.getName.text=Files - Text
-FileReportText.getDesc.text=A delimited text file containing information about individual files in the case.
-ReportBodyFile.progress.querying=Querying files...
-ReportBodyFile.ingestWarning.text=Warning, this report was run before ingest services completed\!
-ReportBodyFile.progress.loading=Loading files...
-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
-ReportKML.progress.querying=Querying files...
-ReportKML.progress.loading=Loading files...
-ReportKML.getName.text=Google Earth KML
-ReportKML.getDesc.text=KML format report with coordinates for relevant files. This format can be used for google earth views.
-ReportKML.getFilePath.text=ReportKML.kml
-ReportExcel.numAartifacts.text=Number of artifacts:
-ReportExcel.getName.text=Excel Report
-ReportExcel.getDesc.text=A report about results and tagged items in Excel (XLS) format.
-ReportExcel.sheetName.text=Summary
-ReportExcel.cellVal.summary=Summary
-ReportExcel.cellVal.caseName=Case Name:
-ReportExcel.cellVal.caseNum=Case Number:
-ReportExcel.cellVal.examiner=Examiner:
-ReportExcel.cellVal.numImages=Number of Images:
-ReportHTML.addThumbRows.dataType.title=Tagged Images - {0}
-ReportHTML.addThumbRows.dataType.msg=Tagged Results and Contents that contain images.
-ReportHTML.thumbLink.tags=Tags:
-ReportHTML.getName.text=HTML Report
-ReportHTML.getDesc.text=A report about results and tagged items in HTML format.
-ReportHTML.writeIndex.title=for case {0}
-ReportHTML.writeIndex.noFrames.msg=Your browser is not compatible with our frame setup.
-ReportHTML.writeIndex.noFrames.seeNav=Please see <a href\="content\nav.html">the navigation page</a> for artifact links,
-ReportHTML.writeIndex.seeSum=and <a href\="content\summary.html">the summary page</a> for a case summary.
-ReportHTML.writeNav.title=Report Navigation
-ReportHTML.writeNav.h1=Report Navigation
-ReportHTML.writeNav.summary=Case Summary
-ReportHTML.writeSum.title=Case Summary
-ReportHTML.writeSum.warningMsg=<span>Warning, this report was run before ingest services completed\!</span>
-#
-# autopsy/test/scripts/regression.py._html_report_diff() uses reportGenOn.text, caseName, caseNum, 
-# examiner as a regex signature to skip report.html and summary.html
-#
-ReportHTML.writeSum.reportGenOn.text=HTML Report Generated on {0}
-ReportHTML.writeSum.imageInfoHeading=<h2>Image Information:</h2>
-ReportHTML.writeSum.softwareInfoHeading=<h2>Software Information:</h2>
-ReportHTML.writeSum.ingestHistoryHeading=<h2>Ingest History:</h2>
-ReportHTML.writeSum.modulesEnabledHeading=Enabled Modules:
-ReportHTML.writeSum.autopsyVersion=Autopsy Version:
-ReportHTML.writeSum.timezone=Timezone:
-ReportHTML.writeSum.path=Path:
-ReportBodyFile.generateReport.srcModuleName.text=TSK Body File
-ReportExcel.endReport.srcModuleName.text=Excel Report
-ReportHTML.writeIndex.srcModuleName.text=HTML Report
-ReportKML.genReport.srcModuleName.text=Geospatial Data
-ReportKML.genReport.reportName=KML Report
-ReportKML.latLongStartPoint={0};{1};;{2} (Start)\n
-ReportKML.latLongEndPoint={0};{1};;{2} (End)\n
-FileReportDataTypes.filename.text=Name
-FileReportDataTypes.fileExt.text=File Extension
-FileReportDataTypes.fileType.text=File Type
-FileReportDataTypes.isDel.text=Is Deleted
-FileReportDataTypes.aTime.text=Last Accessed
-FileReportDataTypes.crTime.text=File Created
-FileReportDataTypes.mTime.text=Last Modified
-FileReportDataTypes.size.text=Size
-FileReportDataTypes.address.text=Address
-FileReportDataTypes.hash.text=Hash Value
-FileReportDataTypes.knownStatus.text=Known Status
-FileReportDataTypes.perms.text=Permissions
-FileReportDataTypes.path.text=Full Path
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/report/modules/Bundle_ja.properties
deleted file mode 100755
index 1dc936e5d3..0000000000
--- a/Core/src/org/sleuthkit/autopsy/report/modules/Bundle_ja.properties
+++ /dev/null
@@ -1,64 +0,0 @@
-FileReportDataTypes.filename.text=\u540d\u524d
-FileReportDataTypes.fileExt.text=\u30d5\u30a1\u30a4\u30eb\u62e1\u5f35\u5b50
-FileReportDataTypes.fileType.text=\u30d5\u30a1\u30a4\u30eb\u30bf\u30a4\u30d7
-FileReportDataTypes.isDel.text=\u306f\u524a\u9664\u3055\u308c\u307e\u3057\u305f
-FileReportDataTypes.aTime.text=\u6700\u5f8c\u306e\u30a2\u30af\u30bb\u30b9
-FileReportDataTypes.crTime.text=\u4f5c\u6210\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb
-FileReportDataTypes.mTime.text=\u6700\u5f8c\u306e\u4fee\u6b63
-FileReportDataTypes.size.text=\u30b5\u30a4\u30ba
-FileReportDataTypes.address.text=\u30a2\u30c9\u30ec\u30b9
-FileReportDataTypes.hash.text=\u30cf\u30c3\u30b7\u30e5\u5024
-FileReportDataTypes.knownStatus.text=\u65e2\u77e5\u30b9\u30c6\u30fc\u30bf\u30b9
-FileReportDataTypes.perms.text=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3
-FileReportDataTypes.path.text=\u30d5\u30eb\u30d1\u30b9
-FileReportText.getName.text=\u30d5\u30a1\u30a4\u30eb - \u30c6\u30ad\u30b9\u30c8
-FileReportText.getDesc.text=\u30b1\u30fc\u30b9\u306e\u500b\u5225\u30d5\u30a1\u30a4\u30eb\u306b\u3064\u3044\u3066\u306e\u60c5\u5831\u3092\u6301\u3064\u3001\u30bf\u30d6\u533a\u5207\u308a\u30c6\u30ad\u30b9\u30c8\u30d5\u30a1\u30a4\u30eb\u3002
-ReportBodyFile.progress.querying=\u30d5\u30a1\u30a4\u30eb\u306e\u30af\u30a8\u30ea\u3092\u5b9f\u884c\u4e2d\u2026
-ReportBodyFile.ingestWarning.text=\u8b66\u544a\u3001\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30b5\u30fc\u30d3\u30b9\u304c\u5b8c\u4e86\u3059\u308b\u524d\u306b\u30ec\u30dd\u30fc\u30c8\u304c\u5b9f\u884c\u3055\u308c\u307e\u3057\u305f\uff01
-ReportBodyFile.progress.loading=\u30d5\u30a1\u30a4\u30eb\u306e\u8aad\u307f\u8fbc\u307f\u4e2d\u2026
-ReportBodyFile.progress.processing={0}\u3092\u51e6\u7406\u4e2d\u2026
-ReportBodyFile.getName.text=TSK\u30dc\u30c7\u30a3\u30d5\u30a1\u30a4\u30eb
-ReportBodyFile.getDesc.text=\u5404\u30d5\u30a1\u30a4\u30eb\u306eMAC\u30bf\u30a4\u30e0\u3092\u542b\u3080\u3001\u30dc\u30c7\u30a3\u30d5\u30a1\u30a4\u30eb\u5f62\u5f0f\u30ec\u30dd\u30fc\u30c8\u3002\u30bf\u30a4\u30e0\u30e9\u30a4\u30f3\u30d3\u30e5\u30fc\u306b\u3053\u306e\u5f62\u5f0f\u3092\u4f7f\u7528\u3067\u304d\u307e\u3059\u3002
-ReportBodyFile.getFilePath.text=BodyFile.txt
-ReportExcel.numAartifacts.text=\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u6570\uff1a
-ReportExcel.getName.text=\u7d50\u679c - Excel
-ReportExcel.getDesc.text=\u7d50\u679c\u306b\u95a2\u3059\u308b\u30ec\u30dd\u30fc\u30c8\u3002Excel(XLS)\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u3067\u30a2\u30a4\u30c6\u30e0\u306e\u30bf\u30b0\u4ed8\u3051\u304c\u3055\u308c\u3066\u3044\u307e\u3059\u3002
-ReportExcel.sheetName.text=\u30b5\u30de\u30ea\u30fc
-ReportExcel.cellVal.summary=\u30b5\u30de\u30ea\u30fc
-ReportExcel.cellVal.caseName=\u30b1\u30fc\u30b9\u540d\uff1a
-ReportExcel.cellVal.caseNum=\u30b1\u30fc\u30b9\u756a\u53f7\uff1a
-ReportExcel.cellVal.examiner=\u8abf\u67fb\u62c5\u5f53\u8005\uff1a
-ReportExcel.cellVal.numImages=\u30a4\u30e1\u30fc\u30b8\u6570\uff1a
-ReportHTML.addThumbRows.dataType.title=\u30bf\u30b0\u4ed8\u3051\u3055\u308c\u305f\u30a4\u30e1\u30fc\u30b8 - {0}
-ReportHTML.addThumbRows.dataType.msg=\u30a4\u30e1\u30fc\u30b8\u3092\u542b\u3080\u30bf\u30b0\u4ed8\u3051\u3055\u308c\u305f\u7d50\u679c\u304a\u3088\u3073\u30b3\u30f3\u30c6\u30f3\u30c4\u3002
-ReportHTML.thumbLink.tags=\u30bf\u30b0\uff1a
-ReportHTML.getName.text=\u7d50\u679c - HTML
-ReportHTML.getDesc.text=HTML\u5f62\u5f0f\u306e\u7d50\u679c\u304a\u3088\u3073\u30bf\u30b0\u4ed8\u3051\u3055\u308c\u305f\u30a2\u30a4\u30c6\u30e0\u306e\u30ec\u30dd\u30fc\u30c8
-ReportHTML.writeIndex.title=\u30b1\u30fc\u30b9{0}\u306eAutopsy\u30ec\u30dd\u30fc\u30c8
-ReportHTML.writeNav.title=\u30ec\u30dd\u30fc\u30c8\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3
-ReportHTML.writeNav.h1=\u30ec\u30dd\u30fc\u30c8\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3
-ReportHTML.writeNav.summary=\u30b1\u30fc\u30b9\u30b5\u30de\u30ea\u30fc
-ReportHTML.writeSum.title=\u30b1\u30fc\u30b9\u30b5\u30de\u30ea\u30fc
-ReportHTML.writeSum.caseName=\u30b1\u30fc\u30b9\uff1a
-ReportHTML.writeSum.caseNum=\u30b1\u30fc\u30b9\u756a\u53f7\uff1a
-ReportHTML.writeSum.examiner=\u8abf\u67fb\u62c5\u5f53\u8005\uff1a
-ReportHTML.writeSum.numImages=\u30a4\u30e1\u30fc\u30b8\u6570\uff1a
-ReportHTML.writeSum.path=\u30d1\u30b9\uff1a
-ReportHTML.writeIndex.noFrames.msg=\u4f7f\u7528\u3057\u3066\u3044\u308b\u30d6\u30e9\u30a6\u30b6\u306f\u5f0a\u793e\u306e\u30d5\u30ec\u30fc\u30e0\u30bb\u30c3\u30c8\u30a2\u30c3\u30d7\u3068\u306e\u4e92\u63db\u6027\u304c\u3042\u308a\u307e\u305b\u3093\u3002
-ReportHTML.writeIndex.noFrames.seeNav=\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u30ea\u30f3\u30af\u306f\u4e0b\u8a18\u306e\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u30da\u30fc\u30b8</a>\u3092\u3054\u89a7\u4e0b\u3055\u3044<a href\="nav.html">
-ReportHTML.writeIndex.seeSum=\u307e\u305f\u3001\u30b1\u30fc\u30b9\u30b5\u30de\u30ea\u30fc\u306f\u4e0b\u8a18\u306e\u30b5\u30de\u30ea\u30fc\u30da\u30fc\u30b8</a>\u3092\u3054\u89a7\u4e0b\u3055\u3044\u3002<a href\="summary.html">
-ReportHTML.writeSum.warningMsg=<span>\u8b66\u544a\u3001\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30b5\u30fc\u30d3\u30b9\u304c\u5b8c\u4e86\u3059\u308b\u524d\u306b\u30ec\u30dd\u30fc\u30c8\u304c\u5b9f\u884c\u3055\u308c\u307e\u3057\u305f\uff01</span>
-ReportHTML.writeSum.noExaminer=<i>\u8abf\u67fb\u62c5\u5f53\u8005\u7121\u3057</i>
-ReportHTML.writeSum.imageInfoHeading=<h2>\u30a4\u30e1\u30fc\u30b8\u60c5\u5831\uff1a</h2>
-ReportHTML.writeSum.timezone=\u30bf\u30a4\u30e0\u30be\u30fc\u30f3\uff1a
-ReportHTML.writeSum.reportGenOn.text={0}\u306bHTML\u30ec\u30dd\u30fc\u30c8\u306f\u751f\u6210\u3055\u308c\u307e\u3057\u305f
-ReportHTML.writeSum.noCaseNum=<i>\u30b1\u30fc\u30b9\u756a\u53f7\u304c\u3042\u308a\u307e\u305b\u3093</i>
-ReportKML.getDesc.text=\u95a2\u9023\u30d5\u30a1\u30a4\u30eb\u306e\u5ea7\u6a19\u3092\u542b\u3080KML\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u306e\u30ec\u30dd\u30fc\u30c8\u3002\u3053\u306e\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u306fGoogle Earth\u30d3\u30e5\u30fc\u306b\u4f7f\u7528\u3067\u304d\u307e\u3059\u3002
-ReportKML.getName.text=Google Earth/KML
-ReportKML.progress.loading=\u30d5\u30a1\u30a4\u30eb\u306e\u8aad\u307f\u8fbc\u307f\u4e2d\u2026
-ReportKML.progress.querying=\u30d5\u30a1\u30a4\u30eb\u306e\u30af\u30a8\u30ea\u3092\u5b9f\u884c\u4e2d\u2026
-ReportBodyFile.generateReport.srcModuleName.text=TSK\u30dc\u30c7\u30a3\u30d5\u30a1\u30a4\u30eb
-ReportExcel.endReport.srcModuleName.text=Excel\u30ec\u30dd\u30fc\u30c8
-ReportHTML.writeIndex.srcModuleName.text=HTML\u30ec\u30dd\u30fc\u30c8
-ReportKML.genReport.reportName=KML\u30ec\u30dd\u30fc\u30c8
-ReportKML.getFilePath.text=\u30ec\u30dd\u30fc\u30c8KML.kml
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/bodyfile/Bundle.properties b/Core/src/org/sleuthkit/autopsy/report/modules/bodyfile/Bundle.properties
new file mode 100755
index 0000000000..01de80c160
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/bodyfile/Bundle.properties
@@ -0,0 +1,8 @@
+ReportBodyFile.progress.querying=Querying files...
+ReportBodyFile.ingestWarning.text=Warning, this report was run before ingest services completed\!
+ReportBodyFile.progress.loading=Loading files...
+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
+ReportBodyFile.generateReport.srcModuleName.text=TSK Body File
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/bodyfile/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/report/modules/bodyfile/Bundle.properties-MERGED
new file mode 100755
index 0000000000..01de80c160
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/bodyfile/Bundle.properties-MERGED
@@ -0,0 +1,8 @@
+ReportBodyFile.progress.querying=Querying files...
+ReportBodyFile.ingestWarning.text=Warning, this report was run before ingest services completed\!
+ReportBodyFile.progress.loading=Loading files...
+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
+ReportBodyFile.generateReport.srcModuleName.text=TSK Body File
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/bodyfile/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/report/modules/bodyfile/Bundle_ja.properties
new file mode 100755
index 0000000000..4871aafb86
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/bodyfile/Bundle_ja.properties
@@ -0,0 +1,8 @@
+ReportBodyFile.progress.querying=\u30d5\u30a1\u30a4\u30eb\u306e\u30af\u30a8\u30ea\u3092\u5b9f\u884c\u4e2d\u2026
+ReportBodyFile.ingestWarning.text=\u8b66\u544a\u3001\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30b5\u30fc\u30d3\u30b9\u304c\u5b8c\u4e86\u3059\u308b\u524d\u306b\u30ec\u30dd\u30fc\u30c8\u304c\u5b9f\u884c\u3055\u308c\u307e\u3057\u305f\uff01
+ReportBodyFile.progress.loading=\u30d5\u30a1\u30a4\u30eb\u306e\u8aad\u307f\u8fbc\u307f\u4e2d\u2026
+ReportBodyFile.progress.processing={0}\u3092\u51e6\u7406\u4e2d\u2026
+ReportBodyFile.getName.text=TSK\u30dc\u30c7\u30a3\u30d5\u30a1\u30a4\u30eb
+ReportBodyFile.getDesc.text=\u5404\u30d5\u30a1\u30a4\u30eb\u306eMAC\u30bf\u30a4\u30e0\u3092\u542b\u3080\u3001\u30dc\u30c7\u30a3\u30d5\u30a1\u30a4\u30eb\u5f62\u5f0f\u30ec\u30dd\u30fc\u30c8\u3002\u30bf\u30a4\u30e0\u30e9\u30a4\u30f3\u30d3\u30e5\u30fc\u306b\u3053\u306e\u5f62\u5f0f\u3092\u4f7f\u7528\u3067\u304d\u307e\u3059\u3002
+ReportBodyFile.getFilePath.text=BodyFile.txt
+ReportBodyFile.generateReport.srcModuleName.text=TSK\u30dc\u30c7\u30a3\u30d5\u30a1\u30a4\u30eb
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/ReportBodyFile.java b/Core/src/org/sleuthkit/autopsy/report/modules/bodyfile/ReportBodyFile.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/report/modules/ReportBodyFile.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/bodyfile/ReportBodyFile.java
index 895031b312..de25f8b1b2 100644
--- a/Core/src/org/sleuthkit/autopsy/report/modules/ReportBodyFile.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/bodyfile/ReportBodyFile.java
@@ -20,7 +20,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report.modules;
+package org.sleuthkit.autopsy.report.modules.bodyfile;
 
 import org.sleuthkit.autopsy.report.GeneralReportModule;
 import java.io.BufferedWriter;
diff --git a/Core/src/org/sleuthkit/autopsy/report/caseuco/Bundle.properties b/Core/src/org/sleuthkit/autopsy/report/modules/caseuco/Bundle.properties
similarity index 100%
rename from Core/src/org/sleuthkit/autopsy/report/caseuco/Bundle.properties
rename to Core/src/org/sleuthkit/autopsy/report/modules/caseuco/Bundle.properties
diff --git a/Core/src/org/sleuthkit/autopsy/report/caseuco/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/report/modules/caseuco/Bundle.properties-MERGED
similarity index 100%
rename from Core/src/org/sleuthkit/autopsy/report/caseuco/Bundle.properties-MERGED
rename to Core/src/org/sleuthkit/autopsy/report/modules/caseuco/Bundle.properties-MERGED
diff --git a/Core/src/org/sleuthkit/autopsy/report/caseuco/CaseUcoFormatExporter.java b/Core/src/org/sleuthkit/autopsy/report/modules/caseuco/CaseUcoFormatExporter.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/report/caseuco/CaseUcoFormatExporter.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/caseuco/CaseUcoFormatExporter.java
index aae92dfb9c..ec20e8c977 100755
--- a/Core/src/org/sleuthkit/autopsy/report/caseuco/CaseUcoFormatExporter.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/caseuco/CaseUcoFormatExporter.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report.caseuco;
+package org.sleuthkit.autopsy.report.modules.caseuco;
 
 import com.fasterxml.jackson.core.JsonEncoding;
 import com.fasterxml.jackson.core.JsonFactory;
diff --git a/Core/src/org/sleuthkit/autopsy/report/caseuco/ReportCaseUco.java b/Core/src/org/sleuthkit/autopsy/report/modules/caseuco/ReportCaseUco.java
similarity index 98%
rename from Core/src/org/sleuthkit/autopsy/report/caseuco/ReportCaseUco.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/caseuco/ReportCaseUco.java
index 278dacb6cb..75ddc1a718 100755
--- a/Core/src/org/sleuthkit/autopsy/report/caseuco/ReportCaseUco.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/caseuco/ReportCaseUco.java
@@ -17,7 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report.caseuco;
+package org.sleuthkit.autopsy.report.modules.caseuco;
 
 import javax.swing.JPanel;
 import org.openide.util.NbBundle;
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/excel/Bundle.properties b/Core/src/org/sleuthkit/autopsy/report/modules/excel/Bundle.properties
new file mode 100755
index 0000000000..968355d84d
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/excel/Bundle.properties
@@ -0,0 +1,10 @@
+ReportExcel.numAartifacts.text=Number of artifacts:
+ReportExcel.getName.text=Excel Report
+ReportExcel.getDesc.text=A report about results and tagged items in Excel (XLS) format.
+ReportExcel.sheetName.text=Summary
+ReportExcel.cellVal.summary=Summary
+ReportExcel.cellVal.caseName=Case Name:
+ReportExcel.cellVal.caseNum=Case Number:
+ReportExcel.cellVal.examiner=Examiner:
+ReportExcel.cellVal.numImages=Number of Images:
+ReportExcel.endReport.srcModuleName.text=Excel Report
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/excel/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/report/modules/excel/Bundle.properties-MERGED
new file mode 100755
index 0000000000..abdc200271
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/excel/Bundle.properties-MERGED
@@ -0,0 +1,19 @@
+ReportExcel.exceptionMessage.dataTooLarge=Value is too long to fit into an Excel cell. 
+ReportExcel.exceptionMessage.errorText=Error showing data into an Excel cell.
+ReportExcel.numAartifacts.text=Number of artifacts:
+ReportExcel.getName.text=Excel Report
+ReportExcel.getDesc.text=A report about results and tagged items in Excel (XLS) format.
+ReportExcel.sheetName.text=Summary
+ReportExcel.cellVal.summary=Summary
+ReportExcel.cellVal.caseName=Case Name:
+ReportExcel.cellVal.caseNum=Case Number:
+ReportExcel.cellVal.examiner=Examiner:
+ReportExcel.cellVal.numImages=Number of Images:
+ReportExcel.endReport.srcModuleName.text=Excel Report
+ReportExcel.writeSummary.caseName=Case Name:
+ReportExcel.writeSummary.caseNotes=Case Notes:
+ReportExcel.writeSummary.caseNum=Case Number:
+ReportExcel.writeSummary.examiner=Examiner:
+ReportExcel.writeSummary.numImages=Number of Images:
+ReportExcel.writeSummary.sheetName=Summary
+ReportExcel.writeSummary.summary=Summary
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/excel/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/report/modules/excel/Bundle_ja.properties
new file mode 100755
index 0000000000..0c990dc024
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/excel/Bundle_ja.properties
@@ -0,0 +1,10 @@
+ReportExcel.numAartifacts.text=\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u6570\uff1a
+ReportExcel.getName.text=\u7d50\u679c - Excel
+ReportExcel.getDesc.text=\u7d50\u679c\u306b\u95a2\u3059\u308b\u30ec\u30dd\u30fc\u30c8\u3002Excel(XLS)\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u3067\u30a2\u30a4\u30c6\u30e0\u306e\u30bf\u30b0\u4ed8\u3051\u304c\u3055\u308c\u3066\u3044\u307e\u3059\u3002
+ReportExcel.sheetName.text=\u30b5\u30de\u30ea\u30fc
+ReportExcel.cellVal.summary=\u30b5\u30de\u30ea\u30fc
+ReportExcel.cellVal.caseName=\u30b1\u30fc\u30b9\u540d\uff1a
+ReportExcel.cellVal.caseNum=\u30b1\u30fc\u30b9\u756a\u53f7\uff1a
+ReportExcel.cellVal.examiner=\u8abf\u67fb\u62c5\u5f53\u8005\uff1a
+ReportExcel.cellVal.numImages=\u30a4\u30e1\u30fc\u30b8\u6570\uff1a
+ReportExcel.endReport.srcModuleName.text=Excel\u30ec\u30dd\u30fc\u30c8
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/ReportExcel.java b/Core/src/org/sleuthkit/autopsy/report/modules/excel/ReportExcel.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/report/modules/ReportExcel.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/excel/ReportExcel.java
index 51ba30736b..bab066680c 100644
--- a/Core/src/org/sleuthkit/autopsy/report/modules/ReportExcel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/excel/ReportExcel.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report.modules;
+package org.sleuthkit.autopsy.report.modules.excel;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/file/Bundle.properties b/Core/src/org/sleuthkit/autopsy/report/modules/file/Bundle.properties
new file mode 100755
index 0000000000..57faefb816
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/file/Bundle.properties
@@ -0,0 +1,21 @@
+# To change this license header, choose License Headers in Project Properties.
+# To change this template file, choose Tools | Templates
+# and open the template in the editor.
+
+ReportFileTextConfigurationPanel.tabDelimitedButton.text=Tab delimited
+ReportFileTextConfigurationPanel.commaDelimitedButton.text=Comma delimited
+FileReportText.getName.text=Files - Text
+FileReportText.getDesc.text=A delimited text file containing information about individual files in the case.
+FileReportDataTypes.filename.text=Name
+FileReportDataTypes.fileExt.text=File Extension
+FileReportDataTypes.fileType.text=File Type
+FileReportDataTypes.isDel.text=Is Deleted
+FileReportDataTypes.aTime.text=Last Accessed
+FileReportDataTypes.crTime.text=File Created
+FileReportDataTypes.mTime.text=Last Modified
+FileReportDataTypes.size.text=Size
+FileReportDataTypes.address.text=Address
+FileReportDataTypes.hash.text=Hash Value
+FileReportDataTypes.knownStatus.text=Known Status
+FileReportDataTypes.perms.text=Permissions
+FileReportDataTypes.path.text=Full Path
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/file/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/report/modules/file/Bundle.properties-MERGED
new file mode 100755
index 0000000000..57faefb816
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/file/Bundle.properties-MERGED
@@ -0,0 +1,21 @@
+# To change this license header, choose License Headers in Project Properties.
+# To change this template file, choose Tools | Templates
+# and open the template in the editor.
+
+ReportFileTextConfigurationPanel.tabDelimitedButton.text=Tab delimited
+ReportFileTextConfigurationPanel.commaDelimitedButton.text=Comma delimited
+FileReportText.getName.text=Files - Text
+FileReportText.getDesc.text=A delimited text file containing information about individual files in the case.
+FileReportDataTypes.filename.text=Name
+FileReportDataTypes.fileExt.text=File Extension
+FileReportDataTypes.fileType.text=File Type
+FileReportDataTypes.isDel.text=Is Deleted
+FileReportDataTypes.aTime.text=Last Accessed
+FileReportDataTypes.crTime.text=File Created
+FileReportDataTypes.mTime.text=Last Modified
+FileReportDataTypes.size.text=Size
+FileReportDataTypes.address.text=Address
+FileReportDataTypes.hash.text=Hash Value
+FileReportDataTypes.knownStatus.text=Known Status
+FileReportDataTypes.perms.text=Permissions
+FileReportDataTypes.path.text=Full Path
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/file/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/report/modules/file/Bundle_ja.properties
new file mode 100755
index 0000000000..7c692907e1
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/file/Bundle_ja.properties
@@ -0,0 +1,15 @@
+FileReportDataTypes.filename.text=\u540d\u524d
+FileReportDataTypes.fileExt.text=\u30d5\u30a1\u30a4\u30eb\u62e1\u5f35\u5b50
+FileReportDataTypes.fileType.text=\u30d5\u30a1\u30a4\u30eb\u30bf\u30a4\u30d7
+FileReportDataTypes.isDel.text=\u306f\u524a\u9664\u3055\u308c\u307e\u3057\u305f
+FileReportDataTypes.aTime.text=\u6700\u5f8c\u306e\u30a2\u30af\u30bb\u30b9
+FileReportDataTypes.crTime.text=\u4f5c\u6210\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb
+FileReportDataTypes.mTime.text=\u6700\u5f8c\u306e\u4fee\u6b63
+FileReportDataTypes.size.text=\u30b5\u30a4\u30ba
+FileReportDataTypes.address.text=\u30a2\u30c9\u30ec\u30b9
+FileReportDataTypes.hash.text=\u30cf\u30c3\u30b7\u30e5\u5024
+FileReportDataTypes.knownStatus.text=\u65e2\u77e5\u30b9\u30c6\u30fc\u30bf\u30b9
+FileReportDataTypes.perms.text=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3
+FileReportDataTypes.path.text=\u30d5\u30eb\u30d1\u30b9
+FileReportText.getName.text=\u30d5\u30a1\u30a4\u30eb - \u30c6\u30ad\u30b9\u30c8
+FileReportText.getDesc.text=\u30b1\u30fc\u30b9\u306e\u500b\u5225\u30d5\u30a1\u30a4\u30eb\u306b\u3064\u3044\u3066\u306e\u60c5\u5831\u3092\u6301\u3064\u3001\u30bf\u30d6\u533a\u5207\u308a\u30c6\u30ad\u30b9\u30c8\u30d5\u30a1\u30a4\u30eb\u3002
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/FileReportDataTypes.java b/Core/src/org/sleuthkit/autopsy/report/modules/file/FileReportDataTypes.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/report/modules/FileReportDataTypes.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/file/FileReportDataTypes.java
index 0aa67c3bdb..af6c2c2a61 100644
--- a/Core/src/org/sleuthkit/autopsy/report/modules/FileReportDataTypes.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/file/FileReportDataTypes.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report.modules;
+package org.sleuthkit.autopsy.report.modules.file;
 
 import org.openide.util.NbBundle;
 import org.sleuthkit.datamodel.AbstractFile;
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/FileReportModuleSettings.java b/Core/src/org/sleuthkit/autopsy/report/modules/file/FileReportModuleSettings.java
similarity index 96%
rename from Core/src/org/sleuthkit/autopsy/report/modules/FileReportModuleSettings.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/file/FileReportModuleSettings.java
index c09bdb82df..554cb5526b 100755
--- a/Core/src/org/sleuthkit/autopsy/report/modules/FileReportModuleSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/file/FileReportModuleSettings.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report.modules;
+package org.sleuthkit.autopsy.report.modules.file;
 
 import org.sleuthkit.autopsy.report.ReportModuleSettings;
 
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/FileReportText.java b/Core/src/org/sleuthkit/autopsy/report/modules/file/FileReportText.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/report/modules/FileReportText.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/file/FileReportText.java
index 390562f0b9..1048c74bfa 100644
--- a/Core/src/org/sleuthkit/autopsy/report/modules/FileReportText.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/file/FileReportText.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report.modules;
+package org.sleuthkit.autopsy.report.modules.file;
 
 import org.sleuthkit.autopsy.report.NoReportModuleSettings;
 import org.sleuthkit.autopsy.report.ReportModuleSettings;
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/ReportFileTextConfigurationPanel.form b/Core/src/org/sleuthkit/autopsy/report/modules/file/ReportFileTextConfigurationPanel.form
similarity index 90%
rename from Core/src/org/sleuthkit/autopsy/report/modules/ReportFileTextConfigurationPanel.form
rename to Core/src/org/sleuthkit/autopsy/report/modules/file/ReportFileTextConfigurationPanel.form
index 491bff6dc5..74cd26810e 100644
--- a/Core/src/org/sleuthkit/autopsy/report/modules/ReportFileTextConfigurationPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/file/ReportFileTextConfigurationPanel.form
@@ -50,7 +50,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/report/modules/Bundle.properties" key="ReportFileTextConfigurationPanel.tabDelimitedButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/file/Bundle.properties" key="ReportFileTextConfigurationPanel.tabDelimitedButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
@@ -60,7 +60,7 @@
           <ComponentRef name="delimiterGroup"/>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/Bundle.properties" key="ReportFileTextConfigurationPanel.commaDelimitedButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/file/Bundle.properties" key="ReportFileTextConfigurationPanel.commaDelimitedButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/ReportFileTextConfigurationPanel.java b/Core/src/org/sleuthkit/autopsy/report/modules/file/ReportFileTextConfigurationPanel.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/report/modules/ReportFileTextConfigurationPanel.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/file/ReportFileTextConfigurationPanel.java
index 65efe092ff..2593016b84 100644
--- a/Core/src/org/sleuthkit/autopsy/report/modules/ReportFileTextConfigurationPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/file/ReportFileTextConfigurationPanel.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report.modules;
+package org.sleuthkit.autopsy.report.modules.file;
 
 /**
  * Panel for configuring settings for the file text report
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/html/Bundle.properties b/Core/src/org/sleuthkit/autopsy/report/modules/html/Bundle.properties
new file mode 100755
index 0000000000..36d9a646b2
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/html/Bundle.properties
@@ -0,0 +1,35 @@
+# To change this license header, choose License Headers in Project Properties.
+# To change this template file, choose Tools | Templates
+# and open the template in the editor.
+
+ReportHTMLConfigurationPanel.headerLabel.text=Header:
+ReportHTMLConfigurationPanel.footerTextField.text=
+ReportHTMLConfigurationPanel.headerTextField.text=
+ReportHTMLConfigurationPanel.footerLabel.text=Footer:
+ReportHTML.addThumbRows.dataType.title=Tagged Images - {0}
+ReportHTML.addThumbRows.dataType.msg=Tagged Results and Contents that contain images.
+ReportHTML.thumbLink.tags=Tags:
+ReportHTML.getName.text=HTML Report
+ReportHTML.getDesc.text=A report about results and tagged items in HTML format.
+ReportHTML.writeIndex.title=for case {0}
+ReportHTML.writeIndex.noFrames.msg=Your browser is not compatible with our frame setup.
+ReportHTML.writeIndex.noFrames.seeNav=Please see <a href\="content\nav.html">the navigation page</a> for artifact links,
+ReportHTML.writeIndex.seeSum=and <a href\="content\summary.html">the summary page</a> for a case summary.
+ReportHTML.writeNav.title=Report Navigation
+ReportHTML.writeNav.h1=Report Navigation
+ReportHTML.writeNav.summary=Case Summary
+ReportHTML.writeSum.title=Case Summary
+ReportHTML.writeSum.warningMsg=<span>Warning, this report was run before ingest services completed\!</span>
+#
+# autopsy/test/scripts/regression.py._html_report_diff() uses reportGenOn.text, caseName, caseNum, 
+# examiner as a regex signature to skip report.html and summary.html
+#
+ReportHTML.writeSum.reportGenOn.text=HTML Report Generated on {0}
+ReportHTML.writeSum.imageInfoHeading=<h2>Image Information:</h2>
+ReportHTML.writeSum.softwareInfoHeading=<h2>Software Information:</h2>
+ReportHTML.writeSum.ingestHistoryHeading=<h2>Ingest History:</h2>
+ReportHTML.writeSum.modulesEnabledHeading=Enabled Modules:
+ReportHTML.writeSum.autopsyVersion=Autopsy Version:
+ReportHTML.writeSum.timezone=Timezone:
+ReportHTML.writeSum.path=Path:
+ReportHTML.writeIndex.srcModuleName.text=HTML Report
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/html/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/report/modules/html/Bundle.properties-MERGED
new file mode 100755
index 0000000000..0033acaaaa
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/html/Bundle.properties-MERGED
@@ -0,0 +1,40 @@
+# To change this license header, choose License Headers in Project Properties.
+# To change this template file, choose Tools | Templates
+# and open the template in the editor.
+
+ReportHTML.writeSum.case=Case:
+ReportHTML.writeSum.caseNotes=Notes:
+ReportHTML.writeSum.caseNumber=Case Number:
+ReportHTML.writeSum.caseNumImages=Number of Images:
+ReportHTML.writeSum.examiner=Examiner:
+ReportHTMLConfigurationPanel.headerLabel.text=Header:
+ReportHTMLConfigurationPanel.footerTextField.text=
+ReportHTMLConfigurationPanel.headerTextField.text=
+ReportHTMLConfigurationPanel.footerLabel.text=Footer:
+ReportHTML.addThumbRows.dataType.title=Tagged Images - {0}
+ReportHTML.addThumbRows.dataType.msg=Tagged Results and Contents that contain images.
+ReportHTML.thumbLink.tags=Tags:
+ReportHTML.getName.text=HTML Report
+ReportHTML.getDesc.text=A report about results and tagged items in HTML format.
+ReportHTML.writeIndex.title=for case {0}
+ReportHTML.writeIndex.noFrames.msg=Your browser is not compatible with our frame setup.
+ReportHTML.writeIndex.noFrames.seeNav=Please see <a href\="content\nav.html">the navigation page</a> for artifact links,
+ReportHTML.writeIndex.seeSum=and <a href\="content\summary.html">the summary page</a> for a case summary.
+ReportHTML.writeNav.title=Report Navigation
+ReportHTML.writeNav.h1=Report Navigation
+ReportHTML.writeNav.summary=Case Summary
+ReportHTML.writeSum.title=Case Summary
+ReportHTML.writeSum.warningMsg=<span>Warning, this report was run before ingest services completed\!</span>
+#
+# autopsy/test/scripts/regression.py._html_report_diff() uses reportGenOn.text, caseName, caseNum, 
+# examiner as a regex signature to skip report.html and summary.html
+#
+ReportHTML.writeSum.reportGenOn.text=HTML Report Generated on {0}
+ReportHTML.writeSum.imageInfoHeading=<h2>Image Information:</h2>
+ReportHTML.writeSum.softwareInfoHeading=<h2>Software Information:</h2>
+ReportHTML.writeSum.ingestHistoryHeading=<h2>Ingest History:</h2>
+ReportHTML.writeSum.modulesEnabledHeading=Enabled Modules:
+ReportHTML.writeSum.autopsyVersion=Autopsy Version:
+ReportHTML.writeSum.timezone=Timezone:
+ReportHTML.writeSum.path=Path:
+ReportHTML.writeIndex.srcModuleName.text=HTML Report
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/html/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/report/modules/html/Bundle_ja.properties
new file mode 100755
index 0000000000..50dfb93246
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/html/Bundle_ja.properties
@@ -0,0 +1,25 @@
+ReportHTML.addThumbRows.dataType.title=\u30bf\u30b0\u4ed8\u3051\u3055\u308c\u305f\u30a4\u30e1\u30fc\u30b8 - {0}
+ReportHTML.addThumbRows.dataType.msg=\u30a4\u30e1\u30fc\u30b8\u3092\u542b\u3080\u30bf\u30b0\u4ed8\u3051\u3055\u308c\u305f\u7d50\u679c\u304a\u3088\u3073\u30b3\u30f3\u30c6\u30f3\u30c4\u3002
+ReportHTML.thumbLink.tags=\u30bf\u30b0\uff1a
+ReportHTML.getName.text=\u7d50\u679c - HTML
+ReportHTML.getDesc.text=HTML\u5f62\u5f0f\u306e\u7d50\u679c\u304a\u3088\u3073\u30bf\u30b0\u4ed8\u3051\u3055\u308c\u305f\u30a2\u30a4\u30c6\u30e0\u306e\u30ec\u30dd\u30fc\u30c8
+ReportHTML.writeIndex.title=\u30b1\u30fc\u30b9{0}\u306eAutopsy\u30ec\u30dd\u30fc\u30c8
+ReportHTML.writeNav.title=\u30ec\u30dd\u30fc\u30c8\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3
+ReportHTML.writeNav.h1=\u30ec\u30dd\u30fc\u30c8\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3
+ReportHTML.writeNav.summary=\u30b1\u30fc\u30b9\u30b5\u30de\u30ea\u30fc
+ReportHTML.writeSum.title=\u30b1\u30fc\u30b9\u30b5\u30de\u30ea\u30fc
+ReportHTML.writeSum.caseName=\u30b1\u30fc\u30b9\uff1a
+ReportHTML.writeSum.caseNum=\u30b1\u30fc\u30b9\u756a\u53f7\uff1a
+ReportHTML.writeSum.examiner=\u8abf\u67fb\u62c5\u5f53\u8005\uff1a
+ReportHTML.writeSum.numImages=\u30a4\u30e1\u30fc\u30b8\u6570\uff1a
+ReportHTML.writeSum.path=\u30d1\u30b9\uff1a
+ReportHTML.writeIndex.noFrames.msg=\u4f7f\u7528\u3057\u3066\u3044\u308b\u30d6\u30e9\u30a6\u30b6\u306f\u5f0a\u793e\u306e\u30d5\u30ec\u30fc\u30e0\u30bb\u30c3\u30c8\u30a2\u30c3\u30d7\u3068\u306e\u4e92\u63db\u6027\u304c\u3042\u308a\u307e\u305b\u3093\u3002
+ReportHTML.writeIndex.noFrames.seeNav=\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u30ea\u30f3\u30af\u306f\u4e0b\u8a18\u306e\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u30da\u30fc\u30b8</a>\u3092\u3054\u89a7\u4e0b\u3055\u3044<a href\="nav.html">
+ReportHTML.writeIndex.seeSum=\u307e\u305f\u3001\u30b1\u30fc\u30b9\u30b5\u30de\u30ea\u30fc\u306f\u4e0b\u8a18\u306e\u30b5\u30de\u30ea\u30fc\u30da\u30fc\u30b8</a>\u3092\u3054\u89a7\u4e0b\u3055\u3044\u3002<a href\="summary.html">
+ReportHTML.writeSum.warningMsg=<span>\u8b66\u544a\u3001\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30b5\u30fc\u30d3\u30b9\u304c\u5b8c\u4e86\u3059\u308b\u524d\u306b\u30ec\u30dd\u30fc\u30c8\u304c\u5b9f\u884c\u3055\u308c\u307e\u3057\u305f\uff01</span>
+ReportHTML.writeSum.noExaminer=<i>\u8abf\u67fb\u62c5\u5f53\u8005\u7121\u3057</i>
+ReportHTML.writeSum.imageInfoHeading=<h2>\u30a4\u30e1\u30fc\u30b8\u60c5\u5831\uff1a</h2>
+ReportHTML.writeSum.timezone=\u30bf\u30a4\u30e0\u30be\u30fc\u30f3\uff1a
+ReportHTML.writeSum.reportGenOn.text={0}\u306bHTML\u30ec\u30dd\u30fc\u30c8\u306f\u751f\u6210\u3055\u308c\u307e\u3057\u305f
+ReportHTML.writeSum.noCaseNum=<i>\u30b1\u30fc\u30b9\u756a\u53f7\u304c\u3042\u308a\u307e\u305b\u3093</i>
+ReportHTML.writeIndex.srcModuleName.text=HTML\u30ec\u30dd\u30fc\u30c8
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/HTMLReportModuleSettings.java b/Core/src/org/sleuthkit/autopsy/report/modules/html/HTMLReportModuleSettings.java
similarity index 97%
rename from Core/src/org/sleuthkit/autopsy/report/modules/HTMLReportModuleSettings.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/html/HTMLReportModuleSettings.java
index 8da0536b2d..0d9726605c 100755
--- a/Core/src/org/sleuthkit/autopsy/report/modules/HTMLReportModuleSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/html/HTMLReportModuleSettings.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report.modules;
+package org.sleuthkit.autopsy.report.modules.html;
 
 import org.sleuthkit.autopsy.report.ReportModuleSettings;
 
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/ReportHTML.java b/Core/src/org/sleuthkit/autopsy/report/modules/html/ReportHTML.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/report/modules/ReportHTML.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/html/ReportHTML.java
index 9e18e8e2c7..fd94f7c37a 100644
--- a/Core/src/org/sleuthkit/autopsy/report/modules/ReportHTML.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/html/ReportHTML.java
@@ -20,7 +20,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report.modules;
+package org.sleuthkit.autopsy.report.modules.html;
 
 import org.sleuthkit.autopsy.report.NoReportModuleSettings;
 import org.sleuthkit.autopsy.report.ReportModuleSettings;
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/ReportHTMLConfigurationPanel.form b/Core/src/org/sleuthkit/autopsy/report/modules/html/ReportHTMLConfigurationPanel.form
similarity index 85%
rename from Core/src/org/sleuthkit/autopsy/report/modules/ReportHTMLConfigurationPanel.form
rename to Core/src/org/sleuthkit/autopsy/report/modules/html/ReportHTMLConfigurationPanel.form
index 518a86f75f..55feb16700 100755
--- a/Core/src/org/sleuthkit/autopsy/report/modules/ReportHTMLConfigurationPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/html/ReportHTMLConfigurationPanel.form
@@ -60,28 +60,28 @@
     <Component class="javax.swing.JLabel" name="headerLabel">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/Bundle.properties" key="ReportHTMLConfigurationPanel.headerLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/html/Bundle.properties" key="ReportHTMLConfigurationPanel.headerLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JLabel" name="footerLabel">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/Bundle.properties" key="ReportHTMLConfigurationPanel.footerLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/html/Bundle.properties" key="ReportHTMLConfigurationPanel.footerLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JTextField" name="headerTextField">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/Bundle.properties" key="ReportHTMLConfigurationPanel.headerTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/html/Bundle.properties" key="ReportHTMLConfigurationPanel.headerTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JTextField" name="footerTextField">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/Bundle.properties" key="ReportHTMLConfigurationPanel.footerTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/html/Bundle.properties" key="ReportHTMLConfigurationPanel.footerTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/ReportHTMLConfigurationPanel.java b/Core/src/org/sleuthkit/autopsy/report/modules/html/ReportHTMLConfigurationPanel.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/report/modules/ReportHTMLConfigurationPanel.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/html/ReportHTMLConfigurationPanel.java
index 9a0226969e..0ecd9c8dde 100755
--- a/Core/src/org/sleuthkit/autopsy/report/modules/ReportHTMLConfigurationPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/html/ReportHTMLConfigurationPanel.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report.modules;
+package org.sleuthkit.autopsy.report.modules.html;
 
 /**
  * The panel shown for all TableReportModules when configuring report modules.
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/kml/Bundle.properties b/Core/src/org/sleuthkit/autopsy/report/modules/kml/Bundle.properties
new file mode 100755
index 0000000000..c329b8ed7c
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/kml/Bundle.properties
@@ -0,0 +1,9 @@
+ReportKML.progress.querying=Querying files...
+ReportKML.progress.loading=Loading files...
+ReportKML.getName.text=Google Earth KML
+ReportKML.getDesc.text=KML format report with coordinates for relevant files. This format can be used for google earth views.
+ReportKML.getFilePath.text=ReportKML.kml:
+ReportKML.genReport.srcModuleName.text=Geospatial Data
+ReportKML.genReport.reportName=KML Report
+ReportKML.latLongStartPoint={0};{1};;{2} (Start)\n
+ReportKML.latLongEndPoint={0};{1};;{2} (End)\n
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/kml/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/report/modules/kml/Bundle.properties-MERGED
new file mode 100755
index 0000000000..c329b8ed7c
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/kml/Bundle.properties-MERGED
@@ -0,0 +1,9 @@
+ReportKML.progress.querying=Querying files...
+ReportKML.progress.loading=Loading files...
+ReportKML.getName.text=Google Earth KML
+ReportKML.getDesc.text=KML format report with coordinates for relevant files. This format can be used for google earth views.
+ReportKML.getFilePath.text=ReportKML.kml:
+ReportKML.genReport.srcModuleName.text=Geospatial Data
+ReportKML.genReport.reportName=KML Report
+ReportKML.latLongStartPoint={0};{1};;{2} (Start)\n
+ReportKML.latLongEndPoint={0};{1};;{2} (End)\n
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/kml/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/report/modules/kml/Bundle_ja.properties
new file mode 100755
index 0000000000..27048c26c1
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/kml/Bundle_ja.properties
@@ -0,0 +1,6 @@
+ReportKML.getDesc.text=\u95a2\u9023\u30d5\u30a1\u30a4\u30eb\u306e\u5ea7\u6a19\u3092\u542b\u3080KML\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u306e\u30ec\u30dd\u30fc\u30c8\u3002\u3053\u306e\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u306fGoogle Earth\u30d3\u30e5\u30fc\u306b\u4f7f\u7528\u3067\u304d\u307e\u3059\u3002
+ReportKML.getName.text=Google Earth/KML
+ReportKML.progress.loading=\u30d5\u30a1\u30a4\u30eb\u306e\u8aad\u307f\u8fbc\u307f\u4e2d\u2026
+ReportKML.progress.querying=\u30d5\u30a1\u30a4\u30eb\u306e\u30af\u30a8\u30ea\u3092\u5b9f\u884c\u4e2d\u2026
+ReportKML.genReport.reportName=KML\u30ec\u30dd\u30fc\u30c8
+ReportKML.getFilePath.text=\u30ec\u30dd\u30fc\u30c8KML.kml
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/ReportKML.java b/Core/src/org/sleuthkit/autopsy/report/modules/kml/ReportKML.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/report/modules/ReportKML.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/kml/ReportKML.java
index b7d4f4cdd3..ed4283718c 100644
--- a/Core/src/org/sleuthkit/autopsy/report/modules/ReportKML.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/kml/ReportKML.java
@@ -17,7 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report.modules;
+package org.sleuthkit.autopsy.report.modules.kml;
 
 import org.sleuthkit.autopsy.report.GeneralReportModule;
 import javax.swing.JPanel;
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/portablecase/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/report/modules/portablecase/Bundle.properties-MERGED
new file mode 100755
index 0000000000..86f2766b1c
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/portablecase/Bundle.properties-MERGED
@@ -0,0 +1,39 @@
+PortableCaseReportModule.compressCase.canceled=Compression canceled by user
+PortableCaseReportModule.compressCase.errorCompressingCase=Error compressing case
+# {0} - Temp folder path
+PortableCaseReportModule.compressCase.errorCreatingTempFolder=Could not create temporary folder {0}
+PortableCaseReportModule.compressCase.errorFinding7zip=Could not locate 7-Zip executable
+# {0} - File name
+PortableCaseReportModule.copyContentToPortableCase.copyingFile=Copying file {0}
+# {0} - case folder
+PortableCaseReportModule.createCase.caseDirExists=Case folder {0} already exists
+PortableCaseReportModule.createCase.errorCreatingCase=Error creating case
+# {0} - folder
+PortableCaseReportModule.createCase.errorCreatingFolder=Error creating folder {0}
+PortableCaseReportModule.createCase.errorStoringMaxIds=Error storing maximum database IDs
+PortableCaseReportModule.generateReport.caseClosed=Current case has been closed
+PortableCaseReportModule.generateReport.compressingCase=Compressing case...
+# {0} - tag name
+PortableCaseReportModule.generateReport.copyingArtifacts=Copying artifacts tagged as {0}...
+# {0} - tag name
+PortableCaseReportModule.generateReport.copyingFiles=Copying files tagged as {0}...
+PortableCaseReportModule.generateReport.copyingTags=Copying tags...
+PortableCaseReportModule.generateReport.creatingCase=Creating portable case database...
+PortableCaseReportModule.generateReport.errorCopyingArtifacts=Error copying tagged artifacts
+PortableCaseReportModule.generateReport.errorCopyingFiles=Error copying tagged files
+PortableCaseReportModule.generateReport.errorCopyingInterestingFiles=Error copying interesting files
+PortableCaseReportModule.generateReport.errorCopyingInterestingResults=Error copying interesting results
+PortableCaseReportModule.generateReport.errorCopyingTags=Error copying tags
+# {0} - attribute type name
+PortableCaseReportModule.generateReport.errorLookingUpAttrType=Error looking up attribute type {0}
+PortableCaseReportModule.generateReport.errorReadingSets=Error while reading interesting items sets from case database
+PortableCaseReportModule.generateReport.errorReadingTags=Error while reading tags from case database
+PortableCaseReportModule.generateReport.interestingItemError=Error loading intersting items
+PortableCaseReportModule.generateReport.noContentToCopy=No interesting files, results, or tagged items to copy
+# {0} - output folder
+PortableCaseReportModule.generateReport.outputDirDoesNotExist=Output folder {0} does not exist
+# {0} - output folder
+PortableCaseReportModule.generateReport.outputDirIsNotDir=Output folder {0} is not a folder
+PortableCaseReportModule.generateReport.verifying=Verifying selected parameters...
+PortableCaseReportModule.getDescription.description=Copies selected items to a new single-user case that can be easily shared
+PortableCaseReportModule.getName.name=Portable Case
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/PortableCaseReportModule.java b/Core/src/org/sleuthkit/autopsy/report/modules/portablecase/PortableCaseReportModule.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/report/modules/PortableCaseReportModule.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/portablecase/PortableCaseReportModule.java
index 3089f60ef0..c10edf49c1 100644
--- a/Core/src/org/sleuthkit/autopsy/report/modules/PortableCaseReportModule.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/portablecase/PortableCaseReportModule.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report.modules;
+package org.sleuthkit.autopsy.report.modules.portablecase;
 
 import org.sleuthkit.autopsy.report.ReportModule;
 import java.util.logging.Level;
@@ -43,7 +43,7 @@ import org.sleuthkit.autopsy.coreutils.PlatformUtil;
 import org.sleuthkit.autopsy.datamodel.ContentUtils;
 import org.sleuthkit.autopsy.coreutils.FileTypeUtils.FileTypeCategory;
 import org.sleuthkit.autopsy.report.ReportProgressPanel;
-import org.sleuthkit.autopsy.report.caseuco.CaseUcoFormatExporter;
+import org.sleuthkit.autopsy.report.modules.caseuco.CaseUcoFormatExporter;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.BlackboardArtifact;
 import org.sleuthkit.datamodel.BlackboardArtifactTag;
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/PortableCaseReportModuleSettings.java b/Core/src/org/sleuthkit/autopsy/report/modules/portablecase/PortableCaseReportModuleSettings.java
similarity index 98%
rename from Core/src/org/sleuthkit/autopsy/report/modules/PortableCaseReportModuleSettings.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/portablecase/PortableCaseReportModuleSettings.java
index 60dd96b84d..81252516ba 100755
--- a/Core/src/org/sleuthkit/autopsy/report/modules/PortableCaseReportModuleSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/portablecase/PortableCaseReportModuleSettings.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report.modules;
+package org.sleuthkit.autopsy.report.modules.portablecase;
 
 import org.sleuthkit.autopsy.report.ReportModuleSettings;
 import java.util.ArrayList;
diff --git a/Core/src/org/sleuthkit/autopsy/modules/stix/Bundle.properties b/Core/src/org/sleuthkit/autopsy/report/modules/stix/Bundle.properties
similarity index 100%
rename from Core/src/org/sleuthkit/autopsy/modules/stix/Bundle.properties
rename to Core/src/org/sleuthkit/autopsy/report/modules/stix/Bundle.properties
diff --git a/Core/src/org/sleuthkit/autopsy/modules/stix/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/report/modules/stix/Bundle.properties-MERGED
similarity index 100%
rename from Core/src/org/sleuthkit/autopsy/modules/stix/Bundle.properties-MERGED
rename to Core/src/org/sleuthkit/autopsy/report/modules/stix/Bundle.properties-MERGED
diff --git a/Core/src/org/sleuthkit/autopsy/modules/stix/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/report/modules/stix/Bundle_ja.properties
similarity index 100%
rename from Core/src/org/sleuthkit/autopsy/modules/stix/Bundle_ja.properties
rename to Core/src/org/sleuthkit/autopsy/report/modules/stix/Bundle_ja.properties
diff --git a/Core/src/org/sleuthkit/autopsy/modules/stix/EvalAccountObj.java b/Core/src/org/sleuthkit/autopsy/report/modules/stix/EvalAccountObj.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/modules/stix/EvalAccountObj.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/stix/EvalAccountObj.java
index 35bfd82eff..5d58f10388 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/stix/EvalAccountObj.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/stix/EvalAccountObj.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.modules.stix;
+package org.sleuthkit.autopsy.report.modules.stix;
 
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.datamodel.SleuthkitCase;
diff --git a/Core/src/org/sleuthkit/autopsy/modules/stix/EvalAddressObj.java b/Core/src/org/sleuthkit/autopsy/report/modules/stix/EvalAddressObj.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/modules/stix/EvalAddressObj.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/stix/EvalAddressObj.java
index b37f9dd304..e8ec9b3d79 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/stix/EvalAddressObj.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/stix/EvalAddressObj.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.modules.stix;
+package org.sleuthkit.autopsy.report.modules.stix;
 
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.datamodel.SleuthkitCase;
diff --git a/Core/src/org/sleuthkit/autopsy/modules/stix/EvalDomainObj.java b/Core/src/org/sleuthkit/autopsy/report/modules/stix/EvalDomainObj.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/modules/stix/EvalDomainObj.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/stix/EvalDomainObj.java
index e57ac8e067..203355c7d0 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/stix/EvalDomainObj.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/stix/EvalDomainObj.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.modules.stix;
+package org.sleuthkit.autopsy.report.modules.stix;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/Core/src/org/sleuthkit/autopsy/modules/stix/EvalEmailObj.java b/Core/src/org/sleuthkit/autopsy/report/modules/stix/EvalEmailObj.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/modules/stix/EvalEmailObj.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/stix/EvalEmailObj.java
index f15b96d12a..78344eb4de 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/stix/EvalEmailObj.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/stix/EvalEmailObj.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.modules.stix;
+package org.sleuthkit.autopsy.report.modules.stix;
 
 import org.sleuthkit.datamodel.BlackboardArtifact;
 import org.sleuthkit.datamodel.BlackboardAttribute;
diff --git a/Core/src/org/sleuthkit/autopsy/modules/stix/EvalFileObj.java b/Core/src/org/sleuthkit/autopsy/report/modules/stix/EvalFileObj.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/modules/stix/EvalFileObj.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/stix/EvalFileObj.java
index c5b3bae881..842cfe5efb 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/stix/EvalFileObj.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/stix/EvalFileObj.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.modules.stix;
+package org.sleuthkit.autopsy.report.modules.stix;
 
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.datamodel.SleuthkitCase;
diff --git a/Core/src/org/sleuthkit/autopsy/modules/stix/EvalNetworkShareObj.java b/Core/src/org/sleuthkit/autopsy/report/modules/stix/EvalNetworkShareObj.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/modules/stix/EvalNetworkShareObj.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/stix/EvalNetworkShareObj.java
index 7e6fa7c7b1..b145120eeb 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/stix/EvalNetworkShareObj.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/stix/EvalNetworkShareObj.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.modules.stix;
+package org.sleuthkit.autopsy.report.modules.stix;
 
 import java.util.ArrayList;
 import org.sleuthkit.autopsy.casemodule.Case;
diff --git a/Core/src/org/sleuthkit/autopsy/modules/stix/EvalRegistryObj.java b/Core/src/org/sleuthkit/autopsy/report/modules/stix/EvalRegistryObj.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/modules/stix/EvalRegistryObj.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/stix/EvalRegistryObj.java
index 8c41b87042..8cf6e522f6 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/stix/EvalRegistryObj.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/stix/EvalRegistryObj.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.modules.stix;
+package org.sleuthkit.autopsy.report.modules.stix;
 
 import com.williballenthin.rejistry.RegistryHiveFile;
 import com.williballenthin.rejistry.RegistryKey;
diff --git a/Core/src/org/sleuthkit/autopsy/modules/stix/EvalSystemObj.java b/Core/src/org/sleuthkit/autopsy/report/modules/stix/EvalSystemObj.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/modules/stix/EvalSystemObj.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/stix/EvalSystemObj.java
index 73a7b1449f..956f82fa02 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/stix/EvalSystemObj.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/stix/EvalSystemObj.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.modules.stix;
+package org.sleuthkit.autopsy.report.modules.stix;
 
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.datamodel.SleuthkitCase;
diff --git a/Core/src/org/sleuthkit/autopsy/modules/stix/EvalURIObj.java b/Core/src/org/sleuthkit/autopsy/report/modules/stix/EvalURIObj.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/modules/stix/EvalURIObj.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/stix/EvalURIObj.java
index 0c0ddb6971..49aa3f2e48 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/stix/EvalURIObj.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/stix/EvalURIObj.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.modules.stix;
+package org.sleuthkit.autopsy.report.modules.stix;
 
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.datamodel.SleuthkitCase;
diff --git a/Core/src/org/sleuthkit/autopsy/modules/stix/EvalURLHistoryObj.java b/Core/src/org/sleuthkit/autopsy/report/modules/stix/EvalURLHistoryObj.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/modules/stix/EvalURLHistoryObj.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/stix/EvalURLHistoryObj.java
index 5cf0b28213..d952761e23 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/stix/EvalURLHistoryObj.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/stix/EvalURLHistoryObj.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.modules.stix;
+package org.sleuthkit.autopsy.report.modules.stix;
 
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.datamodel.SleuthkitCase;
diff --git a/Core/src/org/sleuthkit/autopsy/modules/stix/EvaluatableObject.java b/Core/src/org/sleuthkit/autopsy/report/modules/stix/EvaluatableObject.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/modules/stix/EvaluatableObject.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/stix/EvaluatableObject.java
index 1fd7a7bed1..2f48c65ac5 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/stix/EvaluatableObject.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/stix/EvaluatableObject.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.modules.stix;
+package org.sleuthkit.autopsy.report.modules.stix;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/Core/src/org/sleuthkit/autopsy/modules/stix/ObservableResult.java b/Core/src/org/sleuthkit/autopsy/report/modules/stix/ObservableResult.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/modules/stix/ObservableResult.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/stix/ObservableResult.java
index a0570ee415..ecfc179e90 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/stix/ObservableResult.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/stix/ObservableResult.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.modules.stix;
+package org.sleuthkit.autopsy.report.modules.stix;
 
 import java.util.List;
 import java.util.ArrayList;
diff --git a/Core/src/org/sleuthkit/autopsy/modules/stix/STIXReportModule.java b/Core/src/org/sleuthkit/autopsy/report/modules/stix/STIXReportModule.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/modules/stix/STIXReportModule.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/stix/STIXReportModule.java
index 75334d55d7..06ebacd550 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/stix/STIXReportModule.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/stix/STIXReportModule.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.modules.stix;
+package org.sleuthkit.autopsy.report.modules.stix;
 
 import java.io.BufferedWriter;
 import java.io.File;
diff --git a/Core/src/org/sleuthkit/autopsy/modules/stix/STIXReportModuleConfigPanel.form b/Core/src/org/sleuthkit/autopsy/report/modules/stix/STIXReportModuleConfigPanel.form
similarity index 84%
rename from Core/src/org/sleuthkit/autopsy/modules/stix/STIXReportModuleConfigPanel.form
rename to Core/src/org/sleuthkit/autopsy/report/modules/stix/STIXReportModuleConfigPanel.form
index a75ce772f4..d65bb2be2e 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/stix/STIXReportModuleConfigPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/stix/STIXReportModuleConfigPanel.form
@@ -52,7 +52,7 @@
     <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/modules/stix/Bundle.properties" key="STIXReportModuleConfigPanel.jLabel2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/stix/Bundle.properties" key="STIXReportModuleConfigPanel.jLabel2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <AuxValues>
@@ -62,7 +62,7 @@
     <Component class="javax.swing.JTextField" name="jStixFileTextField">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/modules/stix/Bundle.properties" key="STIXReportModuleConfigPanel.jStixFileTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/stix/Bundle.properties" key="STIXReportModuleConfigPanel.jStixFileTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -74,7 +74,7 @@
     <Component class="javax.swing.JButton" name="jButton1">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/modules/stix/Bundle.properties" key="STIXReportModuleConfigPanel.jButton1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/stix/Bundle.properties" key="STIXReportModuleConfigPanel.jButton1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -87,7 +87,7 @@
     <Component class="javax.swing.JCheckBox" name="jCheckBox1">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/modules/stix/Bundle.properties" key="STIXReportModuleConfigPanel.jCheckBox1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/stix/Bundle.properties" key="STIXReportModuleConfigPanel.jCheckBox1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
diff --git a/Core/src/org/sleuthkit/autopsy/modules/stix/STIXReportModuleConfigPanel.java b/Core/src/org/sleuthkit/autopsy/report/modules/stix/STIXReportModuleConfigPanel.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/modules/stix/STIXReportModuleConfigPanel.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/stix/STIXReportModuleConfigPanel.java
index acf3dd6664..5a7d5b9b35 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/stix/STIXReportModuleConfigPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/stix/STIXReportModuleConfigPanel.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.modules.stix;
+package org.sleuthkit.autopsy.report.modules.stix;
 
 import java.io.File;
 import javax.swing.JFileChooser;
diff --git a/Core/src/org/sleuthkit/autopsy/modules/stix/STIXReportModuleSettings.java b/Core/src/org/sleuthkit/autopsy/report/modules/stix/STIXReportModuleSettings.java
similarity index 96%
rename from Core/src/org/sleuthkit/autopsy/modules/stix/STIXReportModuleSettings.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/stix/STIXReportModuleSettings.java
index e545aca81a..25ade99380 100755
--- a/Core/src/org/sleuthkit/autopsy/modules/stix/STIXReportModuleSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/stix/STIXReportModuleSettings.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.modules.stix;
+package org.sleuthkit.autopsy.report.modules.stix;
 
 import org.sleuthkit.autopsy.report.ReportModuleSettings;
 
diff --git a/Core/src/org/sleuthkit/autopsy/modules/stix/StixArtifactData.java b/Core/src/org/sleuthkit/autopsy/report/modules/stix/StixArtifactData.java
similarity index 98%
rename from Core/src/org/sleuthkit/autopsy/modules/stix/StixArtifactData.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/stix/StixArtifactData.java
index 3cc86a0187..86f9788033 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/stix/StixArtifactData.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/stix/StixArtifactData.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.modules.stix;
+package org.sleuthkit.autopsy.report.modules.stix;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDb.java b/Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/AddTaggedHashesToHashDb.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDb.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/AddTaggedHashesToHashDb.java
index b6b85e7425..c7f0ada710 100644
--- a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDb.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/AddTaggedHashesToHashDb.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report.taggedhashes;
+package org.sleuthkit.autopsy.report.modules.taggedhashes;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.form b/Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/AddTaggedHashesToHashDbConfigPanel.form
similarity index 84%
rename from Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.form
rename to Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/AddTaggedHashesToHashDbConfigPanel.form
index d2bda3b577..eb4e1827ab 100644
--- a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/AddTaggedHashesToHashDbConfigPanel.form
@@ -95,7 +95,7 @@
     <Component class="javax.swing.JButton" name="selectAllButton">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/taggedhashes/Bundle.properties" key="AddTaggedHashesToHashDbConfigPanel.selectAllButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/taggedhashes/Bundle.properties" key="AddTaggedHashesToHashDbConfigPanel.selectAllButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -105,7 +105,7 @@
     <Component class="javax.swing.JButton" name="deselectAllButton">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/taggedhashes/Bundle.properties" key="AddTaggedHashesToHashDbConfigPanel.deselectAllButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/taggedhashes/Bundle.properties" key="AddTaggedHashesToHashDbConfigPanel.deselectAllButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -115,7 +115,7 @@
     <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/report/taggedhashes/Bundle.properties" key="AddTaggedHashesToHashDbConfigPanel.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/taggedhashes/Bundle.properties" key="AddTaggedHashesToHashDbConfigPanel.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
@@ -135,7 +135,7 @@
     <Component class="javax.swing.JButton" name="configureHashDatabasesButton">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/taggedhashes/Bundle.properties" key="AddTaggedHashesToHashDbConfigPanel.configureHashDatabasesButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/taggedhashes/Bundle.properties" key="AddTaggedHashesToHashDbConfigPanel.configureHashDatabasesButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -145,14 +145,14 @@
     <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/report/taggedhashes/Bundle.properties" key="AddTaggedHashesToHashDbConfigPanel.jLabel2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/taggedhashes/Bundle.properties" key="AddTaggedHashesToHashDbConfigPanel.jLabel2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JCheckBox" name="jAllTagsCheckBox">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/taggedhashes/Bundle.properties" key="AddTaggedHashesToHashDbConfigPanel.jAllTagsCheckBox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/taggedhashes/Bundle.properties" key="AddTaggedHashesToHashDbConfigPanel.jAllTagsCheckBox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
diff --git a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java b/Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java
index c7346b0515..a74d01f672 100644
--- a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report.taggedhashes;
+package org.sleuthkit.autopsy.report.modules.taggedhashes;
 
 import java.awt.Component;
 import java.awt.event.ItemEvent;
diff --git a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/Bundle.properties b/Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/Bundle.properties
similarity index 100%
rename from Core/src/org/sleuthkit/autopsy/report/taggedhashes/Bundle.properties
rename to Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/Bundle.properties
diff --git a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/Bundle.properties-MERGED
similarity index 100%
rename from Core/src/org/sleuthkit/autopsy/report/taggedhashes/Bundle.properties-MERGED
rename to Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/Bundle.properties-MERGED
diff --git a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/HashesReportModuleSettings.java b/Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/HashesReportModuleSettings.java
similarity index 97%
rename from Core/src/org/sleuthkit/autopsy/report/taggedhashes/HashesReportModuleSettings.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/HashesReportModuleSettings.java
index f43dfebf10..097e141ee3 100755
--- a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/HashesReportModuleSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/HashesReportModuleSettings.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report.taggedhashes;
+package org.sleuthkit.autopsy.report.modules.taggedhashes;
 
 import org.sleuthkit.autopsy.modules.hashdatabase.HashDbManager.HashDb;
 import org.sleuthkit.autopsy.report.ReportModuleSettings;

From d1b3e0e6d035b0363cefa06a6924cbe784948f97 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Fri, 6 Sep 2019 09:07:06 -0400
Subject: [PATCH 103/192] Fixed a bug in tagged hashes UI panel

---
 .../taggedhashes/AddTaggedHashesToHashDbConfigPanel.java      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java b/Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java
index a74d01f672..7fc1ab8c54 100644
--- a/Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java
@@ -78,6 +78,10 @@ class AddTaggedHashesToHashDbConfigPanel extends javax.swing.JPanel {
     }
     
     void setConfiguration(HashesReportModuleSettings settings) {
+        // reload tags list. user could have opened a differet case 
+        // or there could be no case open (e.g. Command Line report wizard) 
+        customizeComponents();
+        
         // update tag selection
         jAllTagsCheckBox.setSelected(settings.isExportAllTags());
         

From 24fe6e35bb78f151b133853c1f56048c55579466 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Fri, 6 Sep 2019 11:32:04 -0400
Subject: [PATCH 104/192] Fixed a bug in tagged hashes UI panel

---
 .../AddTaggedHashesToHashDbConfigPanel.java     | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java b/Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java
index 7fc1ab8c54..ef7389cc26 100644
--- a/Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java
@@ -53,15 +53,15 @@ class AddTaggedHashesToHashDbConfigPanel extends javax.swing.JPanel {
 
     private static final long serialVersionUID = 1L;
     private List<TagName> tagNames;
-    private final Map<String, Boolean> tagNameSelections = new LinkedHashMap<>();
-    private final TagNamesListModel tagsNamesListModel = new TagNamesListModel();
-    private final TagsNamesListCellRenderer tagsNamesRenderer = new TagsNamesListCellRenderer();
+    private Map<String, Boolean> tagNameSelections = new LinkedHashMap<>();
+    private TagNamesListModel tagsNamesListModel = new TagNamesListModel();
+    private TagsNamesListCellRenderer tagsNamesRenderer = new TagsNamesListCellRenderer();
     private HashDb selectedHashSet = null;
 
     AddTaggedHashesToHashDbConfigPanel() {
         initComponents();
         customizeComponents();
-        
+              
         this.jAllTagsCheckBox.addItemListener(new ItemListener() {
             @Override
             public void itemStateChanged(ItemEvent e) {
@@ -78,8 +78,8 @@ class AddTaggedHashesToHashDbConfigPanel extends javax.swing.JPanel {
     }
     
     void setConfiguration(HashesReportModuleSettings settings) {
-        // reload tags list. user could have opened a differet case 
-        // or there could be no case open (e.g. Command Line report wizard) 
+        // Need to reset tags. User may have opened a different case or
+        // there may not be a case open any more (Command Line wizard).
         customizeComponents();
         
         // update tag selection
@@ -93,6 +93,9 @@ class AddTaggedHashesToHashDbConfigPanel extends javax.swing.JPanel {
     }
 
     private void customizeComponents() {
+        tagNameSelections = new LinkedHashMap<>();
+        tagsNamesListModel = new TagNamesListModel();
+        tagsNamesRenderer = new TagsNamesListCellRenderer();
         populateTagNameComponents();
         populateHashSetComponents();
     }
@@ -116,7 +119,7 @@ class AddTaggedHashesToHashDbConfigPanel extends javax.swing.JPanel {
         for (TagName tagName : tagNames) {
             tagNameSelections.put(tagName.getDisplayName(), Boolean.FALSE);
         }
-
+        
         // Set up the tag names JList component to be a collection of check boxes
         // for selecting tag names. The mouse click listener updates tagNameSelections
         // to reflect user choices.

From 0c68f4aa3db8383e3dbf65db8eda71ae270aa028 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Fri, 6 Sep 2019 12:01:57 -0400
Subject: [PATCH 105/192] Fixed a bug in portable case UI panels

---
 ...PortableCaseInterestingItemsListPanel.java | 49 +++++++++++--------
 .../PortableCaseTagsListPanel.java            | 31 +++++++-----
 .../infrastructure/ReportVisualPanel2.java    |  3 +-
 .../infrastructure/ReportWizardIterator.java  |  7 +--
 .../ReportWizardPortableCaseOptionsPanel.java |  6 ++-
 ...tWizardPortableCaseOptionsVisualPanel.java |  8 +--
 6 files changed, 60 insertions(+), 44 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseInterestingItemsListPanel.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseInterestingItemsListPanel.java
index e4d9f319b9..a85a576523 100644
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseInterestingItemsListPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseInterestingItemsListPanel.java
@@ -60,12 +60,14 @@ class PortableCaseInterestingItemsListPanel extends javax.swing.JPanel {
     
     private final ReportWizardPortableCaseOptionsPanel wizPanel;
     private final PortableCaseReportModuleSettings settings;
+    private final boolean useCaseSpecificData;
     
     /**
      * Creates new form PortableCaseListPanel
      */
-    PortableCaseInterestingItemsListPanel(ReportWizardPortableCaseOptionsPanel wizPanel, PortableCaseReportModuleSettings options) {
+    PortableCaseInterestingItemsListPanel(ReportWizardPortableCaseOptionsPanel wizPanel, PortableCaseReportModuleSettings options, boolean useCaseSpecificData) {
         this.wizPanel = wizPanel;
+        this.useCaseSpecificData = useCaseSpecificData;
         this.settings = options;
         initComponents();
         customizeComponents();
@@ -98,26 +100,31 @@ class PortableCaseInterestingItemsListPanel extends javax.swing.JPanel {
         // Get the set names in use for the current case.
         setNames = new ArrayList<>();
         setCounts = new HashMap<>();
-        try {
-            // There may not be a case open when configuring report modules for Command Line execution
-            // Get all SET_NAMEs from interesting item artifacts
-            String innerSelect = "SELECT (value_text) AS set_name FROM blackboard_attributes WHERE (artifact_type_id = '" + 
-                    BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT.getTypeID() + "' OR artifact_type_id = '" +
-                    BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT.getTypeID() + "') AND attribute_type_id = '" + 
-                    BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME.getTypeID() + "'"; // NON-NLS
-            
-            // Get the count of each SET_NAME
-            String query = "set_name, count(1) AS set_count FROM (" + innerSelect + ") set_names GROUP BY set_name"; // NON-NLS
-            
-            GetInterestingItemSetNamesCallback callback = new GetInterestingItemSetNamesCallback();
-            Case.getCurrentCaseThrows().getSleuthkitCase().getCaseDbAccessManager().select(query, callback);
-            setCounts = callback.getSetCountMap();
-            setNames.addAll(setCounts.keySet());
-        } catch (TskCoreException ex) {
-            Logger.getLogger(ReportWizardPortableCaseOptionsVisualPanel.class.getName()).log(Level.SEVERE, "Failed to get interesting item set names", ex); // NON-NLS
-        } catch (NoCurrentCaseException ex) {
-            // There may not be a case open when configuring report modules for Command Line execution
-            Logger.getLogger(ReportWizardPortableCaseOptionsVisualPanel.class.getName()).log(Level.WARNING, "Exception while getting open case.", ex); // NON-NLS
+        
+        // only try to load tag names if we are displaying case specific data, otherwise
+        // we will be displaying case specific data in command line wizard if there is 
+        // a case open in the background
+        if (useCaseSpecificData) {
+            try {
+                // Get all SET_NAMEs from interesting item artifacts
+                String innerSelect = "SELECT (value_text) AS set_name FROM blackboard_attributes WHERE (artifact_type_id = '"
+                        + BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT.getTypeID() + "' OR artifact_type_id = '"
+                        + BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT.getTypeID() + "') AND attribute_type_id = '"
+                        + BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME.getTypeID() + "'"; // NON-NLS
+
+                // Get the count of each SET_NAME
+                String query = "set_name, count(1) AS set_count FROM (" + innerSelect + ") set_names GROUP BY set_name"; // NON-NLS
+
+                GetInterestingItemSetNamesCallback callback = new GetInterestingItemSetNamesCallback();
+                Case.getCurrentCaseThrows().getSleuthkitCase().getCaseDbAccessManager().select(query, callback);
+                setCounts = callback.getSetCountMap();
+                setNames.addAll(setCounts.keySet());
+            } catch (TskCoreException ex) {
+                Logger.getLogger(ReportWizardPortableCaseOptionsVisualPanel.class.getName()).log(Level.SEVERE, "Failed to get interesting item set names", ex); // NON-NLS
+            } catch (NoCurrentCaseException ex) {
+                // There may not be a case open when configuring report modules for Command Line execution
+                Logger.getLogger(ReportWizardPortableCaseOptionsVisualPanel.class.getName()).log(Level.WARNING, "Exception while getting open case.", ex); // NON-NLS
+            }
         }
         Collections.sort(setNames);
 
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseTagsListPanel.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseTagsListPanel.java
index cb6f37c7a2..97fa45f13f 100644
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseTagsListPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseTagsListPanel.java
@@ -60,12 +60,14 @@ class PortableCaseTagsListPanel extends javax.swing.JPanel {
     
     private final ReportWizardPortableCaseOptionsPanel wizPanel;
     private final PortableCaseReportModuleSettings settings;
+    private final boolean useCaseSpecificData;
     
     /**
      * Creates new form PortableCaseListPanel
      */
-    PortableCaseTagsListPanel(ReportWizardPortableCaseOptionsPanel wizPanel, PortableCaseReportModuleSettings options) {
+    PortableCaseTagsListPanel(ReportWizardPortableCaseOptionsPanel wizPanel, PortableCaseReportModuleSettings options, boolean useCaseSpecificData) {
         this.wizPanel = wizPanel;
+        this.useCaseSpecificData = useCaseSpecificData;
         this.settings = options;
         initComponents();
         customizeComponents();
@@ -95,18 +97,23 @@ class PortableCaseTagsListPanel extends javax.swing.JPanel {
     private void customizeComponents() {
         // Get the tag names in use for the current case.
         tagNames = new ArrayList<>();
+        Map<Long, Long> tagCountsByID = new HashMap<>();
         try {
-            // There may not be a case open when configuring report modules for Command Line execution
-            tagNames = Case.getCurrentCaseThrows().getServices().getTagsManager().getTagNamesInUse();
-      
-            // Get the counts for each tag ID
-            String query = "tag_name_id, count(1) AS tag_count " + 
-                        "FROM (" + 
-                        "SELECT tag_name_id FROM content_tags UNION ALL SELECT tag_name_id FROM blackboard_artifact_tags" + 
-                        ") tag_ids GROUP BY tag_name_id"; // NON-NLS
-            GetTagCountsCallback callback = new GetTagCountsCallback();
-            Case.getCurrentCaseThrows().getSleuthkitCase().getCaseDbAccessManager().select(query, callback);
-            Map<Long, Long> tagCountsByID = callback.getTagCountMap();        
+            // only try to load tag names if we are displaying case specific data, otherwise
+            // we will be displaying case specific data in command line wizard if there is 
+            // a case open in the background
+            if (useCaseSpecificData) {
+                tagNames = Case.getCurrentCaseThrows().getServices().getTagsManager().getTagNamesInUse();
+
+                // Get the counts for each tag ID
+                String query = "tag_name_id, count(1) AS tag_count "
+                        + "FROM ("
+                        + "SELECT tag_name_id FROM content_tags UNION ALL SELECT tag_name_id FROM blackboard_artifact_tags"
+                        + ") tag_ids GROUP BY tag_name_id"; // NON-NLS
+                GetTagCountsCallback callback = new GetTagCountsCallback();
+                Case.getCurrentCaseThrows().getSleuthkitCase().getCaseDbAccessManager().select(query, callback);
+                tagCountsByID = callback.getTagCountMap();
+            }
 
             // Mark the tag names as unselected. Note that tagNameSelections is a
             // LinkedHashMap so that order is preserved and the tagNames and tagNameSelections
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel2.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel2.java
index aa5c2ed59f..e34098bf10 100644
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel2.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel2.java
@@ -146,7 +146,8 @@ final class ReportVisualPanel2 extends JPanel {
         // by user. We should read tag names from the database each time.
         try {
             // only try to load tag names if we are displaying case specific data, otherwise
-            // there may not be a case open.
+            // we will be displaying case specific data in command line wizard if there is 
+            // a case open in the background
             if (useCaseSpecificData) {
                 // get tags and artifact types from current case
                 tagNamesInUse = Case.getCurrentCaseThrows().getServices().getTagsManager().getTagNamesInUse();
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardIterator.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardIterator.java
index d5b86e69ca..d39db13392 100644
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardIterator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardIterator.java
@@ -18,9 +18,6 @@
  */
 package org.sleuthkit.autopsy.report.infrastructure;
 
-import org.sleuthkit.autopsy.report.infrastructure.ReportingConfigLoader;
-import org.sleuthkit.autopsy.report.infrastructure.ReportConfigException;
-import org.sleuthkit.autopsy.report.infrastructure.ReportingConfig;
 import java.awt.Component;
 import java.util.Arrays;
 import java.util.List;
@@ -74,12 +71,12 @@ final class ReportWizardIterator implements WizardDescriptor.Iterator<WizardDesc
             firstPanel = new ReportWizardPanel1(config.getModuleConfigs());
             tableConfigPanel = new ReportWizardPanel2(useCaseSpecificData, config.getTableReportSettings());
             fileConfigPanel = new ReportWizardFileOptionsPanel(config.getFileReportSettings());
-            portableCaseConfigPanel = new ReportWizardPortableCaseOptionsPanel(config.getModuleConfigs());
+            portableCaseConfigPanel = new ReportWizardPortableCaseOptionsPanel(config.getModuleConfigs(), useCaseSpecificData);
         } else {
             firstPanel = new ReportWizardPanel1(null);
             tableConfigPanel = new ReportWizardPanel2(useCaseSpecificData, null);
             fileConfigPanel = new ReportWizardFileOptionsPanel(null);
-            portableCaseConfigPanel = new ReportWizardPortableCaseOptionsPanel(null);
+            portableCaseConfigPanel = new ReportWizardPortableCaseOptionsPanel(null, useCaseSpecificData);
         }
 
         allConfigPanels = new WizardDescriptor.Panel[]{firstPanel, tableConfigPanel, fileConfigPanel, portableCaseConfigPanel};
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPortableCaseOptionsPanel.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPortableCaseOptionsPanel.java
index f0263566e3..a9cca52a25 100644
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPortableCaseOptionsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPortableCaseOptionsPanel.java
@@ -37,9 +37,11 @@ class ReportWizardPortableCaseOptionsPanel implements WizardDescriptor.Finishabl
     private ReportWizardPortableCaseOptionsVisualPanel component;
     private final JButton finishButton;
     private Map<String, ReportModuleConfig> moduleConfigs;
+    private final boolean useCaseSpecificData;
 
-    ReportWizardPortableCaseOptionsPanel(Map<String, ReportModuleConfig> moduleConfigs) {
+    ReportWizardPortableCaseOptionsPanel(Map<String, ReportModuleConfig> moduleConfigs, boolean useCaseSpecificData) {
         this.moduleConfigs = moduleConfigs;
+        this.useCaseSpecificData = useCaseSpecificData;
         finishButton = new JButton(
                 NbBundle.getMessage(this.getClass(), "ReportWizardFileOptionsPanel.finishButton.text"));
         finishButton.setEnabled(false);
@@ -69,7 +71,7 @@ class ReportWizardPortableCaseOptionsPanel implements WizardDescriptor.Finishabl
     @Override
     public ReportWizardPortableCaseOptionsVisualPanel getComponent() {
         if (component == null) {
-            component = new ReportWizardPortableCaseOptionsVisualPanel(this, moduleConfigs);
+            component = new ReportWizardPortableCaseOptionsVisualPanel(this, moduleConfigs, useCaseSpecificData);
         }
         return component;
     }
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPortableCaseOptionsVisualPanel.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPortableCaseOptionsVisualPanel.java
index 7e1bc02332..72ffd4b8de 100644
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPortableCaseOptionsVisualPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPortableCaseOptionsVisualPanel.java
@@ -36,12 +36,14 @@ class ReportWizardPortableCaseOptionsVisualPanel extends javax.swing.JPanel {
     private final ReportWizardPortableCaseOptionsPanel wizPanel;
     private PortableCaseReportModuleSettings settings = null;
     private Map<String, ReportModuleConfig> moduleConfigs;
+    private final boolean useCaseSpecificData;
     
     /**
      * Creates new form ReportWizardPortableCaseOptionsVisualPanel
      */
-    ReportWizardPortableCaseOptionsVisualPanel(ReportWizardPortableCaseOptionsPanel wizPanel, Map<String, ReportModuleConfig> moduleConfigs) {
+    ReportWizardPortableCaseOptionsVisualPanel(ReportWizardPortableCaseOptionsPanel wizPanel, Map<String, ReportModuleConfig> moduleConfigs, boolean useCaseSpecificData) {
         this.wizPanel = wizPanel;
+        this.useCaseSpecificData = useCaseSpecificData;
         this.moduleConfigs = moduleConfigs;
         initComponents();
         customizeComponents();
@@ -86,8 +88,8 @@ class ReportWizardPortableCaseOptionsVisualPanel extends javax.swing.JPanel {
         
         // initialize other panels and pass them the settings
         listPanel.setLayout(new GridLayout(1,2));
-        listPanel.add(new PortableCaseTagsListPanel(wizPanel, settings));
-        listPanel.add(new PortableCaseInterestingItemsListPanel(wizPanel, settings));
+        listPanel.add(new PortableCaseTagsListPanel(wizPanel, settings, useCaseSpecificData));
+        listPanel.add(new PortableCaseInterestingItemsListPanel(wizPanel, settings, useCaseSpecificData));
     }
     
     @NbBundle.Messages({

From 31eeddd61d99e720c00841590a133aa30e20c26f Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Fri, 6 Sep 2019 13:14:51 -0400
Subject: [PATCH 106/192] Mino

---
 .../commandlineingest/CommandLineIngestSettingsPanel.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.java
index ad754eefba..f87469c4ec 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.java
@@ -39,7 +39,7 @@ public class CommandLineIngestSettingsPanel extends javax.swing.JPanel {
     private static final Logger logger = Logger.getLogger(CommandLineIngestSettingsPanel.class.getName());
     
     static final String REPORTING_CONFIGURATION_NAME = "CommandLineIngest";
-    private static final boolean DISPLAY_CASE_SPECIFIC_DATA = false; // do not try to display case specific data as there is likely no case open
+    private static final boolean DISPLAY_CASE_SPECIFIC_DATA = false; // do not try to display case specific data
     private static final boolean RUN_REPORTS = false; // do not generate reports as part of running the report wizard
 
     /**

From 0a18e51a92f4320688cedc491cb340156de333c7 Mon Sep 17 00:00:00 2001
From: Kelly Kelly <kelly@basistech.com>
Date: Fri, 6 Sep 2019 16:01:04 -0400
Subject: [PATCH 107/192] Added support to parseshell bags to ExtractRegistry

---
 .../recentactivity/Bundle.properties-MERGED   |   3 +
 .../recentactivity/ExtractRegistry.java       | 154 +++++++-
 .../recentactivity/ShellBagParser.java        | 361 ++++++++++++++++++
 3 files changed, 510 insertions(+), 8 deletions(-)
 create mode 100755 RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ShellBagParser.java

diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED
index f27b253e16..80f22aa5ef 100755
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED
@@ -189,4 +189,7 @@ SearchEngineURLQueryAnalyzer.domainSubStr.none=NONE
 SearchEngineURLQueryAnalyzer.toString=Name: {0}\nDomain Substring: {1}\nCount: {2}\nSplit Tokens: \n{3}
 SearchEngineURLQueryAnalyzer.parentModuleName.noSpace=RecentActivity
 SearchEngineURLQueryAnalyzer.parentModuleName=Recent Activity
+Shellbag_Artifact_Display_Name=Shell Bags
+Shellbag_Key_Attribute_Display_Name=Key
+Shellbag_Last_Write_Attribute_Display_Name=Last Write
 UsbDeviceIdMapper.parseAndLookup.text=Product: {0}
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java
index 522ef5a262..b139fa29e5 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java
@@ -66,16 +66,20 @@ import static java.util.TimeZone.getTimeZone;
 import org.openide.util.Lookup;
 import org.sleuthkit.autopsy.ingest.DataSourceIngestModuleProgress;
 import org.sleuthkit.autopsy.ingest.IngestModule.IngestModuleException;
-import org.sleuthkit.autopsy.ingest.IngestServices;
-import org.sleuthkit.autopsy.ingest.ModuleDataEvent;
 import org.sleuthkit.autopsy.keywordsearchservice.KeywordSearchService;
+import org.sleuthkit.autopsy.recentactivity.ShellBagParser.ShellBag;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.BlackboardArtifact;
 import org.sleuthkit.datamodel.BlackboardAttribute;
+import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DATETIME_ACCESSED;
+import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DATETIME_CREATED;
+import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DATETIME_MODIFIED;
+import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_PATH;
 import org.sleuthkit.datamodel.Content;
 import org.sleuthkit.datamodel.ReadContentInputStream.ReadContentInputStreamException;
 import org.sleuthkit.datamodel.Report;
 import org.sleuthkit.datamodel.TskCoreException;
+import org.sleuthkit.datamodel.TskDataException;
 
 /**
  * Extract windows registry data using regripper. Runs two versions of
@@ -86,7 +90,10 @@ import org.sleuthkit.datamodel.TskCoreException;
 @NbBundle.Messages({
     "RegRipperNotFound=Autopsy RegRipper executable not found.",
     "RegRipperFullNotFound=Full version RegRipper executable not found.",
-    "Progress_Message_Analyze_Registry=Analyzing Registry Files"
+    "Progress_Message_Analyze_Registry=Analyzing Registry Files",
+    "Shellbag_Artifact_Display_Name=Shell Bags",
+    "Shellbag_Key_Attribute_Display_Name=Key",
+    "Shellbag_Last_Write_Attribute_Display_Name=Last Write"
 })
 class ExtractRegistry extends Extract {
 
@@ -103,6 +110,14 @@ class ExtractRegistry extends Extract {
     private final Path rrFullHome; // Path to the full version of RegRipper
     private Content dataSource;
     private IngestJobContext context;
+    
+    private static final String SHELLBAG_ARTIFACT_NAME = "RA_SHELL_BAG"; //NON-NLS
+    private static final String SHELLBAG_ATTRIBUTE_LAST_WRITE = "RA_SHELL_BAG_LAST_WRITE"; //NON-NLS
+    private static final String SHELLBAG_ATTRIBUTE_KEY= "RA_SHELL_BAG_KEY"; //NON-NLS
+    
+    BlackboardArtifact.Type shellBagArtifactType = null;
+    BlackboardAttribute.Type shellBagKeyAttributeType = null;
+    BlackboardAttribute.Type shellBagLastWriteAttributeType = null;
 
     ExtractRegistry() throws IngestModuleException {
         moduleName = NbBundle.getMessage(ExtractIE.class, "ExtractRegistry.moduleName.text");
@@ -166,6 +181,13 @@ class ExtractRegistry extends Extract {
         } catch (TskCoreException ex) {
             logger.log(Level.WARNING, "Error fetching 'ntuser.dat' file."); //NON-NLS
         }
+        
+        // find the user-specific ntuser-dat files
+        try {
+            allRegistryFiles.addAll(fileManager.findFiles(dataSource, "usrclass.dat")); //NON-NLS
+        } catch (TskCoreException ex) {
+            logger.log(Level.WARNING, String.format("Error finding 'usrclass.dat' files."), ex); //NON-NLS
+        }
 
         // find the system hives'
         String[] regFileNames = new String[]{"system", "software", "security", "sam"}; //NON-NLS
@@ -175,7 +197,7 @@ class ExtractRegistry extends Extract {
             } catch (TskCoreException ex) {
                 String msg = NbBundle.getMessage(this.getClass(),
                         "ExtractRegistry.findRegFiles.errMsg.errReadingFile", regFileName);
-                logger.log(Level.WARNING, msg);
+                logger.log(Level.WARNING, msg, ex);
                 this.addErrorMessage(this.getName() + ": " + msg);
             }
         }
@@ -253,6 +275,13 @@ class ExtractRegistry extends Extract {
                     this.addErrorMessage(
                             NbBundle.getMessage(this.getClass(), "ExtractRegistry.analyzeRegFiles.failedParsingResults",
                                     this.getName(), regFileName));
+                } else if (regFileNameLocal.toLowerCase().contains("ntuser") || regFileNameLocal.toLowerCase().contains("usrclass")) {
+                    try {
+                        List<ShellBag> shellbags = ShellBagParser.parseShellbagOutput(regOutputFiles.fullPlugins);
+                        createShellBagArtifacts(regFile, shellbags);
+                    } catch (IOException | TskCoreException ex) {
+                        logger.log(Level.WARNING, String.format("Unable to get shell bags from file %s", regOutputFiles.fullPlugins), ex);
+                    }
                 }
                 try {
                     Report report = currentCase.addReport(regOutputFiles.fullPlugins,
@@ -311,6 +340,8 @@ class ExtractRegistry extends Extract {
             fullType = "sam"; //NON-NLS
         } else if (regFilePath.toLowerCase().contains("security")) { //NON-NLS
             fullType = "security"; //NON-NLS
+        }else if (regFilePath.toLowerCase().contains("usrclass")) { //NON-NLS
+            fullType = "usrclass"; //NON-NLS
         } else {
             return regOutputFiles;
         }
@@ -811,13 +842,13 @@ class ExtractRegistry extends Extract {
             } // for
             return true;
         } catch (FileNotFoundException ex) {
-            logger.log(Level.SEVERE, "Error finding the registry file.", ex); //NON-NLS
+            logger.log(Level.WARNING, String.format("Error finding the registry file: %s", regFilePath), ex); //NON-NLS
         } catch (SAXException ex) {
-            logger.log(Level.SEVERE, "Error parsing the registry XML.", ex); //NON-NLS
+            logger.log(Level.WARNING, String.format("Error parsing the registry XML: %s", regFilePath), ex); //NON-NLS
         } catch (IOException ex) {
-            logger.log(Level.SEVERE, "Error building the document parser.", ex); //NON-NLS
+            logger.log(Level.WARNING, String.format("Error building the document parser: %s", regFilePath), ex); //NON-NLS
         } catch (ParserConfigurationException ex) {
-            logger.log(Level.SEVERE, "Error configuring the registry parser.", ex); //NON-NLS
+            logger.log(Level.WARNING, String.format("Error configuring the registry parser: %s", regFilePath), ex); //NON-NLS
         } finally {
             try {
                 if (fstream != null) {
@@ -979,7 +1010,114 @@ class ExtractRegistry extends Extract {
 
         progressBar.progress(Bundle.Progress_Message_Analyze_Registry());
         analyzeRegistryFiles();
+    }
+   
+    /**
+     * Create the shellbag artifacts from the list of ShellBag objects.
+     *
+     * @param regFile   The data source file
+     * @param shellbags List of shellbags from source file
+     *
+     * @throws TskCoreException
+     */
+    void createShellBagArtifacts(AbstractFile regFile, List<ShellBag> shellbags) throws TskCoreException {
+        List<BlackboardArtifact> artifacts = new ArrayList<>();
+        for (ShellBag bag : shellbags) {
+            BlackboardArtifact artifact = regFile.newArtifact(getShellBagArtifact().getTypeID());
+            artifact.addAttribute(new BlackboardAttribute(TSK_PATH, getName(), bag.getResource()));
+            artifact.addAttribute(new BlackboardAttribute(getKeyAttribute(), getName(), bag.getKey()));
 
+            long time = bag.getModified();
+            if (time != 0) {
+                artifact.addAttribute(new BlackboardAttribute(TSK_DATETIME_MODIFIED, getName(), time));
+            }
+
+            time = bag.getCreated();
+            if (time != 0) {
+                artifact.addAttribute(new BlackboardAttribute(TSK_DATETIME_CREATED, getName(), time));
+            }
+
+            time = bag.getAccessed();
+            if (time != 0) {
+                artifact.addAttribute(new BlackboardAttribute(TSK_DATETIME_ACCESSED, getName(), time));
+            }
+
+            time = bag.getLastWrite();
+            if (time != 0) {
+                artifact.addAttribute(new BlackboardAttribute(getLastWriteAttribute(), getName(), time));
+            }
+
+            artifacts.add(artifact);
+        }
+
+        postArtifacts(artifacts);
+    }
+
+    /**
+     * Returns the custom Shellbag artifact type or creates it if it does not
+     * currently exist.
+     *
+     * @return BlackboardArtifact.Type for shellbag artifacts
+     *
+     * @throws TskCoreException
+     */
+    private BlackboardArtifact.Type getShellBagArtifact() throws TskCoreException {
+        if (shellBagArtifactType == null) {
+            try {
+                tskCase.addBlackboardArtifactType(SHELLBAG_ARTIFACT_NAME, Bundle.Shellbag_Artifact_Display_Name()); //NON-NLS
+            } catch (TskDataException ex) {
+                // Artifact already exists
+                logger.log(Level.INFO, String.format("%s may have already been defined for this case", SHELLBAG_ARTIFACT_NAME), ex);
+            }
+
+            shellBagArtifactType = tskCase.getArtifactType(SHELLBAG_ARTIFACT_NAME);
+        }
+
+        return shellBagArtifactType;
+    }
+
+    /**
+     * Gets the custom BlackboardAttribute type. The attribute type is created
+     * if it does not currently exist.
+     *
+     * @return The BlackboardAttribute type
+     *
+     * @throws TskCoreException
+     */
+    private BlackboardAttribute.Type getLastWriteAttribute() throws TskCoreException {
+        if (shellBagLastWriteAttributeType == null) {
+            try {
+                shellBagLastWriteAttributeType = tskCase.addArtifactAttributeType(SHELLBAG_ATTRIBUTE_LAST_WRITE, 
+                                                    BlackboardAttribute.TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.DATETIME, 
+                                                    Bundle.Shellbag_Last_Write_Attribute_Display_Name());
+            } catch (TskDataException ex) {
+                // Attribute already exists get it from the case
+                shellBagLastWriteAttributeType = tskCase.getAttributeType(SHELLBAG_ATTRIBUTE_LAST_WRITE);
+            }
+        }
+        return shellBagLastWriteAttributeType;
+    }
+
+    /**
+     * Gets the custom BlackboardAttribute type. The attribute type is created
+     * if it does not currently exist.
+     *
+     * @return The BlackboardAttribute type
+     *
+     * @throws TskCoreException
+     */
+    private BlackboardAttribute.Type getKeyAttribute() throws TskCoreException {
+        if (shellBagKeyAttributeType == null) {
+            try {
+                shellBagKeyAttributeType = tskCase.addArtifactAttributeType(SHELLBAG_ATTRIBUTE_KEY, 
+                                                    BlackboardAttribute.TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING, 
+                                                    Bundle.Shellbag_Key_Attribute_Display_Name());
+            } catch (TskDataException ex) {
+                // The attribute already exists get it from the case
+                shellBagKeyAttributeType = tskCase.getAttributeType(SHELLBAG_ATTRIBUTE_KEY);
+            }
+        }
+        return shellBagKeyAttributeType;
     }
 
     /**
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ShellBagParser.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ShellBagParser.java
new file mode 100755
index 0000000000..d0aef93305
--- /dev/null
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ShellBagParser.java
@@ -0,0 +1,361 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2019 Basis Technology Corp.
+ *
+ * Copyright 2012 42six Solutions.
+ * Contact: aebadirad <at> 42six <dot> com
+ * Project Contact/Architect: 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.recentactivity;
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+import org.sleuthkit.autopsy.coreutils.Logger;
+
+/**
+ * Parse the ntuser and ursclass regripper output files for shellbags.
+ */
+public class ShellBagParser {
+    
+    private final Logger logger = Logger.getLogger(ShellBagParser.class.getName());
+
+    static SimpleDateFormat DATE_TIME_FORMATTER = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    // Last Write date\time format from itempos plugin
+    static SimpleDateFormat DATE_TIME_FORMATTER2 = new SimpleDateFormat("EEE MMM dd HH:mm:ss yyyyy");
+
+    private ShellBagParser() {
+    }
+
+    /**
+     * Parse the given file for shell bags.
+     * 
+     * @param regFilePath Regripper output file
+     * 
+     * @return List of the found shellbags
+     * 
+     * @throws FileNotFoundException
+     * @throws IOException 
+     */
+    static List<ShellBag> parseShellbagOutput(String regFilePath) throws FileNotFoundException, IOException {
+        List<ShellBag> shellbags = new ArrayList<>();
+        File regfile = new File(regFilePath);
+
+        ShellBagParser sbparser = new ShellBagParser();
+
+        try (BufferedReader reader = new BufferedReader(new FileReader(regfile))) {
+            String line = reader.readLine();
+            while (line != null) {
+                line = line.trim();
+
+                if (line.matches("^shellbags_xp v.*")) {
+                    shellbags.addAll(sbparser.parseShellBagsXP(reader));
+                } else if (line.matches("^shellbags v.*")) {
+                    shellbags.addAll(sbparser.parseShellBags(reader));
+                } else if (line.matches("^itempos.*")) {
+                    shellbags.addAll(sbparser.parseItempos(reader));
+                }
+
+                line = reader.readLine();
+            }
+        }
+
+        return shellbags;
+    }
+
+    /**
+     * Parse the output from the shellbag_xp plugin.
+     * 
+     * @param reader File reader
+     * 
+     * @return List of found shellbags
+     * 
+     * @throws IOException 
+     */
+    List<ShellBag> parseShellBagsXP(BufferedReader reader) throws IOException {
+        List<ShellBag> shellbags = new ArrayList<>();
+        String line = reader.readLine();
+
+        while (line != null && !isSectionSeparator(line)) {
+
+            if (isShellbagXPDataLine(line)) {
+                String[] tokens = line.split("\\|");
+                if (tokens.length >= 6) {
+                    shellbags.add(new ShellBag(tokens[5].trim(), "Software\\Microsoft\\Windows\\ShellNoRoam\\BagMRU", tokens[0].trim(), tokens[1].trim(), tokens[2].trim(), tokens[3].trim()));
+                }
+            }
+
+            line = reader.readLine();
+        }
+
+        return shellbags;
+    }
+
+    /**
+     * Parse the output of the shellbags regripper plugin.
+     * 
+     * @param reader
+     * @return List of found shellbags
+     * 
+     * @throws IOException 
+     */
+    List<ShellBag> parseShellBags(BufferedReader reader) throws IOException {
+        List<ShellBag> shellbags = new ArrayList<>();
+        String line = reader.readLine();
+        String regPath = "Local Settings\\Software\\Microsoft\\Windows\\Shell\\BagMRU";
+
+        while (line != null && !isSectionSeparator(line)) {
+
+            if (isShellbagDataLine(line)) {
+                String[] tokens = line.split("\\|");
+                String path = tokens[6].replaceAll("\\[.*?\\]", "").trim();
+                int index = line.lastIndexOf('[');
+                String endstuff = "";
+                if (index != -1) {
+                    endstuff = line.substring(index, line.length() - 1).replace("[Desktop", "");
+                }
+                if (tokens.length >= 7) {
+                    shellbags.add(new ShellBag(path, regPath + endstuff, tokens[0].trim(), tokens[1].trim(), tokens[2].trim(), tokens[3].trim()));
+                }
+            }
+
+            line = reader.readLine();
+        }
+
+        return shellbags;
+    }
+
+    /**
+     * Parse the output of the Itempos regripper plugin.
+     * 
+     * @param reader
+     * 
+     * @return List of found shell bags.
+     * 
+     * @throws IOException 
+     */
+    List<ShellBag> parseItempos(BufferedReader reader) throws IOException {
+        List<ShellBag> shellbags = new ArrayList<>();
+        String bagpath = "";
+        String lastWrite = "";
+        String line = reader.readLine();
+
+        while (line != null && !isSectionSeparator(line)) {
+
+            if (isItemposDataLine(line)) {
+                String[] tokens = line.split("\\|");
+                if (tokens.length >= 5) {
+                    shellbags.add(new ShellBag(tokens[4].trim(), bagpath, lastWrite, tokens[1].trim(), tokens[2].trim(), tokens[3].trim()));
+                }
+            } else if (line.contains("Software\\")) {
+                bagpath = line.trim();
+                lastWrite = "";
+            } else if (line.contains("LastWrite:")) {
+                lastWrite = line.replace("LastWrite:", "").trim();
+            }
+
+            line = reader.readLine();
+        }
+
+        return shellbags;
+    }
+
+    /**
+     * Return whether or not the given line is a plugin output separator.
+     * 
+     * The format of the plugin output separators is:
+     * ----------------------------------------
+     * 
+     * @param line
+     * 
+     * @return True if the line is a section separator
+     */
+    boolean isSectionSeparator(String line) {
+        if (line == null || line.isEmpty()) {
+            return false;
+        }
+
+        return line.trim().matches("^-+");
+    }
+
+    /**
+     * This data rows from the itempos plugin are in the format:
+     * <size> | <Modified time> | <Accessed time> | <Created time> | <Name>
+     * The times are in the format YYYY-MM-dd HH:mm:ss
+     *
+     * @param line
+     *
+     * @return
+     */
+    boolean isItemposDataLine(String line) {
+        return line.matches("^\\d*?\\s*?\\|.*?\\|.*?\\|.*?\\|.*?");
+    }
+
+    /**
+     * The data rows from the shellbags_xp plug look like
+     * <MRU Time> | <Modified time> | <Accessed time> | <Created time> |
+     * <Zip SubFolder> | <Resource>
+     *
+     * The times are in the format YYYY-MM-dd HH:mm:ss
+     *
+     * @param line
+     *
+     * @return
+     */
+    boolean isShellbagXPDataLine(String line) {
+        return line.matches("^(\\d+?.*?\\s*? | \\s*?)\\|.*?\\|.*?\\|.*?\\|.*?\\|.*?");
+    }
+
+    /**
+     * The data rows from the shellbags plug look like
+     * <MRU Time> | <Modified time> | <Accessed time> | <Created time> |
+     * <Zip SubFolder> |<MFT File Ref> <Resource>
+     *
+     * The times are in the format YYYY-MM-dd HH:mm:ss
+     *
+     * @param line
+     *
+     * @return
+     */
+    boolean isShellbagDataLine(String line) {
+        return line.matches("^(\\d+?.*?\\s*? | \\s*?)\\|.*?\\|.*?\\|.*?\\|.*?\\|.*?\\|.*?");
+    }
+    
+    /**
+     * Class to hold the shell bag data.
+     * 
+     */
+    class ShellBag {
+
+        private String resource = "";
+        private String key = "";
+        private String lastWrite = "";
+        private String modified = "";
+        private String accessed = "";
+        private String created = "";
+
+        /**
+         * Creates a new shell bag object.
+         * 
+         * Any of the parameters can be "";
+         * 
+         * @param resource String from the "Resource" or "Name" column, depending on the plugin
+         * @param key  String registry key value
+         * @param lastWrite Depending on the plugin lastWrite is either Last write value or the MRU Time value
+         * @param modified  Modified time string
+         * @param accessed  Accessed time string
+         * @param created   Created time string
+         */
+        ShellBag(String resource, String key, String lastWrite, String modified, String accessed, String created) {
+            this.resource = resource;
+            this.key = key;
+            this.lastWrite = lastWrite;
+            this.accessed = accessed;
+            this.modified = modified;
+            this.created = created;
+        }
+
+        /**
+         * Returns the resource string.
+         * 
+         * @return The shellbag resource or empty string.
+         */
+        String getResource() {
+            return resource == null ? "" : resource;
+        }
+
+         /**
+         * Returns the key string.
+         * 
+         * @return The shellbag key or empty string.
+         */
+        String getKey() {
+            return key == null ? "" : key;
+        }
+
+         /**
+         * Returns the last time in seconds since java epoch or 
+         * 0 if no valid time was found.
+         * 
+         * @return The time in seconds or 0 if no valid time.
+         */
+        long getLastWrite() {
+            return parseDateTime(lastWrite);
+        }
+
+        /**
+         * Returns the last time in seconds since java epoch or 
+         * 0 if no valid time was found.
+         * 
+         * @return The time in seconds or 0 if no valid time.
+         */
+        long getModified() {
+            return parseDateTime(modified);
+        }
+        
+        /**
+         * Returns the last time in seconds since java epoch or 
+         * 0 if no valid time was found.
+         * 
+         * @return The time in seconds or 0 if no valid time.
+         */
+        long getAccessed() {
+            return parseDateTime(accessed);
+        }
+
+        /**
+         * Returns the last time in seconds since java epoch or 
+         * 0 if no valid time was found.
+         * 
+         * @return The time in seconds or 0 if no valid time.
+         */
+        long getCreated() {
+            return parseDateTime(created);
+        }
+
+        /**
+         * Returns the date\time in seconds from epoch for the given string with
+         * format yyyy-MM-dd HH:mm:ss;
+         *
+         * @param dateTimeString String of format yyyy-MM-dd HH:mm:ss
+         *
+         * @return time in seconds from java epoch
+         */
+        long parseDateTime(String dateTimeString) {
+            if (!dateTimeString.isEmpty()) {
+                try {
+                    return DATE_TIME_FORMATTER.parse(dateTimeString).getTime() / 1000;
+                } catch (ParseException ex) {
+                    // The parse of the string may fail because there are two possible formats.
+                }
+
+                try {
+                    return DATE_TIME_FORMATTER2.parse(dateTimeString).getTime() / 1000;
+                } catch (ParseException ex) {
+                    
+                }
+            }
+            return 0;
+        }
+    }
+
+}

From 37327f49c32ac1db8041ea088af96f78fee8c93c Mon Sep 17 00:00:00 2001
From: Kelly Kelly <kelly@basistech.com>
Date: Mon, 9 Sep 2019 12:56:48 -0400
Subject: [PATCH 108/192] Modified code to add shellbag attributes in one call

---
 .../recentactivity/ExtractRegistry.java       | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java
index b139fa29e5..55a1af1e61 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java
@@ -1023,29 +1023,33 @@ class ExtractRegistry extends Extract {
     void createShellBagArtifacts(AbstractFile regFile, List<ShellBag> shellbags) throws TskCoreException {
         List<BlackboardArtifact> artifacts = new ArrayList<>();
         for (ShellBag bag : shellbags) {
+            Collection<BlackboardAttribute> attributes = new ArrayList<>();
             BlackboardArtifact artifact = regFile.newArtifact(getShellBagArtifact().getTypeID());
-            artifact.addAttribute(new BlackboardAttribute(TSK_PATH, getName(), bag.getResource()));
-            artifact.addAttribute(new BlackboardAttribute(getKeyAttribute(), getName(), bag.getKey()));
+            attributes.add(new BlackboardAttribute(TSK_PATH, getName(), bag.getResource()));
+            attributes.add(new BlackboardAttribute(getKeyAttribute(), getName(), bag.getKey()));
 
-            long time = bag.getModified();
+            long time;
+            time = bag.getLastWrite();
             if (time != 0) {
-                artifact.addAttribute(new BlackboardAttribute(TSK_DATETIME_MODIFIED, getName(), time));
+                attributes.add(new BlackboardAttribute(getLastWriteAttribute(), getName(), time));
+            }
+            
+            time = bag.getModified();
+            if (time != 0) {
+                attributes.add(new BlackboardAttribute(TSK_DATETIME_MODIFIED, getName(), time));
             }
 
             time = bag.getCreated();
             if (time != 0) {
-                artifact.addAttribute(new BlackboardAttribute(TSK_DATETIME_CREATED, getName(), time));
+                attributes.add(new BlackboardAttribute(TSK_DATETIME_CREATED, getName(), time));
             }
 
             time = bag.getAccessed();
             if (time != 0) {
-                artifact.addAttribute(new BlackboardAttribute(TSK_DATETIME_ACCESSED, getName(), time));
+                attributes.add(new BlackboardAttribute(TSK_DATETIME_ACCESSED, getName(), time));
             }
 
-            time = bag.getLastWrite();
-            if (time != 0) {
-                artifact.addAttribute(new BlackboardAttribute(getLastWriteAttribute(), getName(), time));
-            }
+            artifact.addAttributes(attributes);
 
             artifacts.add(artifact);
         }

From 422ff6330ec5b5c30d634d70d960c20b6af71b0e Mon Sep 17 00:00:00 2001
From: "U-BASIS\\dsmyda" <dsmyda@win-dsmyd-4990.basistech.net>
Date: Mon, 9 Sep 2019 13:48:09 -0400
Subject: [PATCH 109/192] Moved work to use this branch as base

---
 .../android/ResultSetIterator.py              |  35 +++
 .../android/TskCallLogsParser.py              |  59 +++++
 .../android/TskContactsParser.py              |  49 ++++
 .../android/TskMessagesParser.py              |  68 ++++++
 InternalPythonModules/android/line.py         | 225 ++++++++++++++++++
 InternalPythonModules/android/module.py       |   3 +-
 6 files changed, 438 insertions(+), 1 deletion(-)
 create mode 100644 InternalPythonModules/android/ResultSetIterator.py
 create mode 100644 InternalPythonModules/android/TskCallLogsParser.py
 create mode 100644 InternalPythonModules/android/TskContactsParser.py
 create mode 100644 InternalPythonModules/android/TskMessagesParser.py
 create mode 100644 InternalPythonModules/android/line.py

diff --git a/InternalPythonModules/android/ResultSetIterator.py b/InternalPythonModules/android/ResultSetIterator.py
new file mode 100644
index 0000000000..4abd4438df
--- /dev/null
+++ b/InternalPythonModules/android/ResultSetIterator.py
@@ -0,0 +1,35 @@
+"""
+Autopsy Forensic Browser
+
+Copyright 2019 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.
+"""
+
+class ResultSetIterator(object):
+    """
+        Generic base class for iterating through database recordms
+    """
+
+    def __init__(self, result_set):
+        self.result_set = result_set
+
+    def next(self):
+        if self.result_set is None:
+            return False
+        return self.result_set.next()
+
+    def close(self):
+        if self.result_set is not None:
+            self.result_set.close()
diff --git a/InternalPythonModules/android/TskCallLogsParser.py b/InternalPythonModules/android/TskCallLogsParser.py
new file mode 100644
index 0000000000..77c7aa12da
--- /dev/null
+++ b/InternalPythonModules/android/TskCallLogsParser.py
@@ -0,0 +1,59 @@
+"""
+Autopsy Forensic Browser
+
+Copyright 2019 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.
+"""
+from ResultSetIterator import ResultSetIterator
+
+class TskCallLogsParser(ResultSetIterator):
+    """
+        Generic TSK_CALLLOG artifact template. Each of these methods
+        will contain the extraction and transformation logic for 
+        converting raw database records to the expected TSK_CALLLOG
+        format.
+
+        A simple example of data transformation would be computing 
+        the end time of a call when the database only supplies the start
+        time and duration.
+    """
+
+    def __init__(self, result_set):
+        super(TskCallLogsParser, self).__init__(result_set)
+        self.INCOMING_MSG_STRING = "Incoming"
+        self.OUTGOING_MSG_STRING = "Outgoing"
+        self._DEFAULT_STRING = ""
+        self._DEFAULT_LONG = -1L
+
+    def get_account_name(self):
+        return self._DEFAULT_STRING 
+
+    def get_call_direction(self):
+        return self._DEFAULT_STRING 
+
+    def get_phone_number_from(self):
+        return self._DEFAULT_STRING 
+
+    def get_phone_number_to(self):
+        return self._DEFAULT_STRING 
+
+    def get_call_start_date_time(self):
+        return self._DEFAULT_LONG 
+
+    def get_call_end_date_time(self):
+        return self._DEFAULT_LONG 
+
+    def get_contact_name(self):
+        return self._DEFAULT_STRING
diff --git a/InternalPythonModules/android/TskContactsParser.py b/InternalPythonModules/android/TskContactsParser.py
new file mode 100644
index 0000000000..122e6a9445
--- /dev/null
+++ b/InternalPythonModules/android/TskContactsParser.py
@@ -0,0 +1,49 @@
+"""
+Autopsy Forensic Browser
+
+Copyright 2019 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.
+"""
+from ResultSetIterator import ResultSetIterator
+
+class TskContactsParser(ResultSetIterator):
+    """
+        Generic TSK_CONTACT artifact template. Each of these methods
+        will contain the extraction and transformation logic for 
+        converting raw database records to the expected TSK_CONTACT
+        format.
+    """
+
+    def __init__(self, result_set):
+        super(TskContactsParser, self).__init__(result_set)
+        self._DEFAULT_VALUE = ""
+
+    def get_account_name(self):
+        return self._DEFAULT_VALUE
+
+    def get_contact_name(self):
+        return self._DEFAULT_VALUE
+
+    def get_phone(self):
+        return self._DEFAULT_VALUE
+
+    def get_home_phone(self):
+        return self._DEFAULT_VALUE
+
+    def get_mobile_phone(self):
+        return self._DEFAULT_VALUE
+    
+    def get_email(self):
+        return self._DEFAULT_VALUE
diff --git a/InternalPythonModules/android/TskMessagesParser.py b/InternalPythonModules/android/TskMessagesParser.py
new file mode 100644
index 0000000000..0346a203e7
--- /dev/null
+++ b/InternalPythonModules/android/TskMessagesParser.py
@@ -0,0 +1,68 @@
+"""
+Autopsy Forensic Browser
+
+Copyright 2019 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.
+"""
+from ResultSetIterator import ResultSetIterator
+
+class TskMessagesParser(ResultSetIterator):
+    """
+        Generic TSK_MESSAGE artifact template. Each of these methods
+        will contain the extraction and transformation logic for 
+        converting raw database records to the expected TSK_MESSAGE
+        format.
+
+        An easy example of such a transformation would be converting
+        message date time from milliseconds to seconds. 
+    """
+
+    def __init__(self, result_set):
+        super(TskMessagesParser, self).__init__(result_set)
+        self.INCOMING_MSG_STRING = "Incoming"
+        self.OUTGOING_MSG_STRING = "Outgoing"
+        self._DEFAULT_TEXT = ""
+        self._DEFAULT_LONG = -1L
+        self._DEFAULT_INT = -1
+
+    def get_account_id(self):
+        return self._DEFAULT_TEXT
+
+    def get_message_type(self):
+        return self._DEFAULT_TEXT
+
+    def get_message_direction(self):  
+        return self._DEFAULT_TEXT
+
+    def get_phone_number_from(self):
+        return self._DEFAULT_TEXT
+
+    def get_phone_number_to(self):
+        return self._DEFAULT_TEXT
+
+    def get_message_date_time(self):
+        return self._DEFAULT_LONG
+
+    def get_message_read_status(self):
+        return self._DEFAULT_INT
+
+    def get_message_subject(self):
+        return self._DEFAULT_TEXT
+
+    def get_message_text(self):
+        return self._DEFAULT_TEXT
+
+    def get_thread_id(self):
+        return self._DEFAULT_TEXT
diff --git a/InternalPythonModules/android/line.py b/InternalPythonModules/android/line.py
new file mode 100644
index 0000000000..67589fcbea
--- /dev/null
+++ b/InternalPythonModules/android/line.py
@@ -0,0 +1,225 @@
+"""
+Autopsy Forensic Browser
+
+Copyright 2019 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.
+"""
+
+from java.io import File
+from java.lang import Class
+from java.lang import ClassNotFoundException
+from java.lang import Long
+from java.lang import String
+from java.sql import ResultSet
+from java.sql import SQLException
+from java.sql import Statement
+from java.util.logging import Level
+from java.util import ArrayList
+from org.apache.commons.codec.binary import Base64
+from org.sleuthkit.autopsy.casemodule import Case
+from org.sleuthkit.autopsy.coreutils import Logger
+from org.sleuthkit.autopsy.coreutils import MessageNotifyUtil
+from org.sleuthkit.autopsy.coreutils import AppSQLiteDB as SQLiteUtil
+from org.sleuthkit.autopsy.coreutils import AppDBParserHelper as BlackboardUtil
+from org.sleuthkit.autopsy.datamodel import ContentUtils
+from org.sleuthkit.autopsy.ingest import IngestJobContext
+from org.sleuthkit.datamodel import AbstractFile
+from org.sleuthkit.datamodel import BlackboardArtifact
+from org.sleuthkit.datamodel import BlackboardAttribute
+from org.sleuthkit.datamodel import Content
+from org.sleuthkit.datamodel import TskCoreException
+from org.sleuthkit.datamodel import Account
+from TskContactsParser import TskContactsParser
+from TskMessagesParser import TskMessagesParser
+from TskCallLogsParser import TskCallLogsParser
+
+import traceback
+import general
+
+class LineAnalyzer(general.AndroidComponentAnalyzer):
+    """
+        Parses the Line App databases for TSK contacts & message artifacts.
+    """
+
+    def __init__(self):
+        self._logger = Logger.getLogger(self.__class__.__name__)
+        self._LINE_PACKAGE_NAME = "jp.naver.line.android"
+        self._PARSER_NAME = "Line Parser"
+
+    def analyze(self, dataSource, fileManager, context):
+        try:
+            contact_and_message_dbs = SQLiteUtil.findAppDatabases(dataSource, "naver_line", self._LINE_PACKAGE_NAME)
+            calllog_dbs = SQLiteUtil.findAppDatabases(dataSource, "call_history", self._LINE_PACKAGE_NAME)
+
+            for contact_and_message_db in contact_and_message_dbs:
+                blackboard_util = BlackboardUtil(self._PARSER_NAME, contact_and_message_db.getDBFile(), Account.Type.LINE) 
+
+                contacts_parser = LineContactsParser(contact_and_message_db)
+                while contacts_parser.next():
+                    blackboard_util.addContact( 
+                        contacts_parser.get_account_name(), 
+                        contacts_parser.get_contact_name(), 
+                        contacts_parser.get_phone(),
+                        contacts_parser.get_home_phone(),
+                        contacts_parser.get_mobile_phone(),
+                        contacts_parser.get_email()
+                    )
+                contacts_parser.close()
+                """
+                messages_parser = LineMessagesParser(line_db)
+                while messages_parser.next():
+                    blackboard_util.addMessage(
+                        messages_parser.get_account_id(),
+                        messages_parser.get_message_type(),
+                        messages_parser.get_message_direction(),
+                        messages_parser.get_phone_number_from(),
+                        messages_parser.get_phone_number_to(),
+                        messages_parser.get_message_date_time(),
+                        messages_parser.get_message_read_status(),
+                        messages_parser.get_message_subject(),
+                        messages_parser.get_message_text(),
+                        messages_parser.get_thread_id() 
+                    )
+                messages_parser.close()
+                """
+                contact_and_message_db.close()
+
+            for calllog_db in calllog_dbs:
+                blackboard_util = BlackboardUtil(self._PARSER_NAME, calllog_db.getDBFile(), Account.Type.LINE)
+
+                calllog_parser = LineCallLogsParser(calllog_db)
+                while calllog_parser.next():
+                    blackboard_util.addCalllog(
+                        calllog_parser.get_account_name(),
+                        calllog_parser.get_call_direction(),
+                        calllog_parser.get_phone_number_from(),
+                        calllog_parser.get_phone_number_to(),
+                        calllog_parser.get_call_start_date_time(),
+                        calllog_parser.get_call_end_date_time(),
+                        calllog_parser.get_contact_name()
+                    )
+
+                calllog_parser.close()
+                calllog_db.close()
+
+        except (SQLException, TskCoreException) as ex:
+            # Error parsing Line databases.
+            self._logger.log(Level.WARNING, "Error parsing the Line App Databases", ex)
+            self._logger.log(Level.WARNING, traceback.format_exc())   
+
+class LineCallLogsParser(TskCallLogsParser):
+    """
+        Parses out TSK_CALLLOG information from the Line database.
+        TSK_CALLLOG fields that are not in the line database are given
+        a default value inherited from the super class.
+    """
+
+    def __init__(self, calllog_db):
+        super(LineCallLogsParser, self).__init__(calllog_db.runQuery(
+                 """
+                     SELECT C.caller_mid            AS mid, 
+                            substr(C.call_type, -1) AS direction, 
+                            C.start_time            AS start_time, 
+                            C.end_time              AS end_time 
+                     FROM   call_history AS C 
+                 """
+             )
+        )
+        self._OUTGOING_CALL = "O"
+        self._INCOMING_CALL = "I"
+        self._had_error = False
+
+        def get_call_direction(self):
+            direction = self.result_set.getString("direction")
+            if direction == self._OUTGOING_CALL:
+                return self.OUTGOING_MSG_STRING
+            return self.INCOMING_MSG_STRING
+
+        def get_call_start_date_time(self):
+            start_time = self.result_set.getString("start_time")
+            try:
+                return long(start_time) / 1000
+            except ValueError as ve:
+                self._had_error = True
+
+        def get_call_end_date_time(self):
+            end_time = self.result_set.getString("end_time")
+            try:
+                return long(end_time) / 1000
+            except ValueError as ve:
+                self._had_error = True
+
+class LineContactsParser(TskContactsParser):
+    """
+        Parses out TSK_CONTACT information from the Line database.
+        TSK_CONTACT fields that are not in the line database are given
+        a default value inherited from the super class. 
+    """
+
+    def __init__(self, contact_db):
+        super(LineContactsParser, self).__init__(contact_db.runQuery(
+                 """
+                     SELECT name,
+                            server_name
+                     FROM   contacts
+                 """
+              )
+        )
+    def get_account_name(self):
+        return self.result_set.getString("server_name")
+
+    def get_contact_name(self):
+        return self.result_set.getString("name")
+
+class LineMessagesParser(TskMessagesParser):
+    """
+        Parse out TSK_MESSAGE information from the Line database.
+        TSK_MESSAGE fields that are not in the line database are given
+        a default value inherited from the super class.
+    """
+
+    def __init__(self, message_db):
+        super().__init__(message_db.runQuery(
+            """SELECT created_time, content, contacts.server_name AS server_name, read_count
+                                              FROM chat_history 
+                                                   JOIN contacts 
+                                                        ON chat_history.from_mid = contacts.m_id"""
+        ))
+        self._LINE_MESSAGE_TYPE = "Line Message"
+        self._had_error = False
+
+    def get_account_id(self):
+        return self.result_set.getString("server_name")
+
+    def get_message_type(self):
+        return self.LINE_MESSAGE_TYPE
+
+    def get_phone_number_from(self):
+        return self.result_set("server_name")
+
+    def get_message_date_time(self):
+        created_time = self.result_set.getString("created_time")
+        try:
+            #Get time in seconds (created_time is stored in ms from epoch)
+            return long(created_time) / 1000
+        except ValueError as ve:
+            self._had_error = True
+            return super(LineMessagesParser, self).get_message_date_time()
+
+    def get_message_text(self):
+        content = self.result_set.getString("content") 
+        if not LineContentUtil.is_text_message(content):
+            return ""
+        return content
diff --git a/InternalPythonModules/android/module.py b/InternalPythonModules/android/module.py
index 6430ec82be..9893df2b74 100644
--- a/InternalPythonModules/android/module.py
+++ b/InternalPythonModules/android/module.py
@@ -47,6 +47,7 @@ import tangomessage
 import textmessage
 import wwfmessage
 import imo
+import line
 
 class AndroidModuleFactory(IngestModuleFactoryAdapter):
 
@@ -91,7 +92,7 @@ class AndroidIngestModule(DataSourceIngestModule):
         analyzers = [contact.ContactAnalyzer(), calllog.CallLogAnalyzer(), textmessage.TextMessageAnalyzer(),
                      tangomessage.TangoMessageAnalyzer(), wwfmessage.WWFMessageAnalyzer(),
                      googlemaplocation.GoogleMapLocationAnalyzer(), browserlocation.BrowserLocationAnalyzer(),
-                     cachelocation.CacheLocationAnalyzer(), imo.IMOAnalyzer()]
+                     cachelocation.CacheLocationAnalyzer(), imo.IMOAnalyzer(), line.LineAnalyzer()]
         self.log(Level.INFO, "running " + str(len(analyzers)) + " analyzers")
         progressBar.switchToDeterminate(len(analyzers))
 

From b773f8a03db96dbfe7e0dc1e7d06e748031d43f4 Mon Sep 17 00:00:00 2001
From: "U-BASIS\\dsmyda" <dsmyda@win-dsmyd-4990.basistech.net>
Date: Mon, 9 Sep 2019 16:37:21 -0400
Subject: [PATCH 110/192] debugging line queries

---
 InternalPythonModules/android/line.py | 36 +++++++++++++++++++++------
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/InternalPythonModules/android/line.py b/InternalPythonModules/android/line.py
index 67589fcbea..df8db5d088 100644
--- a/InternalPythonModules/android/line.py
+++ b/InternalPythonModules/android/line.py
@@ -60,8 +60,8 @@ class LineAnalyzer(general.AndroidComponentAnalyzer):
 
     def analyze(self, dataSource, fileManager, context):
         try:
-            contact_and_message_dbs = SQLiteUtil.findAppDatabases(dataSource, "naver_line", self._LINE_PACKAGE_NAME)
-            calllog_dbs = SQLiteUtil.findAppDatabases(dataSource, "call_history", self._LINE_PACKAGE_NAME)
+            contact_and_message_dbs = SQLiteUtil.findAppDatabases(dataSource, "naver_line.db", True, self._LINE_PACKAGE_NAME)
+            calllog_dbs = SQLiteUtil.findAppDatabases(dataSource, "call_history", True, self._LINE_PACKAGE_NAME)
 
             for contact_and_message_db in contact_and_message_dbs:
                 blackboard_util = BlackboardUtil(self._PARSER_NAME, contact_and_message_db.getDBFile(), Account.Type.LINE) 
@@ -98,9 +98,17 @@ class LineAnalyzer(general.AndroidComponentAnalyzer):
 
             for calllog_db in calllog_dbs:
                 blackboard_util = BlackboardUtil(self._PARSER_NAME, calllog_db.getDBFile(), Account.Type.LINE)
+                calllog_db.attachDatabase(dataSource, "naver_line.db", True, calllog_db.getDBFile().getParentPath(), "naver")
 
                 calllog_parser = LineCallLogsParser(calllog_db)
                 while calllog_parser.next():
+                    print(calllog_parser.get_account_name())
+                    print(calllog_parser.get_contact_name())
+                    print(calllog_parser.get_call_direction())
+                    print(calllog_parser.get_phone_number_from())
+                    print(calllog_parser.get_phone_number_to())
+                    print(calllog_parser.get_call_start_date_time())
+                    print(calllog_parser.get_call_end_date_time())
                     blackboard_util.addCalllog(
                         calllog_parser.get_account_name(),
                         calllog_parser.get_call_direction(),
@@ -111,6 +119,7 @@ class LineAnalyzer(general.AndroidComponentAnalyzer):
                         calllog_parser.get_contact_name()
                     )
 
+                calllog_db.detachDatabase("naver")
                 calllog_parser.close()
                 calllog_db.close()
 
@@ -129,11 +138,14 @@ class LineCallLogsParser(TskCallLogsParser):
     def __init__(self, calllog_db):
         super(LineCallLogsParser, self).__init__(calllog_db.runQuery(
                  """
-                     SELECT C.caller_mid            AS mid, 
-                            substr(C.call_type, -1) AS direction, 
-                            C.start_time            AS start_time, 
-                            C.end_time              AS end_time 
-                     FROM   call_history AS C 
+                     SELECT substr(CallH.call_type, -1) AS direction, 
+                            CallH.start_time            AS start_time, 
+                            CallH.end_time              AS end_time, 
+                            ConT.server_name            AS account_name, 
+                            ConT.name                   AS contact_name 
+                     FROM   call_history AS CallH 
+                            JOIN naver.contacts AS ConT 
+                              ON CallH.caller_mid = ConT.m_id 
                  """
              )
         )
@@ -153,6 +165,8 @@ class LineCallLogsParser(TskCallLogsParser):
                 return long(start_time) / 1000
             except ValueError as ve:
                 self._had_error = True
+                print("bad_conversion")
+                return super(LineCallLogsParser, self).get_call_start_date_time()
 
         def get_call_end_date_time(self):
             end_time = self.result_set.getString("end_time")
@@ -160,6 +174,14 @@ class LineCallLogsParser(TskCallLogsParser):
                 return long(end_time) / 1000
             except ValueError as ve:
                 self._had_error = True
+                print("bad conversion")
+                return super(LineCallLogsParser, self).get_call_end_date_time()
+
+        def get_account_name(self):
+            return self.result_set.getString("account_name")
+
+        def get_contact_name(self):
+            return self.result_set.getString("contact_name")
 
 class LineContactsParser(TskContactsParser):
     """

From 19526ba5a4d037c1ff25945c717f9e095a14c880 Mon Sep 17 00:00:00 2001
From: "U-BASIS\\dsmyda" <dsmyda@win-dsmyd-4990.basistech.net>
Date: Wed, 11 Sep 2019 12:09:00 -0400
Subject: [PATCH 111/192] Copied infrastructure into new branch

---
 .../android/ResultSetIterator.py              | 35 ++++++++++
 .../android/TskCallLogsParser.py              | 58 ++++++++++++++++
 .../android/TskContactsParser.py              | 49 +++++++++++++
 .../android/TskMessagesParser.py              | 68 +++++++++++++++++++
 4 files changed, 210 insertions(+)
 create mode 100644 InternalPythonModules/android/ResultSetIterator.py
 create mode 100644 InternalPythonModules/android/TskCallLogsParser.py
 create mode 100644 InternalPythonModules/android/TskContactsParser.py
 create mode 100644 InternalPythonModules/android/TskMessagesParser.py

diff --git a/InternalPythonModules/android/ResultSetIterator.py b/InternalPythonModules/android/ResultSetIterator.py
new file mode 100644
index 0000000000..4abd4438df
--- /dev/null
+++ b/InternalPythonModules/android/ResultSetIterator.py
@@ -0,0 +1,35 @@
+"""
+Autopsy Forensic Browser
+
+Copyright 2019 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.
+"""
+
+class ResultSetIterator(object):
+    """
+        Generic base class for iterating through database recordms
+    """
+
+    def __init__(self, result_set):
+        self.result_set = result_set
+
+    def next(self):
+        if self.result_set is None:
+            return False
+        return self.result_set.next()
+
+    def close(self):
+        if self.result_set is not None:
+            self.result_set.close()
diff --git a/InternalPythonModules/android/TskCallLogsParser.py b/InternalPythonModules/android/TskCallLogsParser.py
new file mode 100644
index 0000000000..66ea27eee3
--- /dev/null
+++ b/InternalPythonModules/android/TskCallLogsParser.py
@@ -0,0 +1,58 @@
+"""
+Autopsy Forensic Browser
+
+Copyright 2019 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.
+"""
+from ResultSetIterator import ResultSetIterator
+
+class TskCallLogsParser(ResultSetIterator):
+    """
+        Generic TSK_CALLLOG artifact template. Each of these methods
+        will contain the extraction and transformation logic for 
+        converting raw database records to the expected TSK_CALLLOG
+        format.
+
+        A simple example of data transformation would be computing 
+        the end time of a call when the database only supplies the start
+        time and duration.
+    """
+
+    def __init__(self, result_set):
+        super(TskCallLogsParser, self).__init__(result_set)
+        self.INCOMING_CALL = "Incoming"
+        self.OUTGOING_CALL = "Outgoing"
+        self._DEFAULT_STRING = ""
+
+    def get_account_name(self):
+        return self._DEFAULT_STRING 
+
+    def get_call_direction(self):
+        return self._DEFAULT_STRING 
+
+    def get_phone_number_from(self):
+        return self._DEFAULT_STRING 
+
+    def get_phone_number_to(self):
+        return self._DEFAULT_STRING 
+
+    def get_call_start_date_time(self):
+        return self._DEFAULT_LONG 
+
+    def get_call_end_date_time(self):
+        return self._DEFAULT_LONG 
+
+    def get_contact_name(self):
+        return self._DEFAULT_STRING
diff --git a/InternalPythonModules/android/TskContactsParser.py b/InternalPythonModules/android/TskContactsParser.py
new file mode 100644
index 0000000000..122e6a9445
--- /dev/null
+++ b/InternalPythonModules/android/TskContactsParser.py
@@ -0,0 +1,49 @@
+"""
+Autopsy Forensic Browser
+
+Copyright 2019 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.
+"""
+from ResultSetIterator import ResultSetIterator
+
+class TskContactsParser(ResultSetIterator):
+    """
+        Generic TSK_CONTACT artifact template. Each of these methods
+        will contain the extraction and transformation logic for 
+        converting raw database records to the expected TSK_CONTACT
+        format.
+    """
+
+    def __init__(self, result_set):
+        super(TskContactsParser, self).__init__(result_set)
+        self._DEFAULT_VALUE = ""
+
+    def get_account_name(self):
+        return self._DEFAULT_VALUE
+
+    def get_contact_name(self):
+        return self._DEFAULT_VALUE
+
+    def get_phone(self):
+        return self._DEFAULT_VALUE
+
+    def get_home_phone(self):
+        return self._DEFAULT_VALUE
+
+    def get_mobile_phone(self):
+        return self._DEFAULT_VALUE
+    
+    def get_email(self):
+        return self._DEFAULT_VALUE
diff --git a/InternalPythonModules/android/TskMessagesParser.py b/InternalPythonModules/android/TskMessagesParser.py
new file mode 100644
index 0000000000..e3edbb25c8
--- /dev/null
+++ b/InternalPythonModules/android/TskMessagesParser.py
@@ -0,0 +1,68 @@
+"""
+Autopsy Forensic Browser
+
+Copyright 2019 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.
+"""
+from ResultSetIterator import ResultSetIterator
+from org.sleuthkit.datamodel import Account
+from org.sleuthkit.autopsy.coreutils import AppDBParserHelper
+
+class TskMessagesParser(ResultSetIterator):
+    """
+        Generic TSK_MESSAGE artifact template. Each of these methods
+        will contain the extraction and transformation logic for 
+        converting raw database records to the expected TSK_MESSAGE
+        format.
+
+        An easy example of such a transformation would be converting
+        message date time from milliseconds to seconds. 
+    """
+
+    def __init__(self, result_set):
+        super(TskMessagesParser, self).__init__(result_set)
+        self.INCOMING_MSG = "Incoming"
+        self.OUTGOING_MSG = "Outgoing"
+        self._DEFAULT_TEXT = ""
+        self._DEFAULT_LONG = -1L
+        self._DEFAULT_MSG_READ_STATUS = AppDBParserHelper.MessageReadStatusEnum.UNKNOWN
+        self._DEFAULT_ACCOUNT_ADDRESS = Account.Address("","")
+
+    def get_message_type(self):
+        return self._DEFAULT_TEXT
+
+    def get_message_direction(self):  
+        return self._DEFAULT_TEXT
+
+    def get_phone_number_from(self):
+        return self._DEFAULT_ACCOUNT_ADDRESS
+
+    def get_phone_number_to(self):
+        return self._DEFAULT_ACCOUNT_ADDRESS
+
+    def get_message_date_time(self):
+        return self._DEFAULT_LONG
+
+    def get_message_read_status(self):
+        return self._DEFAULT_MSG_READ_STATUS
+
+    def get_message_subject(self):
+        return self._DEFAULT_TEXT
+
+    def get_message_text(self):
+        return self._DEFAULT_TEXT
+
+    def get_thread_id(self):
+        return self._DEFAULT_TEXT

From 7026b84b7aacfe973b81fffe5b1b9bb186a550eb Mon Sep 17 00:00:00 2001
From: "U-BASIS\\dsmyda" <dsmyda@win-dsmyd-4990.basistech.net>
Date: Wed, 11 Sep 2019 12:13:31 -0400
Subject: [PATCH 112/192] Moved old whatsapp work into this branch and modified
 module.py to run

---
 InternalPythonModules/android/module.py   |   3 +-
 InternalPythonModules/android/whatsapp.py | 203 ++++++++++++++++++++++
 2 files changed, 205 insertions(+), 1 deletion(-)
 create mode 100644 InternalPythonModules/android/whatsapp.py

diff --git a/InternalPythonModules/android/module.py b/InternalPythonModules/android/module.py
index 6430ec82be..322700481c 100644
--- a/InternalPythonModules/android/module.py
+++ b/InternalPythonModules/android/module.py
@@ -47,6 +47,7 @@ import tangomessage
 import textmessage
 import wwfmessage
 import imo
+import whatsapp
 
 class AndroidModuleFactory(IngestModuleFactoryAdapter):
 
@@ -91,7 +92,7 @@ class AndroidIngestModule(DataSourceIngestModule):
         analyzers = [contact.ContactAnalyzer(), calllog.CallLogAnalyzer(), textmessage.TextMessageAnalyzer(),
                      tangomessage.TangoMessageAnalyzer(), wwfmessage.WWFMessageAnalyzer(),
                      googlemaplocation.GoogleMapLocationAnalyzer(), browserlocation.BrowserLocationAnalyzer(),
-                     cachelocation.CacheLocationAnalyzer(), imo.IMOAnalyzer()]
+                     cachelocation.CacheLocationAnalyzer(), imo.IMOAnalyzer(), whatsapp.WhatsAppAnalyzer()]
         self.log(Level.INFO, "running " + str(len(analyzers)) + " analyzers")
         progressBar.switchToDeterminate(len(analyzers))
 
diff --git a/InternalPythonModules/android/whatsapp.py b/InternalPythonModules/android/whatsapp.py
new file mode 100644
index 0000000000..cceff4494f
--- /dev/null
+++ b/InternalPythonModules/android/whatsapp.py
@@ -0,0 +1,203 @@
+"""
+Autopsy Forensic Browser
+
+Copyright 2019 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.
+"""
+
+from java.io import File
+from java.lang import Class
+from java.lang import ClassNotFoundException
+from java.lang import Long
+from java.lang import String
+from java.sql import ResultSet
+from java.sql import SQLException
+from java.sql import Statement
+from java.util.logging import Level
+from org.apache.commons.codec.binary import Base64
+from org.sleuthkit.autopsy.casemodule import Case
+from org.sleuthkit.autopsy.coreutils import Logger
+from org.sleuthkit.autopsy.coreutils import AppSQLiteDB as SQLiteUtil
+from org.sleuthkit.autopsy.coreutils import AppDBParserHelper as BlackboardUtil
+from org.sleuthkit.autopsy.ingest import IngestJobContext
+from org.sleuthkit.datamodel import AbstractFile
+from org.sleuthkit.datamodel import BlackboardArtifact
+from org.sleuthkit.datamodel import BlackboardAttribute
+from org.sleuthkit.datamodel import Content
+from org.sleuthkit.datamodel import TskCoreException
+from org.sleuthkit.datamodel import Account
+from TskMessagesParser import TskMessagesParser
+from TskContactsParser import TskContactsParser
+from TskCallLogsParser import TskCallLogsParser
+
+import traceback
+import general
+
+class WhatsAppAnalyzer(general.AndroidComponentAnalyzer):
+    """
+        Parses the WhatsApp databases for TSK contact and message artifacts.
+    """
+   
+    def __init__(self):
+        self._logger = Logger.getLogger(self.__class__.__name__)
+        self._WHATSAPP_PACKAGE_NAME = "com.whatsapp"
+        self._PARSER_NAME = "WhatsApp Parser"
+
+    def analyze(self, dataSource, fileManager, context):
+        """
+            Extract, Transform and Load all messages and contacts from the WhatsApp databases.
+        """
+
+        try:
+            contact_dbs = SQLiteUtil.findAppDatabases(dataSource, "wa.db", self._WHATSAPP_PACKAGE_NAME)
+            message_dbs = SQLiteUtil.findAppDatabases(dataSource, "msgstore.db", self._WHATSAPP_PACKAGE_NAME)
+
+            #Extract TSK_CONTACT information
+            for contact_db in contact_dbs:
+                blackboard_util = BlackboardUtil(self._PARSER_NAME, contact_db.getDBFile(), Account.Type.WHATSAPP) 
+                contacts_parser = WhatsAppContactsParser(contact_db)
+                while contacts_parser.next():
+                    blackboard_util.addContact( 
+                        contacts_parser.get_account_name(), 
+                        contacts_parser.get_contact_name(), 
+                        contacts_parser.get_phone(),
+                        contacts_parser.get_home_phone(),
+                        contacts_parser.get_mobile_phone(),
+                        contacts_parser.get_email()
+                    )
+                contacts_parser.close()
+
+            for message_db in message_dbs:
+                blackboard_util = BlackboardUtil(self._PARSER_NAME, message_db.getDBFile(), Account.Type.WHATSAPP)
+            """
+                message_db.attachDatabase(message_db.getDBFile().getParentPath(), "wa.db", "wadb")
+                messages_parser = WhatsAppMessagesParser(message_db)
+                while messages_parser.next():
+                    blackboard_util.addMessage(
+                        messages_parser.get_account_id(),
+                        messages_parser.get_message_type(),
+                        messages_parser.get_message_direction(),
+                        messages_parser.get_phone_number_from(),
+                        messages_parser.get_phone_number_to(),
+                        messages_parser.get_message_date_time(),
+                        messages_parser.get_message_read_status(),
+                        messages_parser.get_message_subject(),
+                        messages_parser.get_message_text(),
+                        messages_parser.get_thread_id()
+                    )
+                messages_parser.close()
+            """
+        except (SQLException, TskCoreException) as ex:
+            #Error parsing WhatsApp db
+            self._logger.log(Level.WARNING, "Error parsing WhatsApp Databases", ex)
+            self._logger.log(Level.WARNING, traceback.format_exec())
+
+class WhatsAppContactsParser(TskContactsParser):
+    """
+        Extracts TSK_CONTACT information from the WhatsApp database.
+        TSK_CONTACT fields that are not in the WhatsApp database are given a default value
+        inherited from the super class. 
+    """
+
+    def __init__(self, contact_db):
+        super(WhatsAppContactsParser, self).__init__(contact_db.runQuery(
+                 """ 
+                     SELECT number,
+                            CASE
+	                      WHEN given_name is NULL THEN family_name
+		              WHEN family_name is NULL THEN given_name
+		              ELSE given_name 
+                                   || " "
+                                   || family_name
+	                    END name
+                     FROM wa_contacts
+                     WHERE given_name is not NULL OR family_name IS NOT NULL
+                 """
+              )
+        )
+
+    def get_account_name(self):
+        return self.result_set.getString("name")
+
+    def get_contact_name(self):
+        return self.result_set.getString("name")
+
+    def get_phone(self):
+        return self.result_set.getString("number")
+
+class WhatsAppMessagesParser(TskMessagesParser):
+    """
+        Extract TSK_MESSAGE information from the WhatsApp database.
+        TSK_CONTACT fields that are not in the WhatsApp database are given a default value
+        inherited from the super class. 
+    """
+
+    def __init__(self, message_db):
+        super(WhatsAppMessageParser, self).__init__(message_db.runQuery(
+                 """
+                     SELECT M.data               AS content, 
+                            WDB.number           AS number, 
+                            CASE 
+                              WHEN WDB.given_name IS NULL THEN WDB.family_name 
+                              WHEN WDB.family_name IS NULL THEN WDB.given_name 
+                              ELSE WDB.given_name 
+                                   || " " 
+                                   || WDB.family_name 
+                            END                  name, 
+                            M.key_from_me        AS direction, 
+                            M.received_timestamp AS recieved_datetime, 
+                            M.timestamp          AS send_datetime 
+                     FROM   messages AS M 
+                            JOIN wadb.wa_contacts AS WDB 
+                              ON M.key_remote_jid = WDB.jid 
+                 """
+              )
+        )
+        self._WHATSAPP_MESSAGE_TYPE = "WhatsApp Message"
+        self._INCOMING_MESSAGE_TYPE = 0
+        self._OUTGOING_MESSAGE_TYPE = 1
+        self._INCOMING_MSG_STRING = "Incoming"
+        self._OUTGOING_MSG_STRING = "Outgoing"
+
+    def get_account_id(self):
+        return self.result_set.getString("name")
+
+    def get_message_type(self):
+        return self._WHATSAPP_MESSAGE_TYPE 
+
+    def get_phone_number_to(self):
+        if self.get_message_direction() == self._OUTGOING_MSG_STRING:
+            return self.result_set.getString("number")
+        return super(WhatsAppMessageParser, self).get_phone_number_to()
+
+    def get_phone_number_from(self):
+        if self.get_message_direction() == self._INCOMING_MSG_STRING:
+            return self.result_set.getString("number")
+        return super(WhatsAppMessageParser, self).get_phone_number_from() 
+
+    def get_message_direction(self):  
+        direction = self.result_set.getInt("direction")
+        if direction == self._INCOMING_MESSAGE_TYPE:
+            return self._INCOMING_MSG_STRING
+        return self._OUTGOING_MSG_STRING
+    
+    def get_message_date_time(self):
+        #transform from ms to seconds
+        if get_message_direction() == self._OUTGOING_MSG_STRING:
+            return self.result_set.getLong("send_datetime") / 1000
+        return self.result_set.getLong("received_datetime") / 1000
+
+    def get_message_text(self):
+        return self.result_set.getString("content") 

From 5ad1f282aa6631f9d385e8e1cd62a673fc80b45f Mon Sep 17 00:00:00 2001
From: Kelly Kelly <kelly@basistech.com>
Date: Wed, 11 Sep 2019 15:02:33 -0400
Subject: [PATCH 113/192] Modified handle TagDeleted functions to check for
 both artifact and content tags

---
 .../autopsy/timeline/FilteredEventsModel.java     | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/timeline/FilteredEventsModel.java b/Core/src/org/sleuthkit/autopsy/timeline/FilteredEventsModel.java
index 457939f04c..44975ade85 100755
--- a/Core/src/org/sleuthkit/autopsy/timeline/FilteredEventsModel.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/FilteredEventsModel.java
@@ -512,8 +512,14 @@ public final class FilteredEventsModel {
         DeletedContentTagInfo deletedTagInfo = evt.getDeletedTagInfo();
 
         Content content = autoCase.getSleuthkitCase().getContentById(deletedTagInfo.getContentID());
-        boolean tagged = autoCase.getServices().getTagsManager().getContentTagsByContent(content).isEmpty() == false;
-        Set<Long> updatedEventIDs = deleteTag(content.getId(), null, deletedTagInfo.getTagID(), tagged);
+        boolean isContentTagged = autoCase.getServices().getTagsManager().getContentTagsByContent(content).isEmpty() == false;
+        boolean isArtifactTagged = false;
+        
+        if(content instanceof BlackboardArtifact) {
+            isArtifactTagged = autoCase.getServices().getTagsManager().getBlackboardArtifactTagsByArtifact((BlackboardArtifact)content).isEmpty() == false;
+        }
+        
+        Set<Long> updatedEventIDs = deleteTag(content.getId(), null, deletedTagInfo.getTagID(), isArtifactTagged || isContentTagged);
         return postTagsDeleted(updatedEventIDs);
     }
 
@@ -521,8 +527,9 @@ public final class FilteredEventsModel {
         DeletedBlackboardArtifactTagInfo deletedTagInfo = evt.getDeletedTagInfo();
 
         BlackboardArtifact artifact = autoCase.getSleuthkitCase().getBlackboardArtifact(deletedTagInfo.getArtifactID());
-        boolean tagged = autoCase.getServices().getTagsManager().getBlackboardArtifactTagsByArtifact(artifact).isEmpty() == false;
-        Set<Long> updatedEventIDs = deleteTag(artifact.getObjectID(), artifact.getArtifactID(), deletedTagInfo.getTagID(), tagged);
+        boolean isArtifactTagged = autoCase.getServices().getTagsManager().getBlackboardArtifactTagsByArtifact(artifact).isEmpty() == false;
+        boolean isContentTagged = autoCase.getServices().getTagsManager().getContentTagsByContent(artifact).isEmpty() == false;
+        Set<Long> updatedEventIDs = deleteTag(artifact.getObjectID(), artifact.getArtifactID(), deletedTagInfo.getTagID(), isArtifactTagged || isContentTagged);
         return postTagsDeleted(updatedEventIDs);
     }
 

From a131ce17602dba62958aa8186023ada08514e12d Mon Sep 17 00:00:00 2001
From: "U-BASIS\\dsmyda" <dsmyda@win-dsmyd-4990.basistech.net>
Date: Wed, 11 Sep 2019 15:08:43 -0400
Subject: [PATCH 114/192] Rest of the whats app implementation and some
 refactoring

---
 InternalPythonModules/android/whatsapp.py | 126 ++++++++++++----------
 1 file changed, 72 insertions(+), 54 deletions(-)

diff --git a/InternalPythonModules/android/whatsapp.py b/InternalPythonModules/android/whatsapp.py
index cceff4494f..cc46bc0380 100644
--- a/InternalPythonModules/android/whatsapp.py
+++ b/InternalPythonModules/android/whatsapp.py
@@ -29,8 +29,8 @@ from java.util.logging import Level
 from org.apache.commons.codec.binary import Base64
 from org.sleuthkit.autopsy.casemodule import Case
 from org.sleuthkit.autopsy.coreutils import Logger
-from org.sleuthkit.autopsy.coreutils import AppSQLiteDB as SQLiteUtil
-from org.sleuthkit.autopsy.coreutils import AppDBParserHelper as BlackboardUtil
+from org.sleuthkit.autopsy.coreutils import AppSQLiteDB
+from org.sleuthkit.autopsy.coreutils import AppDBParserHelper
 from org.sleuthkit.autopsy.ingest import IngestJobContext
 from org.sleuthkit.datamodel import AbstractFile
 from org.sleuthkit.datamodel import BlackboardArtifact
@@ -57,19 +57,24 @@ class WhatsAppAnalyzer(general.AndroidComponentAnalyzer):
 
     def analyze(self, dataSource, fileManager, context):
         """
-            Extract, Transform and Load all messages and contacts from the WhatsApp databases.
+            Extract, Transform and Load all TSK contact and message
+            artifacts from the WhatsApp databases.
         """
 
         try:
-            contact_dbs = SQLiteUtil.findAppDatabases(dataSource, "wa.db", self._WHATSAPP_PACKAGE_NAME)
-            message_dbs = SQLiteUtil.findAppDatabases(dataSource, "msgstore.db", self._WHATSAPP_PACKAGE_NAME)
+            contact_dbs = AppSQLiteDB.findAppDatabases(dataSource,
+                    "wa.db", True, self._WHATSAPP_PACKAGE_NAME)
+            message_dbs = AppSQLiteDB.findAppDatabases(dataSource,
+                    "msgstore.db", True, self._WHATSAPP_PACKAGE_NAME)
 
             #Extract TSK_CONTACT information
             for contact_db in contact_dbs:
-                blackboard_util = BlackboardUtil(self._PARSER_NAME, contact_db.getDBFile(), Account.Type.WHATSAPP) 
+                helper = AppDBParserHelper(self._PARSER_NAME,
+                        contact_db.getDBFile(), Account.Type.WHATSAPP) 
+
                 contacts_parser = WhatsAppContactsParser(contact_db)
                 while contacts_parser.next():
-                    blackboard_util.addContact( 
+                    helper.addContact( 
                         contacts_parser.get_account_name(), 
                         contacts_parser.get_contact_name(), 
                         contacts_parser.get_phone(),
@@ -79,14 +84,18 @@ class WhatsAppAnalyzer(general.AndroidComponentAnalyzer):
                     )
                 contacts_parser.close()
 
+                contact_db.close()
+
             for message_db in message_dbs:
-                blackboard_util = BlackboardUtil(self._PARSER_NAME, message_db.getDBFile(), Account.Type.WHATSAPP)
-            """
-                message_db.attachDatabase(message_db.getDBFile().getParentPath(), "wa.db", "wadb")
+                helper = AppDBParserHelper(self._PARSER_NAME,
+                        message_db.getDBFile(), Account.Type.WHATSAPP)
+
+                message_db.attachDatabase(dataSource, "wa.db",
+                        message_db.getDBFile().getParentPath(), "wadb")
+
                 messages_parser = WhatsAppMessagesParser(message_db)
                 while messages_parser.next():
-                    blackboard_util.addMessage(
-                        messages_parser.get_account_id(),
+                    helper.addMessage(
                         messages_parser.get_message_type(),
                         messages_parser.get_message_direction(),
                         messages_parser.get_phone_number_from(),
@@ -98,7 +107,8 @@ class WhatsAppAnalyzer(general.AndroidComponentAnalyzer):
                         messages_parser.get_thread_id()
                     )
                 messages_parser.close()
-            """
+
+                message_db.close()
         except (SQLException, TskCoreException) as ex:
             #Error parsing WhatsApp db
             self._logger.log(Level.WARNING, "Error parsing WhatsApp Databases", ex)
@@ -107,29 +117,21 @@ class WhatsAppAnalyzer(general.AndroidComponentAnalyzer):
 class WhatsAppContactsParser(TskContactsParser):
     """
         Extracts TSK_CONTACT information from the WhatsApp database.
-        TSK_CONTACT fields that are not in the WhatsApp database are given a default value
-        inherited from the super class. 
+        TSK_CONTACT fields that are not in the WhatsApp database are given
+        a default value inherited from the super class. 
     """
 
     def __init__(self, contact_db):
         super(WhatsAppContactsParser, self).__init__(contact_db.runQuery(
                  """ 
-                     SELECT number,
-                            CASE
-	                      WHEN given_name is NULL THEN family_name
-		              WHEN family_name is NULL THEN given_name
-		              ELSE given_name 
-                                   || " "
-                                   || family_name
-	                    END name
-                     FROM wa_contacts
-                     WHERE given_name is not NULL OR family_name IS NOT NULL
+                     SELECT """ + _get_contacts_formatting() + """
+                     FROM   wa_contacts AS WC
                  """
               )
         )
 
     def get_account_name(self):
-        return self.result_set.getString("name")
+        return self.get_phone()
 
     def get_contact_name(self):
         return self.result_set.getString("name")
@@ -140,64 +142,80 @@ class WhatsAppContactsParser(TskContactsParser):
 class WhatsAppMessagesParser(TskMessagesParser):
     """
         Extract TSK_MESSAGE information from the WhatsApp database.
-        TSK_CONTACT fields that are not in the WhatsApp database are given a default value
-        inherited from the super class. 
+        TSK_CONTACT fields that are not in the WhatsApp database are given
+        a default value inherited from the super class. 
     """
 
     def __init__(self, message_db):
-        super(WhatsAppMessageParser, self).__init__(message_db.runQuery(
+        super(WhatsAppMessagesParser, self).__init__(message_db.runQuery(
                  """
                      SELECT M.data               AS content, 
-                            WDB.number           AS number, 
-                            CASE 
-                              WHEN WDB.given_name IS NULL THEN WDB.family_name 
-                              WHEN WDB.family_name IS NULL THEN WDB.given_name 
-                              ELSE WDB.given_name 
-                                   || " " 
-                                   || WDB.family_name 
-                            END                  name, 
+                        """+_get_contacts_formatting()+""",
                             M.key_from_me        AS direction, 
-                            M.received_timestamp AS recieved_datetime, 
+                            M.received_timestamp AS received_datetime, 
                             M.timestamp          AS send_datetime 
                      FROM   messages AS M 
-                            JOIN wadb.wa_contacts AS WDB 
-                              ON M.key_remote_jid = WDB.jid 
+                            JOIN wadb.wa_contacts AS WC 
+                              ON M.key_remote_jid = WC.jid
                  """
               )
         )
         self._WHATSAPP_MESSAGE_TYPE = "WhatsApp Message"
         self._INCOMING_MESSAGE_TYPE = 0
         self._OUTGOING_MESSAGE_TYPE = 1
-        self._INCOMING_MSG_STRING = "Incoming"
-        self._OUTGOING_MSG_STRING = "Outgoing"
-
-    def get_account_id(self):
-        return self.result_set.getString("name")
 
     def get_message_type(self):
         return self._WHATSAPP_MESSAGE_TYPE 
 
     def get_phone_number_to(self):
-        if self.get_message_direction() == self._OUTGOING_MSG_STRING:
-            return self.result_set.getString("number")
-        return super(WhatsAppMessageParser, self).get_phone_number_to()
+        if self.get_message_direction() == self.OUTGOING_MSG:
+            return Account.Address(self.result_set.getString("number"), 
+                        self.result_set.getString("number"))
+        return super(WhatsAppMessagesParser, self).get_phone_number_to()
 
     def get_phone_number_from(self):
-        if self.get_message_direction() == self._INCOMING_MSG_STRING:
-            return self.result_set.getString("number")
-        return super(WhatsAppMessageParser, self).get_phone_number_from() 
+        if self.get_message_direction() == self.INCOMING_MSG:
+            return Account.Address(self.result_set.getString("number"), 
+                        self.result_set.getString("number"))
+        return super(WhatsAppMessagesParser, self).get_phone_number_from() 
 
     def get_message_direction(self):  
         direction = self.result_set.getInt("direction")
         if direction == self._INCOMING_MESSAGE_TYPE:
-            return self._INCOMING_MSG_STRING
-        return self._OUTGOING_MSG_STRING
+            return self.INCOMING_MSG
+        return self.OUTGOING_MSG
     
     def get_message_date_time(self):
         #transform from ms to seconds
-        if get_message_direction() == self._OUTGOING_MSG_STRING:
+        if self.get_message_direction() == self.OUTGOING_MSG:
             return self.result_set.getLong("send_datetime") / 1000
         return self.result_set.getLong("received_datetime") / 1000
 
     def get_message_text(self):
         return self.result_set.getString("content") 
+
+def _get_contacts_formatting():
+    """
+        This function is here to explicitly stress the point that the 
+        formatting routine used in the contacts and messages parsers
+        should never differ. These fields are used to correlate in Autopsy.
+        
+        The SQL statement assumes wa_contacts table is named WC.
+    """
+
+    return """ 
+               CASE 
+                 WHEN WC.number IS NULL THEN WC.jid 
+                 WHEN WC.number == "" THEN WC.jid 
+                 ELSE WC.number 
+               END number, 
+               CASE 
+                 WHEN WC.given_name IS NULL 
+                      AND WC.family_name IS NULL THEN WC.jid 
+                 WHEN WC.given_name IS NULL THEN WC.family_name 
+                 WHEN WC.family_name IS NULL THEN WC.given_name 
+                 ELSE WC.given_name 
+                      || " " 
+                      || WC.family_name 
+               END name 
+           """

From ea60f0292c888968d74d14c5897585ce73e0df4a Mon Sep 17 00:00:00 2001
From: Kelly Kelly <kelly@basistech.com>
Date: Wed, 11 Sep 2019 16:20:45 -0400
Subject: [PATCH 115/192] added the creation and modifty time to the file
 system file

---
 .../sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java
index f461a2d026..f1f46677de 100755
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java
@@ -48,7 +48,10 @@ import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.BlackboardArtifact;
 import static org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE.TSK_OS_ACCOUNT;
 import org.sleuthkit.datamodel.BlackboardAttribute;
+import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DATETIME_ACCESSED;
+import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DATETIME_CREATED;
 import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DATETIME_DELETED;
+import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DATETIME_MODIFIED;
 import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_PATH;
 import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_USER_ID;
 import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_USER_NAME;
@@ -444,7 +447,6 @@ final class ExtractRecycleBin extends Extract {
         bba.addAttribute(new BlackboardAttribute(TSK_PATH, getName(), fileName));
         bba.addAttribute(new BlackboardAttribute(TSK_DATETIME_DELETED, getName(), dateTime));
         bba.addAttribute(new BlackboardAttribute(TSK_USER_NAME, getName(), userName == null || userName.isEmpty() ? "" : userName));
-
         return bba;
     }
 
@@ -509,7 +511,7 @@ final class ExtractRecycleBin extends Extract {
                 TskData.TSK_FS_NAME_FLAG_ENUM.UNALLOC,
                 (short) (TskData.TSK_FS_META_FLAG_ENUM.UNALLOC.getValue() | TskData.TSK_FS_META_FLAG_ENUM.USED.getValue()),
                 recycleBinFile.getSize(),
-                0, 0, 0, deletedTime,
+                recycleBinFile.getCtime(), recycleBinFile.getCrtime(), recycleBinFile.getAtime(), deletedTime,
                 true, parentDir);
     }
 

From 0213e40d3ef2321354a47c8982e3661704388844 Mon Sep 17 00:00:00 2001
From: "U-BASIS\\dsmyda" <dsmyda@win-dsmyd-4990.basistech.net>
Date: Wed, 11 Sep 2019 16:48:21 -0400
Subject: [PATCH 116/192] Initial infra commit

---
 .../android/ResultSetIterator.py              | 35 +++++++++
 .../android/TskCallLogsParser.py              | 63 ++++++++++++++++
 .../android/TskContactsParser.py              | 49 +++++++++++++
 .../android/TskMessagesParser.py              | 72 +++++++++++++++++++
 4 files changed, 219 insertions(+)
 create mode 100644 InternalPythonModules/android/ResultSetIterator.py
 create mode 100644 InternalPythonModules/android/TskCallLogsParser.py
 create mode 100644 InternalPythonModules/android/TskContactsParser.py
 create mode 100644 InternalPythonModules/android/TskMessagesParser.py

diff --git a/InternalPythonModules/android/ResultSetIterator.py b/InternalPythonModules/android/ResultSetIterator.py
new file mode 100644
index 0000000000..4abd4438df
--- /dev/null
+++ b/InternalPythonModules/android/ResultSetIterator.py
@@ -0,0 +1,35 @@
+"""
+Autopsy Forensic Browser
+
+Copyright 2019 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.
+"""
+
+class ResultSetIterator(object):
+    """
+        Generic base class for iterating through database recordms
+    """
+
+    def __init__(self, result_set):
+        self.result_set = result_set
+
+    def next(self):
+        if self.result_set is None:
+            return False
+        return self.result_set.next()
+
+    def close(self):
+        if self.result_set is not None:
+            self.result_set.close()
diff --git a/InternalPythonModules/android/TskCallLogsParser.py b/InternalPythonModules/android/TskCallLogsParser.py
new file mode 100644
index 0000000000..3bc0e0141b
--- /dev/null
+++ b/InternalPythonModules/android/TskCallLogsParser.py
@@ -0,0 +1,63 @@
+"""
+Autopsy Forensic Browser
+
+Copyright 2019 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.
+"""
+from ResultSetIterator import ResultSetIterator
+from org.sleuthkit.autopsy.coreutils import AppDBParserHelper
+from org.sleuthkit.datamodel import Account
+
+class TskCallLogsParser(ResultSetIterator):
+    """
+        Generic TSK_CALLLOG artifact template. Each of these methods
+        will contain the extraction and transformation logic for 
+        converting raw database records to the expected TSK_CALLLOG
+        format.
+
+        A simple example of data transformation would be computing 
+        the end time of a call when the database only supplies the start
+        time and duration.
+    """
+
+    def __init__(self, result_set):
+        super(TskCallLogsParser, self).__init__(result_set)
+        self._DEFAULT_STRING = ""
+        self._DEFAULT_DIRECTION = AppDBParserHelper.CommunicationDirection.UNKNOWN
+        self._DEFAULT_ADDRESS = Account.Address("","")
+        self._DEFAULT_CALL_TYPE = AppDBParserHelper.CallMediaType.UNKNOWN
+
+        self.INCOMING_CALL = AppDBParserHelper.CommunicationDirection.INCOMING
+        self.OUTGOING_CALL = AppDBParserHelper.CommunicationDirection.OUTGOING
+        self.AUDIO_CALL = AppDBParserHelper.CallMediaType.AUDIO
+        self.VIDEO_CALL = AppDBParserHelper.CallMediaType.VIDEO
+
+    def get_call_direction(self):
+        return self._DEFAULT_DIRECTION 
+
+    def get_phone_number_from(self):
+        return self._DEFAULT_ADDRESS 
+
+    def get_phone_number_to(self):
+        return self._DEFAULT_ADDRESS 
+
+    def get_call_start_date_time(self):
+        return self._DEFAULT_LONG 
+
+    def get_call_end_date_time(self):
+        return self._DEFAULT_LONG 
+    
+    def get_call_type(self):
+        return self._DEFAULT_CALL_TYPE
diff --git a/InternalPythonModules/android/TskContactsParser.py b/InternalPythonModules/android/TskContactsParser.py
new file mode 100644
index 0000000000..122e6a9445
--- /dev/null
+++ b/InternalPythonModules/android/TskContactsParser.py
@@ -0,0 +1,49 @@
+"""
+Autopsy Forensic Browser
+
+Copyright 2019 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.
+"""
+from ResultSetIterator import ResultSetIterator
+
+class TskContactsParser(ResultSetIterator):
+    """
+        Generic TSK_CONTACT artifact template. Each of these methods
+        will contain the extraction and transformation logic for 
+        converting raw database records to the expected TSK_CONTACT
+        format.
+    """
+
+    def __init__(self, result_set):
+        super(TskContactsParser, self).__init__(result_set)
+        self._DEFAULT_VALUE = ""
+
+    def get_account_name(self):
+        return self._DEFAULT_VALUE
+
+    def get_contact_name(self):
+        return self._DEFAULT_VALUE
+
+    def get_phone(self):
+        return self._DEFAULT_VALUE
+
+    def get_home_phone(self):
+        return self._DEFAULT_VALUE
+
+    def get_mobile_phone(self):
+        return self._DEFAULT_VALUE
+    
+    def get_email(self):
+        return self._DEFAULT_VALUE
diff --git a/InternalPythonModules/android/TskMessagesParser.py b/InternalPythonModules/android/TskMessagesParser.py
new file mode 100644
index 0000000000..69d05cd6fe
--- /dev/null
+++ b/InternalPythonModules/android/TskMessagesParser.py
@@ -0,0 +1,72 @@
+"""
+Autopsy Forensic Browser
+
+Copyright 2019 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.
+"""
+from ResultSetIterator import ResultSetIterator
+from org.sleuthkit.datamodel import Account
+from org.sleuthkit.autopsy.coreutils import AppDBParserHelper
+
+class TskMessagesParser(ResultSetIterator):
+    """
+        Generic TSK_MESSAGE artifact template. Each of these methods
+        will contain the extraction and transformation logic for 
+        converting raw database records to the expected TSK_MESSAGE
+        format.
+
+        An easy example of such a transformation would be converting
+        message date time from milliseconds to seconds. 
+    """
+
+    def __init__(self, result_set):
+        super(TskMessagesParser, self).__init__(result_set)
+        self._DEFAULT_TEXT = ""
+        self._DEFAULT_LONG = -1L
+        self._DEFAULT_MSG_READ_STATUS = AppDBParserHelper.MessageReadStatusEnum.UNKNOWN
+        self._DEFAULT_ACCOUNT_ADDRESS = Account.Address("","")
+        self._DEFAULT_COMMUNICATION_DIRECTION = AppDBParserHelper.CommunicationDirection.UNKNOWN
+
+        self.INCOMING = AppDBParserHelper.CommunicationDirection.INCOMING
+        self.OUTGOING = AppDBParserHelper.CommunicationDirection.OUTGOING
+        self.READ = AppDBParserHelper.MessageReadStatusEnum.READ
+        self.UNREAD = AppDBParserHelper.MessageReadStatusEnum.UNREAD
+
+    def get_message_type(self):
+        return self._DEFAULT_TEXT
+
+    def get_message_direction(self):  
+        return self._DEFAULT_COMMUNICATION_DIRECTION
+
+    def get_phone_number_from(self):
+        return self._DEFAULT_ACCOUNT_ADDRESS
+
+    def get_phone_number_to(self):
+        return self._DEFAULT_ACCOUNT_ADDRESS
+
+    def get_message_date_time(self):
+        return self._DEFAULT_LONG
+
+    def get_message_read_status(self):
+        return self._DEFAULT_MSG_READ_STATUS
+
+    def get_message_subject(self):
+        return self._DEFAULT_TEXT
+
+    def get_message_text(self):
+        return self._DEFAULT_TEXT
+
+    def get_thread_id(self):
+        return self._DEFAULT_TEXT

From 7c15ebc260529d5307b027a9deaed329abd56343 Mon Sep 17 00:00:00 2001
From: "U-BASIS\\dsmyda" <dsmyda@win-dsmyd-4990.basistech.net>
Date: Wed, 11 Sep 2019 16:58:19 -0400
Subject: [PATCH 117/192] Initial template commit

---
 InternalPythonModules/android/textnow.py | 195 +++++++++++++++++++++++
 1 file changed, 195 insertions(+)
 create mode 100644 InternalPythonModules/android/textnow.py

diff --git a/InternalPythonModules/android/textnow.py b/InternalPythonModules/android/textnow.py
new file mode 100644
index 0000000000..a84d1a3931
--- /dev/null
+++ b/InternalPythonModules/android/textnow.py
@@ -0,0 +1,195 @@
+"""
+Autopsy Forensic Browser
+
+Copyright 2019 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.
+"""
+
+from java.io import File
+from java.lang import Class
+from java.lang import ClassNotFoundException
+from java.lang import Long
+from java.lang import String
+from java.sql import ResultSet
+from java.sql import SQLException
+from java.sql import Statement
+from java.util.logging import Level
+from org.apache.commons.codec.binary import Base64
+from org.sleuthkit.autopsy.casemodule import Case
+from org.sleuthkit.autopsy.coreutils import Logger
+from org.sleuthkit.autopsy.coreutils import AppSQLiteDB
+from org.sleuthkit.autopsy.coreutils import AppDBParserHelper
+from org.sleuthkit.autopsy.ingest import IngestJobContext
+from org.sleuthkit.datamodel import AbstractFile
+from org.sleuthkit.datamodel import BlackboardArtifact
+from org.sleuthkit.datamodel import BlackboardAttribute
+from org.sleuthkit.datamodel import Content
+from org.sleuthkit.datamodel import TskCoreException
+from org.sleuthkit.datamodel import Account
+from TskMessagesParser import TskMessagesParser
+from TskContactsParser import TskContactsParser
+from TskCallLogsParser import TskCallLogsParser
+
+import traceback
+import general
+
+class TextNowAnalyzer(general.AndroidComponentAnalyzer):
+    """
+        Parses the TextNow App databases for TSK contacts, message 
+        and calllog artifacts.
+    """
+   
+    def __init__(self):
+        self._logger = Logger.getLogger(self.__class__.__name__)
+        self._TEXTNOW_PACKAGE_NAME = "com.enflick.android.TextNow"
+        self._PARSER_NAME = "TextNow Parser"
+
+    def analyze(self, dataSource, fileManager, context):
+        """
+            Extract, Transform and Load all messages, contacts and 
+            calllogs from the TextNow databases.
+        """
+
+        try:
+            textnow_dbs = AppSQLiteDB.findAppDatabases(dataSource, 
+                    "viber_data", True, self._TEXTNOW_PACKAGE_NAME)
+
+            #Extract TSK_CONTACT and TSK_CALLLOG information
+            for textnow_db in textnow_dbs:
+                helper = AppDBParserHelper(self._PARSER_NAME, 
+                        textnow_db.getDBFile(), Account.Type.TEXTNOW) 
+
+                contacts_parser = TextNowContactsParser(textnow_db)
+                while contacts_parser.next():
+                    helper.addContact( 
+                        contacts_parser.get_account_name(), 
+                        contacts_parser.get_contact_name(), 
+                        contacts_parser.get_phone(),
+                        contacts_parser.get_home_phone(),
+                        contacts_parser.get_mobile_phone(),
+                        contacts_parser.get_email()
+                    )
+                contacts_parser.close()
+
+                calllog_parser = TextNowCallLogsParser(textnow_db)
+                while calllog_parser.next():
+                    helper.addCalllog(
+                        calllog_parser.get_call_direction(),
+                        calllog_parser.get_phone_number_from(),
+                        calllog_parser.get_phone_number_to(),
+                        calllog_parser.get_call_start_date_time(),
+                        calllog_parser.get_call_end_date_time(),
+                        calllog_parser.get_call_type()
+                    )
+                calllog_parser.close()
+
+                messages_parser = TextNowMessagesParser(textnow_db)
+                while messages_parser.next():
+                    helper.addMessage(
+                        messages_parser.get_message_type(),
+                        messages_parser.get_message_direction(),
+                        messages_parser.get_phone_number_from(),
+                        messages_parser.get_phone_number_to(),
+                        messages_parser.get_message_date_time(),
+                        messages_parser.get_message_read_status(),
+                        messages_parser.get_message_subject(),
+                        messages_parser.get_message_text(),
+                        messages_parser.get_thread_id()
+                    )
+                messages_parser.close()
+                
+                textnow_db.close()
+        except (SQLException, TskCoreException) as ex:
+            #Error parsing TextNow db
+            self._logger.log(Level.WARNING, "Error parsing TextNow Databases", ex)
+            self._logger.log(Level.WARNING, traceback.format_exec())
+
+class TextNowCallLogsParser(TskCallLogsParser):
+    """
+        Extracts TSK_CALLLOG information from the TextNow database.
+        TSK_CALLLOG fields that are not in the TextNow database are given
+        a default value inherited from the super class.
+    """
+
+    def __init__(self, calllog_db):
+        super(TextNowCallLogsParser, self).__init__(calllog_db.runQuery(
+                 """
+                 """
+             )    
+        )
+
+    def get_phone_number_from(self):
+
+    def get_phone_number_to(self):
+
+    def get_call_direction(self):
+
+    def get_call_start_date_time(self):
+
+    def get_call_end_date_time(self):
+
+    def get_call_type(self):
+
+class TextNowContactsParser(TskContactsParser):
+    """
+        Extracts TSK_CONTACT information from the TextNow database.
+        TSK_CONTACT fields that are not in the TextNow database are given 
+        a default value inherited from the super class. 
+    """
+
+    def __init__(self, contact_db):
+        super(TextNowContactsParser, self).__init__(contact_db.runQuery(
+                 """
+                 """                                                         
+             )
+        )
+    
+    def get_account_name(self):
+        
+    def get_contact_name(self):
+
+    def get_phone(self):
+
+class TextNowMessagesParser(TskMessagesParser):
+    """
+        Extract TSK_MESSAGE information from the TextNow database.
+        TSK_CONTACT fields that are not in the TextNow database are given
+        a default value inherited from the super class. 
+    """
+
+    def __init__(self, message_db):
+        super(TextNowMessagesParser, self).__init__(message_db.runQuery(
+                 """
+                 """
+             )
+        )
+        self._TEXTNOW_MESSAGE_TYPE = "TextNow Message"
+
+    def get_message_type(self):
+        return self._TEXTNOW_MESSAGE_TYPE 
+
+    def get_phone_number_from(self):
+
+    def get_message_direction(self):  
+    
+    def get_phone_number_to(self):
+
+    def get_message_date_time(self):
+
+    def get_message_read_status(self):
+
+    def get_message_text(self):
+
+    def get_thread_id(self):

From 3f64e6a72c99c72ebfd16aa118259cd7a2ae3262 Mon Sep 17 00:00:00 2001
From: Akira Ueda <ue@gol.com>
Date: Thu, 12 Sep 2019 17:04:02 +0900
Subject: [PATCH 118/192] Use phrase query and original highlighter

- Use phrase query in the same way as the previous version.
- Use original highlighter instead of FastVectorHighlighter which does not work fine with Japanese text and phrase query
---
 .../keywordsearch/HighlightedText.java        | 50 +++++++++++++++++--
 .../LanguageSpecificContentQueryHelper.java   |  5 +-
 .../autopsy/keywordsearch/LuceneQuery.java    |  2 +-
 3 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedText.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedText.java
index 5223a50a74..0532bae16a 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedText.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedText.java
@@ -365,7 +365,7 @@ class HighlightedText implements IndexedText {
                 if (2.2 <= indexSchemaVersion) {
                     //if the query is literal try to get solr to do the highlighting
                     final String highlightQuery = keywords.stream().map(s ->
-                        LanguageSpecificContentQueryHelper.expandQueryString(KeywordSearchUtil.escapeLuceneQuery(s)))
+                        LanguageSpecificContentQueryHelper.expandQueryString(KeywordSearchUtil.quoteQuery(KeywordSearchUtil.escapeLuceneQuery(s))))
                         .collect(Collectors.joining(" OR "));
                     q.setQuery(highlightQuery);
                     for (Server.Schema field : LanguageSpecificContentQueryHelper.getQueryFields()) {
@@ -391,10 +391,17 @@ class HighlightedText implements IndexedText {
                 }
 
                 //tune the highlighter
-                q.setParam("hl.useFastVectorHighlighter", "on"); //fast highlighter scales better than standard one NON-NLS
-                q.setParam("hl.tag.pre", HIGHLIGHT_PRE); //makes sense for FastVectorHighlighter only NON-NLS
-                q.setParam("hl.tag.post", HIGHLIGHT_POST); //makes sense for FastVectorHighlighter only NON-NLS
-                q.setParam("hl.fragListBuilder", "single"); //makes sense for FastVectorHighlighter only NON-NLS
+                if (shouldUseOriginalHighlighter(contentIdStr)) {
+                    // use original highlighter
+                    q.setParam("hl.useFastVectorHighlighter", "off");
+                    q.setParam("hl.simple.pre", HIGHLIGHT_PRE);
+                    q.setParam("hl.simple.post", HIGHLIGHT_POST);
+                } else {
+                    q.setParam("hl.useFastVectorHighlighter", "on"); //fast highlighter scales better than standard one NON-NLS
+                    q.setParam("hl.tag.pre", HIGHLIGHT_PRE); //makes sense for FastVectorHighlighter only NON-NLS
+                    q.setParam("hl.tag.post", HIGHLIGHT_POST); //makes sense for FastVectorHighlighter only NON-NLS
+                    q.setParam("hl.fragListBuilder", "single"); //makes sense for FastVectorHighlighter only NON-NLS
+                }
 
                 //docs says makes sense for the original Highlighter only, but not really
                 q.setParam("hl.maxAnalyzedChars", Server.HL_ANALYZE_CHARS_UNLIMITED); //NON-NLS
@@ -599,4 +606,37 @@ class HighlightedText implements IndexedText {
         return buf.toString();
     }
 
+    /**
+     * Return true if we should use original highlighter instead of FastVectorHighlighter.
+     *
+     * In the case Japanese text and phrase query, FastVectorHighlighter does not work well.
+     *
+     * Note about highlighters:
+     *   If the query is "雨が降る" (phrase query), Solr divides it into 雨 and 降る. が is a stop word here.
+     *   It seems that FastVector highlighter does not produce any snippet when there is a stop word between terms.
+     *   On the other hand, original highlighter produces multiple matches, for example:
+     *   > <em>雨</em>が<em>降っ</em>ています
+     *   Unified highlighter (from Solr 6.4) handles the case as expected:
+     *   > <em>雨が降っ</em>ています。
+     */
+    private boolean shouldUseOriginalHighlighter(String contentID) throws NoOpenCoreException, KeywordSearchModuleException {
+        final SolrQuery q = new SolrQuery();
+        q.setQuery("*:*");
+        q.addFilterQuery(Server.Schema.ID.toString() + ":" + contentID);
+        q.setFields(Server.Schema.LANGUAGE.toString());
+
+        QueryResponse response = solrServer.query(q, METHOD.POST);
+        SolrDocumentList solrDocuments = response.getResults();
+
+        if (!solrDocuments.isEmpty()) {
+            SolrDocument solrDocument = solrDocuments.get(0);
+            if (solrDocument != null) {
+                Object languageField = solrDocument.getFieldValue(Server.Schema.LANGUAGE.toString());
+                if (languageField != null) {
+                    return languageField.equals("ja");
+                }
+            }
+        }
+        return false;
+    }
 }
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelper.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelper.java
index c4df0e7fdc..c08d5207f1 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelper.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelper.java
@@ -44,7 +44,7 @@ class LanguageSpecificContentQueryHelper {
    */
   static String expandQueryString(final String queryStr) {
     List<String> fieldQueries = new ArrayList<>();
-    fieldQueries.add(Server.Schema.TEXT.toString() + ":" + KeywordSearchUtil.quoteQuery(queryStr));
+    fieldQueries.add(Server.Schema.TEXT.toString() + ":" + queryStr);
     fieldQueries.addAll(LANGUAGE_SPECIFIC_CONTENT_FIELDS.stream().map(field -> field.toString() + ":" + queryStr).collect(Collectors.toList()));
     return String.join(" OR ", fieldQueries);
   }
@@ -129,7 +129,8 @@ class LanguageSpecificContentQueryHelper {
 
     final String filterQuery = Server.Schema.ID.toString() + ":" + KeywordSearchUtil.escapeLuceneQuery(contentID);
     final String highlightQuery = keywords.stream()
-        .map(s -> LanguageSpecificContentQueryHelper.expandQueryString(KeywordSearchUtil.escapeLuceneQuery(s)))
+        .map(s -> LanguageSpecificContentQueryHelper.expandQueryString(
+            KeywordSearchUtil.quoteQuery(KeywordSearchUtil.escapeLuceneQuery(s))))
         .collect(Collectors.joining(" "));
 
     q.addFilterQuery(filterQuery);
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java
index 8bc5191149..a324c03324 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java
@@ -301,7 +301,7 @@ class LuceneQuery implements KeywordSearchQuery {
             queryStr = field + ":" + queryStr;
             q.setQuery(queryStr);
         } else if (2.2 <= indexSchemaVersion && originalKeyword.searchTermIsLiteral()) {
-            q.setQuery(LanguageSpecificContentQueryHelper.expandQueryString(keywordStringEscaped));
+            q.setQuery(LanguageSpecificContentQueryHelper.expandQueryString(queryStr));
         } else {
             q.setQuery(queryStr);
         }

From ef0446708d139310d5487fd87f6a2655aacdd02b Mon Sep 17 00:00:00 2001
From: Kelly Kelly <kelly@basistech.com>
Date: Thu, 12 Sep 2019 09:44:38 -0400
Subject: [PATCH 119/192] cleaned up imports

---
 .../sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java    | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java
index f1f46677de..3fa746cf82 100755
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java
@@ -48,10 +48,7 @@ import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.BlackboardArtifact;
 import static org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE.TSK_OS_ACCOUNT;
 import org.sleuthkit.datamodel.BlackboardAttribute;
-import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DATETIME_ACCESSED;
-import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DATETIME_CREATED;
 import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DATETIME_DELETED;
-import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DATETIME_MODIFIED;
 import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_PATH;
 import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_USER_ID;
 import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_USER_NAME;

From 3b7fc4a4b4ea42bda80e2bef0fc50bdf55d6d095 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Thu, 12 Sep 2019 16:28:09 -0400
Subject: [PATCH 120/192] Bug fix in table report panel's Finish button

---
 .../autopsy/report/infrastructure/ReportVisualPanel2.java       | 1 +
 .../autopsy/report/infrastructure/ReportWizardPanel2.java       | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel2.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel2.java
index e34098bf10..9c3830e023 100644
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel2.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel2.java
@@ -135,6 +135,7 @@ final class ReportVisualPanel2 extends JPanel {
                 deselectAllButton.setEnabled(false);
                 break;
         }
+        updateFinishButton();
     }
 
     // Initialize the list of Tags
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPanel2.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPanel2.java
index 1435f7aa42..90619d5ea2 100644
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPanel2.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPanel2.java
@@ -18,7 +18,6 @@
  */
 package org.sleuthkit.autopsy.report.infrastructure;
 
-import org.sleuthkit.autopsy.report.infrastructure.TableReportSettings;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import javax.swing.JButton;
@@ -92,7 +91,6 @@ class ReportWizardPanel2 implements WizardDescriptor.Panel<WizardDescriptor> {
     @Override
     public void readSettings(WizardDescriptor wiz) {
         // Re-enable the normal wizard buttons
-        setFinish(true);
         this.wiz = wiz;
         wiz.setOptions(new Object[]{WizardDescriptor.PREVIOUS_OPTION, nextButton, finishButton, WizardDescriptor.CANCEL_OPTION});
     }

From 0ab8f0d76dc0f93ca07ab93039177a6fd5696915 Mon Sep 17 00:00:00 2001
From: William Schaefer <wschaefer@basistech.net>
Date: Thu, 12 Sep 2019 17:27:26 -0400
Subject: [PATCH 121/192] 5338 - initial code to optionally limit multi-user
 access

---
 .../autopsy/casemodule/AccessLimiter.java     | 49 +++++++++++++++++++
 .../sleuthkit/autopsy/casemodule/Case.java    |  2 +-
 .../casemodule/NewCaseVisualPanel1.java       |  2 +-
 .../dsp/Bundle.properties-MERGED              |  4 +-
 4 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100644 Core/src/org/sleuthkit/autopsy/casemodule/AccessLimiter.java

diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AccessLimiter.java b/Core/src/org/sleuthkit/autopsy/casemodule/AccessLimiter.java
new file mode 100644
index 0000000000..9a84ac4657
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/AccessLimiter.java
@@ -0,0 +1,49 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2019 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.casemodule;
+
+import java.io.File;
+import java.nio.file.Paths;
+import org.sleuthkit.autopsy.coreutils.PlatformUtil;
+
+/**
+ * Class for methods to check if access should be limited to a feature
+ *
+ */
+final class AccessLimiter {
+
+    private final static String MULTI_USER_ACCESS_FILE_NAME = "mualimit"; // NON-NLS
+    private final static String MULTI_USER_ACCESS_FILE_PATH = Paths.get(PlatformUtil.getUserConfigDirectory(), MULTI_USER_ACCESS_FILE_NAME).toString();
+
+    /**
+     * Check if privileges regarding multi-user cases should be restricted.
+     *
+     * @return True if privileges should be restricted, false otherwise.
+     */
+    static boolean limitMultiUserAccess() {
+        return new File(MULTI_USER_ACCESS_FILE_PATH).exists();
+    }
+
+    /**
+     * Private constructor for a utility class
+     */
+    private AccessLimiter() {
+        //private constructer left empty intentionally
+    }
+}
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java
index f455a0c9fb..2fb17fdd36 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java
@@ -1049,7 +1049,7 @@ public class Case {
                 /*
                  * Enable the case-specific actions.
                  */
-                CallableSystemAction.get(AddImageAction.class).setEnabled(true);
+                CallableSystemAction.get(AddImageAction.class).setEnabled(Case.getCurrentCase().getMetadata().getCaseType() == CaseType.SINGLE_USER_CASE || !AccessLimiter.limitMultiUserAccess());
                 CallableSystemAction.get(CaseCloseAction.class).setEnabled(true);
                 CallableSystemAction.get(CaseDetailsAction.class).setEnabled(true);
                 CallableSystemAction.get(DataSourceSummaryAction.class).setEnabled(true);
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java
index aedbb3671f..f49f91a490 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java
@@ -61,7 +61,7 @@ final class NewCaseVisualPanel1 extends JPanel implements DocumentListener {
      */
     void readSettings() {
         caseNameTextField.setText("");
-        if (UserPreferences.getIsMultiUserModeEnabled()) {
+        if (UserPreferences.getIsMultiUserModeEnabled() && !AccessLimiter.limitMultiUserAccess()) {
             multiUserCaseRadioButton.setEnabled(true);
             multiUserCaseRadioButton.setSelected(true);
         } else {
diff --git a/Core/src/org/sleuthkit/autopsy/logicalimager/dsp/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/logicalimager/dsp/Bundle.properties-MERGED
index 6636cdda9f..21ed945bd2 100644
--- a/Core/src/org/sleuthkit/autopsy/logicalimager/dsp/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/logicalimager/dsp/Bundle.properties-MERGED
@@ -4,11 +4,11 @@
 
 # {0} - file number
 # {1} - total files
-AddLogicalImageTask.addingExtractedFile=Adding extracted file ({0}/{1})
+AddLogicalImageTask.addingExtractedFile=Adding extracted files ({0}/{1})
 AddLogicalImageTask.addingExtractedFiles=Adding extracted files
 # {0} - file number
 # {1} - total files
-AddLogicalImageTask.addingInterestingFile=Adding interesting file ({0}/{1})
+AddLogicalImageTask.addingInterestingFile=Adding interesting files ({0}/{1})
 AddLogicalImageTask.addingInterestingFiles=Adding search results as interesting files
 # {0} - file
 AddLogicalImageTask.addingToReport=Adding {0} to report

From 23a849e76cc54944331f06dc422fc4d87fb6d817 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Thu, 12 Sep 2019 17:34:03 -0400
Subject: [PATCH 122/192] Progress panel fix

---
 .../autopsy/report/infrastructure/Bundle.properties       | 1 +
 .../report/infrastructure/Bundle.properties-MERGED        | 1 +
 .../report/infrastructure/TableReportGenerator.java       | 8 +++++---
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle.properties b/Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle.properties
index 8f0d8dae6b..201f4e91b0 100755
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle.properties
@@ -42,6 +42,7 @@ ReportGenerationPanel.confDlg.title.closing=Closing
 ReportGenerationPanel.confDlg.cancelReport.msg=Are you sure you'd like to cancel the report?
 ReportGenerator.displayProgress.title.text=Report Generation Progress...
 ReportGenerator.progress.queryingDb.text=Querying database...
+ReportGenerator.progress.readingTagsArtifacts.text=Reading tags and artifacts from case database
 ReportGenerator.progress.processingFile.text=Now processing {0}
 ReportGenerator.artifactTable.taggedResults.text=Contains results that were tagged with one of the following:
 ReportGenerator.progress.processing=Now processing {0}...
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle.properties-MERGED
index 9de9b638d0..26a34520ff 100755
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle.properties-MERGED
@@ -51,6 +51,7 @@ ReportGenerationPanel.confDlg.title.closing=Closing
 ReportGenerationPanel.confDlg.cancelReport.msg=Are you sure you'd like to cancel the report?
 ReportGenerator.displayProgress.title.text=Report Generation Progress...
 ReportGenerator.progress.queryingDb.text=Querying database...
+ReportGenerator.progress.readingTagsArtifacts.text=Reading tags and artifacts from case database
 ReportGenerator.progress.processingFile.text=Now processing {0}
 ReportGenerator.artifactTable.taggedResults.text=Contains results that were tagged with one of the following:
 ReportGenerator.progress.processing=Now processing {0}...
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportGenerator.java
index 14c9c17027..537452928c 100644
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportGenerator.java
@@ -113,11 +113,9 @@ class TableReportGenerator {
     }
 
     protected void execute() {
-        // Start the progress indicators for each active TableReportModule.
 
         progressPanel.start();
-        progressPanel.setIndeterminate(false);
-        progressPanel.setMaximumProgress(this.artifactTypes.size() + 2); // +2 for content and blackboard artifact tags
+        progressPanel.updateStatusLabel(NbBundle.getMessage(this.getClass(), "ReportGenerator.progress.readingTagsArtifacts.text"));
         
         if (settings.isUseCaseSpecificData()) {
             // Get the artifact types selected by the user.
@@ -142,6 +140,10 @@ class TableReportGenerator {
             }
         }
         
+        // Start the progress indicators for each active TableReportModule.
+        progressPanel.setIndeterminate(false);
+        progressPanel.setMaximumProgress(this.artifactTypes.size() + 2); // +2 for content and blackboard artifact tags
+        
         // report on the blackboard results
         if (progressPanel.getStatus() != ReportProgressPanel.ReportStatus.CANCELED) {
             makeBlackboardArtifactTables();

From 861a47fe6a1acb128421670d6435ff947263eca5 Mon Sep 17 00:00:00 2001
From: William Schaefer <wschaefer@basistech.net>
Date: Thu, 12 Sep 2019 17:42:17 -0400
Subject: [PATCH 123/192] 5338 undo accidental commit of merged file unrelated
 to this PR

---
 .../autopsy/logicalimager/dsp/Bundle.properties-MERGED        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/logicalimager/dsp/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/logicalimager/dsp/Bundle.properties-MERGED
index 21ed945bd2..6636cdda9f 100644
--- a/Core/src/org/sleuthkit/autopsy/logicalimager/dsp/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/logicalimager/dsp/Bundle.properties-MERGED
@@ -4,11 +4,11 @@
 
 # {0} - file number
 # {1} - total files
-AddLogicalImageTask.addingExtractedFile=Adding extracted files ({0}/{1})
+AddLogicalImageTask.addingExtractedFile=Adding extracted file ({0}/{1})
 AddLogicalImageTask.addingExtractedFiles=Adding extracted files
 # {0} - file number
 # {1} - total files
-AddLogicalImageTask.addingInterestingFile=Adding interesting files ({0}/{1})
+AddLogicalImageTask.addingInterestingFile=Adding interesting file ({0}/{1})
 AddLogicalImageTask.addingInterestingFiles=Adding search results as interesting files
 # {0} - file
 AddLogicalImageTask.addingToReport=Adding {0} to report

From 93119e82fa72c8a01361695bd907de840e1042ce Mon Sep 17 00:00:00 2001
From: Akira Ueda <ue@gol.com>
Date: Fri, 13 Sep 2019 12:09:53 +0900
Subject: [PATCH 124/192] Update schema version in schema.xml

---
 .../solr/solr/configsets/AutopsyConfig/conf/schema.xml         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/KeywordSearch/solr/solr/configsets/AutopsyConfig/conf/schema.xml b/KeywordSearch/solr/solr/configsets/AutopsyConfig/conf/schema.xml
index 1d2c566d3a..bbc68fea00 100644
--- a/KeywordSearch/solr/solr/configsets/AutopsyConfig/conf/schema.xml
+++ b/KeywordSearch/solr/solr/configsets/AutopsyConfig/conf/schema.xml
@@ -45,7 +45,7 @@
     that avoids logging every request
 -->
 
-<schema name="Autopsy Keyword Search" version="2.1">
+<schema name="Autopsy Keyword Search" version="2.2">
   <!-- attribute "name" is the name of this schema and is only used for display purposes.
        Applications should change this to reflect the nature of the search collection.
        version="1.4" is Solr's version number for the schema syntax and semantics.  It should
@@ -62,6 +62,7 @@
        2.0 added chunk_size field
        2.1 to facilitate case insensitive regex search,no longer copying content into content_str.
            content_str will be populated with lowercase content by Autopsy.
+       2.2 added text_ja type, content_ja and language fields to support Japanese text search
      -->
 
   <types>

From 11bbcb4484c95e870f3c460805afffa545c18bb8 Mon Sep 17 00:00:00 2001
From: Akira Ueda <ue@gol.com>
Date: Fri, 13 Sep 2019 14:13:32 +0900
Subject: [PATCH 125/192] Add copyright/license header block

---
 .../keywordsearch/LanguageDetector.java        | 18 ++++++++++++++++++
 .../LanguageSpecificContentIndexingHelper.java | 18 ++++++++++++++++++
 .../LanguageSpecificContentQueryHelper.java    | 18 ++++++++++++++++++
 .../autopsy/keywordsearch/MiniChunks.java      | 18 ++++++++++++++++++
 .../autopsy/keywordsearch/QueryParser.java     | 18 ++++++++++++++++++
 ...LanguageSpecificContentQueryHelperTest.java | 18 ++++++++++++++++++
 .../autopsy/keywordsearch/MiniChunksTest.java  | 18 ++++++++++++++++++
 .../autopsy/keywordsearch/QueryParserTest.java | 18 ++++++++++++++++++
 8 files changed, 144 insertions(+)

diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageDetector.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageDetector.java
index 3bcd06d856..31e43b72d2 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageDetector.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageDetector.java
@@ -1,3 +1,21 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2011-2019 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.keywordsearch;
 
 import com.optimaize.langdetect.LanguageDetectorBuilder;
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentIndexingHelper.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentIndexingHelper.java
index fbea9bc995..9b7770720d 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentIndexingHelper.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentIndexingHelper.java
@@ -1,3 +1,21 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2011-2019 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.keywordsearch;
 
 import org.apache.commons.lang3.math.NumberUtils;
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelper.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelper.java
index c08d5207f1..299f5cba11 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelper.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelper.java
@@ -1,3 +1,21 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2011-2019 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.keywordsearch;
 
 import org.apache.solr.client.solrj.SolrQuery;
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/MiniChunks.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/MiniChunks.java
index c6d3c28d73..ce65bbffca 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/MiniChunks.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/MiniChunks.java
@@ -1,3 +1,21 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2011-2019 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.keywordsearch;
 
 class MiniChunks {
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/QueryParser.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/QueryParser.java
index 2572ab34c3..b3421cbdc2 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/QueryParser.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/QueryParser.java
@@ -1,3 +1,21 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2011-2019 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.keywordsearch;
 
 import org.apache.solr.client.solrj.SolrQuery;
diff --git a/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelperTest.java b/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelperTest.java
index 8941133cfd..59f9505c39 100644
--- a/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelperTest.java
+++ b/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelperTest.java
@@ -1,3 +1,21 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2011-2019 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.keywordsearch;
 
 import org.junit.Test;
diff --git a/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/MiniChunksTest.java b/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/MiniChunksTest.java
index 9505418ff6..9a87ce1818 100644
--- a/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/MiniChunksTest.java
+++ b/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/MiniChunksTest.java
@@ -1,3 +1,21 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2011-2019 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.keywordsearch;
 
 import org.junit.Assert;
diff --git a/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/QueryParserTest.java b/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/QueryParserTest.java
index 866d721e22..b744a87847 100644
--- a/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/QueryParserTest.java
+++ b/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/QueryParserTest.java
@@ -1,3 +1,21 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2011-2019 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.keywordsearch;
 
 import org.junit.Test;

From 1bde490e018346546302ec94a06785f8edb7aa22 Mon Sep 17 00:00:00 2001
From: Akira Ueda <ue@gol.com>
Date: Fri, 13 Sep 2019 14:56:50 +0900
Subject: [PATCH 126/192] Add a comment on TERMFREQ

---
 .../src/org/sleuthkit/autopsy/keywordsearch/Server.java      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
index eab213c2c8..ebe6015243 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
@@ -189,6 +189,11 @@ public class Server {
                 return "chunk_size"; //NON-NLS
             }
         },
+        /**
+         * termfreq is a function which returns the number of times the term appears.
+         * This is not an actual field defined in schema.xml, but can be gotten from returned documents
+         * in the same way as fields.
+         */
         TERMFREQ {
             @Override
             public String toString() {

From 7781e8c57c4b45f1c25c92910ecb5fa15c463fed Mon Sep 17 00:00:00 2001
From: Akira Ueda <ue@gol.com>
Date: Fri, 13 Sep 2019 15:56:28 +0900
Subject: [PATCH 127/192] Consolidate Language classes

---
 .../autopsy/keywordsearch/Ingester.java       |  2 +-
 .../autopsy/keywordsearch/Language.java       | 46 +++++++++++++++++++
 .../keywordsearch/LanguageDetector.java       | 15 +-----
 ...LanguageSpecificContentIndexingHelper.java | 32 ++-----------
 4 files changed, 51 insertions(+), 44 deletions(-)
 create mode 100644 KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Language.java

diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Ingester.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Ingester.java
index 7de05777c7..6bae2abcb6 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Ingester.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Ingester.java
@@ -162,7 +162,7 @@ class Ingester {
                 String chunkId = Server.getChunkIdString(sourceID, numChunks + 1);
                 fields.put(Server.Schema.ID.toString(), chunkId);
                 fields.put(Server.Schema.CHUNK_SIZE.toString(), String.valueOf(chunk.getBaseChunkLength()));
-                Optional<LanguageSpecificContentIndexingHelper.Language> language = languageSpecificContentIndexingHelper.detectLanguageIfNeeded(chunk);
+                Optional<Language> language = languageSpecificContentIndexingHelper.detectLanguageIfNeeded(chunk);
                 language.ifPresent(lang -> languageSpecificContentIndexingHelper.updateLanguageSpecificFields(fields, chunk, lang));
                 try {
                     //add the chunk text to Solr index
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Language.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Language.java
new file mode 100644
index 0000000000..088bf15da2
--- /dev/null
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Language.java
@@ -0,0 +1,46 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2011-2019 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.keywordsearch;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+/**
+ * Language.
+ *
+ * Contents which are detected to have these languages should be indexed to a corresponding language-specific field
+ * such as content_ja.
+ */
+public enum Language {
+  JAPANESE("ja");
+
+  private String value;
+
+  String getValue() {
+    return value;
+  }
+
+  static Optional<Language> fromValue(String value) {
+    return Arrays.stream(Language.values()).filter(x -> x.value.equals(value)).findFirst();
+  }
+
+  Language(String value) {
+    this.value = value;
+  }
+}
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageDetector.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageDetector.java
index 31e43b72d2..a80f3f8276 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageDetector.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageDetector.java
@@ -34,11 +34,6 @@ import java.util.Optional;
 
 class LanguageDetector {
 
-  public enum Language {
-    JAPANESE,
-    ENGLISH,
-  }
-
   private List<LanguageProfile> languageProfiles;
 
   LanguageDetector() {
@@ -60,14 +55,6 @@ class LanguageDetector {
     TextObjectFactory textObjectFactory = CommonTextObjectFactories.forDetectingOnLargeText();
 
     TextObject textObject = textObjectFactory.forText(text);
-    return languageDetector.detect(textObject).transform(Optional::of).or(Optional.empty()).map(LdLocale::getLanguage).flatMap(LanguageDetector::toLanguage);
-  }
-
-  private static Optional<Language> toLanguage(String s) {
-    switch (s) {
-      case "ja": return Optional.of(Language.JAPANESE);
-      case "en": return Optional.of(Language.ENGLISH);
-      default: return Optional.empty();
-    }
+    return languageDetector.detect(textObject).transform(Optional::of).or(Optional.empty()).map(LdLocale::getLanguage).flatMap(Language::fromValue);
   }
 }
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentIndexingHelper.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentIndexingHelper.java
index 9b7770720d..9ca5686501 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentIndexingHelper.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentIndexingHelper.java
@@ -31,16 +31,12 @@ import java.util.Optional;
 
 class LanguageSpecificContentIndexingHelper {
 
-  enum Language {
-    JAPANESE
-  }
-
   private final LanguageDetector languageDetector = new LanguageDetector();
 
   Optional<Language> detectLanguageIfNeeded(Chunker.Chunk chunk) throws NoOpenCoreException {
     double indexSchemaVersion = NumberUtils.toDouble(KeywordSearch.getServer().getIndexInfo().getSchemaVersion());
     if (2.2 <= indexSchemaVersion) {
-      return languageDetector.detect(chunk.toString()).flatMap(lang -> Optional.ofNullable(toLanguage(lang)));
+      return languageDetector.detect(chunk.toString());
     } else {
       return Optional.empty();
     }
@@ -55,7 +51,7 @@ class LanguageSpecificContentIndexingHelper {
 
     // index the chunk to a language specific field
     fields.put(Server.Schema.CONTENT_JA.toString(), values);
-    fields.put(Server.Schema.LANGUAGE.toString(), toFieldValue(language));
+    fields.put(Server.Schema.LANGUAGE.toString(), language.getValue());
   }
 
   void indexMiniChunk(Chunker.Chunk chunk, String sourceName, Map<String, Object> fields, String baseChunkID, Language language)
@@ -71,7 +67,7 @@ class LanguageSpecificContentIndexingHelper {
 
       // index the chunk to a language specific field
       updateDoc.addField(Server.Schema.CONTENT_JA.toString(), chunk.toString().substring(chunk.getBaseChunkLength()));
-      updateDoc.addField(Server.Schema.LANGUAGE.toString(), toFieldValue(language));
+      updateDoc.addField(Server.Schema.LANGUAGE.toString(), language.getValue());
 
       TimingMetric metric = HealthMonitor.getTimingMetric("Solr: Index chunk");
 
@@ -83,26 +79,4 @@ class LanguageSpecificContentIndexingHelper {
           NbBundle.getMessage(Ingester.class, "Ingester.ingest.exception.err.msg", sourceName), ex);
     }
   }
-
-  private static String toFieldValue(Language language) {
-    if (language == null) {
-      return null;
-    }
-    switch (language) {
-      case JAPANESE: return "ja";
-      default:
-        throw new IllegalStateException("Unknown language: " + language);
-    }
-  }
-
-  private Language toLanguage(LanguageDetector.Language language) {
-    if (language == null) {
-      return null;
-    }
-    switch (language) {
-      case JAPANESE: return Language.JAPANESE;
-      default:
-        return null;
-    }
-  }
 }

From f6b12e90eab5963eec41d81522efd4d39f591788 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Fri, 13 Sep 2019 09:13:47 -0400
Subject: [PATCH 128/192] Added wait cursor when loading report modules

---
 .../autopsy/report/infrastructure/ReportVisualPanel1.java    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel1.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel1.java
index f64e8bcf55..f211886c03 100644
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel1.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel1.java
@@ -25,6 +25,7 @@ import org.sleuthkit.autopsy.report.ReportModuleSettings;
 import org.sleuthkit.autopsy.report.GeneralReportModule;
 import java.awt.BorderLayout;
 import java.awt.Component;
+import java.awt.Cursor;
 import java.util.ArrayList;
 import static java.util.Collections.swap;
 import java.util.HashMap;
@@ -41,6 +42,7 @@ import javax.swing.event.ListSelectionListener;
 import org.openide.DialogDisplayer;
 import org.openide.NotifyDescriptor;
 import org.openide.util.NbBundle;
+import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.coreutils.Logger;
 
 /**
@@ -73,9 +75,12 @@ final class ReportVisualPanel1 extends JPanel implements ListSelectionListener {
 
     // Initialize the list of ReportModules
     private void initModules() {
+
+        WindowManager.getDefault().getMainWindow().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
         tableModules = ReportModuleLoader.getTableReportModules();
         generalModules = ReportModuleLoader.getGeneralReportModules();
         fileModules = ReportModuleLoader.getFileReportModules();
+        WindowManager.getDefault().getMainWindow().setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
 
         for (TableReportModule module : tableModules) {
             if (!moduleIsValid(module)) {

From 4f171c7a51361c75918fa0f0b9a0b0ae53612c84 Mon Sep 17 00:00:00 2001
From: "U-BASIS\\dsmyda" <dsmyda@win-dsmyd-4990.basistech.net>
Date: Fri, 13 Sep 2019 17:19:14 -0400
Subject: [PATCH 129/192] Updated parser templates with correct default values

---
 InternalPythonModules/android/TskCallLogsParser.py | 2 +-
 InternalPythonModules/android/TskMessagesParser.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/InternalPythonModules/android/TskCallLogsParser.py b/InternalPythonModules/android/TskCallLogsParser.py
index 3bc0e0141b..763ba3c15f 100644
--- a/InternalPythonModules/android/TskCallLogsParser.py
+++ b/InternalPythonModules/android/TskCallLogsParser.py
@@ -36,7 +36,7 @@ class TskCallLogsParser(ResultSetIterator):
         super(TskCallLogsParser, self).__init__(result_set)
         self._DEFAULT_STRING = ""
         self._DEFAULT_DIRECTION = AppDBParserHelper.CommunicationDirection.UNKNOWN
-        self._DEFAULT_ADDRESS = Account.Address("","")
+        self._DEFAULT_ADDRESS = None 
         self._DEFAULT_CALL_TYPE = AppDBParserHelper.CallMediaType.UNKNOWN
 
         self.INCOMING_CALL = AppDBParserHelper.CommunicationDirection.INCOMING
diff --git a/InternalPythonModules/android/TskMessagesParser.py b/InternalPythonModules/android/TskMessagesParser.py
index 69d05cd6fe..15c4166db7 100644
--- a/InternalPythonModules/android/TskMessagesParser.py
+++ b/InternalPythonModules/android/TskMessagesParser.py
@@ -36,7 +36,7 @@ class TskMessagesParser(ResultSetIterator):
         self._DEFAULT_TEXT = ""
         self._DEFAULT_LONG = -1L
         self._DEFAULT_MSG_READ_STATUS = AppDBParserHelper.MessageReadStatusEnum.UNKNOWN
-        self._DEFAULT_ACCOUNT_ADDRESS = Account.Address("","")
+        self._DEFAULT_ACCOUNT_ADDRESS = None 
         self._DEFAULT_COMMUNICATION_DIRECTION = AppDBParserHelper.CommunicationDirection.UNKNOWN
 
         self.INCOMING = AppDBParserHelper.CommunicationDirection.INCOMING

From e90a2ea15c0e81538fe188e9d8a1dcc952cf01ea Mon Sep 17 00:00:00 2001
From: "U-BASIS\\dsmyda" <dsmyda@win-dsmyd-4990.basistech.net>
Date: Fri, 13 Sep 2019 17:46:53 -0400
Subject: [PATCH 130/192] More infra additions

---
 InternalPythonModules/android/general.py | 11 +++++++++++
 InternalPythonModules/android/module.py  |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/InternalPythonModules/android/general.py b/InternalPythonModules/android/general.py
index 28c96be9b9..53c123d13c 100644
--- a/InternalPythonModules/android/general.py
+++ b/InternalPythonModules/android/general.py
@@ -26,3 +26,14 @@ class AndroidComponentAnalyzer:
     # The Analyzer should implement this method
     def analyze(self, dataSource, fileManager, context):
         raise NotImplementedError
+
+"""
+A utility method to append list of attachments to msg body
+"""
+def appendAttachmentList(msgBody, attachmentsList):
+    body = msgBody
+    if attachmentsList:
+        body = body + "\n\n------------Attachments------------\n"
+        body = body + "\n".join(attachmentsList)
+
+    return body
diff --git a/InternalPythonModules/android/module.py b/InternalPythonModules/android/module.py
index 6430ec82be..f3dce7b96a 100644
--- a/InternalPythonModules/android/module.py
+++ b/InternalPythonModules/android/module.py
@@ -47,6 +47,7 @@ import tangomessage
 import textmessage
 import wwfmessage
 import imo
+import textnow
 
 class AndroidModuleFactory(IngestModuleFactoryAdapter):
 
@@ -91,7 +92,7 @@ class AndroidIngestModule(DataSourceIngestModule):
         analyzers = [contact.ContactAnalyzer(), calllog.CallLogAnalyzer(), textmessage.TextMessageAnalyzer(),
                      tangomessage.TangoMessageAnalyzer(), wwfmessage.WWFMessageAnalyzer(),
                      googlemaplocation.GoogleMapLocationAnalyzer(), browserlocation.BrowserLocationAnalyzer(),
-                     cachelocation.CacheLocationAnalyzer(), imo.IMOAnalyzer()]
+                     cachelocation.CacheLocationAnalyzer(), imo.IMOAnalyzer(), textnow.TextNowAnalyzer()]
         self.log(Level.INFO, "running " + str(len(analyzers)) + " analyzers")
         progressBar.switchToDeterminate(len(analyzers))
 

From 8f3eab11a421bf01c0483424520d0ae76ea6047d Mon Sep 17 00:00:00 2001
From: "U-BASIS\\dsmyda" <dsmyda@win-dsmyd-4990.basistech.net>
Date: Fri, 13 Sep 2019 17:47:14 -0400
Subject: [PATCH 131/192] Fully implemented text now parser

---
 InternalPythonModules/android/textnow.py | 136 ++++++++++++++++++++++-
 1 file changed, 131 insertions(+), 5 deletions(-)

diff --git a/InternalPythonModules/android/textnow.py b/InternalPythonModules/android/textnow.py
index a84d1a3931..6ab7d14801 100644
--- a/InternalPythonModules/android/textnow.py
+++ b/InternalPythonModules/android/textnow.py
@@ -41,6 +41,7 @@ from org.sleuthkit.datamodel import Account
 from TskMessagesParser import TskMessagesParser
 from TskContactsParser import TskContactsParser
 from TskCallLogsParser import TskCallLogsParser
+from general import appendAttachmentList
 
 import traceback
 import general
@@ -55,6 +56,7 @@ class TextNowAnalyzer(general.AndroidComponentAnalyzer):
         self._logger = Logger.getLogger(self.__class__.__name__)
         self._TEXTNOW_PACKAGE_NAME = "com.enflick.android.TextNow"
         self._PARSER_NAME = "TextNow Parser"
+        self._VERSION = "6.41.0.2"
 
     def analyze(self, dataSource, fileManager, context):
         """
@@ -64,13 +66,13 @@ class TextNowAnalyzer(general.AndroidComponentAnalyzer):
 
         try:
             textnow_dbs = AppSQLiteDB.findAppDatabases(dataSource, 
-                    "viber_data", True, self._TEXTNOW_PACKAGE_NAME)
+                    "textnow_data.db", True, self._TEXTNOW_PACKAGE_NAME)
 
-            #Extract TSK_CONTACT and TSK_CALLLOG information
             for textnow_db in textnow_dbs:
                 helper = AppDBParserHelper(self._PARSER_NAME, 
                         textnow_db.getDBFile(), Account.Type.TEXTNOW) 
 
+                #Extract TSK_CONTACT information
                 contacts_parser = TextNowContactsParser(textnow_db)
                 while contacts_parser.next():
                     helper.addContact( 
@@ -83,6 +85,7 @@ class TextNowAnalyzer(general.AndroidComponentAnalyzer):
                     )
                 contacts_parser.close()
 
+                #Extract TSK_CALLLOG information
                 calllog_parser = TextNowCallLogsParser(textnow_db)
                 while calllog_parser.next():
                     helper.addCalllog(
@@ -95,6 +98,7 @@ class TextNowAnalyzer(general.AndroidComponentAnalyzer):
                     )
                 calllog_parser.close()
 
+                #Extract TSK_MESSAGES information
                 messages_parser = TextNowMessagesParser(textnow_db)
                 while messages_parser.next():
                     helper.addMessage(
@@ -109,7 +113,7 @@ class TextNowAnalyzer(general.AndroidComponentAnalyzer):
                         messages_parser.get_thread_id()
                     )
                 messages_parser.close()
-                
+
                 textnow_db.close()
         except (SQLException, TskCoreException) as ex:
             #Error parsing TextNow db
@@ -126,21 +130,47 @@ class TextNowCallLogsParser(TskCallLogsParser):
     def __init__(self, calllog_db):
         super(TextNowCallLogsParser, self).__init__(calllog_db.runQuery(
                  """
+                     SELECT contact_value     AS num, 
+                            message_direction AS direction, 
+                            message_text      AS duration, 
+                            date              AS datetime 
+                     FROM   messages AS M 
+                     WHERE  message_type IN ( 100, 102 )
                  """
              )    
         )
+        self._INCOMING_CALL_TYPE = 1
+        self._OUTGOING_CALL_TYPE = 2
+        self._has_errors = False
 
     def get_phone_number_from(self):
+        if self.get_call_direction() == self.OUTGOING_CALL:
+            return super(TextNowCallLogsParser, self).get_phone_number_from()
+        return Account.Address(self.result_set.getString("num"),
+                        self.result_set.getString("num"))
 
     def get_phone_number_to(self):
+        if self.get_call_direction() == self.INCOMING_CALL:
+            return super(TextNowCallLogsParser, self).get_phone_number_to() 
+        return Account.Address(self.result_set.getString("num"), 
+                        self.result_set.getString("num"))
 
     def get_call_direction(self):
+        if self.result_set.getInt("direction") == self._INCOMING_CALL_TYPE:
+            return self.INCOMING_CALL 
+        return self.OUTGOING_CALL
 
     def get_call_start_date_time(self):
+        return self.result_set.getLong("datetime") / 1000
 
     def get_call_end_date_time(self):
-
-    def get_call_type(self):
+        start = self.get_call_start_date_time()
+        duration = self.result_set.getString("duration")
+        try:
+            return start + long(duration)
+        except ValueError as ve:
+            self._has_errors = True 
+            return super(TextNowCallLogsParser, self).get_call_end_date_time() 
 
 class TextNowContactsParser(TskContactsParser):
     """
@@ -152,15 +182,25 @@ class TextNowContactsParser(TskContactsParser):
     def __init__(self, contact_db):
         super(TextNowContactsParser, self).__init__(contact_db.runQuery(
                  """
+                     SELECT C.contact_value AS number, 
+                            CASE 
+                              WHEN contact_name IS NULL THEN contact_value 
+                              WHEN contact_name == "" THEN contact_value 
+                              ELSE contact_name 
+                            END             name 
+                     FROM   contacts AS C
                  """                                                         
              )
         )
     
     def get_account_name(self):
+        return self.result_set.getString("number")
         
     def get_contact_name(self):
+        return self.result_set.getString("name")
 
     def get_phone(self):
+        return self.result_set.getString("number")
 
 class TextNowMessagesParser(TskMessagesParser):
     """
@@ -170,26 +210,112 @@ class TextNowMessagesParser(TskMessagesParser):
     """
 
     def __init__(self, message_db):
+        """
+            The TextNow database in v6.41.0.2 is structured as follows:
+                - A messages table, which stores messages from/to a number
+                - A contacts table, which stores phone numbers
+                - A groups table, which stores each group the device owner is a part of
+                - A group_members table, which stores who is in each group
+
+            The messages table contains both call logs and messages, with a type
+            column differentiating the two.
+            
+            The query below does the following:
+                - The group_info inner query creates a comma seperated list of group recipients
+                  for each group. This result is then joined on the groups table to get the thread id. 
+                - The contacts table is unioned with this result so we have a complete map
+                  of "from" phone_numbers -> recipients (group or single). This is the
+                  'to_from_map' inner query.
+                - Finally, the to_from_map results are joined with the messages table to get all
+                  of the communication details.  
+        """
         super(TextNowMessagesParser, self).__init__(message_db.runQuery(
                  """
+                    SELECT CASE 
+                             WHEN message_direction == 2 THEN "" 
+                             WHEN to_addresses IS NULL THEN M.contact_value 
+                             ELSE contact_name 
+                           end from_address, 
+                           CASE 
+                             WHEN message_direction == 1 THEN "" 
+                             WHEN to_addresses IS NULL THEN M.contact_value 
+                             ELSE to_addresses 
+                           end to_address, 
+                           message_direction, 
+                           message_text, 
+                           M.READ, 
+                           M.date, 
+                           M.attach, 
+                           thread_id 
+                    FROM   (SELECT group_info.contact_value, 
+                                   group_info.to_addresses, 
+                                   G._id AS thread_id 
+                            FROM   (SELECT GM.contact_value, 
+                                           Group_concat(GM.member_contact_value) AS to_addresses 
+                                    FROM   group_members AS GM 
+                                    GROUP  BY GM.contact_value) AS group_info 
+                                   JOIN groups AS G 
+                                     ON G.contact_value = group_info.contact_value 
+                            UNION 
+                            SELECT c.contact_value, 
+                                   NULL, 
+                                   -1 
+                            FROM   contacts AS c) AS to_from_map 
+                           JOIN messages AS M 
+                             ON M.contact_value = to_from_map.contact_value 
+                    WHERE  message_type NOT IN ( 102, 100 ) 
                  """
              )
         )
         self._TEXTNOW_MESSAGE_TYPE = "TextNow Message"
+        self._INCOMING_MESSAGE_TYPE = 1
+        self._OUTGOING_MESSAGE_TYPE = 2
+        self._UNKNOWN_THREAD_ID = -1
 
     def get_message_type(self):
         return self._TEXTNOW_MESSAGE_TYPE 
 
     def get_phone_number_from(self):
+        if self.result_set.getString("from_address") == "":
+            return super(TextNowMessagesParser, self).get_phone_number_from() 
+        return Account.Address(self.result_set.getString("from_address"),
+                    self.result_set.getString("from_address"))
 
     def get_message_direction(self):  
+        direction = self.result_set.getInt("message_direction")
+        if direction == self._INCOMING_MESSAGE_TYPE:
+            return self.INCOMING
+        return self.OUTGOING
     
     def get_phone_number_to(self):
+        if self.result_set.getString("to_address") == "":
+            return super(TextNowMessagesParser, self).get_phone_number_to() 
+        return Account.Address(self.result_set.getString("to_address"),
+                    self.result_set.getString("to_address"))
 
     def get_message_date_time(self):
+        #convert ms to s
+        return self.result_set.getLong("date") / 1000;
 
     def get_message_read_status(self):
+        read = self.result_set.getBoolean("read")
+        if self.get_message_direction() == self.INCOMING:
+            if read == True:
+                return self.READ
+            return self.UNREAD
+
+        #read status for outgoing messages cannot be determined, give default
+        return super(TextNowMessagesParser, self).get_message_read_status()
 
     def get_message_text(self):
+        text = self.result_set.getString("message_text")
+        attachment = self.result_set.getString("attach")
+        if attachment != "":
+            text = appendAttachmentList(text, [attachment]) 
+        return text
 
     def get_thread_id(self):
+        thread_id = self.result_set.getInt("thread_id")
+        if thread_id == self._UNKNOWN_THREAD_ID:
+            return super(TextNowMessagesParser, self).get_thread_id()
+        return str(thread_id)

From 8fd7abdf559e9e965b1f2e827b25e618e627da6b Mon Sep 17 00:00:00 2001
From: "U-BASIS\\dsmyda" <dsmyda@win-dsmyd-4990.basistech.net>
Date: Sat, 14 Sep 2019 11:03:49 -0400
Subject: [PATCH 132/192] Updated infra changes

---
 .../android/TskCallLogsParser.py              | 25 +++++++++++--------
 .../android/TskMessagesParser.py              | 12 ++++++---
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/InternalPythonModules/android/TskCallLogsParser.py b/InternalPythonModules/android/TskCallLogsParser.py
index 66ea27eee3..763ba3c15f 100644
--- a/InternalPythonModules/android/TskCallLogsParser.py
+++ b/InternalPythonModules/android/TskCallLogsParser.py
@@ -17,6 +17,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from ResultSetIterator import ResultSetIterator
+from org.sleuthkit.autopsy.coreutils import AppDBParserHelper
+from org.sleuthkit.datamodel import Account
 
 class TskCallLogsParser(ResultSetIterator):
     """
@@ -32,27 +34,30 @@ class TskCallLogsParser(ResultSetIterator):
 
     def __init__(self, result_set):
         super(TskCallLogsParser, self).__init__(result_set)
-        self.INCOMING_CALL = "Incoming"
-        self.OUTGOING_CALL = "Outgoing"
         self._DEFAULT_STRING = ""
+        self._DEFAULT_DIRECTION = AppDBParserHelper.CommunicationDirection.UNKNOWN
+        self._DEFAULT_ADDRESS = None 
+        self._DEFAULT_CALL_TYPE = AppDBParserHelper.CallMediaType.UNKNOWN
 
-    def get_account_name(self):
-        return self._DEFAULT_STRING 
+        self.INCOMING_CALL = AppDBParserHelper.CommunicationDirection.INCOMING
+        self.OUTGOING_CALL = AppDBParserHelper.CommunicationDirection.OUTGOING
+        self.AUDIO_CALL = AppDBParserHelper.CallMediaType.AUDIO
+        self.VIDEO_CALL = AppDBParserHelper.CallMediaType.VIDEO
 
     def get_call_direction(self):
-        return self._DEFAULT_STRING 
+        return self._DEFAULT_DIRECTION 
 
     def get_phone_number_from(self):
-        return self._DEFAULT_STRING 
+        return self._DEFAULT_ADDRESS 
 
     def get_phone_number_to(self):
-        return self._DEFAULT_STRING 
+        return self._DEFAULT_ADDRESS 
 
     def get_call_start_date_time(self):
         return self._DEFAULT_LONG 
 
     def get_call_end_date_time(self):
         return self._DEFAULT_LONG 
-
-    def get_contact_name(self):
-        return self._DEFAULT_STRING
+    
+    def get_call_type(self):
+        return self._DEFAULT_CALL_TYPE
diff --git a/InternalPythonModules/android/TskMessagesParser.py b/InternalPythonModules/android/TskMessagesParser.py
index e3edbb25c8..15c4166db7 100644
--- a/InternalPythonModules/android/TskMessagesParser.py
+++ b/InternalPythonModules/android/TskMessagesParser.py
@@ -33,18 +33,22 @@ class TskMessagesParser(ResultSetIterator):
 
     def __init__(self, result_set):
         super(TskMessagesParser, self).__init__(result_set)
-        self.INCOMING_MSG = "Incoming"
-        self.OUTGOING_MSG = "Outgoing"
         self._DEFAULT_TEXT = ""
         self._DEFAULT_LONG = -1L
         self._DEFAULT_MSG_READ_STATUS = AppDBParserHelper.MessageReadStatusEnum.UNKNOWN
-        self._DEFAULT_ACCOUNT_ADDRESS = Account.Address("","")
+        self._DEFAULT_ACCOUNT_ADDRESS = None 
+        self._DEFAULT_COMMUNICATION_DIRECTION = AppDBParserHelper.CommunicationDirection.UNKNOWN
+
+        self.INCOMING = AppDBParserHelper.CommunicationDirection.INCOMING
+        self.OUTGOING = AppDBParserHelper.CommunicationDirection.OUTGOING
+        self.READ = AppDBParserHelper.MessageReadStatusEnum.READ
+        self.UNREAD = AppDBParserHelper.MessageReadStatusEnum.UNREAD
 
     def get_message_type(self):
         return self._DEFAULT_TEXT
 
     def get_message_direction(self):  
-        return self._DEFAULT_TEXT
+        return self._DEFAULT_COMMUNICATION_DIRECTION
 
     def get_phone_number_from(self):
         return self._DEFAULT_ACCOUNT_ADDRESS

From 611a03fa09e1e0af763e5fbe73f81eb6e923cb0b Mon Sep 17 00:00:00 2001
From: "U-BASIS\\dsmyda" <dsmyda@win-dsmyd-4990.basistech.net>
Date: Sat, 14 Sep 2019 11:04:52 -0400
Subject: [PATCH 133/192] Added version number

---
 InternalPythonModules/android/whatsapp.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/InternalPythonModules/android/whatsapp.py b/InternalPythonModules/android/whatsapp.py
index cc46bc0380..7afdf184c2 100644
--- a/InternalPythonModules/android/whatsapp.py
+++ b/InternalPythonModules/android/whatsapp.py
@@ -54,6 +54,7 @@ class WhatsAppAnalyzer(general.AndroidComponentAnalyzer):
         self._logger = Logger.getLogger(self.__class__.__name__)
         self._WHATSAPP_PACKAGE_NAME = "com.whatsapp"
         self._PARSER_NAME = "WhatsApp Parser"
+        self._VERSION = "2.19.244"
 
     def analyze(self, dataSource, fileManager, context):
         """

From 7f2464a2e59d6c7dd83b9aa6e5147587650bb448 Mon Sep 17 00:00:00 2001
From: "U-BASIS\\dsmyda" <dsmyda@win-dsmyd-4990.basistech.net>
Date: Sun, 15 Sep 2019 12:21:05 -0400
Subject: [PATCH 134/192] Fully implemented the whatsapp parser

---
 InternalPythonModules/android/general.py  |  11 +
 InternalPythonModules/android/whatsapp.py | 279 ++++++++++++++++++----
 2 files changed, 238 insertions(+), 52 deletions(-)

diff --git a/InternalPythonModules/android/general.py b/InternalPythonModules/android/general.py
index 28c96be9b9..53c123d13c 100644
--- a/InternalPythonModules/android/general.py
+++ b/InternalPythonModules/android/general.py
@@ -26,3 +26,14 @@ class AndroidComponentAnalyzer:
     # The Analyzer should implement this method
     def analyze(self, dataSource, fileManager, context):
         raise NotImplementedError
+
+"""
+A utility method to append list of attachments to msg body
+"""
+def appendAttachmentList(msgBody, attachmentsList):
+    body = msgBody
+    if attachmentsList:
+        body = body + "\n\n------------Attachments------------\n"
+        body = body + "\n".join(attachmentsList)
+
+    return body
diff --git a/InternalPythonModules/android/whatsapp.py b/InternalPythonModules/android/whatsapp.py
index 7afdf184c2..9ae57c09d6 100644
--- a/InternalPythonModules/android/whatsapp.py
+++ b/InternalPythonModules/android/whatsapp.py
@@ -41,13 +41,15 @@ from org.sleuthkit.datamodel import Account
 from TskMessagesParser import TskMessagesParser
 from TskContactsParser import TskContactsParser
 from TskCallLogsParser import TskCallLogsParser
+from general import appendAttachmentList
 
 import traceback
 import general
 
 class WhatsAppAnalyzer(general.AndroidComponentAnalyzer):
     """
-        Parses the WhatsApp databases for TSK contact and message artifacts.
+        Parses the WhatsApp databases for TSK contact, message 
+        and calllog artifacts.
     """
    
     def __init__(self):
@@ -58,8 +60,8 @@ class WhatsAppAnalyzer(general.AndroidComponentAnalyzer):
 
     def analyze(self, dataSource, fileManager, context):
         """
-            Extract, Transform and Load all TSK contact and message
-            artifacts from the WhatsApp databases.
+            Extract, Transform and Load all TSK contact, message
+            and calllog artifacts from the WhatsApp databases.
         """
 
         try:
@@ -109,12 +111,154 @@ class WhatsAppAnalyzer(general.AndroidComponentAnalyzer):
                     )
                 messages_parser.close()
 
+                group_calllogs_parser = WhatsAppGroupCallLogsParser(message_db)
+                while group_calllogs_parser.next():
+                    helper.addCalllog(
+                        group_calllogs_parser.get_call_direction(),
+                        group_calllogs_parser.get_phone_number_from(),
+                        group_calllogs_parser.get_phone_number_to(),
+                        group_calllogs_parser.get_call_start_date_time(),
+                        group_calllogs_parser.get_call_end_date_time(),
+                        group_calllogs_parser.get_call_type()
+                    )
+                group_calllogs_parser.close()
+
+                single_calllogs_parser = WhatsAppSingleCallLogsParser(message_db)
+                while single_calllogs_parser.next():
+                    helper.addCalllog(
+                        single_calllogs_parser.get_call_direction(),
+                        single_calllogs_parser.get_phone_number_from(),
+                        single_calllogs_parser.get_phone_number_to(),
+                        single_calllogs_parser.get_call_start_date_time(),
+                        single_calllogs_parser.get_call_end_date_time(),
+                        single_calllogs_parser.get_call_type()
+                    )
+                single_calllogs_parser.close()
+                
                 message_db.close()
         except (SQLException, TskCoreException) as ex:
             #Error parsing WhatsApp db
             self._logger.log(Level.WARNING, "Error parsing WhatsApp Databases", ex)
             self._logger.log(Level.WARNING, traceback.format_exec())
 
+class WhatsAppGroupCallLogsParser(TskCallLogsParser):
+    """
+        Extracts TSK_CALLLOG information from group call logs
+        in the WhatsApp database. 
+    """
+
+    def __init__(self, calllog_db):
+        super(WhatsAppGroupCallLogsParser, self).__init__(calllog_db.runQuery(
+                 """
+                     SELECT CL.video_call, 
+                            CL.timestamp, 
+                            CL.duration, 
+                            CL.from_me, 
+                            J.raw_string as from_num,
+                            group_concat(J.raw_string) AS group_members 
+                     FROM   call_log_participant_v2 AS CLP 
+                            JOIN call_log AS CL 
+                              ON CL._id = CLP.call_log_row_id 
+                            JOIN jid AS J 
+                              ON J._id = CLP.jid_row_id 
+                            GROUP  BY CL._id
+                 """
+             )
+        )
+        self._INCOMING_CALL_TYPE = 0
+        self._OUTGOING_CALL_TYPE = 1
+        self._VIDEO_CALL_TYPE = 1
+
+    def get_call_direction(self):
+        if self.result_set.getInt("from_me") == self._INCOMING_CALL_TYPE:
+            return self.INCOMING_CALL
+        return self.OUTGOING_CALL
+
+    def get_phone_number_from(self):
+        if self.get_call_direction() == self.INCOMING_CALL:
+            sender = self.result_set.getString("from_num")
+            return Account.Address(sender, sender)
+        return super(WhatsAppGroupCallLogsParser, self).get_phone_number_from()
+
+    def get_phone_number_to(self):
+        if self.get_call_direction() == self.OUTGOING_CALL:
+            group = self.result_set.getString("group_members")
+            members = []
+            for token in group.split(","):
+                members.append(Account.Address(token, token))
+            return members
+        return super(WhatsAppGroupCallLogsParser, self).get_phone_number_to()
+
+    def get_call_start_date_time(self):
+        return self.result_set.getLong("timestamp") / 1000
+
+    def get_call_end_date_time(self):
+        start = self.get_call_start_date_time()
+        duration = self.result_set.getInt("duration")
+        return start + duration
+    
+    def get_call_type(self):
+        if self.result_set.getInt("video_call") == self._VIDEO_CALL_TYPE:
+            return self.VIDEO_CALL
+        return self.AUDIO_CALL 
+
+class WhatsAppSingleCallLogsParser(TskCallLogsParser):
+    """
+        Extracts TSK_CALLLOG information from 1 to 1 call logs
+        in the WhatsApp database. 
+    """
+    
+    def __init__(self, calllog_db):
+        super(WhatsAppSingleCallLogsParser, self).__init__(calllog_db.runQuery(
+                 """
+                     SELECT CL.timestamp, 
+                            CL.video_call, 
+                            CL.duration, 
+                            J.raw_string AS num, 
+                            CL.from_me
+                     FROM   call_log AS CL 
+                            JOIN jid AS J 
+                              ON J._id = CL.jid_row_id 
+                     WHERE  CL._id NOT IN (SELECT DISTINCT call_log_row_id 
+                                           FROM   call_log_participant_v2) 
+                 """
+             )
+        )
+        self._INCOMING_CALL_TYPE = 0
+        self._OUTGOING_CALL_TYPE = 1
+        self._VIDEO_CALL_TYPE = 1
+    
+    def get_call_direction(self):
+        if self.result_set.getInt("from_me") == self._INCOMING_CALL_TYPE:
+            return self.INCOMING_CALL
+        return self.OUTGOING_CALL
+
+    def get_phone_number_from(self):
+        if self.get_call_direction() == self.INCOMING_CALL:
+            sender = self.result_set.getString("num")
+            return Account.Address(sender, sender)
+        return super(WhatsAppSingleCallLogsParser, self).get_phone_number_from()
+
+    def get_phone_number_to(self):
+        if self.get_call_direction() == self.OUTGOING_CALL:
+            to = self.result_set.getString("num") 
+            return Account.Address(to, to)
+        return super(WhatsAppSingleCallLogsParser, self).get_phone_number_to()
+
+    def get_call_start_date_time(self):
+        return self.result_set.getLong("timestamp") / 1000
+
+    def get_call_end_date_time(self):
+        start = self.get_call_start_date_time()
+        duration = self.result_set.getInt("duration")
+        return start + duration
+    
+    def get_call_type(self):
+        if self.result_set.getInt("video_call") == self._VIDEO_CALL_TYPE:
+            return self.VIDEO_CALL
+        return self.AUDIO_CALL 
+
+
 class WhatsAppContactsParser(TskContactsParser):
     """
         Extracts TSK_CONTACT information from the WhatsApp database.
@@ -125,14 +269,31 @@ class WhatsAppContactsParser(TskContactsParser):
     def __init__(self, contact_db):
         super(WhatsAppContactsParser, self).__init__(contact_db.runQuery(
                  """ 
-                     SELECT """ + _get_contacts_formatting() + """
+                     SELECT jid, 
+                            CASE 
+                              WHEN WC.number IS NULL THEN WC.jid 
+                              WHEN WC.number == "" THEN WC.jid 
+                              ELSE WC.number 
+                            END number, 
+                            CASE 
+                              WHEN WC.given_name IS NULL 
+                                   AND WC.family_name IS NULL 
+                                   AND WC.display_name IS NULL THEN WC.jid 
+                              WHEN WC.given_name IS NULL 
+                                   AND WC.family_name IS NULL THEN WC.display_name 
+                              WHEN WC.given_name IS NULL THEN WC.family_name 
+                              WHEN WC.family_name IS NULL THEN WC.given_name 
+                              ELSE WC.given_name 
+                                   || " " 
+                                   || WC.family_name 
+                            END name 
                      FROM   wa_contacts AS WC
                  """
-              )
+                  )
         )
 
     def get_account_name(self):
-        return self.get_phone()
+        return self.result_set.getString("jid")
 
     def get_contact_name(self):
         return self.result_set.getString("name")
@@ -150,73 +311,87 @@ class WhatsAppMessagesParser(TskMessagesParser):
     def __init__(self, message_db):
         super(WhatsAppMessagesParser, self).__init__(message_db.runQuery(
                  """
-                     SELECT M.data               AS content, 
-                        """+_get_contacts_formatting()+""",
-                            M.key_from_me        AS direction, 
-                            M.received_timestamp AS received_datetime, 
-                            M.timestamp          AS send_datetime 
-                     FROM   messages AS M 
-                            JOIN wadb.wa_contacts AS WC 
-                              ON M.key_remote_jid = WC.jid
+                     SELECT M.key_remote_jid  AS id, 
+                            contact_info.recipients, 
+                            key_from_me       AS direction, 
+                            CASE 
+		              WHEN M.data IS NULL THEN ""
+		              ELSE M.data 
+	                    END AS content,
+                            M.timestamp       AS send_timestamp, 
+                            M.received_timestamp, 
+                            M.remote_resource AS group_sender,
+                            M.media_url As attachment,
+	                    M.media_mime_type as attachment_mimetype
+                     FROM   (SELECT jid, 
+                                    recipients 
+                             FROM   wadb.wa_contacts AS WC 
+                                    LEFT JOIN (SELECT gjid, 
+                                                      group_concat(CASE 
+                                                                     WHEN jid == "" THEN NULL
+                                                                     ELSE jid
+                                                                   END) AS recipients 
+                                               FROM   group_participants 
+                                               GROUP  BY gjid) AS group_map 
+                                           ON WC.jid = group_map.gjid 
+                             GROUP  BY jid) AS contact_info 
+                            JOIN messages AS M 
+                              ON M.key_remote_jid = contact_info.jid
                  """
               )
         )
         self._WHATSAPP_MESSAGE_TYPE = "WhatsApp Message"
         self._INCOMING_MESSAGE_TYPE = 0
         self._OUTGOING_MESSAGE_TYPE = 1
+        self._message_db = message_db
 
     def get_message_type(self):
         return self._WHATSAPP_MESSAGE_TYPE 
 
     def get_phone_number_to(self):
-        if self.get_message_direction() == self.OUTGOING_MSG:
-            return Account.Address(self.result_set.getString("number"), 
-                        self.result_set.getString("number"))
+        group = self.result_set.getString("recipients")
+        if group is not None:
+            return Account.Address(self.result_set.getString("id"), group)
+        if self.get_message_direction() == self.OUTGOING:
+            return Account.Address(self.result_set.getString("id"), 
+                            self.result_set.getString("id"))
         return super(WhatsAppMessagesParser, self).get_phone_number_to()
 
     def get_phone_number_from(self):
-        if self.get_message_direction() == self.INCOMING_MSG:
-            return Account.Address(self.result_set.getString("number"), 
-                        self.result_set.getString("number"))
+        if self.get_message_direction() == self.INCOMING:
+            group_sender = self.result_set.getString("group_sender")
+            group = self.result_set.getString("recipients")
+            if group_sender is not None and group is not None:
+                return Account.Address(group_sender, group_sender)
+            else:
+                return Account.Address(self.result_set.getString("id"), 
+                            self.result_set.getString("id"))
         return super(WhatsAppMessagesParser, self).get_phone_number_from() 
 
     def get_message_direction(self):  
         direction = self.result_set.getInt("direction")
         if direction == self._INCOMING_MESSAGE_TYPE:
-            return self.INCOMING_MSG
-        return self.OUTGOING_MSG
+            return self.INCOMING
+        return self.OUTGOING
     
     def get_message_date_time(self):
         #transform from ms to seconds
-        if self.get_message_direction() == self.OUTGOING_MSG:
-            return self.result_set.getLong("send_datetime") / 1000
-        return self.result_set.getLong("received_datetime") / 1000
+        if self.get_message_direction() == self.OUTGOING:
+            return self.result_set.getLong("send_timestamp") / 1000
+        return self.result_set.getLong("received_timestamp") / 1000
 
     def get_message_text(self):
-        return self.result_set.getString("content") 
-
-def _get_contacts_formatting():
-    """
-        This function is here to explicitly stress the point that the 
-        formatting routine used in the contacts and messages parsers
-        should never differ. These fields are used to correlate in Autopsy.
-        
-        The SQL statement assumes wa_contacts table is named WC.
-    """
-
-    return """ 
-               CASE 
-                 WHEN WC.number IS NULL THEN WC.jid 
-                 WHEN WC.number == "" THEN WC.jid 
-                 ELSE WC.number 
-               END number, 
-               CASE 
-                 WHEN WC.given_name IS NULL 
-                      AND WC.family_name IS NULL THEN WC.jid 
-                 WHEN WC.given_name IS NULL THEN WC.family_name 
-                 WHEN WC.family_name IS NULL THEN WC.given_name 
-                 ELSE WC.given_name 
-                      || " " 
-                      || WC.family_name 
-               END name 
-           """
+        message = self.result_set.getString("content") 
+        attachment = self.result_set.getString("attachment")
+        if attachment is not None:
+            mime_type = self.result_set.getString("attachment_mimetype")
+            if mime_type is not None:
+                attachment += "\nMIME type: " + mime_type 
+            return appendAttachmentList(message, [attachment])
+        return message
+    
+    def get_thread_id(self):
+        group = self.result_set.getString("recipients")
+        if group is not None:
+            return self.result_set.getString("id")
+        return super(WhatsAppMessagesParser, self).get_thread_id()

From 8edaab679e626270263368758357d5a212efcd44 Mon Sep 17 00:00:00 2001
From: "U-BASIS\\dsmyda" <dsmyda@win-dsmyd-4990.basistech.net>
Date: Sun, 15 Sep 2019 12:32:35 -0400
Subject: [PATCH 135/192] infra upgrades

---
 .../android/TskCallLogsParser.py              | 26 +++++++++++--------
 .../android/TskMessagesParser.py              | 22 +++++++++-------
 InternalPythonModules/android/general.py      | 11 ++++++++
 3 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/InternalPythonModules/android/TskCallLogsParser.py b/InternalPythonModules/android/TskCallLogsParser.py
index 77c7aa12da..763ba3c15f 100644
--- a/InternalPythonModules/android/TskCallLogsParser.py
+++ b/InternalPythonModules/android/TskCallLogsParser.py
@@ -17,6 +17,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from ResultSetIterator import ResultSetIterator
+from org.sleuthkit.autopsy.coreutils import AppDBParserHelper
+from org.sleuthkit.datamodel import Account
 
 class TskCallLogsParser(ResultSetIterator):
     """
@@ -32,28 +34,30 @@ class TskCallLogsParser(ResultSetIterator):
 
     def __init__(self, result_set):
         super(TskCallLogsParser, self).__init__(result_set)
-        self.INCOMING_MSG_STRING = "Incoming"
-        self.OUTGOING_MSG_STRING = "Outgoing"
         self._DEFAULT_STRING = ""
-        self._DEFAULT_LONG = -1L
+        self._DEFAULT_DIRECTION = AppDBParserHelper.CommunicationDirection.UNKNOWN
+        self._DEFAULT_ADDRESS = None 
+        self._DEFAULT_CALL_TYPE = AppDBParserHelper.CallMediaType.UNKNOWN
 
-    def get_account_name(self):
-        return self._DEFAULT_STRING 
+        self.INCOMING_CALL = AppDBParserHelper.CommunicationDirection.INCOMING
+        self.OUTGOING_CALL = AppDBParserHelper.CommunicationDirection.OUTGOING
+        self.AUDIO_CALL = AppDBParserHelper.CallMediaType.AUDIO
+        self.VIDEO_CALL = AppDBParserHelper.CallMediaType.VIDEO
 
     def get_call_direction(self):
-        return self._DEFAULT_STRING 
+        return self._DEFAULT_DIRECTION 
 
     def get_phone_number_from(self):
-        return self._DEFAULT_STRING 
+        return self._DEFAULT_ADDRESS 
 
     def get_phone_number_to(self):
-        return self._DEFAULT_STRING 
+        return self._DEFAULT_ADDRESS 
 
     def get_call_start_date_time(self):
         return self._DEFAULT_LONG 
 
     def get_call_end_date_time(self):
         return self._DEFAULT_LONG 
-
-    def get_contact_name(self):
-        return self._DEFAULT_STRING
+    
+    def get_call_type(self):
+        return self._DEFAULT_CALL_TYPE
diff --git a/InternalPythonModules/android/TskMessagesParser.py b/InternalPythonModules/android/TskMessagesParser.py
index 0346a203e7..15c4166db7 100644
--- a/InternalPythonModules/android/TskMessagesParser.py
+++ b/InternalPythonModules/android/TskMessagesParser.py
@@ -17,6 +17,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from ResultSetIterator import ResultSetIterator
+from org.sleuthkit.datamodel import Account
+from org.sleuthkit.autopsy.coreutils import AppDBParserHelper
 
 class TskMessagesParser(ResultSetIterator):
     """
@@ -31,32 +33,34 @@ class TskMessagesParser(ResultSetIterator):
 
     def __init__(self, result_set):
         super(TskMessagesParser, self).__init__(result_set)
-        self.INCOMING_MSG_STRING = "Incoming"
-        self.OUTGOING_MSG_STRING = "Outgoing"
         self._DEFAULT_TEXT = ""
         self._DEFAULT_LONG = -1L
-        self._DEFAULT_INT = -1
+        self._DEFAULT_MSG_READ_STATUS = AppDBParserHelper.MessageReadStatusEnum.UNKNOWN
+        self._DEFAULT_ACCOUNT_ADDRESS = None 
+        self._DEFAULT_COMMUNICATION_DIRECTION = AppDBParserHelper.CommunicationDirection.UNKNOWN
 
-    def get_account_id(self):
-        return self._DEFAULT_TEXT
+        self.INCOMING = AppDBParserHelper.CommunicationDirection.INCOMING
+        self.OUTGOING = AppDBParserHelper.CommunicationDirection.OUTGOING
+        self.READ = AppDBParserHelper.MessageReadStatusEnum.READ
+        self.UNREAD = AppDBParserHelper.MessageReadStatusEnum.UNREAD
 
     def get_message_type(self):
         return self._DEFAULT_TEXT
 
     def get_message_direction(self):  
-        return self._DEFAULT_TEXT
+        return self._DEFAULT_COMMUNICATION_DIRECTION
 
     def get_phone_number_from(self):
-        return self._DEFAULT_TEXT
+        return self._DEFAULT_ACCOUNT_ADDRESS
 
     def get_phone_number_to(self):
-        return self._DEFAULT_TEXT
+        return self._DEFAULT_ACCOUNT_ADDRESS
 
     def get_message_date_time(self):
         return self._DEFAULT_LONG
 
     def get_message_read_status(self):
-        return self._DEFAULT_INT
+        return self._DEFAULT_MSG_READ_STATUS
 
     def get_message_subject(self):
         return self._DEFAULT_TEXT
diff --git a/InternalPythonModules/android/general.py b/InternalPythonModules/android/general.py
index 28c96be9b9..53c123d13c 100644
--- a/InternalPythonModules/android/general.py
+++ b/InternalPythonModules/android/general.py
@@ -26,3 +26,14 @@ class AndroidComponentAnalyzer:
     # The Analyzer should implement this method
     def analyze(self, dataSource, fileManager, context):
         raise NotImplementedError
+
+"""
+A utility method to append list of attachments to msg body
+"""
+def appendAttachmentList(msgBody, attachmentsList):
+    body = msgBody
+    if attachmentsList:
+        body = body + "\n\n------------Attachments------------\n"
+        body = body + "\n".join(attachmentsList)
+
+    return body

From 8259882b71b84518f60de7bc48ca87fbb19e5082 Mon Sep 17 00:00:00 2001
From: "U-BASIS\\dsmyda" <dsmyda@win-dsmyd-4990.basistech.net>
Date: Sun, 15 Sep 2019 22:04:27 -0400
Subject: [PATCH 136/192] Fully implemented line parser

---
 .../android/TskCallLogsParser.py              |   1 +
 InternalPythonModules/android/line.py         | 211 +++++++++++-------
 2 files changed, 136 insertions(+), 76 deletions(-)

diff --git a/InternalPythonModules/android/TskCallLogsParser.py b/InternalPythonModules/android/TskCallLogsParser.py
index 763ba3c15f..8c61070693 100644
--- a/InternalPythonModules/android/TskCallLogsParser.py
+++ b/InternalPythonModules/android/TskCallLogsParser.py
@@ -38,6 +38,7 @@ class TskCallLogsParser(ResultSetIterator):
         self._DEFAULT_DIRECTION = AppDBParserHelper.CommunicationDirection.UNKNOWN
         self._DEFAULT_ADDRESS = None 
         self._DEFAULT_CALL_TYPE = AppDBParserHelper.CallMediaType.UNKNOWN
+        self._DEFAULT_LONG = -1
 
         self.INCOMING_CALL = AppDBParserHelper.CommunicationDirection.INCOMING
         self.OUTGOING_CALL = AppDBParserHelper.CommunicationDirection.OUTGOING
diff --git a/InternalPythonModules/android/line.py b/InternalPythonModules/android/line.py
index df8db5d088..d7cab1b852 100644
--- a/InternalPythonModules/android/line.py
+++ b/InternalPythonModules/android/line.py
@@ -31,8 +31,8 @@ from org.apache.commons.codec.binary import Base64
 from org.sleuthkit.autopsy.casemodule import Case
 from org.sleuthkit.autopsy.coreutils import Logger
 from org.sleuthkit.autopsy.coreutils import MessageNotifyUtil
-from org.sleuthkit.autopsy.coreutils import AppSQLiteDB as SQLiteUtil
-from org.sleuthkit.autopsy.coreutils import AppDBParserHelper as BlackboardUtil
+from org.sleuthkit.autopsy.coreutils import AppSQLiteDB 
+from org.sleuthkit.autopsy.coreutils import AppDBParserHelper
 from org.sleuthkit.autopsy.datamodel import ContentUtils
 from org.sleuthkit.autopsy.ingest import IngestJobContext
 from org.sleuthkit.datamodel import AbstractFile
@@ -57,18 +57,22 @@ class LineAnalyzer(general.AndroidComponentAnalyzer):
         self._logger = Logger.getLogger(self.__class__.__name__)
         self._LINE_PACKAGE_NAME = "jp.naver.line.android"
         self._PARSER_NAME = "Line Parser"
+        self._VERSION = "9.15.1"
 
     def analyze(self, dataSource, fileManager, context):
         try:
-            contact_and_message_dbs = SQLiteUtil.findAppDatabases(dataSource, "naver_line.db", True, self._LINE_PACKAGE_NAME)
-            calllog_dbs = SQLiteUtil.findAppDatabases(dataSource, "call_history", True, self._LINE_PACKAGE_NAME)
+            contact_and_message_dbs = AppSQLiteDB.findAppDatabases(dataSource, 
+                    "naver_line", True, self._LINE_PACKAGE_NAME)
+            calllog_dbs = AppSQLiteDB.findAppDatabases(dataSource,
+                    "call_history", True, self._LINE_PACKAGE_NAME)
 
             for contact_and_message_db in contact_and_message_dbs:
-                blackboard_util = BlackboardUtil(self._PARSER_NAME, contact_and_message_db.getDBFile(), Account.Type.LINE) 
+                helper = AppDBParserHelper(self._PARSER_NAME, 
+                            contact_and_message_db.getDBFile(), Account.Type.LINE) 
 
                 contacts_parser = LineContactsParser(contact_and_message_db)
                 while contacts_parser.next():
-                    blackboard_util.addContact( 
+                    helper.addContact( 
                         contacts_parser.get_account_name(), 
                         contacts_parser.get_contact_name(), 
                         contacts_parser.get_phone(),
@@ -77,11 +81,10 @@ class LineAnalyzer(general.AndroidComponentAnalyzer):
                         contacts_parser.get_email()
                     )
                 contacts_parser.close()
-                """
-                messages_parser = LineMessagesParser(line_db)
+
+                messages_parser = LineMessagesParser(contact_and_message_db)
                 while messages_parser.next():
-                    blackboard_util.addMessage(
-                        messages_parser.get_account_id(),
+                    helper.addMessage(
                         messages_parser.get_message_type(),
                         messages_parser.get_message_direction(),
                         messages_parser.get_phone_number_from(),
@@ -93,36 +96,27 @@ class LineAnalyzer(general.AndroidComponentAnalyzer):
                         messages_parser.get_thread_id() 
                     )
                 messages_parser.close()
-                """
                 contact_and_message_db.close()
 
             for calllog_db in calllog_dbs:
-                blackboard_util = BlackboardUtil(self._PARSER_NAME, calllog_db.getDBFile(), Account.Type.LINE)
-                calllog_db.attachDatabase(dataSource, "naver_line.db", True, calllog_db.getDBFile().getParentPath(), "naver")
+                helper = AppDBParserHelper(self._PARSER_NAME,
+                         calllog_db.getDBFile(), Account.Type.LINE)
+                calllog_db.attachDatabase(dataSource, 
+                        "naver_line", calllog_db.getDBFile().getParentPath(), "naver")
 
                 calllog_parser = LineCallLogsParser(calllog_db)
                 while calllog_parser.next():
-                    print(calllog_parser.get_account_name())
-                    print(calllog_parser.get_contact_name())
-                    print(calllog_parser.get_call_direction())
-                    print(calllog_parser.get_phone_number_from())
-                    print(calllog_parser.get_phone_number_to())
-                    print(calllog_parser.get_call_start_date_time())
-                    print(calllog_parser.get_call_end_date_time())
-                    blackboard_util.addCalllog(
-                        calllog_parser.get_account_name(),
+                    helper.addCalllog(
                         calllog_parser.get_call_direction(),
                         calllog_parser.get_phone_number_from(),
                         calllog_parser.get_phone_number_to(),
                         calllog_parser.get_call_start_date_time(),
                         calllog_parser.get_call_end_date_time(),
-                        calllog_parser.get_contact_name()
+                        calllog_parser.get_call_type()
                     )
-
-                calllog_db.detachDatabase("naver")
                 calllog_parser.close()
-                calllog_db.close()
 
+                calllog_db.close()
         except (SQLException, TskCoreException) as ex:
             # Error parsing Line databases.
             self._logger.log(Level.WARNING, "Error parsing the Line App Databases", ex)
@@ -141,47 +135,62 @@ class LineCallLogsParser(TskCallLogsParser):
                      SELECT substr(CallH.call_type, -1) AS direction, 
                             CallH.start_time            AS start_time, 
                             CallH.end_time              AS end_time, 
-                            ConT.server_name            AS account_name, 
-                            ConT.name                   AS contact_name 
-                     FROM   call_history AS CallH 
-                            JOIN naver.contacts AS ConT 
-                              ON CallH.caller_mid = ConT.m_id 
+                            ConT.server_name            AS name, 
+                            CallH.voip_type             AS call_type, 
+                            ConT.m_id 
+                            FROM   call_history AS CallH 
+                                   JOIN naver.contacts AS ConT 
+                                     ON CallH.caller_mid = ConT.m_id
                  """
              )
         )
-        self._OUTGOING_CALL = "O"
-        self._INCOMING_CALL = "I"
+        self._OUTGOING_CALL_TYPE = "O"
+        self._INCOMING_CALL_TYPE = "I"
         self._had_error = False
+        self._VIDEO_CALL_TYPE = "V"
+        self._AUDIO_CALL_TYPE = "A"
 
-        def get_call_direction(self):
-            direction = self.result_set.getString("direction")
-            if direction == self._OUTGOING_CALL:
-                return self.OUTGOING_MSG_STRING
-            return self.INCOMING_MSG_STRING
+    def get_call_direction(self):
+        direction = self.result_set.getString("direction")
+        if direction == self._OUTGOING_CALL_TYPE:
+            return self.OUTGOING_CALL
+        return self.INCOMING_CALL
 
-        def get_call_start_date_time(self):
-            start_time = self.result_set.getString("start_time")
-            try:
-                return long(start_time) / 1000
-            except ValueError as ve:
-                self._had_error = True
-                print("bad_conversion")
-                return super(LineCallLogsParser, self).get_call_start_date_time()
+    def get_call_start_date_time(self):
+        try:
+            return long(self.result_set.getString("start_time")) / 1000
+        except ValueError as ve:
+            self._had_error = True
+            return super(LineCallLogsParser, self).get_call_start_date_time()
 
-        def get_call_end_date_time(self):
-            end_time = self.result_set.getString("end_time")
-            try:
-                return long(end_time) / 1000
-            except ValueError as ve:
-                self._had_error = True
-                print("bad conversion")
-                return super(LineCallLogsParser, self).get_call_end_date_time()
+    def get_call_end_date_time(self):
+        try:
+            return long(self.result_set.getString("end_time")) / 1000
+        except ValueError as ve:
+            self._had_error = True
+            return super(LineCallLogsParser, self).get_call_end_date_time()
+    
+    def get_phone_number_to(self):
+        if self.get_call_direction() == self.OUTGOING_CALL:
+            return Account.Address(self.result_set.getString("m_id"), 
+                        self.result_set.getString("name"))
+        return super(LineCallLogsParser, self).get_phone_number_to()
 
-        def get_account_name(self):
-            return self.result_set.getString("account_name")
+    def get_phone_number_from(self):
+        if self.get_call_direction() == self.INCOMING_CALL:
+            return Account.Address(self.result_set.getString("m_id"),
+                        self.result_set.getString("name"))
+        return super(LineCallLogsParser, self).get_phone_number_from()
 
-        def get_contact_name(self):
-            return self.result_set.getString("contact_name")
+    def get_call_type(self):
+        if self.result_set.getString("call_type") == self._VIDEO_CALL_TYPE:
+            return self.VIDEO_CALL
+        if self.result_set.getString("call_type") == self._AUDIO_CALL_TYPE:
+            return self.AUDIO_CALL
+        return super(LineCallLogsParser, self).get_call_type()
+
+    def has_incomplete_results(self):
+        return self._had_error
 
 class LineContactsParser(TskContactsParser):
     """
@@ -193,17 +202,17 @@ class LineContactsParser(TskContactsParser):
     def __init__(self, contact_db):
         super(LineContactsParser, self).__init__(contact_db.runQuery(
                  """
-                     SELECT name,
+                     SELECT m_id,
                             server_name
                      FROM   contacts
                  """
               )
         )
     def get_account_name(self):
-        return self.result_set.getString("server_name")
+        return self.result_set.getString("m_id")
 
     def get_contact_name(self):
-        return self.result_set.getString("name")
+        return self.result_set.getString("server_name")
 
 class LineMessagesParser(TskMessagesParser):
     """
@@ -213,23 +222,45 @@ class LineMessagesParser(TskMessagesParser):
     """
 
     def __init__(self, message_db):
-        super().__init__(message_db.runQuery(
-            """SELECT created_time, content, contacts.server_name AS server_name, read_count
-                                              FROM chat_history 
-                                                   JOIN contacts 
-                                                        ON chat_history.from_mid = contacts.m_id"""
-        ))
+        super(LineMessagesParser, self).__init__(message_db.runQuery(
+            """
+                SELECT all_contacts.name, 
+                       all_contacts.id, 
+                       all_contacts.members, 
+                       CH.from_mid, 
+                       CH.content, 
+                       CH.created_time, 
+                       CH.attachement_type, 
+                       CH.attachement_local_uri,
+                       CH.status 
+                FROM   (SELECT G.name, 
+                               group_members.id, 
+                               group_members.members 
+                        FROM   (SELECT id, 
+                                       group_concat(m_id) AS members 
+                                FROM   membership 
+                                GROUP  BY id) AS group_members 
+                               JOIN groups AS G 
+                                 ON G.id = group_members.id 
+                        UNION 
+                        SELECT server_name, 
+                               m_id, 
+                               NULL 
+                        FROM   contacts) AS all_contacts 
+                       JOIN chat_history AS CH 
+                         ON CH.chat_id = all_contacts.id
+            """
+                        )
+        )
         self._LINE_MESSAGE_TYPE = "Line Message"
+        #From the limited test data, it appeared that incoming
+        #was only associated with a 1 status. Status # 3 and 7
+        #was only associated with outgoing.
+        self._INCOMING_MESSAGE_TYPE = 1
         self._had_error = False
 
-    def get_account_id(self):
-        return self.result_set.getString("server_name")
-
     def get_message_type(self):
-        return self.LINE_MESSAGE_TYPE
-
-    def get_phone_number_from(self):
-        return self.result_set("server_name")
+        return self._LINE_MESSAGE_TYPE
 
     def get_message_date_time(self):
         created_time = self.result_set.getString("created_time")
@@ -242,6 +273,34 @@ class LineMessagesParser(TskMessagesParser):
 
     def get_message_text(self):
         content = self.result_set.getString("content") 
-        if not LineContentUtil.is_text_message(content):
-            return ""
         return content
+
+    def get_message_direction(self):  
+        if self.result_set.getInt("status") == self._INCOMING_MESSAGE_TYPE:
+            return self.INCOMING
+        return self.OUTGOING
+
+    def get_phone_number_from(self):
+        if self.get_message_direction() == self.INCOMING:
+            group = self.result_set.getString("members")
+            if group is None:
+                return Account.Address(self.result_set.getString("from_mid"),
+                            self.result_set.getString("name"))
+            return Account.Address(self.result_set.getString("from_mid"),
+                            self.result_set.getString("name"))
+        return super(LineMessagesParser, self).get_phone_number_from()
+
+    def get_phone_number_to(self):
+        if self.get_message_direction() == self.OUTGOING:
+            group = self.result_set.getString("members")
+            if group is None:
+                return Account.Address(self.result_set.getString("id"),
+                            self.result_set.getString("name"))
+            return Account.Address(group, self.result_set.getString("name"))
+        return super(LineMessagesParser, self).get_phone_number_to()
+
+    def get_thread_id(self):
+        members = self.result_set.getString("members")
+        if members is not None:
+            return self.result_set.getString("id")
+        return super(LineMessagesParser, self).get_thread_id()

From 5b87544b97fe22b6bae72f8eb1c1aca52ea9c993 Mon Sep 17 00:00:00 2001
From: "U-BASIS\\dsmyda" <dsmyda@win-dsmyd-4990.basistech.net>
Date: Sun, 15 Sep 2019 23:29:10 -0400
Subject: [PATCH 137/192] Added attachments and removed call logs

---
 InternalPythonModules/android/line.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/InternalPythonModules/android/line.py b/InternalPythonModules/android/line.py
index d7cab1b852..1dc9871329 100644
--- a/InternalPythonModules/android/line.py
+++ b/InternalPythonModules/android/line.py
@@ -44,6 +44,7 @@ from org.sleuthkit.datamodel import Account
 from TskContactsParser import TskContactsParser
 from TskMessagesParser import TskMessagesParser
 from TskCallLogsParser import TskCallLogsParser
+from general import appendAttachmentList
 
 import traceback
 import general
@@ -114,6 +115,7 @@ class LineAnalyzer(general.AndroidComponentAnalyzer):
                         calllog_parser.get_call_end_date_time(),
                         calllog_parser.get_call_type()
                     )
+                calllog_db.detachDatabase("naver")
                 calllog_parser.close()
 
                 calllog_db.close()
@@ -249,6 +251,7 @@ class LineMessagesParser(TskMessagesParser):
                         FROM   contacts) AS all_contacts 
                        JOIN chat_history AS CH 
                          ON CH.chat_id = all_contacts.id
+                WHERE attachement_type != 6
             """
                         )
         )
@@ -273,6 +276,11 @@ class LineMessagesParser(TskMessagesParser):
 
     def get_message_text(self):
         content = self.result_set.getString("content") 
+        attachment_uri = self.result_set.getString("attachement_local_uri")
+        if attachment_uri is not None and content is not None:
+            return appendAttachmentList(content, [attachment_uri])
+        elif attachment_uri is not None and content is None:
+            return appendAttachmentList("", [attachment_uri])
         return content
 
     def get_message_direction(self):  

From bbaa32957d2376f33fae8da395d93cb536edb1ae Mon Sep 17 00:00:00 2001
From: Kelly Kelly <kelly@basistech.com>
Date: Mon, 16 Sep 2019 11:24:03 -0400
Subject: [PATCH 138/192] Made the tag and hash hit filters generic

---
 .../autopsy/timeline/FilteredEventsModel.java | 44 -----------
 .../timeline/ui/detailview/EventNodeBase.java | 54 +++++++------
 .../filtering/datamodel/RootFilterState.java  | 42 +++++-----
 .../filtering/datamodel/SqlFilterState.java   |  9 +++
 .../filtering/datamodel/TagsFilterState.java  | 78 -------------------
 5 files changed, 56 insertions(+), 171 deletions(-)
 delete mode 100755 Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/TagsFilterState.java

diff --git a/Core/src/org/sleuthkit/autopsy/timeline/FilteredEventsModel.java b/Core/src/org/sleuthkit/autopsy/timeline/FilteredEventsModel.java
index 457939f04c..c49c85049d 100755
--- a/Core/src/org/sleuthkit/autopsy/timeline/FilteredEventsModel.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/FilteredEventsModel.java
@@ -35,9 +35,7 @@ import javafx.beans.InvalidationListener;
 import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
 import javafx.collections.ObservableMap;
-import javafx.collections.ObservableSet;
 import static org.apache.commons.collections4.CollectionUtils.emptyIfNull;
 import static org.apache.commons.collections4.CollectionUtils.isNotEmpty;
 import org.joda.time.DateTimeZone;
@@ -58,7 +56,6 @@ import org.sleuthkit.autopsy.timeline.events.TagsAddedEvent;
 import org.sleuthkit.autopsy.timeline.events.TagsDeletedEvent;
 import org.sleuthkit.autopsy.timeline.ui.filtering.datamodel.FilterState;
 import org.sleuthkit.autopsy.timeline.ui.filtering.datamodel.RootFilterState;
-import org.sleuthkit.autopsy.timeline.ui.filtering.datamodel.TagsFilterState;
 import org.sleuthkit.autopsy.timeline.utils.CacheLoaderImpl;
 import org.sleuthkit.autopsy.timeline.utils.FilterUtils;
 import org.sleuthkit.autopsy.timeline.zooming.ZoomState;
@@ -70,7 +67,6 @@ import org.sleuthkit.datamodel.ContentTag;
 import org.sleuthkit.datamodel.DataSource;
 import org.sleuthkit.datamodel.SleuthkitCase;
 import org.sleuthkit.datamodel.Tag;
-import org.sleuthkit.datamodel.TagName;
 import org.sleuthkit.datamodel.TimelineManager;
 import org.sleuthkit.datamodel.TskCoreException;
 import org.sleuthkit.datamodel.TimelineEvent;
@@ -81,10 +77,8 @@ import org.sleuthkit.datamodel.TimelineFilter.DataSourcesFilter;
 import org.sleuthkit.datamodel.TimelineFilter.EventTypeFilter;
 import org.sleuthkit.datamodel.TimelineFilter.FileTypesFilter;
 import org.sleuthkit.datamodel.TimelineFilter.HashHitsFilter;
-import org.sleuthkit.datamodel.TimelineFilter.HashSetFilter;
 import org.sleuthkit.datamodel.TimelineFilter.HideKnownFilter;
 import org.sleuthkit.datamodel.TimelineFilter.RootFilter;
-import org.sleuthkit.datamodel.TimelineFilter.TagNameFilter;
 import org.sleuthkit.datamodel.TimelineFilter.TagsFilter;
 import org.sleuthkit.datamodel.TimelineFilter.TextFilter;
 
@@ -129,8 +123,6 @@ public final class FilteredEventsModel {
     private final LoadingCache<ZoomState, Map<TimelineEventType, Long>> eventCountsCache;
     /** Map from datasource id to datasource name. */
     private final ObservableMap<Long, String> datasourcesMap = FXCollections.observableHashMap();
-    private final ObservableSet< String> hashSets = FXCollections.observableSet();
-    private final ObservableList<TagName> tagNames = FXCollections.observableArrayList();
     // end caches
 
     /**
@@ -171,8 +163,6 @@ public final class FilteredEventsModel {
         };
 
         datasourcesMap.addListener(filterSyncListener);
-        hashSets.addListener(filterSyncListener);
-        tagNames.addListener(filterSyncListener);
 
         requestedFilter.set(getDefaultFilter());
 
@@ -248,15 +238,11 @@ public final class FilteredEventsModel {
      */
     synchronized private void populateFilterData() throws TskCoreException {
         SleuthkitCase skCase = autoCase.getSleuthkitCase();
-        hashSets.addAll(eventManager.getHashSetNames());
 
         //because there is no way to remove a datasource we only add to this map.
         for (DataSource ds : skCase.getDataSources()) {
             datasourcesMap.putIfAbsent(ds.getId(), ds.getName());
         }
-
-        //should this only be tags applied to files or event bearing artifacts?
-        tagNames.setAll(skCase.getTagNamesInUse());
     }
 
     /**
@@ -269,22 +255,8 @@ public final class FilteredEventsModel {
      *                        with the tags in use in the case
      */
     public void syncFilters(RootFilterState rootFilterState) {
-        TagsFilterState tagsFilterState = rootFilterState.getTagsFilterState();
-        for (TagName tagName : tagNames) {
-            tagsFilterState.getFilter().addSubFilter(new TagNameFilter(tagName));
-        }
-        for (FilterState<? extends TagNameFilter> tagFilterState : rootFilterState.getTagsFilterState().getSubFilterStates()) {
-            // disable states for tag names that don't exist in case.
-            tagFilterState.setDisabled(tagNames.contains(tagFilterState.getFilter().getTagName()) == false);
-        }
-
         DataSourcesFilter dataSourcesFilter = rootFilterState.getDataSourcesFilterState().getFilter();
         datasourcesMap.entrySet().forEach(entry -> dataSourcesFilter.addSubFilter(newDataSourceFromMapEntry(entry)));
-
-        HashHitsFilter hashSetsFilter = rootFilterState.getHashHitsFilterState().getFilter();
-        for (String hashSet : hashSets) {
-            hashSetsFilter.addSubFilter(new HashSetFilter(hashSet));
-        }
     }
 
     /**
@@ -351,10 +323,8 @@ public final class FilteredEventsModel {
                 -> dataSourcesFilter.addSubFilter(newDataSourceFromMapEntry(dataSourceEntry)));
 
         HashHitsFilter hashHitsFilter = new HashHitsFilter();
-        hashSets.stream().map(HashSetFilter::new).forEach(hashHitsFilter::addSubFilter);
 
         TagsFilter tagsFilter = new TagsFilter();
-        tagNames.stream().map(TagNameFilter::new).forEach(tagsFilter::addSubFilter);
 
         FileTypesFilter fileTypesFilter = FilterUtils.createDefaultFileTypesFilter();
 
@@ -388,20 +358,6 @@ public final class FilteredEventsModel {
         return events;
     }
 
-    /**
-     * get a count of tagnames applied to the given event ids as a map from
-     * tagname displayname to count of tag applications
-     *
-     * @param eventIDsWithTags the event ids to get the tag counts map for
-     *
-     * @return a map from tagname displayname to count of applications
-     *
-     * @throws org.sleuthkit.datamodel.TskCoreException
-     */
-    public Map<String, Long> getTagCountsByTagName(Set<Long> eventIDsWithTags) throws TskCoreException {
-        return eventManager.getTagCountsByTagName(eventIDsWithTags);
-    }
-
     public List<Long> getEventIDs(Interval timeRange, FilterState<? extends TimelineFilter> filter) throws TskCoreException {
 
         final Interval overlap;
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventNodeBase.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventNodeBase.java
index 17c6e3c394..1977d3ce6d 100755
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventNodeBase.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventNodeBase.java
@@ -269,7 +269,7 @@ public abstract class EventNodeBase<Type extends DetailViewEvent> extends StackP
     }
 
     /**
-     * defer tooltip content creation till needed, this had a surprisingly large
+     * defer tooltip content creation until needed, this had a surprisingly large
      * impact on speed of loading the chart
      */
     @NbBundle.Messages({"# {0} - counts",
@@ -293,37 +293,35 @@ public abstract class EventNodeBase<Type extends DetailViewEvent> extends StackP
 
                 @Override
                 protected String call() throws Exception {
-                    HashMap<String, Long> hashSetCounts = new HashMap<>();
-                    if (tlEvent.getEventIDsWithHashHits().isEmpty() == false) {
-                        try {
-                            //TODO:push this to DB
-                            for (TimelineEvent tle : eventsModel.getEventsById(tlEvent.getEventIDsWithHashHits())) {
-                                Set<String> hashSetNames = sleuthkitCase.getContentById(tle.getFileObjID()).getHashSetNames();
-                                for (String hashSetName : hashSetNames) {
-                                    hashSetCounts.merge(hashSetName, 1L, Long::sum);
-                                }
-                            }
-                        } catch (TskCoreException ex) {
-                            LOGGER.log(Level.SEVERE, "Error getting hashset hit info for event.", ex); //NON-NLS
-                        }
-                    }
-                    String hashSetCountsString = hashSetCounts.entrySet().stream()
-                            .map((Map.Entry<String, Long> t) -> t.getKey() + " : " + t.getValue())
-                            .collect(Collectors.joining("\n"));
+//                    HashMap<String, Long> hashSetCounts = new HashMap<>();
+//                    if (tlEvent.getEventIDsWithHashHits().isEmpty() == false) {
+//                        try {
+//                            //TODO:push this to DB
+//                            for (TimelineEvent tle : eventsModel.getEventsById(tlEvent.getEventIDsWithHashHits())) {
+//                                Set<String> hashSetNames = sleuthkitCase.getContentById(tle.getFileObjID()).getHashSetNames();
+//                                for (String hashSetName : hashSetNames) {
+//                                    hashSetCounts.merge(hashSetName, 1L, Long::sum);
+//                                }
+//                            }
+//                        } catch (TskCoreException ex) {
+//                            LOGGER.log(Level.SEVERE, "Error getting hashset hit info for event.", ex); //NON-NLS
+//                        }
+//                    }
+//                    String hashSetCountsString = hashSetCounts.entrySet().stream()
+//                            .map((Map.Entry<String, Long> t) -> t.getKey() + " : " + t.getValue())
+//                            .collect(Collectors.joining("\n"));
 
-                    Map<String, Long> tagCounts = new HashMap<>();
-                    if (tlEvent.getEventIDsWithTags().isEmpty() == false) {
-                        tagCounts.putAll(eventsModel.getTagCountsByTagName(tlEvent.getEventIDsWithTags()));
-                    }
-                    String tagCountsString = tagCounts.entrySet().stream()
-                            .map((Map.Entry<String, Long> t) -> t.getKey() + " : " + t.getValue())
-                            .collect(Collectors.joining("\n"));
+//                    Map<String, Long> tagCounts = new HashMap<>();
+//                    if (tlEvent.getEventIDsWithTags().isEmpty() == false) {
+//                        tagCounts.putAll(eventsModel.getTagCountsByTagName(tlEvent.getEventIDsWithTags()));
+//                    }
+//                    String tagCountsString = tagCounts.entrySet().stream()
+//                            .map((Map.Entry<String, Long> t) -> t.getKey() + " : " + t.getValue())
+//                            .collect(Collectors.joining("\n"));
 
                     return Bundle.EventNodeBase_tooltip_text(getEventIDs().size(), getEventType(), getDescription(),
                             TimeLineController.getZonedFormatter().print(getStartMillis()),
-                            TimeLineController.getZonedFormatter().print(getEndMillis() + 1000))
-                           + (hashSetCountsString.isEmpty() ? "" : Bundle.EventNodeBase_toolTip_hashSetHits(hashSetCountsString))
-                           + (tagCountsString.isEmpty() ? "" : Bundle.EventNodeBase_toolTip_tags(tagCountsString));
+                            TimeLineController.getZonedFormatter().print(getEndMillis() + 1000));
                 }
 
                 @Override
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/RootFilterState.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/RootFilterState.java
index 66f53c8998..d33a32ed21 100755
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/RootFilterState.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/RootFilterState.java
@@ -35,21 +35,21 @@ import org.sleuthkit.datamodel.TimelineFilter.EventTypeFilter;
 import org.sleuthkit.datamodel.TimelineFilter.FileTypeFilter;
 import org.sleuthkit.datamodel.TimelineFilter.FileTypesFilter;
 import org.sleuthkit.datamodel.TimelineFilter.HashHitsFilter;
-import org.sleuthkit.datamodel.TimelineFilter.HashSetFilter;
 import org.sleuthkit.datamodel.TimelineFilter.HideKnownFilter;
 import org.sleuthkit.datamodel.TimelineFilter.RootFilter;
 import org.sleuthkit.datamodel.TimelineFilter.TextFilter;
+import org.sleuthkit.datamodel.TimelineFilter.TagsFilter;
 
 /** A FilterState for RootFilters. Provides named access to the sub
- * filterstates.
+ * filter states.
  */
 public class RootFilterState extends CompoundFilterState<TimelineFilter, RootFilter> {
 
     private final CompoundFilterState<EventTypeFilter, EventTypeFilter> eventTypeFilterState;
     private final SqlFilterState<HideKnownFilter> knownFilterState;
     private final SqlFilterState<TextFilter> textFilterState;
-    private final TagsFilterState tagsFilterState;
-    private final CompoundFilterState<HashSetFilter, HashHitsFilter> hashHitsFilterState;
+    private final SqlFilterState<TagsFilter> tagsFilterState;
+    private final SqlFilterState<HashHitsFilter> hashHitsFilterState;
     private final CompoundFilterState<DataSourceFilter, DataSourcesFilter> dataSourcesFilterState;
     private final CompoundFilterState<TimelineFilter.FileTypeFilter, TimelineFilter.FileTypesFilter> fileTypesFilterState;
 
@@ -63,8 +63,8 @@ public class RootFilterState extends CompoundFilterState<TimelineFilter, RootFil
                 new CompoundFilterState<>(delegate.getEventTypeFilter()),
                 new SqlFilterState<>(delegate.getKnownFilter()),
                 new SqlFilterState<>(delegate.getTextFilter()),
-                new TagsFilterState(delegate.getTagsFilter()),
-                new CompoundFilterState<>(delegate.getHashHitsFilter()),
+                new SqlFilterState<>(delegate.getTagsFilter()),
+                new SqlFilterState<>(delegate.getHashHitsFilter()),
                 new CompoundFilterState<>(delegate.getDataSourcesFilter()),
                 new CompoundFilterState<>(delegate.getFileTypesFilter())
         );
@@ -74,8 +74,8 @@ public class RootFilterState extends CompoundFilterState<TimelineFilter, RootFil
                             CompoundFilterState<EventTypeFilter, EventTypeFilter> eventTypeFilterState,
                             SqlFilterState<HideKnownFilter> knownFilterState,
                             SqlFilterState<TextFilter> textFilterState,
-                            TagsFilterState tagsFilterState,
-                            CompoundFilterState<HashSetFilter, HashHitsFilter> hashHitsFilterState,
+                            SqlFilterState<TagsFilter> tagsFilterState,
+                            SqlFilterState<HashHitsFilter> hashHitsFilterState,
                             CompoundFilterState<DataSourceFilter, DataSourcesFilter> dataSourcesFilterState,
                             CompoundFilterState<FileTypeFilter, FileTypesFilter> fileTypesFilterState) {
         super(filter, Arrays.asList(eventTypeFilterState, knownFilterState, textFilterState, tagsFilterState, hashHitsFilterState, dataSourcesFilterState, fileTypesFilterState));
@@ -133,11 +133,11 @@ public class RootFilterState extends CompoundFilterState<TimelineFilter, RootFil
         return textFilterState;
     }
 
-    public TagsFilterState getTagsFilterState() {
+    public SqlFilterState<TagsFilter> getTagsFilterState() {
         return tagsFilterState;
     }
 
-    public CompoundFilterState<HashSetFilter, HashHitsFilter> getHashHitsFilterState() {
+    public SqlFilterState<HashHitsFilter> getHashHitsFilterState() {
         return hashHitsFilterState;
     }
 
@@ -161,17 +161,17 @@ public class RootFilterState extends CompoundFilterState<TimelineFilter, RootFil
                 Lists.transform(getSubFilterStates(), FilterState::getActiveFilter));
     }
 
-    @SuppressWarnings("rawtypes")
-    public boolean hasActiveHashFilters() {
-        return hashHitsFilterState.isActive()
-               && hashHitsFilterState.getSubFilterStates().stream().anyMatch(FilterState::isActive);
-    }
-
-    @SuppressWarnings("rawtypes")
-    public boolean hasActiveTagsFilters() {
-        return tagsFilterState.isActive()
-               && tagsFilterState.getSubFilterStates().stream().anyMatch(FilterState::isActive);
-    }
+//    @SuppressWarnings("rawtypes")
+//    public boolean hasActiveHashFilters() {
+//        return hashHitsFilterState.isActive();
+//              // && hashHitsFilterState.getSubFilterStates().stream().anyMatch(FilterState::isActive);
+//    }
+//
+//    @SuppressWarnings("rawtypes")
+//    public boolean hasActiveTagsFilters() {
+//        return tagsFilterState.isActive();
+//             //  && tagsFilterState.getSubFilterStates().stream().anyMatch(FilterState::isActive);
+//    }
 
     @Override
     public ObservableList<FilterState<? extends TimelineFilter>> getSubFilterStates() {
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/SqlFilterState.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/SqlFilterState.java
index 5180dd3425..2f33ebec61 100755
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/SqlFilterState.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/SqlFilterState.java
@@ -36,6 +36,15 @@ public class SqlFilterState<FilterType extends TimelineFilter> extends AbstractF
         // the "Hide Known Filters", "Tags", "Hashsets" and "Text".
         // There are better ways to do this, but this works in a pinch
         this(filter, !(filter instanceof TimelineFilter.HideKnownFilter || filter instanceof TimelineFilter.TagsFilter || filter instanceof TimelineFilter.HashHitsFilter || filter instanceof TimelineFilter.TextFilter));
+        
+         selectedProperty().addListener(selectedProperty -> {
+           if (filter instanceof TimelineFilter.TagsFilter) {
+               ((TimelineFilter.TagsFilter)filter).setTagged(isSelected());
+           } else  if (filter instanceof TimelineFilter.HashHitsFilter) {
+               ((TimelineFilter.HashHitsFilter)filter).setTagged(isSelected());
+           }
+        });
+        
     }
 
     /**
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/TagsFilterState.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/TagsFilterState.java
deleted file mode 100755
index 12b17ed201..0000000000
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/TagsFilterState.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Autopsy Forensic Browser
- *
- * Copyright 2018-2019 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.timeline.ui.filtering.datamodel;
-
-import com.google.common.collect.Lists;
-import java.util.Collection;
-import javafx.collections.ListChangeListener;
-import org.sleuthkit.datamodel.TimelineFilter.TagNameFilter;
-import org.sleuthkit.datamodel.TimelineFilter.TagsFilter;
-
-/**
- * Specialization of CompoundFilterState for TagName/Tags-Filter.
- *
- * Newly added subfilters made to be SELECTED when they are added.
- */
-public class TagsFilterState extends CompoundFilterState<TagNameFilter, TagsFilter> {
-
-    public TagsFilterState(TagsFilter delegate) {
-        super(delegate);
-        installSelectNewFiltersListener();
-
-    }
-
-    public TagsFilterState(TagsFilter delegate, Collection<FilterState<? extends TagNameFilter>> subFilterStates) {
-        super(delegate, subFilterStates);
-        installSelectNewFiltersListener();
-    }
-
-    private void installSelectNewFiltersListener() {
-        getSubFilterStates().addListener((ListChangeListener.Change<? extends FilterState<? extends TagNameFilter>> change) -> {
-            while (change.next()) {
-                change.getAddedSubList().forEach(filterState -> filterState.setSelected(true));
-            }
-        });
-    }
-
-    @Override
-    public TagsFilterState copyOf() {
-        TagsFilterState copy = new TagsFilterState(getFilter().copyOf(),
-                Lists.transform(getSubFilterStates(), FilterState::copyOf));
-
-        copy.setSelected(isSelected());
-        copy.setDisabled(isDisabled());
-        return copy;
-    }
-
-    @Override
-    public TagsFilter getActiveFilter() {
-        if (isActive() == false) {
-            return null;
-        }
-
-        TagsFilter copy = new TagsFilter();
-        //add active subfilters to copy.
-        getSubFilterStates().stream()
-                .filter(FilterState::isActive)
-                .map(FilterState::getActiveFilter)
-                .forEach(copy::addSubFilter);
-
-        return copy;
-    }
-}

From 1289c5577268d40d67da6b106f7a3b66af932113 Mon Sep 17 00:00:00 2001
From: Raman <raman@basistech.com>
Date: Mon, 16 Sep 2019 14:14:00 -0400
Subject: [PATCH 139/192] 5492: Refactor AppDBParserHelper  - moved to
 Sleuthkit/datamodel

---
 .../autopsy/coreutils/AppDBParserHelper.java  | 1321 -----------------
 InternalPythonModules/android/imo.py          |   10 +-
 2 files changed, 6 insertions(+), 1325 deletions(-)
 delete mode 100644 Core/src/org/sleuthkit/autopsy/coreutils/AppDBParserHelper.java

diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/AppDBParserHelper.java b/Core/src/org/sleuthkit/autopsy/coreutils/AppDBParserHelper.java
deleted file mode 100644
index 538ea07098..0000000000
--- a/Core/src/org/sleuthkit/autopsy/coreutils/AppDBParserHelper.java
+++ /dev/null
@@ -1,1321 +0,0 @@
-/*
- * Autopsy Forensic Browser
- *
- * Copyright 2019 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.coreutils;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.logging.Level;
-import org.apache.commons.lang3.StringUtils;
-import org.sleuthkit.autopsy.casemodule.Case;
-import org.sleuthkit.datamodel.AbstractFile;
-import org.sleuthkit.datamodel.AccountFileInstance;
-import org.sleuthkit.datamodel.BlackboardArtifact;
-import org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE;
-import org.sleuthkit.datamodel.BlackboardAttribute;
-import org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE;
-import org.sleuthkit.datamodel.Account;
-import org.sleuthkit.datamodel.Blackboard;
-import org.sleuthkit.datamodel.DataSource;
-import org.sleuthkit.datamodel.Relationship;
-import org.sleuthkit.datamodel.TskCoreException;
-import org.sleuthkit.datamodel.TskDataException;
-
-
-/**
- * A helper class to support modules that parse SQLite databases from mobile 
- * apps and create artifacts.
- */
-public final class AppDBParserHelper  {
-    
-    private static final Logger logger = Logger.getLogger(AppDBParserHelper.class.getName());
-    
-    /**
-     * Enum for message read status
-     */
-    public enum MessageReadStatusEnum {
-
-        UNKNOWN,    /// read status is unknown
-        UNREAD,     /// message has not been read
-        READ        /// message has been read
-    }
-    
-    /**
-     * Enum for call/message direction
-     */
-    public enum CommunicationDirection
-    {
-        UNKNOWN("Unknown"),
-        INCOMING("Incoming"),
-        OUTGOING("Outgoing");
-        
-        private final String dirStr;
-
-        CommunicationDirection(String dir) {
-            this.dirStr = dir;
-        }
-
-        public String getString() {
-            return dirStr;
-        }
-    }
-    
-    /**
-     * Enum for call media type
-     */
-    public enum CallMediaType
-    {
-        UNKNOWN("Unknown"),
-        AUDIO("Audio"),
-        VIDEO("Video");
-        
-        private final String typeStr;
-
-        CallMediaType(String type) {
-            this.typeStr = type;
-        }
-
-        public String getString() {
-            return typeStr;
-        }
-    }
-    
-
-    private final AbstractFile dbAbstractFile;
-    private final String moduleName;
-    
-    // 'self' account for the application. 
-    private final AccountFileInstance selfAccountInstance;
-    
-    // type of accounts to be created for the Application using this helper
-    private final Account.Type accountsType;
-    
-    /**
-     * Constructs a AppDB parser helper for the given DB file.
-     * 
-     * This is a constructor for Apps that that do not have any app specific account information 
-     * for device owner and will use  a 'Device' account in lieu.
-     * 
-     * It creates a DeviceAccount instance to use as a self account.
-     * 
-     * @param moduleName name module using the helper
-     * @param dbFile database file being parsed by the module
-     * @param accountsType account types created by this module
-     * 
-     * @throws TskCoreException 
-     */
-    public AppDBParserHelper(String moduleName, AbstractFile dbFile, Account.Type accountsType) throws TskCoreException {
-        
-        this.moduleName = moduleName;
-        this.dbAbstractFile = dbFile;
-        this.accountsType = accountsType;
-        this.selfAccountInstance = Case.getCurrentCase().getSleuthkitCase().getCommunicationsManager().createAccountFileInstance(Account.Type.DEVICE, ((DataSource)dbFile.getDataSource()).getDeviceId(), moduleName, dbFile);
-    }
-    
-    /**
-     * Constructs a AppDB parser helper for the given DB file.
-     * 
-     * This constructor is for Apps that do have app specific account information 
-     * for the device owner to create a 'self' account.
-     * 
-     * It creates a an account instance with specified type & id and uses it as
-     * a self account.
-     * 
-     * @param moduleName name module using the helper
-     * @param dbFile database file being parsed by the module
-     * @param accountsType account types created by this module
-     * @param selfAccountType self account type to be created for this module
-     * @param selfAccountAddress account unique id for the self account
-     * 
-     * @throws TskCoreException 
-     */
-    public AppDBParserHelper(String moduleName, AbstractFile dbFile, Account.Type accountsType, Account.Type selfAccountType, Account.Address selfAccountAddress) throws TskCoreException {
-        
-        this.moduleName = moduleName;
-        this.dbAbstractFile = dbFile;
-        this.accountsType = accountsType;
-        
-        this.selfAccountInstance = Case.getCurrentCase().getSleuthkitCase().getCommunicationsManager().createAccountFileInstance(selfAccountType, selfAccountAddress.getUniqueID(), moduleName, dbFile);
-    }
-        
-    /**
-     * Constructs a AppDB parser helper for the given DB file.
-     * 
-     * This is a constructor for Apps that do not need to create any 
-     * accounts/relationships.
-     * 
-     * @param moduleName name of module parsing the DB
-     * @param dbFile db file
-     * 
-     */
-    public AppDBParserHelper(String moduleName, AbstractFile dbFile) {
-        this.moduleName = moduleName;
-        this.dbAbstractFile = dbFile;
-        this.selfAccountInstance = null;
-        this.accountsType = null;
-    }
-    
-  
-    /**
-     * Creates and adds a TSK_CONTACT artifact to the case, with specified 
-     * attributes.
-     * Also creates an account instance of specified type for the contact with the 
-     * specified ID.
-     * 
-     * @param contactAccountUniqueID unique id for the contact's account
-     * @param contactName Name of contact
-     * @param phoneNumber primary phone number for contact
-     * @param homePhoneNumber home phone number 
-     * @param mobilePhoneNumber mobile phone number, 
-     * @param emailAddr Email address for contact
-     * 
-     * @return artifact created
-     * 
-     */
-    public BlackboardArtifact addContact(String contactAccountUniqueID, String contactName, 
-                                         String phoneNumber, String homePhoneNumber, 
-                                         String mobilePhoneNumber, String emailAddr) {
-        return addContact(contactAccountUniqueID, contactName,phoneNumber, 
-                           homePhoneNumber,mobilePhoneNumber, emailAddr, 
-                           Collections.<BlackboardAttribute>emptyList() );
-    }
-    
-    
-    /**
-     * Creates and adds a TSK_CONTACT artifact to the case, with specified 
-     * attributes.
-     * Also creates an account instance for the contact with the 
-     * specified ID.
-     * 
-     * @param contactAccountUniqueID unique id for contact account
-     * @param contactName Name of contact
-     * @param phoneNumber primary phone number for contact
-     * @param homePhoneNumber home phone number 
-     * @param mobilePhoneNumber mobile phone number, 
-     * @param emailAddr Email address for contact
-     * 
-     * @param additionalAttributes additional attributes for contact
-     * 
-     * @return contact artifact created
-     * 
-     */
-    public BlackboardArtifact addContact(String contactAccountUniqueID, String contactName, 
-                                         String phoneNumber, String homePhoneNumber, 
-                                         String mobilePhoneNumber, String emailAddr,
-                                         Collection<BlackboardAttribute> additionalAttributes) {
-       
-        BlackboardArtifact contactArtifact = null;
-        try {
-            // Create TSK_CONTACT artifact
-            contactArtifact = this.dbAbstractFile.newArtifact(ARTIFACT_TYPE.TSK_CONTACT);
-            
-            // Add basic attributes for name phonenumber email, if specified
-            contactArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_NAME, moduleName, contactName));
-            
-            if (!StringUtils.isEmpty(phoneNumber)) {
-                  contactArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PHONE_NUMBER, moduleName, phoneNumber));
-            }
-            if (!StringUtils.isEmpty(homePhoneNumber)) {
-                  contactArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PHONE_NUMBER_HOME, moduleName, homePhoneNumber));
-            }
-            if (!StringUtils.isEmpty(mobilePhoneNumber)) {
-                  contactArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PHONE_NUMBER_MOBILE, moduleName, mobilePhoneNumber));
-            }
-            if (!StringUtils.isEmpty(emailAddr)) {
-                contactArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_EMAIL, moduleName, emailAddr));
-            }
-            
-            // Add additional specified attributes
-            for (BlackboardAttribute additionalAttribute: additionalAttributes) {
-                contactArtifact.addAttribute(additionalAttribute);
-            }
-            
-            // Find/Create an account instance for the contact
-            // Create a relationship between selfAccount and contactAccount
-            AccountFileInstance contactAccountInstance = createAccountInstance(accountsType, contactAccountUniqueID);
-            if (selfAccountInstance != null) {
-                addRelationship (selfAccountInstance, contactAccountInstance, contactArtifact, Relationship.Type.CONTACT, 0 );
-            }
-            
-            // post artifact 
-            Case.getCurrentCase().getSleuthkitCase().getBlackboard().postArtifact(contactArtifact, this.moduleName);
-        } catch (TskCoreException ex) {
-            logger.log(Level.SEVERE, "Unable to add contact artifact", ex); //NON-NLS
-            return null;
-        } 
-        catch (Blackboard.BlackboardException ex) {
-            logger.log(Level.SEVERE, String.format("Unable to post artifact %s", ((contactArtifact != null)? contactArtifact.getArtifactID() : "")), ex);  //NON-NLS
-        }
-        
-        return contactArtifact;
-    }
-    
-
-    /**
-     * Creates an account file instance associated with the DB file.
-     * @param accountType
-     * @param accountUniqueID
-     * @return
-     * @throws TskCoreException 
-     */
-    private  AccountFileInstance createAccountInstance(Account.Type accountType, String accountUniqueID ) throws TskCoreException {
-        return Case.getCurrentCase().getSleuthkitCase().getCommunicationsManager().createAccountFileInstance(accountType, accountUniqueID,  moduleName, this.dbAbstractFile);
-    }
-    
-    
-    /**
-     * Adds a relations between the two specified account instances.
-     * 
-     * @param selfAccount device owner account
-     * @param otherAccount other account
-     * @param sourceArtifact artifact from which relationship is derived.
-     * @param relationshipType type of relationship
-     * @param dateTime date/time of relationship 
-     */
-    private void addRelationship(AccountFileInstance selfAccountInstance, AccountFileInstance otherAccountInstance, 
-                                    BlackboardArtifact sourceArtifact, Relationship.Type relationshipType, long dateTime) {
-        try {
-            if (selfAccountInstance.getAccount() != otherAccountInstance.getAccount()) {
-                Case.getCurrentCase().getSleuthkitCase().getCommunicationsManager().addRelationships(selfAccountInstance,
-                    Collections.singletonList(otherAccountInstance), sourceArtifact, relationshipType, dateTime);
-            }
-        } catch (TskCoreException | TskDataException ex) {
-            logger.log(Level.SEVERE, String.format("Unable to add relationship between account %s and account %s", selfAccountInstance.toString(), otherAccountInstance.toString()), ex); //NON-NLS
-        }
-    }
-    
-    
-   /**
-     * Adds a TSK_MESSAGE artifact. 
-     * 
-     * Also creates an account instance for the sender/receiver, and creates a 
-     * relationship between the self account and the sender/receiver account.
-     * 
-     * @param messageType message type
-     * @param direction message direction
-     * @param fromAddress sender address, may be null
-     * @param toAddress recipient address, may be null
-     * @param dateTime date/time of message, 
-     * @param readStatus message read or not
-     * @param subject message subject, may be empty
-     * @param messageText message body, may be empty
-     * @param threadId, message thread id
-     * 
-     * @return message artifact 
-     */
-    public BlackboardArtifact addMessage( 
-                                String messageType, 
-                                CommunicationDirection direction, 
-                                Account.Address fromAddress, 
-                                Account.Address toAddress, 
-                                long dateTime, MessageReadStatusEnum readStatus, 
-                                String subject, String messageText, String threadId) {
-        return addMessage(messageType,  direction,  
-                          fromAddress,  toAddress, dateTime,  readStatus,  
-                          subject, messageText,  threadId, 
-                          Collections.<BlackboardAttribute>emptyList());
-    }
-    
-    /**
-     * Adds a TSK_MESSAGE artifact. 
-     * 
-     * Also creates an account instance for the sender/receiver, and creates a 
-     * relationship between the self account and the sender/receiver account.
-     * 
-     * @param messageType message type
-     * @param direction message direction
-     * @param fromAddress sender address, may be empty
-     * @param toAddress recipient address, may be empty
-     * @param dateTime date/time of message, 
-     * @param readStatus message read or not
-     * @param subject message subject, may be empty
-     * @param messageText message body, may be empty
-     * @param threadId, message thread id
-     * 
-     * @param otherAttributesList additional attributes 
-     * 
-     * @return message artifact
-     */
-    public BlackboardArtifact addMessage( String messageType, 
-                                CommunicationDirection direction, 
-                                Account.Address fromAddress, 
-                                Account.Address toAddress, 
-                                long dateTime, MessageReadStatusEnum readStatus, String subject, 
-                                String messageText, String threadId,
-                                Collection<BlackboardAttribute> otherAttributesList) {
-        
-        return addMessage(messageType, direction,
-                fromAddress,
-                Arrays.asList(toAddress),
-                dateTime, readStatus,
-                subject, messageText, threadId,
-                otherAttributesList);
-    }
-    
-     /**
-     * Adds a TSK_MESSAGE artifact. 
-     * 
-     * Also creates an account instance for the sender/receiver, and creates a 
-     * relationship between the self account and the sender/receiver account.
-     * 
-     * This method is for messages with a multiple recipients.
-     * 
-     * @param messageType message type
-     * @param direction message direction
-     * @param fromAddress sender address, may be null
-     * @param recipientsList recipient address list, may be null or empty list
-     * @param dateTime date/time of message, 
-     * @param readStatus message read or not
-     * @param subject message subject, may be empty
-     * @param messageText message body, may be empty
-     * @param threadId, message thread id
-     * 
-     * 
-     * @return message artifact
-     */
-    public BlackboardArtifact addMessage( String messageType, 
-                CommunicationDirection direction, 
-                Account.Address fromAddress, 
-                List<Account.Address> recipientsList, 
-                long dateTime, MessageReadStatusEnum readStatus, 
-                String subject, String messageText, String threadId) {
-        return addMessage( messageType,  direction,  
-                          fromAddress,  recipientsList, 
-                          dateTime,  readStatus,  
-                          subject, messageText,  threadId, 
-                          Collections.<BlackboardAttribute>emptyList());
-    }
-    
-    
-    public BlackboardArtifact addMessage( String messageType, 
-                CommunicationDirection direction, 
-                Account.Address fromAddress, 
-                List<Account.Address> recipientsList, 
-                long dateTime, MessageReadStatusEnum readStatus, 
-                String subject, String messageText, 
-                String threadId, 
-                Collection<BlackboardAttribute> otherAttributesList) {
-       
-        // Created message artifact.  
-        BlackboardArtifact msgArtifact = null;
-        try {
-            // Create TSK_MESSAGE artifact
-            msgArtifact = dbAbstractFile.newArtifact(ARTIFACT_TYPE.TSK_MESSAGE);
-            if (dateTime > 0) {
-                msgArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME, moduleName, dateTime));
-            }
-            if (readStatus != MessageReadStatusEnum.UNKNOWN) {
-                msgArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_READ_STATUS, moduleName, (readStatus == MessageReadStatusEnum.READ) ? 1 : 0));
-            }
-
-            // Add basic attribute, if the correspond value is specified
-            if (!StringUtils.isEmpty(messageType)) {
-                msgArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_MESSAGE_TYPE, moduleName, messageType));
-            }
-            if (direction != CommunicationDirection.UNKNOWN) {
-                msgArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DIRECTION, moduleName, direction.getString()));
-            }
-            if (fromAddress != null && !StringUtils.isEmpty(fromAddress.getDisplayName())) {
-                msgArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PHONE_NUMBER_FROM, moduleName, fromAddress.getDisplayName()));
-            }
-            // Create a comma separated string of recipients
-            String toAddresses =  addressListToString(recipientsList);
-            if (toAddresses != null && !StringUtils.isEmpty(toAddresses)) {
-                msgArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PHONE_NUMBER_TO, moduleName, toAddresses));
-            }
-
-            if (!StringUtils.isEmpty(subject)) {
-                msgArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_SUBJECT, moduleName, subject));
-            }
-            if (!StringUtils.isEmpty(messageText)) {
-                msgArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_TEXT, moduleName, messageText));
-            }
-            if (!StringUtils.isEmpty(threadId)) {
-                msgArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_THREAD_ID, moduleName, threadId));
-            }
-
-            // Add other specified attributes
-            for (BlackboardAttribute otherAttribute: otherAttributesList) {
-                msgArtifact.addAttribute(otherAttribute);
-            }
-
-            // Find/create an account instance for sender
-            if (fromAddress != null) {
-                AccountFileInstance senderAccountInstance = createAccountInstance(accountsType, fromAddress.getUniqueID());
-
-               // Create a relationship between selfAccount and sender account
-               if (selfAccountInstance != null) {
-                   addRelationship (selfAccountInstance, senderAccountInstance, msgArtifact, Relationship.Type.MESSAGE, dateTime );
-               }
-            }
-
-            // Find/create an account instance for each recipient  
-            if (recipientsList != null) {
-                for(Account.Address recipient : recipientsList) {
-
-                   AccountFileInstance recipientAccountInstance = createAccountInstance(accountsType, recipient.getUniqueID());
-
-                   // Create a relationship between selfAccount and recipient account
-                   if (selfAccountInstance != null) {
-                       addRelationship (selfAccountInstance, recipientAccountInstance, msgArtifact, Relationship.Type.MESSAGE, dateTime );
-                   }
-                }
-            }
-
-            // post artifact 
-            Case.getCurrentCase().getSleuthkitCase().getBlackboard().postArtifact(msgArtifact, this.moduleName);
-        } catch (TskCoreException ex) {
-            logger.log(Level.SEVERE, "Unable to add message artifact", ex); //NON-NLS
-            return null;
-        } 
-        catch (Blackboard.BlackboardException ex) {
-            logger.log(Level.SEVERE, String.format("Unable to post artifact %s", ((msgArtifact != null)? msgArtifact.getArtifactID() : "")), ex);  //NON-NLS
-        }
-        
-        // return the artifact
-        return msgArtifact; 
-    }
-     
-    /**
-     * Adds a TSK_CALLLOG artifact. 
-     * 
-     * Also creates an account instance for the caller/callee, and creates a 
-     * relationship between the self account and the caller/callee account.
-     * 
-     * @param direction call direction
-     * @param fromAddress caller address, may be empty
-     * @param toAddress callee address, may be empty
-     * @param startDateTime start date/time
-     * @param endDateTime end date/time
-     * 
-     * @return call log artifact
-     */
-    public BlackboardArtifact addCalllog(CommunicationDirection direction, 
-                                    Account.Address fromAddress, Account.Address toAddress, 
-                                    long startDateTime, long endDateTime) {
-        return addCalllog(direction, fromAddress, toAddress, 
-                            startDateTime, endDateTime, 
-                            CallMediaType.UNKNOWN);
-    }
-    
-    /**
-     * Adds a TSK_CALLLOG artifact. 
-     * 
-     * Also creates an account instance for the caller/callee, and creates a 
-     * relationship between the self account and the caller/callee account.
-     * 
-     * @param direction call direction
-     * @param fromAddress caller address, may be empty
-     * @param toAddress callee address, may be empty
-     * @param startDateTime start date/time
-     * @param endDateTime end date/time
-     * @param mediaType media type
-     * 
-     * @return call log artifact
-     */
-    public BlackboardArtifact addCalllog(CommunicationDirection direction, 
-                                    Account.Address fromAddress, Account.Address toAddress, 
-                                    long startDateTime, long endDateTime, CallMediaType mediaType) {
-        return addCalllog(direction, fromAddress, toAddress, 
-                            startDateTime, endDateTime, mediaType,
-                            Collections.<BlackboardAttribute>emptyList());
-    }
-    
-    /**
-     * Adds a TSK_CALLLOG artifact. 
-     * 
-     * Also creates an account instance for the caller/receiver, and creates a 
-     * relationship between the self account and the caller/receiver account.
-     * 
-     * @param direction call direction
-     * @param fromAddress caller address, may be empty
-     * @param toAddress callee address, may be empty
-     * @param startDateTime start date/time
-     * @param endDateTime end date/time
-     * @param mediaType media type
-     * @param otherAttributesList other attributes
-     * 
-     * @return call log artifact
-     */
-    public BlackboardArtifact addCalllog(CommunicationDirection direction, 
-                                    Account.Address fromAddress, 
-                                    Account.Address toAddress, 
-                                    long startDateTime, long endDateTime, 
-                                    CallMediaType mediaType, 
-                                    Collection<BlackboardAttribute> otherAttributesList) {
-        return addCalllog(direction, 
-                            fromAddress, 
-                            Arrays.asList(toAddress), 
-                            startDateTime, endDateTime, 
-                            mediaType,
-                            otherAttributesList);
-    }
-    
-     /**
-     * Adds a TSK_CALLLOG artifact. 
-     * 
-     * Also creates an account instance for the caller/callees, 
-     * and creates a relationship between the device owner account and the caller account
-     * as well between the device owner account and each callee account
-     * 
-     * @param direction call direction
-     * @param fromAddress caller address, may be empty
-     * @param toAddressList callee address list, may be empty
-     * @param startDateTime start date/time
-     * @param endDateTime end date/time
-     * 
-     * @return call log artifact
-     */
-    public BlackboardArtifact addCalllog(CommunicationDirection direction, 
-                                Account.Address fromAddress, 
-                                Collection<Account.Address> toAddressList, 
-                                long startDateTime, long endDateTime) {
-    
-         return addCalllog(direction, fromAddress, toAddressList, 
-                            startDateTime, endDateTime, 
-                            CallMediaType.UNKNOWN);
-    }
-    
-     /**
-     * Adds a TSK_CALLLOG artifact. 
-     * 
-     * Also creates an account instance for the caller/callees, 
-     * and creates a relationship between the device owner account and the caller account
-     * as well between the device owner account and each callee account
-     * 
-     * @param direction call direction
-     * @param fromAddress caller address, may be empty
-     * @param toAddressList callee address list, may be empty
-     * @param startDateTime start date/time
-     * @param endDateTime end date/time
-     * @param mediaType call media type
-     * 
-     * @return call log artifact
-     */
-    public BlackboardArtifact addCalllog(CommunicationDirection direction, 
-                                Account.Address fromAddress, 
-                                Collection<Account.Address> toAddressList, 
-                                long startDateTime, long endDateTime,
-                                CallMediaType mediaType) {
-    
-         return addCalllog(direction, fromAddress, toAddressList, 
-                            startDateTime, endDateTime, 
-                            mediaType,
-                            Collections.<BlackboardAttribute>emptyList());
-    }
-    
-    /**
-     * Adds a TSK_CALLLOG artifact. 
-     * 
-     * Also creates an account instance for the caller/callees, 
-     * and creates a relationship between the device owner account and the caller account
-     * as well between the device owner account and each callee account
-     * 
-     * @param direction call direction
-     * @param fromAddress caller address, may be empty
-     * @param toAddressList callee address list, may be empty
-     * @param startDateTime start date/time
-     * @param endDateTime end date/time
-     * @param mediaType called media type
-     * @param otherAttributesList other attributes
-     * 
-     * @return calllog artifact
-     */
-    public BlackboardArtifact addCalllog(CommunicationDirection direction, 
-                                Account.Address fromAddress, 
-                                Collection<Account.Address> toAddressList, 
-                                long startDateTime, long endDateTime,
-                                CallMediaType mediaType,
-                                Collection<BlackboardAttribute> otherAttributesList) {
-        BlackboardArtifact callLogArtifact = null;
-        try {
-            // Create TSK_CALLLOG artifact
-            callLogArtifact = dbAbstractFile.newArtifact(ARTIFACT_TYPE.TSK_CALLLOG);
-            
-            // Add basic attributes 
-            if (startDateTime > 0) {
-                callLogArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME_START, moduleName, startDateTime));
-            }
-            if (endDateTime > 0) {
-                callLogArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME_END, moduleName, endDateTime));
-            }
-            
-            if (direction != CommunicationDirection.UNKNOWN) {
-                callLogArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DIRECTION, moduleName, direction.getString()));
-            }
-            if (fromAddress != null) {
-                callLogArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PHONE_NUMBER_FROM, moduleName, fromAddress.getUniqueID()));
-                if (!StringUtils.isEmpty(fromAddress.getDisplayName())) {
-                    callLogArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_NAME, moduleName, fromAddress.getDisplayName()));
-                }
-            }
-            
-            // Create a comma separated string of recipients
-            String toAddresses =  addressListToString(toAddressList);
-            if (!StringUtils.isEmpty(toAddresses)) {
-                callLogArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PHONE_NUMBER_TO, moduleName, toAddresses));
-            }
-            
-            // Add other specified attributes
-            for (BlackboardAttribute otherAttribute: otherAttributesList) {
-                callLogArtifact.addAttribute(otherAttribute);
-            }
-            
-            // Create a relationship between selfAccount and caller
-            if (fromAddress != null) {
-                AccountFileInstance callerAccountInstance = createAccountInstance(accountsType, fromAddress.getUniqueID());
-                if (selfAccountInstance != null) {
-                   addRelationship (selfAccountInstance, callerAccountInstance, callLogArtifact, Relationship.Type.CALL_LOG, (startDateTime > 0) ? startDateTime : 0 );
-               }
-            }
-            
-             // Create a relationship between selfAccount and each callee
-            if (toAddressList != null) {
-                for(Account.Address callee : toAddressList) {
-                   AccountFileInstance calleeAccountInstance = createAccountInstance(accountsType, callee.getUniqueID());
-                   if (selfAccountInstance != null) {
-                       addRelationship (selfAccountInstance, calleeAccountInstance, callLogArtifact, Relationship.Type.CALL_LOG, (startDateTime > 0) ? startDateTime : 0 );
-                   }
-                }
-            }
-           
-            // post artifact 
-            Case.getCurrentCase().getSleuthkitCase().getBlackboard().postArtifact(callLogArtifact, this.moduleName);
-        } catch (TskCoreException ex) {
-            logger.log(Level.SEVERE, "Unable to add calllog artifact", ex); //NON-NLS
-            return null;
-        } 
-        catch (Blackboard.BlackboardException ex) {
-            logger.log(Level.SEVERE, String.format("Unable to post artifact %s", ((callLogArtifact != null)? callLogArtifact.getArtifactID() : "")), ex);  //NON-NLS
-        }
-        
-        // return the artifact
-        return callLogArtifact;      
-    }
-    
-   
-    /**
-     *  Adds a TSK_WEB_BOOKMARK artifact. 
-     * 
-     * @param url bookmark URL 
-     * @param title bookmark title, may be empty
-     * @param creationTime date/time created
-     * @param progName application/program that created bookmark
-     * 
-     * @return bookmark artifact
-     */
-    public BlackboardArtifact addWebBookmark(String url, String title, long creationTime, String progName) {
-          return addWebBookmark(url, title,  creationTime, progName,
-                            Collections.<BlackboardAttribute>emptyList());
-    }
-    
-    /**
-     *  Adds a TSK_WEB_BOOKMARK artifact. 
-     * 
-     * @param url bookmark URL 
-     * @param title bookmark title, may be empty
-     * @param creationTime date/time created
-     * @param progName application/program that created bookmark
-     * @param otherAttributesList other attributes
-
-     * @return bookmark artifact
-     */
-    public BlackboardArtifact addWebBookmark(String url, String title, long creationTime, String progName,
-             Collection<BlackboardAttribute> otherAttributesList) {
-        
-        BlackboardArtifact bookMarkArtifact = null;
-        try {
-            // Create artifact
-            bookMarkArtifact = dbAbstractFile.newArtifact(ARTIFACT_TYPE.TSK_WEB_BOOKMARK);
-            
-            // Add basic attributes 
-            bookMarkArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL, moduleName, url));
-            if (creationTime > 0) {
-                bookMarkArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME_CREATED, moduleName, creationTime));
-            }
-            
-            if (!StringUtils.isEmpty(title)) {
-                bookMarkArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_TITLE, moduleName, title));
-            }
-            if (!StringUtils.isEmpty(url)) {
-                bookMarkArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DOMAIN, moduleName, NetworkUtils.extractDomain(url)));
-            }
-            if (!StringUtils.isEmpty(progName)) {
-                bookMarkArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME, moduleName, progName));
-            }
-            
-            // Add other specified attributes
-            for (BlackboardAttribute otherAttribute: otherAttributesList) {
-                bookMarkArtifact.addAttribute(otherAttribute);
-            }
-            
-            // post artifact 
-            Case.getCurrentCase().getSleuthkitCase().getBlackboard().postArtifact(bookMarkArtifact, this.moduleName);
-        } catch (TskCoreException ex) {
-            logger.log(Level.SEVERE, "Unable to add bookmark artifact", ex); //NON-NLS
-            return null;
-        } 
-        catch (Blackboard.BlackboardException ex) {
-            logger.log(Level.SEVERE, String.format("Unable to post artifact %s", ((bookMarkArtifact != null)? bookMarkArtifact.getArtifactID() : "")), ex);  //NON-NLS
-        }
-        
-        // return the artifact
-        return bookMarkArtifact;  
-    }
-    
-    
-    /**
-     * Adds a TSK_WEB_COOKIE artifact
-     * 
-     * @param url url of the site that created the cookie
-     * @param creationTime create time of cookie
-     * @param name cookie name 
-     * @param value cookie value
-     * @param programName name of the application that created the cookie
-     * 
-     * @return WebCookie artifact
-     */
-     public BlackboardArtifact addWebCookie(String url, long creationTime, 
-             String name, String value, String programName) {
-        
-        return addWebCookie(url, creationTime, name, value, programName,
-                 Collections.<BlackboardAttribute>emptyList());
-    }
-     
-    /**
-     * Adds a TSK_WEB_COOKIE artifact
-     * 
-     * @param url url of the site that created the cookie
-     * @param creationTime create time of cookie
-     * @param name cookie name 
-     * @param value cookie value
-     * @param programName name of the application that created the cookie
-     * 
-     * @param otherAttributesList other attributes
-     * 
-     * @return WebCookie artifact
-     */
-    public BlackboardArtifact addWebCookie(String url,
-            long creationTime, String name, String value, String programName,
-            Collection<BlackboardAttribute> otherAttributesList) {
-        
-        
-        BlackboardArtifact cookieArtifact = null;
-        try {
-            // Create artifact
-            cookieArtifact = dbAbstractFile.newArtifact(ARTIFACT_TYPE.TSK_WEB_COOKIE);
-            
-            // Add basic attributes 
-            cookieArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL, moduleName, url));
-            if (creationTime > 0) {
-                cookieArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME, moduleName, creationTime));
-            }
-            
-            if (!StringUtils.isEmpty(name)) {
-                cookieArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_NAME, moduleName, name));
-            }
-            if (!StringUtils.isEmpty(value)) {
-                cookieArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_VALUE, moduleName, value));
-            }
-            if (!StringUtils.isEmpty(url)) {
-                cookieArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DOMAIN, moduleName, NetworkUtils.extractDomain(url)));
-            }
-            if (!StringUtils.isEmpty(programName)) {
-                cookieArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME, moduleName, programName));
-            }
-            
-            // Add other specified attributes
-            for (BlackboardAttribute otherAttribute: otherAttributesList) {
-                cookieArtifact.addAttribute(otherAttribute);
-            }
-            
-            // post artifact 
-            Case.getCurrentCase().getSleuthkitCase().getBlackboard().postArtifact(cookieArtifact, this.moduleName);
-        } catch (TskCoreException ex) {
-            logger.log(Level.SEVERE, "Unable to add bookmark artifact", ex); //NON-NLS
-            return null;
-        } 
-        catch (Blackboard.BlackboardException ex) {
-            logger.log(Level.SEVERE, String.format("Unable to post artifact %s", ((cookieArtifact != null)? cookieArtifact.getArtifactID() : "")), ex);  //NON-NLS
-        }
-        
-        // return the artifact
-        return cookieArtifact;  
-    }
-    
-    /**
-     * Adds a Web History artifact
-     * 
-     * @param url url visited
-     * @param accessTime last access time
-     * @param referrer referrer, may be empty
-     * @param title website title, may be empty
-     * @param programName, application recording the history
-     * 
-     * @return artifact created
-     */
-    public BlackboardArtifact addWebHistory(String url, long accessTime, 
-            String referrer, String title, String programName) {
-        return addWebHistory(url, accessTime, referrer, title, programName,
-                Collections.<BlackboardAttribute>emptyList());
-    }
-    
-    /**
-     * Adds a Web History artifact
-     * 
-     * @param url url visited
-     * @param accessTime last access time
-     * @param referrer referrer, may be empty
-     * @param title website title, may be empty
-     * @param programName, application recording the history
-     * @param otherAttributesList other attributes
-     * 
-     * 
-     * 
-     * @return artifact created
-     */
-    public BlackboardArtifact addWebHistory(String url, long accessTime, 
-            String referrer, String title, String programName, 
-            Collection<BlackboardAttribute> otherAttributesList) {
-        
-        BlackboardArtifact webHistoryArtifact = null;
-        try {
-            // Create artifact
-            webHistoryArtifact = dbAbstractFile.newArtifact(ARTIFACT_TYPE.TSK_WEB_HISTORY);
-            
-            // Add basic attributes 
-            webHistoryArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL, moduleName, url));
-            if (accessTime > 0) {
-                webHistoryArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME_ACCESSED, moduleName, accessTime));
-            }
-            
-            if (!StringUtils.isEmpty(title)) {
-                webHistoryArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_TITLE, moduleName, title));
-            }
-            if (!StringUtils.isEmpty(referrer)) {
-                webHistoryArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_REFERRER, moduleName, referrer));
-            }
-   
-            if (!StringUtils.isEmpty(programName)) {
-                webHistoryArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME, moduleName, programName));
-            }
-             if (!StringUtils.isEmpty(url)) {
-                webHistoryArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DOMAIN, moduleName, NetworkUtils.extractDomain(url)));
-            }
-            
-            // Add other specified attributes
-            for (BlackboardAttribute otherAttribute: otherAttributesList) {
-                webHistoryArtifact.addAttribute(otherAttribute);
-            }
-            
-            // post artifact 
-            Case.getCurrentCase().getSleuthkitCase().getBlackboard().postArtifact(webHistoryArtifact, this.moduleName);
-        } catch (TskCoreException ex) {
-            logger.log(Level.SEVERE, "Unable to add bookmark artifact", ex); //NON-NLS
-            return null;
-        } 
-        catch (Blackboard.BlackboardException ex) {
-            logger.log(Level.SEVERE, String.format("Unable to post artifact %s", ((webHistoryArtifact != null)? webHistoryArtifact.getArtifactID() : "")), ex);  //NON-NLS
-        }
-        
-        // return the artifact
-        return webHistoryArtifact;  
-    }
-    
-    /**
-     * Created a TSK_WEB_DOWNNLOAD artifact
-     * 
-     * @param path path of downloaded file
-     * @param startTime date/time downloaded
-     * @param url URL downloaded from
-     * @param progName program that initiated download
-     * 
-     * @return artifact created
-     */
-    public BlackboardArtifact addWebDownload(String path, long startTime, String url, String progName) {
-        return addWebDownload(path, startTime, url, progName, Collections.<BlackboardAttribute>emptyList() );
-    }
-    
-    /**
-     * Created a TSK_WEB_DOWNNLOAD artifact
-     * 
-     * @param path path of downloaded file
-     * @param startTime date/time downloaded
-     * @param url URL downloaded from
-     * @param programName program that initiated download
-     * @param otherAttributesList other attributes
-     * 
-     * 
-     * @return artifact created
-     */
-     public BlackboardArtifact addWebDownload(String path, long startTime, String url, String programName, 
-             Collection<BlackboardAttribute> otherAttributesList ) {
-         
-        BlackboardArtifact webDownloadArtifact = null;
-        try {
-            // Create artifact
-            webDownloadArtifact = dbAbstractFile.newArtifact(ARTIFACT_TYPE.TSK_WEB_DOWNLOAD);
-            
-            // Add basic attributes 
-            webDownloadArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL, moduleName, url));
-            if (startTime > 0) {
-                webDownloadArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME_ACCESSED, moduleName, startTime));
-            }
-            webDownloadArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PATH, moduleName, path));
-            
-            /** Convert path to pathID ****/
-//            long pathID = Util.findID(dataSource, downloadedFilePath);
-//            if (pathID != -1) {
-//                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PATH_ID, moduleName, pathID));
-//            }
-                        
-            if (!StringUtils.isEmpty(programName)) {
-                webDownloadArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME, moduleName, programName));
-            }
-            if (!StringUtils.isEmpty(url)) {
-                webDownloadArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DOMAIN, moduleName, NetworkUtils.extractDomain(url)));
-            }
-            
-            // Add other specified attributes
-            for (BlackboardAttribute otherAttribute: otherAttributesList) {
-                webDownloadArtifact.addAttribute(otherAttribute);
-            }
-            
-            // post artifact 
-            Case.getCurrentCase().getSleuthkitCase().getBlackboard().postArtifact(webDownloadArtifact, this.moduleName);
-        } catch (TskCoreException ex) {
-            logger.log(Level.SEVERE, "Unable to add web download artifact", ex); //NON-NLS
-            return null;
-        } 
-        catch (Blackboard.BlackboardException ex) {
-            logger.log(Level.SEVERE, String.format("Unable to post artifact %s", ((webDownloadArtifact != null)? webDownloadArtifact.getArtifactID() : "")), ex);  //NON-NLS
-        }
-        
-        // return the artifact
-        return webDownloadArtifact;  
-    }
-    
-     
-   /**
-    * Adds a TSK_WEB_FORM_AUTOFILL artifact
-    * 
-    * @param name name of autofill field
-    * @param value value of autofill field
-    * @param creationTime create date/time
-    * @param accessTime last access date/time
-    * @param count count of times used
-    * 
-    * @return artifact created
-    */
-    public BlackboardArtifact addWebFormAutofill(String name, String value, 
-            long creationTime, long accessTime, int count) {
-        return addWebFormAutofill(name, value, creationTime, accessTime, count, 
-                    Collections.<BlackboardAttribute>emptyList() );
-    }
-    
-    /**
-    * Adds a TSK_WEB_FORM_AUTOFILL artifact
-    * 
-    * @param name name of autofill field
-    * @param value value of autofill field
-    * @param creationTime create date/time
-    * @param accessTime last access date/time
-    * @param count count of times used
-    * @param otherAttributesList additional attributes
-    * 
-    * @return artifact created
-    */
-    public BlackboardArtifact addWebFormAutofill(String name, String value, 
-            long creationTime, long accessTime, int count,  
-            Collection<BlackboardAttribute> otherAttributesList ) {
-        BlackboardArtifact webFormAutofillArtifact = null;
-        try {
-            // Create artifact
-            webFormAutofillArtifact = dbAbstractFile.newArtifact(ARTIFACT_TYPE.TSK_WEB_FORM_AUTOFILL);
-            
-            // Add basic attributes 
-            webFormAutofillArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_NAME, moduleName, name));
-            webFormAutofillArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_VALUE, moduleName, value));
-            if (creationTime > 0) {
-                webFormAutofillArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME_CREATED, moduleName, creationTime));
-            }
-            if (accessTime > 0) {
-                webFormAutofillArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME_ACCESSED, moduleName, accessTime));
-            }
-            if (count > 0) {
-                webFormAutofillArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_COUNT, moduleName, count));
-            }
-                            
-            // Add other specified attributes
-            for (BlackboardAttribute otherAttribute: otherAttributesList) {
-                webFormAutofillArtifact.addAttribute(otherAttribute);
-            }
-            
-            // post artifact 
-            Case.getCurrentCase().getSleuthkitCase().getBlackboard().postArtifact(webFormAutofillArtifact, this.moduleName);
-        } catch (TskCoreException ex) {
-            logger.log(Level.SEVERE, "Unable to add web form autofill artifact", ex); //NON-NLS
-            return null;
-        } 
-        catch (Blackboard.BlackboardException ex) {
-            logger.log(Level.SEVERE, String.format("Unable to post artifact %s", ((webFormAutofillArtifact != null)? webFormAutofillArtifact.getArtifactID() : "")), ex);  //NON-NLS
-        }
-        
-        // return the artifact
-        return webFormAutofillArtifact;  
-    }
-     
-    
-    /**
-     * Adds a TSK_WEB_FORM_AUTOFILL artifact.
-     * 
-     * @param personName person name
-     * @param email email address
-     * @param phoneNumber phone number
-     * @param mailingAddress mailing address
-     * @param creationTime creation time
-     * @param accessTime last access time
-     * @param count use count
-     * 
-     * @return artifact created
-     */
-    public BlackboardArtifact addWebFormAddress(String personName, String email, 
-                                String phoneNumber, String mailingAddress, 
-                                long creationTime, long accessTime, int count ) {
-       return addWebFormAddress(personName, email, phoneNumber, 
-                    mailingAddress, creationTime, accessTime, count, 
-                    Collections.<BlackboardAttribute>emptyList() );
-    }
-    
-    /**
-     * Adds a TSK_WEB_FORM_AUTOFILL artifact.
-     * 
-     * @param personName person name
-     * @param email email address
-     * @param phoneNumber phone number
-     * @param mailingAddress mailing address
-     * @param creationTime creation time
-     * @param accessTime last access time
-     * @param count use count
-     * @param otherAttributesList other attributes
-     * 
-     * @return artifact created
-     */
-    public BlackboardArtifact addWebFormAddress(String personName, String email, 
-            String phoneNumber, String mailingAddress, 
-            long creationTime, long accessTime, int count,
-            Collection<BlackboardAttribute> otherAttributesList ) {
-        
-        BlackboardArtifact webFormAddressArtifact = null;
-        try {
-            // Create artifact
-            webFormAddressArtifact = dbAbstractFile.newArtifact(ARTIFACT_TYPE.TSK_WEB_FORM_AUTOFILL);
-            
-            // Add basic attributes 
-            webFormAddressArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_NAME, moduleName, personName));
-            if (creationTime > 0) {
-                webFormAddressArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME_CREATED, moduleName, creationTime));
-            }
-            if (accessTime > 0) {
-                webFormAddressArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME_ACCESSED, moduleName, accessTime));
-            }
-            if (count > 0) {
-                webFormAddressArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_COUNT, moduleName, count));
-            }
-            
-            if (!StringUtils.isEmpty(email)) {
-                webFormAddressArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_EMAIL, moduleName, email));
-            }
-            if (!StringUtils.isEmpty(phoneNumber)) {
-                webFormAddressArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PHONE_NUMBER, moduleName, phoneNumber));
-            }
-            if (!StringUtils.isEmpty(mailingAddress)) {
-                webFormAddressArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_LOCATION, moduleName, mailingAddress));
-            }
-                            
-            // Add other specified attributes
-            for (BlackboardAttribute otherAttribute: otherAttributesList) {
-                webFormAddressArtifact.addAttribute(otherAttribute);
-            }
-            
-            // post artifact 
-            Case.getCurrentCase().getSleuthkitCase().getBlackboard().postArtifact(webFormAddressArtifact, this.moduleName);
-        } catch (TskCoreException ex) {
-            logger.log(Level.SEVERE, "Unable to add web form address artifact", ex); //NON-NLS
-            return null;
-        } 
-        catch (Blackboard.BlackboardException ex) {
-            logger.log(Level.SEVERE, String.format("Unable to post artifact %s", ((webFormAddressArtifact != null)? webFormAddressArtifact.getArtifactID() : "")), ex);  //NON-NLS
-        }
-        
-        // return the artifact
-        return webFormAddressArtifact;
-    }
-    
-    /**
-     * Adds a TSK_INSTALLED_PROGRAM artifact
-     * 
-     * @param programName name of program 
-     * @param dateInstalled date of install
-     * 
-     * @return artifact added
-     */
-    public BlackboardArtifact addInstalledProgram(String programName, long dateInstalled) {
-        return addInstalledProgram(programName, dateInstalled,
-                Collections.<BlackboardAttribute>emptyList() );
-    }
-    
-    /**
-     * Adds a TSK_INSTALLED_PROGRAM artifact
-     * 
-     * @param programName name of program 
-     * @param dateInstalled date of install
-     * @param otherAttributesList additional attributes
-     * 
-     * @return artifact added
-     */
-    public BlackboardArtifact addInstalledProgram(String programName, long dateInstalled, 
-            Collection<BlackboardAttribute> otherAttributesList ) {
-        
-        BlackboardArtifact installedProgramArtifact = null;
-        try {
-            // Create artifact
-            installedProgramArtifact = dbAbstractFile.newArtifact(ARTIFACT_TYPE.TSK_INSTALLED_PROG);
-            
-            // Add basic attributes 
-            installedProgramArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME, moduleName, programName));
-            if (dateInstalled > 0) {
-                installedProgramArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME, moduleName, dateInstalled));
-            }
-                            
-            // Add other specified attributes
-            for (BlackboardAttribute otherAttribute: otherAttributesList) {
-                installedProgramArtifact.addAttribute(otherAttribute);
-            }
-            
-            // post artifact 
-            Case.getCurrentCase().getSleuthkitCase().getBlackboard().postArtifact(installedProgramArtifact, this.moduleName);
-        } catch (TskCoreException ex) {
-            logger.log(Level.SEVERE, "Unable to add installed program artifact", ex); //NON-NLS
-            return null;
-        } 
-        catch (Blackboard.BlackboardException ex) {
-            logger.log(Level.SEVERE, String.format("Unable to post artifact %s", ((installedProgramArtifact != null)? installedProgramArtifact.getArtifactID() : "")), ex);  //NON-NLS
-        }
-        
-        // return the artifact
-        return installedProgramArtifact;
-    }
-    
-    
-    /**
-     * Adds a TSK_GPS_TRACKPOINT artifact
-     * 
-     * @param latitude location latitude
-     * @param longitude location longitude
-     * @param timeStamp date/time trackpoint recoded
-     * @param poiName trackpoint name
-     * @param programName name of program that recorded trackpoint
-     * 
-     * @return artifact added
-     */
-    public BlackboardArtifact addGPSLocation(double latitude, double longitude, 
-            long timeStamp, String poiName, String programName) {
-        
-        return addGPSLocation(latitude, longitude, timeStamp, poiName, programName,
-                Collections.<BlackboardAttribute>emptyList());
-    }
-    
-    /**
-     * Adds a TSK_GPS_TRACKPOINT artifact
-     * 
-     * @param latitude location latitude
-     * @param longitude location longitude
-     * @param timeStamp date/time trackpoint recorded
-     * @param name trackpoint name
-     * @param programName name of program that recorded trackpoint 
-     * @param otherAttributesList other attributes
-     * 
-     * @return artifact added
-     */
-    public BlackboardArtifact addGPSLocation(double latitude, double longitude, long timeStamp, String name, String programName, 
-            Collection<BlackboardAttribute> otherAttributesList) {
-       
-        BlackboardArtifact gpsTrackpointArtifact = null;
-        try {
-            // Create artifact
-            gpsTrackpointArtifact = dbAbstractFile.newArtifact(ARTIFACT_TYPE.TSK_GPS_TRACKPOINT);
-            
-            // Add basic attributes 
-            gpsTrackpointArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_GEO_LATITUDE, moduleName, latitude));
-            gpsTrackpointArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_GEO_LONGITUDE, moduleName, longitude));
-            if (timeStamp > 0) {
-                gpsTrackpointArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME, moduleName, timeStamp));
-            }
-            
-            if (!StringUtils.isEmpty(name)) {
-                gpsTrackpointArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_NAME, moduleName, name));
-            }
-            
-            if (!StringUtils.isEmpty(programName)) {
-                gpsTrackpointArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME, moduleName, programName));
-            }
-                            
-            // Add other specified attributes
-            for (BlackboardAttribute otherAttribute: otherAttributesList) {
-                gpsTrackpointArtifact.addAttribute(otherAttribute);
-            }
-            
-            // post artifact 
-            Case.getCurrentCase().getSleuthkitCase().getBlackboard().postArtifact(gpsTrackpointArtifact, this.moduleName);
-        } catch (TskCoreException ex) {
-            logger.log(Level.SEVERE, "Unable to add GPS trackpoint artifact", ex); //NON-NLS
-            return null;
-        } 
-        catch (Blackboard.BlackboardException ex) {
-            logger.log(Level.SEVERE, String.format("Unable to post artifact %s", ((gpsTrackpointArtifact != null)? gpsTrackpointArtifact.getArtifactID() : "")), ex);  //NON-NLS
-        }
-        
-        // return the artifact
-        return gpsTrackpointArtifact;              
-    }
-    
-    /**
-     * Converts a list of addresses into a single comma separated string of 
-     * addresses.
-     * 
-     * @param addressList
-     * @return comma separated string of addresses
-     */
-    private String addressListToString(Collection<Account.Address> addressList) {
-        
-        String toAddresses =  "";
-        if (addressList != null && (!addressList.isEmpty())) {
-            StringBuilder toAddressesSb = new StringBuilder();
-            for(Account.Address address : addressList) {
-                String displayAddress = !StringUtils.isEmpty(address.getDisplayName()) ? address.getDisplayName() : address.getUniqueID();
-                toAddressesSb = toAddressesSb.length() > 0 ? toAddressesSb.append(",").append(displayAddress) : toAddressesSb.append(displayAddress);
-            }
-            toAddresses =  toAddressesSb.toString();
-        }
-        
-        return toAddresses;
-    }
-}
diff --git a/InternalPythonModules/android/imo.py b/InternalPythonModules/android/imo.py
index e089248e5f..56bf46126e 100644
--- a/InternalPythonModules/android/imo.py
+++ b/InternalPythonModules/android/imo.py
@@ -32,9 +32,7 @@ from org.sleuthkit.autopsy.casemodule import Case
 from org.sleuthkit.autopsy.coreutils import Logger
 from org.sleuthkit.autopsy.coreutils import MessageNotifyUtil
 from org.sleuthkit.autopsy.coreutils import AppSQLiteDB
-from org.sleuthkit.autopsy.coreutils import AppDBParserHelper
-from org.sleuthkit.autopsy.coreutils.AppDBParserHelper import MessageReadStatusEnum
-from org.sleuthkit.autopsy.coreutils.AppDBParserHelper import CommunicationDirection
+
 from org.sleuthkit.autopsy.datamodel import ContentUtils
 from org.sleuthkit.autopsy.ingest import IngestJobContext
 from org.sleuthkit.datamodel import AbstractFile
@@ -43,6 +41,9 @@ from org.sleuthkit.datamodel import BlackboardAttribute
 from org.sleuthkit.datamodel import Content
 from org.sleuthkit.datamodel import TskCoreException
 from org.sleuthkit.datamodel import Account
+from org.sleuthkit.datamodel.blackboardutils import CommunicationArtifactsHelper
+from org.sleuthkit.datamodel.blackboardutils.CommunicationArtifactsHelper import MessageReadStatusEnum
+from org.sleuthkit.datamodel.blackboardutils.CommunicationArtifactsHelper import CommunicationDirection
 
 import traceback
 import general
@@ -76,7 +77,8 @@ class IMOAnalyzer(general.AndroidComponentAnalyzer):
         friendsDbs = AppSQLiteDB.findAppDatabases(dataSource, "imofriends.db", True, "com.imo.android.imous")
         for friendsDb in friendsDbs:
             try:
-                friendsDBHelper = AppDBParserHelper("IMO Parser", friendsDb.getDBFile(),
+                friendsDBHelper = CommunicationArtifactsHelper(Case.getCurrentCase().getSleuthkitCase(),
+                                                    "IMO Parser", friendsDb.getDBFile(),
                                                     Account.Type.IMO, Account.Type.IMO, selfAccountAddress )
                 contactsResultSet = friendsDb.runQuery("SELECT buid, name FROM friends")
                 if contactsResultSet is not None:

From e0066ebdca6831cb799a9e981c48abe7c9e91231 Mon Sep 17 00:00:00 2001
From: esaunders <esaunders@basistech.com>
Date: Mon, 16 Sep 2019 16:07:25 -0400
Subject: [PATCH 140/192] Correctly set page number in the case where the user
 enters an invalid page number in the Go to Page field.

---
 .../autopsy/corecomponents/DataResultViewerTable.java         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
index 71f801282b..c79c8e613c 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
@@ -892,6 +892,8 @@ public class DataResultViewerTable extends AbstractDataResultViewer {
             "DataResultViewerTable.goToPageTextField.msgDlg=Please enter a valid page number between 1 and {0}",
             "DataResultViewerTable.goToPageTextField.err=Invalid page number"})
         void gotoPage() {
+            int originalPage = currentPage;
+
             try {
                 currentPage = Integer.decode(gotoPageTextField.getText());
             } catch (NumberFormatException e) {
@@ -900,7 +902,7 @@ public class DataResultViewerTable extends AbstractDataResultViewer {
             }
 
             if (currentPage > totalPages || currentPage < 1) {
-                currentPage = 1;
+                currentPage = originalPage;
                 JOptionPane.showMessageDialog(DataResultViewerTable.this,
                         Bundle.DataResultViewerTable_goToPageTextField_msgDlg(totalPages),
                         Bundle.DataResultViewerTable_goToPageTextField_err(),

From 6b3a7a6bcbb9049fe07664bb3a1c08a84bea964a Mon Sep 17 00:00:00 2001
From: Raman <raman@basistech.com>
Date: Mon, 16 Sep 2019 17:39:51 -0400
Subject: [PATCH 141/192] Address review comments.

---
 InternalPythonModules/android/imo.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/InternalPythonModules/android/imo.py b/InternalPythonModules/android/imo.py
index 56bf46126e..9062f71f58 100644
--- a/InternalPythonModules/android/imo.py
+++ b/InternalPythonModules/android/imo.py
@@ -42,7 +42,7 @@ from org.sleuthkit.datamodel import Content
 from org.sleuthkit.datamodel import TskCoreException
 from org.sleuthkit.datamodel import Account
 from org.sleuthkit.datamodel.blackboardutils import CommunicationArtifactsHelper
-from org.sleuthkit.datamodel.blackboardutils.CommunicationArtifactsHelper import MessageReadStatusEnum
+from org.sleuthkit.datamodel.blackboardutils.CommunicationArtifactsHelper import MessageReadStatus
 from org.sleuthkit.datamodel.blackboardutils.CommunicationArtifactsHelper import CommunicationDirection
 
 import traceback
@@ -110,11 +110,11 @@ class IMOAnalyzer(general.AndroidComponentAnalyzer):
                         
                         message_read = messagesResultSet.getInt("message_read")
                         if (message_read == 1):
-                            msgReadStatus = MessageReadStatusEnum.READ
+                            msgReadStatus = MessageReadStatus.READ
                         elif (message_read == 0):
-                            msgReadStatus = MessageReadStatusEnum.UNREAD
+                            msgReadStatus = MessageReadStatus.UNREAD
                         else:
-                            msgReadStatus = MessageReadStatusEnum.UNKNOWN
+                            msgReadStatus = MessageReadStatus.UNKNOWN
                                                 
                         timeStamp = messagesResultSet.getLong("timestamp") / 1000000000
 

From 2817edac66dc59f349762bcb47e8b3dcfbe34ef4 Mon Sep 17 00:00:00 2001
From: Akira Ueda <ue@gol.com>
Date: Tue, 17 Sep 2019 15:10:44 +0900
Subject: [PATCH 142/192] Read all language profiles to improve detection
 accuracy

---
 .../keywordsearch/LanguageDetector.java       | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageDetector.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageDetector.java
index a80f3f8276..17fbef425c 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageDetector.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageDetector.java
@@ -21,40 +21,36 @@ package org.sleuthkit.autopsy.keywordsearch;
 import com.optimaize.langdetect.LanguageDetectorBuilder;
 import com.optimaize.langdetect.i18n.LdLocale;
 import com.optimaize.langdetect.ngram.NgramExtractors;
-import com.optimaize.langdetect.profiles.LanguageProfile;
 import com.optimaize.langdetect.profiles.LanguageProfileReader;
 import com.optimaize.langdetect.text.CommonTextObjectFactories;
 import com.optimaize.langdetect.text.TextObject;
 import com.optimaize.langdetect.text.TextObjectFactory;
 
 import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
+import java.io.UncheckedIOException;
 import java.util.Optional;
 
 class LanguageDetector {
 
-  private List<LanguageProfile> languageProfiles;
+  private com.optimaize.langdetect.LanguageDetector impl;
+  private TextObjectFactory textObjectFactory;
 
   LanguageDetector() {
     try {
-      languageProfiles = Arrays.asList(
-          new LanguageProfileReader().readBuiltIn(LdLocale.fromString("en")),
-          new LanguageProfileReader().readBuiltIn(LdLocale.fromString("ja"))
-      );
+      impl = LanguageDetectorBuilder.create(NgramExtractors.standard())
+          .withProfiles(new LanguageProfileReader().readAllBuiltIn())
+          .build();
+      textObjectFactory = CommonTextObjectFactories.forDetectingOnLargeText();
     } catch (IOException e) {
-      throw new RuntimeException(e);
+      // The IOException here could occur when failing to read the language profiles from the classpath.
+      // That can be considered to be a severe IO problem. Nothing can be done here.
+      throw new UncheckedIOException(e);
     }
   }
 
   Optional<Language> detect(String text) {
-    com.optimaize.langdetect.LanguageDetector languageDetector = LanguageDetectorBuilder.create(NgramExtractors.standard())
-        .withProfiles(languageProfiles)
-        .build();
-
-    TextObjectFactory textObjectFactory = CommonTextObjectFactories.forDetectingOnLargeText();
-
     TextObject textObject = textObjectFactory.forText(text);
-    return languageDetector.detect(textObject).transform(Optional::of).or(Optional.empty()).map(LdLocale::getLanguage).flatMap(Language::fromValue);
+    Optional<LdLocale> localeOpt = impl.detect(textObject).transform(Optional::of).or(Optional.empty());
+    return localeOpt.map(LdLocale::getLanguage).flatMap(Language::fromValue);
   }
 }

From cd2a3732b4c8e26d7169ca6d36962f215415ef43 Mon Sep 17 00:00:00 2001
From: Akira Ueda <ue@gol.com>
Date: Tue, 17 Sep 2019 17:12:46 +0900
Subject: [PATCH 143/192] Use FieldAnalysisRequestHandler to parse queries

---
 .../autopsy/keywordsearch/QueryParser.java    | 72 ++++++++++---------
 .../keywordsearch/QueryParserTest.java        | 38 ----------
 2 files changed, 38 insertions(+), 72 deletions(-)
 delete mode 100644 KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/QueryParserTest.java

diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/QueryParser.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/QueryParser.java
index b3421cbdc2..444db82c37 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/QueryParser.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/QueryParser.java
@@ -18,12 +18,13 @@
  */
 package org.sleuthkit.autopsy.keywordsearch;
 
-import org.apache.solr.client.solrj.SolrQuery;
-import org.apache.solr.client.solrj.SolrRequest;
-import org.apache.solr.client.solrj.response.QueryResponse;
+import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.client.solrj.request.FieldAnalysisRequest;
+import org.apache.solr.client.solrj.response.AnalysisResponseBase;
+import org.apache.solr.client.solrj.response.FieldAnalysisResponse;
 
-import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -37,45 +38,48 @@ class QueryParser {
     /**
      * field name -> [term]
      */
-    Map<String, List<String>> fieldTermsMap;
+    final Map<String, List<String>> fieldTermsMap = new HashMap<>();
   }
 
   /**
    * Parse the given query string on Solr and return the result
    */
   static Result parse(String query, List<Server.Schema> fields) throws KeywordSearchModuleException, NoOpenCoreException {
-    SolrQuery q = new SolrQuery();
-    q.setShowDebugInfo(true);
-    q.setQuery(fields.stream().map(f -> String.format("%s:%s", f, KeywordSearchUtil.escapeLuceneQuery(query))).collect(Collectors.joining(" OR ")));
-    q.setRows(0);
+    Server server = KeywordSearch.getServer();
 
-    QueryResponse response = KeywordSearch.getServer().query(q, SolrRequest.METHOD.POST);
-    Map<String, Object> debugMap = response.getDebugMap();
-    String parsedQuery = debugMap.getOrDefault("parsedquery", "").toString();
+    FieldAnalysisRequest request = new FieldAnalysisRequest();
+    for (Server.Schema field : fields) {
+      request.addFieldName(field.toString());
+    }
+    // FieldAnalysisRequest requires to set its field value property,
+    // while the corresponding analysis.fieldvalue parameter is not needed in the API.
+    // Setting an empty value does not effect on the result.
+    request.setFieldValue("");
+    request.setQuery(query);
 
-    Result result = new Result();
-    result.fieldTermsMap = getFieldTermsMap(parsedQuery);
-    return result;
-  }
-
-  static Map<String, List<String>> getFieldTermsMap(String parsedQuery) {
-    Map<String, List<String>> map = new HashMap<>();
-
-    for (String fieldTermStr : parsedQuery.split(" ")) {
-      String[] fieldTerm = fieldTermStr.split(":");
-      if (fieldTerm.length != 2) {
-        continue;
-      }
-
-      String field = fieldTerm[0];
-      String term = fieldTerm[1];
-
-      List<String> terms = map.getOrDefault(field, new ArrayList<>());
-      terms.add(term);
-
-      map.put(field, terms);
+    FieldAnalysisResponse response = new FieldAnalysisResponse();
+    try {
+      response.setResponse(server.request(request));
+    } catch (SolrServerException e) {
+      throw new KeywordSearchModuleException(e);
     }
 
-    return map;
+    Result result = new Result();
+    for (Map.Entry<String, FieldAnalysisResponse.Analysis> entry : response.getAllFieldNameAnalysis()) {
+      Iterator<AnalysisResponseBase.AnalysisPhase> it = entry.getValue().getQueryPhases().iterator();
+
+      // The last phase is the one which is used in the search process.
+      AnalysisResponseBase.AnalysisPhase lastPhase = null;
+      while (it.hasNext()) {
+        lastPhase = it.next();
+      }
+
+      if (lastPhase != null) {
+        List<String> tokens = lastPhase.getTokens().stream().map(AnalysisResponseBase.TokenInfo::getText).collect(Collectors.toList());
+        result.fieldTermsMap.put(entry.getKey(), tokens);
+      }
+    }
+
+    return result;
   }
 }
diff --git a/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/QueryParserTest.java b/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/QueryParserTest.java
deleted file mode 100644
index b744a87847..0000000000
--- a/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/QueryParserTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Autopsy Forensic Browser
- *
- * Copyright 2011-2019 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.keywordsearch;
-
-import org.junit.Test;
-
-import java.util.List;
-import java.util.Map;
-
-import static org.junit.Assert.assertEquals;
-
-public class QueryParserTest {
-
-  @Test
-  public void getFieldTermsMap() {
-    Map<String, List<String>> map = QueryParser.getFieldTermsMap("content_ja:雨 content_ja:降る");
-    List<String> terms = map.get("content_ja");
-    assertEquals(2, terms.size());
-    assertEquals("雨", terms.get(0));
-    assertEquals("降る", terms.get(1));
-  }
-}

From 0218ec348909c541c613f3d88cfa3d566978f363 Mon Sep 17 00:00:00 2001
From: Akira Ueda <ue@gol.com>
Date: Tue, 17 Sep 2019 17:20:25 +0900
Subject: [PATCH 144/192] Reformat code (indent 2 -> 4)

---
 .../autopsy/keywordsearch/Language.java       |  22 +-
 .../keywordsearch/LanguageDetector.java       |  36 +-
 ...LanguageSpecificContentIndexingHelper.java |  74 ++--
 .../LanguageSpecificContentQueryHelper.java   | 375 +++++++++---------
 .../autopsy/keywordsearch/MiniChunks.java     |  20 +-
 .../autopsy/keywordsearch/QueryParser.java    |  86 ++--
 ...anguageSpecificContentQueryHelperTest.java |  52 ++-
 .../autopsy/keywordsearch/MiniChunksTest.java |  24 +-
 8 files changed, 345 insertions(+), 344 deletions(-)

diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Language.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Language.java
index 088bf15da2..5fb1f859d3 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Language.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Language.java
@@ -28,19 +28,19 @@ import java.util.Optional;
  * such as content_ja.
  */
 public enum Language {
-  JAPANESE("ja");
+    JAPANESE("ja");
 
-  private String value;
+    private String value;
 
-  String getValue() {
-    return value;
-  }
+    String getValue() {
+        return value;
+    }
 
-  static Optional<Language> fromValue(String value) {
-    return Arrays.stream(Language.values()).filter(x -> x.value.equals(value)).findFirst();
-  }
+    static Optional<Language> fromValue(String value) {
+        return Arrays.stream(Language.values()).filter(x -> x.value.equals(value)).findFirst();
+    }
 
-  Language(String value) {
-    this.value = value;
-  }
+    Language(String value) {
+        this.value = value;
+    }
 }
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageDetector.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageDetector.java
index 17fbef425c..391a84bb0f 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageDetector.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageDetector.java
@@ -32,25 +32,25 @@ import java.util.Optional;
 
 class LanguageDetector {
 
-  private com.optimaize.langdetect.LanguageDetector impl;
-  private TextObjectFactory textObjectFactory;
+    private com.optimaize.langdetect.LanguageDetector impl;
+    private TextObjectFactory textObjectFactory;
 
-  LanguageDetector() {
-    try {
-      impl = LanguageDetectorBuilder.create(NgramExtractors.standard())
-          .withProfiles(new LanguageProfileReader().readAllBuiltIn())
-          .build();
-      textObjectFactory = CommonTextObjectFactories.forDetectingOnLargeText();
-    } catch (IOException e) {
-      // The IOException here could occur when failing to read the language profiles from the classpath.
-      // That can be considered to be a severe IO problem. Nothing can be done here.
-      throw new UncheckedIOException(e);
+    LanguageDetector() {
+        try {
+            impl = LanguageDetectorBuilder.create(NgramExtractors.standard())
+                .withProfiles(new LanguageProfileReader().readAllBuiltIn())
+                .build();
+            textObjectFactory = CommonTextObjectFactories.forDetectingOnLargeText();
+        } catch (IOException e) {
+            // The IOException here could occur when failing to read the language profiles from the classpath.
+            // That can be considered to be a severe IO problem. Nothing can be done here.
+            throw new UncheckedIOException(e);
+        }
     }
-  }
 
-  Optional<Language> detect(String text) {
-    TextObject textObject = textObjectFactory.forText(text);
-    Optional<LdLocale> localeOpt = impl.detect(textObject).transform(Optional::of).or(Optional.empty());
-    return localeOpt.map(LdLocale::getLanguage).flatMap(Language::fromValue);
-  }
+    Optional<Language> detect(String text) {
+        TextObject textObject = textObjectFactory.forText(text);
+        Optional<LdLocale> localeOpt = impl.detect(textObject).transform(Optional::of).or(Optional.empty());
+        return localeOpt.map(LdLocale::getLanguage).flatMap(Language::fromValue);
+    }
 }
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentIndexingHelper.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentIndexingHelper.java
index 9ca5686501..b17aa4c3b1 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentIndexingHelper.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentIndexingHelper.java
@@ -31,52 +31,52 @@ import java.util.Optional;
 
 class LanguageSpecificContentIndexingHelper {
 
-  private final LanguageDetector languageDetector = new LanguageDetector();
+    private final LanguageDetector languageDetector = new LanguageDetector();
 
-  Optional<Language> detectLanguageIfNeeded(Chunker.Chunk chunk) throws NoOpenCoreException {
-    double indexSchemaVersion = NumberUtils.toDouble(KeywordSearch.getServer().getIndexInfo().getSchemaVersion());
-    if (2.2 <= indexSchemaVersion) {
-      return languageDetector.detect(chunk.toString());
-    } else {
-      return Optional.empty();
-    }
-  }
-
-  void updateLanguageSpecificFields(Map<String, Object> fields, Chunker.Chunk chunk, Language language) {
-    List<String> values = new ArrayList<>();
-    values.add(chunk.toString());
-    if (fields.containsKey(Server.Schema.FILE_NAME.toString())) {
-      values.add(fields.get(Server.Schema.FILE_NAME.toString()).toString());
+    Optional<Language> detectLanguageIfNeeded(Chunker.Chunk chunk) throws NoOpenCoreException {
+        double indexSchemaVersion = NumberUtils.toDouble(KeywordSearch.getServer().getIndexInfo().getSchemaVersion());
+        if (2.2 <= indexSchemaVersion) {
+            return languageDetector.detect(chunk.toString());
+        } else {
+            return Optional.empty();
+        }
     }
 
-    // index the chunk to a language specific field
-    fields.put(Server.Schema.CONTENT_JA.toString(), values);
-    fields.put(Server.Schema.LANGUAGE.toString(), language.getValue());
-  }
+    void updateLanguageSpecificFields(Map<String, Object> fields, Chunker.Chunk chunk, Language language) {
+        List<String> values = new ArrayList<>();
+        values.add(chunk.toString());
+        if (fields.containsKey(Server.Schema.FILE_NAME.toString())) {
+            values.add(fields.get(Server.Schema.FILE_NAME.toString()).toString());
+        }
 
-  void indexMiniChunk(Chunker.Chunk chunk, String sourceName, Map<String, Object> fields, String baseChunkID, Language language)
-      throws Ingester.IngesterException {
-    //Make a SolrInputDocument out of the field map
-    SolrInputDocument updateDoc = new SolrInputDocument();
-    for (String key : fields.keySet()) {
-      updateDoc.addField(key, fields.get(key));
+        // index the chunk to a language specific field
+        fields.put(Server.Schema.CONTENT_JA.toString(), values);
+        fields.put(Server.Schema.LANGUAGE.toString(), language.getValue());
     }
 
-    try {
-      updateDoc.setField(Server.Schema.ID.toString(), MiniChunks.getChunkIdString(baseChunkID));
+    void indexMiniChunk(Chunker.Chunk chunk, String sourceName, Map<String, Object> fields, String baseChunkID, Language language)
+        throws Ingester.IngesterException {
+        //Make a SolrInputDocument out of the field map
+        SolrInputDocument updateDoc = new SolrInputDocument();
+        for (String key : fields.keySet()) {
+            updateDoc.addField(key, fields.get(key));
+        }
 
-      // index the chunk to a language specific field
-      updateDoc.addField(Server.Schema.CONTENT_JA.toString(), chunk.toString().substring(chunk.getBaseChunkLength()));
-      updateDoc.addField(Server.Schema.LANGUAGE.toString(), language.getValue());
+        try {
+            updateDoc.setField(Server.Schema.ID.toString(), MiniChunks.getChunkIdString(baseChunkID));
 
-      TimingMetric metric = HealthMonitor.getTimingMetric("Solr: Index chunk");
+            // index the chunk to a language specific field
+            updateDoc.addField(Server.Schema.CONTENT_JA.toString(), chunk.toString().substring(chunk.getBaseChunkLength()));
+            updateDoc.addField(Server.Schema.LANGUAGE.toString(), language.getValue());
 
-      KeywordSearch.getServer().addDocument(updateDoc);
-      HealthMonitor.submitTimingMetric(metric);
+            TimingMetric metric = HealthMonitor.getTimingMetric("Solr: Index chunk");
 
-    } catch (KeywordSearchModuleException | NoOpenCoreException ex) {
-      throw new Ingester.IngesterException(
-          NbBundle.getMessage(Ingester.class, "Ingester.ingest.exception.err.msg", sourceName), ex);
+            KeywordSearch.getServer().addDocument(updateDoc);
+            HealthMonitor.submitTimingMetric(metric);
+
+        } catch (KeywordSearchModuleException | NoOpenCoreException ex) {
+            throw new Ingester.IngesterException(
+                NbBundle.getMessage(Ingester.class, "Ingester.ingest.exception.err.msg", sourceName), ex);
+        }
     }
-  }
 }
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelper.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelper.java
index 299f5cba11..644d77248e 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelper.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelper.java
@@ -38,200 +38,203 @@ import java.util.stream.Collectors;
 
 class LanguageSpecificContentQueryHelper {
 
-  private static final List<Server.Schema> QUERY_FIELDS = new ArrayList<>();
-  private static final List<Server.Schema> LANGUAGE_SPECIFIC_CONTENT_FIELDS
-      = Collections.singletonList(Server.Schema.CONTENT_JA);
-  private static final boolean DEBUG = (Version.getBuildType() == Version.Type.DEVELOPMENT);
+    private static final List<Server.Schema> QUERY_FIELDS = new ArrayList<>();
+    private static final List<Server.Schema> LANGUAGE_SPECIFIC_CONTENT_FIELDS
+        = Collections.singletonList(Server.Schema.CONTENT_JA);
+    private static final boolean DEBUG = (Version.getBuildType() == Version.Type.DEVELOPMENT);
 
-  static {
-    QUERY_FIELDS.add(Server.Schema.TEXT);
-    QUERY_FIELDS.addAll(LANGUAGE_SPECIFIC_CONTENT_FIELDS);
-  }
-
-  static class QueryResults {
-    List<SolrDocument> chunks = new ArrayList<>();
-    Map</* ID */ String, SolrDocument> miniChunks = new HashMap<>();
-    // objectId_chunk -> "text" -> List of previews
-    Map<String, Map<String, List<String>>> highlighting = new HashMap<>();
-  }
-
-  /**
-   * Make a query string from the given one by applying it to the multiple query fields
-   * @param queryStr escaped query string
-   * @return query string
-   */
-  static String expandQueryString(final String queryStr) {
-    List<String> fieldQueries = new ArrayList<>();
-    fieldQueries.add(Server.Schema.TEXT.toString() + ":" + queryStr);
-    fieldQueries.addAll(LANGUAGE_SPECIFIC_CONTENT_FIELDS.stream().map(field -> field.toString() + ":" + queryStr).collect(Collectors.toList()));
-    return String.join(" OR ", fieldQueries);
-  }
-
-  static List<Server.Schema> getQueryFields() {
-    return QUERY_FIELDS;
-  }
-
-  static void updateQueryResults(QueryResults results, SolrDocument document) {
-    String id = (String) document.getFieldValue(Server.Schema.ID.toString());
-    if (MiniChunks.isMiniChunkID(id)) {
-      results.miniChunks.put(MiniChunks.getBaseChunkID(id), document);
-    } else {
-      results.chunks.add(document);
-    }
-  }
-
-  /**
-   * Get snippets
-   *
-   * @param highlight field ID -> snippets
-   * @return snippets of appropriate fields.
-   *   Note that this method returns {@code Optional.empty} if the result is empty for convenience to interact with the existing code.
-   */
-  static Optional<List<String>> getHighlights(Map<String, List<String>> highlight) {
-    for (Server.Schema field : LANGUAGE_SPECIFIC_CONTENT_FIELDS) {
-      if (highlight.containsKey(field.toString())) {
-        return Optional.of(highlight.get(field.toString()));
-      }
-    }
-    return Optional.empty();
-  }
-
-  /**
-   * Merge KeywordHits from TEXT field and a language specific field
-   *
-   * Replace KeywordHits in the given {@code matches} if its chunk ID is same.
-   */
-  static List<KeywordHit> mergeKeywordHits(List<KeywordHit> matches, Keyword originalKeyword, QueryResults queryResults) throws KeywordSearchModuleException {
-    Map<String, KeywordHit> map = findMatches(originalKeyword, queryResults).stream().collect(Collectors.toMap(KeywordHit::getSolrDocumentId, x -> x));
-    List<KeywordHit> merged = new ArrayList<>();
-
-    // first, replace KeywordHit in matches
-    for (KeywordHit match : matches) {
-      String key = match.getSolrDocumentId();
-      if (map.containsKey(key)) {
-        merged.add(map.get(key));
-        map.remove(key);
-      } else {
-        merged.add(match);
-      }
-    }
-    // second, add rest of KeywordHits from queryResults
-    merged.addAll(map.values());
-
-    return merged;
-  }
-
-  static void configureTermfreqQuery(SolrQuery query, String keyword) throws KeywordSearchModuleException, NoOpenCoreException {
-    // make a request to Solr to parse query.
-    QueryParser.Result queryParserResult = QueryParser.parse(keyword, LANGUAGE_SPECIFIC_CONTENT_FIELDS);
-    query.addField(buildTermfreqQuery(keyword, queryParserResult));
-  }
-
-  static String buildTermfreqQuery(String keyword, QueryParser.Result result) {
-    List<String> termfreqs = new ArrayList<>();
-    for (Map.Entry<String, List<String>> e : result.fieldTermsMap.entrySet()) {
-      String field = e.getKey();
-      for (String term : e.getValue()) {
-        termfreqs.add(String.format("termfreq(\"%s\",\"%s\")", field, KeywordSearchUtil.escapeLuceneQuery(term)));
-      }
+    static {
+        QUERY_FIELDS.add(Server.Schema.TEXT);
+        QUERY_FIELDS.addAll(LANGUAGE_SPECIFIC_CONTENT_FIELDS);
     }
 
-    // sum of all language specific query fields.
-    // only one of these fields could be non-zero.
-    return String.format("termfreq:sum(%s)", String.join(",", termfreqs));
-  }
-
-  static int queryChunkTermfreq(Set<String> keywords, String contentID) throws KeywordSearchModuleException, NoOpenCoreException {
-    SolrQuery q = new SolrQuery();
-    q.setShowDebugInfo(DEBUG);
-
-    final String filterQuery = Server.Schema.ID.toString() + ":" + KeywordSearchUtil.escapeLuceneQuery(contentID);
-    final String highlightQuery = keywords.stream()
-        .map(s -> LanguageSpecificContentQueryHelper.expandQueryString(
-            KeywordSearchUtil.quoteQuery(KeywordSearchUtil.escapeLuceneQuery(s))))
-        .collect(Collectors.joining(" "));
-
-    q.addFilterQuery(filterQuery);
-    q.setQuery(highlightQuery);
-    LanguageSpecificContentQueryHelper.configureTermfreqQuery(q, keywords.iterator().next());
-
-    QueryResponse response = KeywordSearch.getServer().query(q, SolrRequest.METHOD.POST);
-    SolrDocumentList results = response.getResults();
-    if (results.isEmpty()) {
-      return 0;
+    static class QueryResults {
+        List<SolrDocument> chunks = new ArrayList<>();
+        Map</* ID */ String, SolrDocument> miniChunks = new HashMap<>();
+        // objectId_chunk -> "text" -> List of previews
+        Map<String, Map<String, List<String>>> highlighting = new HashMap<>();
     }
 
-    SolrDocument document = results.get(0);
-    return ((Float) document.getFieldValue(Server.Schema.TERMFREQ.toString())).intValue();
-  }
-
-  static int findNthIndexOf(String s, String pattern, int n) {
-    int found = 0;
-    int idx = -1;
-    int len = s.length();
-    while (idx < len && found <= n) {
-      idx = s.indexOf(pattern, idx + 1);
-      if (idx == -1) {
-        break;
-      }
-      found++;
-    }
-
-    return idx;
-  }
-
-  private static List<KeywordHit> findMatches(Keyword originalKeyword, QueryResults queryResults) throws KeywordSearchModuleException {
-    List<KeywordHit> matches = new ArrayList<>();
-    for (SolrDocument document : queryResults.chunks) {
-      String docId = (String) document.getFieldValue(Server.Schema.ID.toString());
-
-      try {
-        int hitCountInChunk = ((Float) document.getFieldValue(Server.Schema.TERMFREQ.toString())).intValue();
-        SolrDocument miniChunk = queryResults.miniChunks.get(docId);
-        if (miniChunk == null) {
-          // last chunk does not have mini chunk because there's no overlapped region with next one
-          matches.add(createKeywordHit(originalKeyword, queryResults.highlighting, docId));
-        } else {
-          int hitCountInMiniChunk = ((Float) miniChunk.getFieldValue(Server.Schema.TERMFREQ.toString())).intValue();
-          if (hitCountInMiniChunk < hitCountInChunk) {
-            // there are at least one hit in base chunk
-            matches.add(createKeywordHit(originalKeyword, queryResults.highlighting, docId));
-          }
-        }
-      } catch (TskException ex) {
-        throw new KeywordSearchModuleException(ex);
-      }
-    }
-    return matches;
-  }
-
-  /** copied from LuceneQuery and modified to use getHighlightFieldValue */
-  private static KeywordHit createKeywordHit(Keyword originalKeyword, Map<String, Map<String, List<String>>> highlightResponse, String docId) throws TskException {
     /**
-     * Get the first snippet from the document if keyword search is
-     * configured to use snippets.
+     * Make a query string from the given one by applying it to the multiple query fields
+     *
+     * @param queryStr escaped query string
+     * @return query string
      */
-    String snippet = "";
-    if (KeywordSearchSettings.getShowSnippets()) {
-      List<String> snippetList = getHighlightFieldValue(highlightResponse.get(docId)).orElse(null);
-      // list is null if there wasn't a snippet
-      if (snippetList != null) {
-        snippet = EscapeUtil.unEscapeHtml(snippetList.get(0)).trim();
-      }
+    static String expandQueryString(final String queryStr) {
+        List<String> fieldQueries = new ArrayList<>();
+        fieldQueries.add(Server.Schema.TEXT.toString() + ":" + queryStr);
+        fieldQueries.addAll(LANGUAGE_SPECIFIC_CONTENT_FIELDS.stream().map(field -> field.toString() + ":" + queryStr).collect(Collectors.toList()));
+        return String.join(" OR ", fieldQueries);
     }
 
-    return new KeywordHit(docId, snippet, originalKeyword.getSearchTerm());
-  }
-
-  /**
-   * @return Optional.empty if empty
-   */
-  private static Optional<List<String>> getHighlightFieldValue(Map<String, List<String>> highlight) {
-    for (Server.Schema field : LANGUAGE_SPECIFIC_CONTENT_FIELDS) {
-      if (highlight.containsKey(field.toString())) {
-        return Optional.of(highlight.get(field.toString()));
-      }
+    static List<Server.Schema> getQueryFields() {
+        return QUERY_FIELDS;
+    }
+
+    static void updateQueryResults(QueryResults results, SolrDocument document) {
+        String id = (String) document.getFieldValue(Server.Schema.ID.toString());
+        if (MiniChunks.isMiniChunkID(id)) {
+            results.miniChunks.put(MiniChunks.getBaseChunkID(id), document);
+        } else {
+            results.chunks.add(document);
+        }
+    }
+
+    /**
+     * Get snippets
+     *
+     * @param highlight field ID -> snippets
+     * @return snippets of appropriate fields.
+     * Note that this method returns {@code Optional.empty} if the result is empty for convenience to interact with the existing code.
+     */
+    static Optional<List<String>> getHighlights(Map<String, List<String>> highlight) {
+        for (Server.Schema field : LANGUAGE_SPECIFIC_CONTENT_FIELDS) {
+            if (highlight.containsKey(field.toString())) {
+                return Optional.of(highlight.get(field.toString()));
+            }
+        }
+        return Optional.empty();
+    }
+
+    /**
+     * Merge KeywordHits from TEXT field and a language specific field
+     *
+     * Replace KeywordHits in the given {@code matches} if its chunk ID is same.
+     */
+    static List<KeywordHit> mergeKeywordHits(List<KeywordHit> matches, Keyword originalKeyword, QueryResults queryResults) throws KeywordSearchModuleException {
+        Map<String, KeywordHit> map = findMatches(originalKeyword, queryResults).stream().collect(Collectors.toMap(KeywordHit::getSolrDocumentId, x -> x));
+        List<KeywordHit> merged = new ArrayList<>();
+
+        // first, replace KeywordHit in matches
+        for (KeywordHit match : matches) {
+            String key = match.getSolrDocumentId();
+            if (map.containsKey(key)) {
+                merged.add(map.get(key));
+                map.remove(key);
+            } else {
+                merged.add(match);
+            }
+        }
+        // second, add rest of KeywordHits from queryResults
+        merged.addAll(map.values());
+
+        return merged;
+    }
+
+    static void configureTermfreqQuery(SolrQuery query, String keyword) throws KeywordSearchModuleException, NoOpenCoreException {
+        // make a request to Solr to parse query.
+        QueryParser.Result queryParserResult = QueryParser.parse(keyword, LANGUAGE_SPECIFIC_CONTENT_FIELDS);
+        query.addField(buildTermfreqQuery(keyword, queryParserResult));
+    }
+
+    static String buildTermfreqQuery(String keyword, QueryParser.Result result) {
+        List<String> termfreqs = new ArrayList<>();
+        for (Map.Entry<String, List<String>> e : result.fieldTermsMap.entrySet()) {
+            String field = e.getKey();
+            for (String term : e.getValue()) {
+                termfreqs.add(String.format("termfreq(\"%s\",\"%s\")", field, KeywordSearchUtil.escapeLuceneQuery(term)));
+            }
+        }
+
+        // sum of all language specific query fields.
+        // only one of these fields could be non-zero.
+        return String.format("termfreq:sum(%s)", String.join(",", termfreqs));
+    }
+
+    static int queryChunkTermfreq(Set<String> keywords, String contentID) throws KeywordSearchModuleException, NoOpenCoreException {
+        SolrQuery q = new SolrQuery();
+        q.setShowDebugInfo(DEBUG);
+
+        final String filterQuery = Server.Schema.ID.toString() + ":" + KeywordSearchUtil.escapeLuceneQuery(contentID);
+        final String highlightQuery = keywords.stream()
+            .map(s -> LanguageSpecificContentQueryHelper.expandQueryString(
+                KeywordSearchUtil.quoteQuery(KeywordSearchUtil.escapeLuceneQuery(s))))
+            .collect(Collectors.joining(" "));
+
+        q.addFilterQuery(filterQuery);
+        q.setQuery(highlightQuery);
+        LanguageSpecificContentQueryHelper.configureTermfreqQuery(q, keywords.iterator().next());
+
+        QueryResponse response = KeywordSearch.getServer().query(q, SolrRequest.METHOD.POST);
+        SolrDocumentList results = response.getResults();
+        if (results.isEmpty()) {
+            return 0;
+        }
+
+        SolrDocument document = results.get(0);
+        return ((Float) document.getFieldValue(Server.Schema.TERMFREQ.toString())).intValue();
+    }
+
+    static int findNthIndexOf(String s, String pattern, int n) {
+        int found = 0;
+        int idx = -1;
+        int len = s.length();
+        while (idx < len && found <= n) {
+            idx = s.indexOf(pattern, idx + 1);
+            if (idx == -1) {
+                break;
+            }
+            found++;
+        }
+
+        return idx;
+    }
+
+    private static List<KeywordHit> findMatches(Keyword originalKeyword, QueryResults queryResults) throws KeywordSearchModuleException {
+        List<KeywordHit> matches = new ArrayList<>();
+        for (SolrDocument document : queryResults.chunks) {
+            String docId = (String) document.getFieldValue(Server.Schema.ID.toString());
+
+            try {
+                int hitCountInChunk = ((Float) document.getFieldValue(Server.Schema.TERMFREQ.toString())).intValue();
+                SolrDocument miniChunk = queryResults.miniChunks.get(docId);
+                if (miniChunk == null) {
+                    // last chunk does not have mini chunk because there's no overlapped region with next one
+                    matches.add(createKeywordHit(originalKeyword, queryResults.highlighting, docId));
+                } else {
+                    int hitCountInMiniChunk = ((Float) miniChunk.getFieldValue(Server.Schema.TERMFREQ.toString())).intValue();
+                    if (hitCountInMiniChunk < hitCountInChunk) {
+                        // there are at least one hit in base chunk
+                        matches.add(createKeywordHit(originalKeyword, queryResults.highlighting, docId));
+                    }
+                }
+            } catch (TskException ex) {
+                throw new KeywordSearchModuleException(ex);
+            }
+        }
+        return matches;
+    }
+
+    /**
+     * copied from LuceneQuery and modified to use getHighlightFieldValue
+     */
+    private static KeywordHit createKeywordHit(Keyword originalKeyword, Map<String, Map<String, List<String>>> highlightResponse, String docId) throws TskException {
+        /**
+         * Get the first snippet from the document if keyword search is
+         * configured to use snippets.
+         */
+        String snippet = "";
+        if (KeywordSearchSettings.getShowSnippets()) {
+            List<String> snippetList = getHighlightFieldValue(highlightResponse.get(docId)).orElse(null);
+            // list is null if there wasn't a snippet
+            if (snippetList != null) {
+                snippet = EscapeUtil.unEscapeHtml(snippetList.get(0)).trim();
+            }
+        }
+
+        return new KeywordHit(docId, snippet, originalKeyword.getSearchTerm());
+    }
+
+    /**
+     * @return Optional.empty if empty
+     */
+    private static Optional<List<String>> getHighlightFieldValue(Map<String, List<String>> highlight) {
+        for (Server.Schema field : LANGUAGE_SPECIFIC_CONTENT_FIELDS) {
+            if (highlight.containsKey(field.toString())) {
+                return Optional.of(highlight.get(field.toString()));
+            }
+        }
+        return Optional.empty();
     }
-    return Optional.empty();
-  }
 }
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/MiniChunks.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/MiniChunks.java
index ce65bbffca..0545a8b032 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/MiniChunks.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/MiniChunks.java
@@ -20,17 +20,17 @@ package org.sleuthkit.autopsy.keywordsearch;
 
 class MiniChunks {
 
-  static String SUFFIX = "_mini";
+    static String SUFFIX = "_mini";
 
-  static String getChunkIdString(String baseChunkID) {
-    return baseChunkID + SUFFIX;
-  }
+    static String getChunkIdString(String baseChunkID) {
+        return baseChunkID + SUFFIX;
+    }
 
-  static boolean isMiniChunkID(String chunkID) {
-    return chunkID.endsWith(SUFFIX);
-  }
+    static boolean isMiniChunkID(String chunkID) {
+        return chunkID.endsWith(SUFFIX);
+    }
 
-  static String getBaseChunkID(String miniChunkID) {
-    return miniChunkID.replaceFirst(SUFFIX + "$", "");
-  }
+    static String getBaseChunkID(String miniChunkID) {
+        return miniChunkID.replaceFirst(SUFFIX + "$", "");
+    }
 }
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/QueryParser.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/QueryParser.java
index 444db82c37..fa0469c0f9 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/QueryParser.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/QueryParser.java
@@ -34,52 +34,52 @@ import java.util.stream.Collectors;
  */
 class QueryParser {
 
-  static class Result {
+    static class Result {
+        /**
+         * field name -> [term]
+         */
+        final Map<String, List<String>> fieldTermsMap = new HashMap<>();
+    }
+
     /**
-     * field name -> [term]
+     * Parse the given query string on Solr and return the result
      */
-    final Map<String, List<String>> fieldTermsMap = new HashMap<>();
-  }
+    static Result parse(String query, List<Server.Schema> fields) throws KeywordSearchModuleException, NoOpenCoreException {
+        Server server = KeywordSearch.getServer();
 
-  /**
-   * Parse the given query string on Solr and return the result
-   */
-  static Result parse(String query, List<Server.Schema> fields) throws KeywordSearchModuleException, NoOpenCoreException {
-    Server server = KeywordSearch.getServer();
+        FieldAnalysisRequest request = new FieldAnalysisRequest();
+        for (Server.Schema field : fields) {
+            request.addFieldName(field.toString());
+        }
+        // FieldAnalysisRequest requires to set its field value property,
+        // while the corresponding analysis.fieldvalue parameter is not needed in the API.
+        // Setting an empty value does not effect on the result.
+        request.setFieldValue("");
+        request.setQuery(query);
 
-    FieldAnalysisRequest request = new FieldAnalysisRequest();
-    for (Server.Schema field : fields) {
-      request.addFieldName(field.toString());
+        FieldAnalysisResponse response = new FieldAnalysisResponse();
+        try {
+            response.setResponse(server.request(request));
+        } catch (SolrServerException e) {
+            throw new KeywordSearchModuleException(e);
+        }
+
+        Result result = new Result();
+        for (Map.Entry<String, FieldAnalysisResponse.Analysis> entry : response.getAllFieldNameAnalysis()) {
+            Iterator<AnalysisResponseBase.AnalysisPhase> it = entry.getValue().getQueryPhases().iterator();
+
+            // The last phase is the one which is used in the search process.
+            AnalysisResponseBase.AnalysisPhase lastPhase = null;
+            while (it.hasNext()) {
+                lastPhase = it.next();
+            }
+
+            if (lastPhase != null) {
+                List<String> tokens = lastPhase.getTokens().stream().map(AnalysisResponseBase.TokenInfo::getText).collect(Collectors.toList());
+                result.fieldTermsMap.put(entry.getKey(), tokens);
+            }
+        }
+
+        return result;
     }
-    // FieldAnalysisRequest requires to set its field value property,
-    // while the corresponding analysis.fieldvalue parameter is not needed in the API.
-    // Setting an empty value does not effect on the result.
-    request.setFieldValue("");
-    request.setQuery(query);
-
-    FieldAnalysisResponse response = new FieldAnalysisResponse();
-    try {
-      response.setResponse(server.request(request));
-    } catch (SolrServerException e) {
-      throw new KeywordSearchModuleException(e);
-    }
-
-    Result result = new Result();
-    for (Map.Entry<String, FieldAnalysisResponse.Analysis> entry : response.getAllFieldNameAnalysis()) {
-      Iterator<AnalysisResponseBase.AnalysisPhase> it = entry.getValue().getQueryPhases().iterator();
-
-      // The last phase is the one which is used in the search process.
-      AnalysisResponseBase.AnalysisPhase lastPhase = null;
-      while (it.hasNext()) {
-        lastPhase = it.next();
-      }
-
-      if (lastPhase != null) {
-        List<String> tokens = lastPhase.getTokens().stream().map(AnalysisResponseBase.TokenInfo::getText).collect(Collectors.toList());
-        result.fieldTermsMap.put(entry.getKey(), tokens);
-      }
-    }
-
-    return result;
-  }
 }
diff --git a/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelperTest.java b/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelperTest.java
index 59f9505c39..b457348f54 100644
--- a/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelperTest.java
+++ b/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelperTest.java
@@ -21,38 +21,36 @@ package org.sleuthkit.autopsy.keywordsearch;
 import org.junit.Test;
 
 import java.util.Arrays;
-import java.util.HashMap;
 
 import static org.junit.Assert.assertEquals;
 
 public class LanguageSpecificContentQueryHelperTest {
 
-  @Test
-  public void makeQueryString() {
-    assertEquals("text:query OR content_ja:query", LanguageSpecificContentQueryHelper.expandQueryString("query"));
-  }
+    @Test
+    public void makeQueryString() {
+        assertEquals("text:query OR content_ja:query", LanguageSpecificContentQueryHelper.expandQueryString("query"));
+    }
 
-  @Test
-  public void findNthIndexOf() {
-    assertEquals(-1, LanguageSpecificContentQueryHelper.findNthIndexOf("A1AA45", "_", 0));
-    assertEquals(0, LanguageSpecificContentQueryHelper.findNthIndexOf("A1AA45", "A", 0));
-    assertEquals(2, LanguageSpecificContentQueryHelper.findNthIndexOf("A1AA45", "A", 1));
-    assertEquals(3, LanguageSpecificContentQueryHelper.findNthIndexOf("A1AA45", "A", 2));
-    assertEquals(-1, LanguageSpecificContentQueryHelper.findNthIndexOf("A1AA45", "A", 3));
-    assertEquals(0, LanguageSpecificContentQueryHelper.findNthIndexOf("A1AA45", "", 0));
-    assertEquals(-1, LanguageSpecificContentQueryHelper.findNthIndexOf("", "A", 0));
-    assertEquals(-1, LanguageSpecificContentQueryHelper.findNthIndexOf("A1AA45", "A", -1));
-    assertEquals(-1, LanguageSpecificContentQueryHelper.findNthIndexOf("A1AA45", "A", 999));
-  }
+    @Test
+    public void findNthIndexOf() {
+        assertEquals(-1, LanguageSpecificContentQueryHelper.findNthIndexOf("A1AA45", "_", 0));
+        assertEquals(0, LanguageSpecificContentQueryHelper.findNthIndexOf("A1AA45", "A", 0));
+        assertEquals(2, LanguageSpecificContentQueryHelper.findNthIndexOf("A1AA45", "A", 1));
+        assertEquals(3, LanguageSpecificContentQueryHelper.findNthIndexOf("A1AA45", "A", 2));
+        assertEquals(-1, LanguageSpecificContentQueryHelper.findNthIndexOf("A1AA45", "A", 3));
+        assertEquals(0, LanguageSpecificContentQueryHelper.findNthIndexOf("A1AA45", "", 0));
+        assertEquals(-1, LanguageSpecificContentQueryHelper.findNthIndexOf("", "A", 0));
+        assertEquals(-1, LanguageSpecificContentQueryHelper.findNthIndexOf("A1AA45", "A", -1));
+        assertEquals(-1, LanguageSpecificContentQueryHelper.findNthIndexOf("A1AA45", "A", 999));
+    }
 
-  @Test
-  public void buildTermfreqQuery() {
-    QueryParser.Result result = new QueryParser.Result();
-    result.fieldTermsMap = new HashMap<>();
-    result.fieldTermsMap.put("field1", Arrays.asList("term1"));
-    result.fieldTermsMap.put("field2", Arrays.asList("term1", "term2"));
-    assertEquals(
-        "termfreq:sum(termfreq(\"field1\",\"term1\"),termfreq(\"field1\",\"term1\"),termfreq(\"field1\",\"term1\"))",
-        LanguageSpecificContentQueryHelper.buildTermfreqQuery("query", result));
-  }
+    @Test
+    public void buildTermfreqQuery() {
+        QueryParser.Result result = new QueryParser.Result();
+        result.fieldTermsMap.put("field1", Arrays.asList("term1"));
+        result.fieldTermsMap.put("field2", Arrays.asList("term1", "term2"));
+        assertEquals(
+            "termfreq:sum(termfreq(\"field1\",\"term1\"),termfreq(\"field1\",\"term1\"),termfreq(\"field1\",\"term1\"))",
+            LanguageSpecificContentQueryHelper.buildTermfreqQuery("query", result));
+    }
 }
diff --git a/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/MiniChunksTest.java b/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/MiniChunksTest.java
index 9a87ce1818..f123c1622b 100644
--- a/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/MiniChunksTest.java
+++ b/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/MiniChunksTest.java
@@ -26,18 +26,18 @@ import static org.junit.Assert.assertTrue;
 
 public class MiniChunksTest {
 
-  @Test
-  public void isMiniChunkID() {
-    assertTrue(MiniChunks.isMiniChunkID("1_1_mini"));
-    assertFalse(MiniChunks.isMiniChunkID("1_1"));
-    assertFalse(MiniChunks.isMiniChunkID("1"));
-  }
+    @Test
+    public void isMiniChunkID() {
+        assertTrue(MiniChunks.isMiniChunkID("1_1_mini"));
+        assertFalse(MiniChunks.isMiniChunkID("1_1"));
+        assertFalse(MiniChunks.isMiniChunkID("1"));
+    }
 
-  @Test
-  public void getBaseChunkID() {
-    Assert.assertEquals("1_1", MiniChunks.getBaseChunkID("1_1_mini"));
-    Assert.assertEquals("1_1", MiniChunks.getBaseChunkID("1_1"));
-    Assert.assertEquals("1", MiniChunks.getBaseChunkID("1"));
-  }
+    @Test
+    public void getBaseChunkID() {
+        Assert.assertEquals("1_1", MiniChunks.getBaseChunkID("1_1_mini"));
+        Assert.assertEquals("1_1", MiniChunks.getBaseChunkID("1_1"));
+        Assert.assertEquals("1", MiniChunks.getBaseChunkID("1"));
+    }
 
 }
\ No newline at end of file

From 2cf109eaab770986d218952fcb425e738694b5a5 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Tue, 17 Sep 2019 08:55:10 -0400
Subject: [PATCH 145/192] Added wait cursor when loading report wizard

---
 .../autopsy/report/infrastructure/ReportVisualPanel1.java     | 4 ----
 .../autopsy/report/infrastructure/ReportWizardAction.java     | 4 ++++
 .../autopsy/report/infrastructure/ReportWizardPanel1.java     | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel1.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel1.java
index f211886c03..75753c9e7b 100644
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel1.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel1.java
@@ -25,7 +25,6 @@ import org.sleuthkit.autopsy.report.ReportModuleSettings;
 import org.sleuthkit.autopsy.report.GeneralReportModule;
 import java.awt.BorderLayout;
 import java.awt.Component;
-import java.awt.Cursor;
 import java.util.ArrayList;
 import static java.util.Collections.swap;
 import java.util.HashMap;
@@ -42,7 +41,6 @@ import javax.swing.event.ListSelectionListener;
 import org.openide.DialogDisplayer;
 import org.openide.NotifyDescriptor;
 import org.openide.util.NbBundle;
-import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.coreutils.Logger;
 
 /**
@@ -76,11 +74,9 @@ final class ReportVisualPanel1 extends JPanel implements ListSelectionListener {
     // Initialize the list of ReportModules
     private void initModules() {
 
-        WindowManager.getDefault().getMainWindow().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
         tableModules = ReportModuleLoader.getTableReportModules();
         generalModules = ReportModuleLoader.getGeneralReportModules();
         fileModules = ReportModuleLoader.getFileReportModules();
-        WindowManager.getDefault().getMainWindow().setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
 
         for (TableReportModule module : tableModules) {
             if (!moduleIsValid(module)) {
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardAction.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardAction.java
index 75335ff7ab..49a99223dd 100644
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardAction.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardAction.java
@@ -25,6 +25,7 @@ package org.sleuthkit.autopsy.report.infrastructure;
 import org.sleuthkit.autopsy.report.modules.portablecase.PortableCaseReportModuleSettings;
 import org.sleuthkit.autopsy.report.modules.portablecase.PortableCaseReportModule;
 import java.awt.Component;
+import java.awt.Cursor;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.beans.PropertyChangeEvent;
@@ -46,6 +47,7 @@ import org.openide.util.HelpCtx;
 import org.openide.util.NbBundle;
 import org.openide.util.actions.CallableSystemAction;
 import org.openide.util.actions.Presenter;
+import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.core.RuntimeProperties;
 import org.sleuthkit.autopsy.coreutils.Logger;
@@ -143,7 +145,9 @@ public final class ReportWizardAction extends CallableSystemAction implements Pr
     @Override
     @SuppressWarnings("unchecked")
     public void actionPerformed(ActionEvent e) {
+        WindowManager.getDefault().getMainWindow().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
         doReportWizard(REPORTING_CONFIGURATION_NAME, DISPLAY_CASE_SPECIFIC_DATA, RUN_REPORTS);
+        WindowManager.getDefault().getMainWindow().setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
     }
 
     @Override
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPanel1.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPanel1.java
index 628284c8ea..dc1927318e 100644
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPanel1.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPanel1.java
@@ -18,7 +18,6 @@
  */
 package org.sleuthkit.autopsy.report.infrastructure;
 
-import org.sleuthkit.autopsy.report.infrastructure.ReportModuleConfig;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.Map;

From d48658407082c8e8ecda412f3529db59974046af Mon Sep 17 00:00:00 2001
From: Mark McKinnon <mark.mckinnon@davenport.edu>
Date: Tue, 17 Sep 2019 09:04:58 -0400
Subject: [PATCH 146/192] Update Shellbag plugin to newer version

Update Shellbag plugin to  newer version in regripper
---
 thirdparty/rr-full/plugins/shellbags.pl | 299 ++++++++++++++----------
 1 file changed, 176 insertions(+), 123 deletions(-)

diff --git a/thirdparty/rr-full/plugins/shellbags.pl b/thirdparty/rr-full/plugins/shellbags.pl
index 5b8587af38..d8e770471e 100644
--- a/thirdparty/rr-full/plugins/shellbags.pl
+++ b/thirdparty/rr-full/plugins/shellbags.pl
@@ -3,6 +3,10 @@
 # RR plugin to parse (Vista, Win7/Win2008R2) shell bags
 #
 # History:
+#   20190715 - updated to parse WPD devices better
+#   20180702 - update to parseGUID function
+#   20180117 - modification thanks to input/data from Mike Godfrey
+#   20160706 - update
 #   20150325 - updated parsing based on input from Eric Zimmerman
 #   20140728 - updated shell item 0x01 parsing
 #   20131216 - updated to support shell item type 0x52
@@ -31,7 +35,7 @@
 # Moore for writing the shell bag parser for Registry Decoder, as well as 
 # assistance with some parsing.
 #
-# License: GPL v3 
+# 
 # copyright 2015 Quantum Analytics Research, LLC
 # Author: H. Carvey, keydet89@yahoo.com
 #-----------------------------------------------------------
@@ -47,12 +51,12 @@ my %config = (hive          => "USRCLASS\.DAT",
               hasShortDescr => 1,
               hasDescr      => 0,
               hasRefs       => 0,
-              version       => 20150325);
+              version       => 20190715);
 
 sub getConfig{return %config}
 
 sub getShortDescr {
-	return "Shell/BagMRU traversal in Win7 USRCLASS.DAT hives";	
+	return "Shell/BagMRU traversal in Win7+ USRCLASS\.DAT hives";	
 }
 sub getDescr{}
 sub getRefs {}
@@ -90,6 +94,7 @@ my %cp_guids = ("{bb64f8a7-bee7-4e1a-ab8d-7d8273f7fdb6}" => "Action Center",
     "{a3dd4f92-658a-410f-84fd-6fbbbef2fffe}" => "Internet Options",
     "{a304259d-52b8-4526-8b1a-a1d6cecc8243}" => "iSCSI Initiator",
     "{725be8f7-668e-4c7b-8f90-46bdb0936430}" => "Keyboard",
+    "{bf782cc9-5a52-4a17-806c-2a894ffeeac5}" => "Language Settings",
     "{e9950154-c418-419e-a90a-20c5287ae24b}" => "Location and Other Sensors",
     "{1fa9085f-25a2-489b-85d4-86326eedcd87}" => "Manage Wireless Networks",
     "{6c8eec18-8d75-41b2-a177-8831d59d2d50}" => "Mouse",
@@ -178,8 +183,8 @@ sub pluginmain {
 	my $class = shift;
 	my $hive = shift;
 	::logMsg("Launching shellbags v.".$VERSION);
-	::rptMsg("shellbags v.".$VERSION); # banner
-    ::rptMsg("(".getHive().") ".getShortDescr()."\n"); # banner
+	::rptMsg("shellbags v.".$VERSION); 
+  ::rptMsg("(".getHive().") ".getShortDescr()."\n"); 
 	my %item = ();
 
 	my $reg = Parse::Win32Registry->new($hive);
@@ -226,6 +231,13 @@ sub traverse {
 
  		my $type = unpack("C",substr($values{$v},2,1));
 
+# DEBUG ------------------------------------------------
+#		::rptMsg($key->get_path()."\\".$v);
+#  	::rptMsg(sprintf "Type = 0x%x",$type);
+#		probe($values{$v});
+#		::rptMsg("");
+# DEBUG ------------------------------------------------
+ 		
 # Need to first check to see if the parent of the item was a zip folder
 # and if the 'zipsubfolder' value is set to 1		
 		if (exists ${$parent}{zipsubfolder} && ${$parent}{zipsubfolder} == 1) {
@@ -245,6 +257,9 @@ sub traverse {
 # System Folder 			
  			%item = parseSystemFolderEntry($values{$v});
  		}
+ 		elsif ($type == 0x2a) {
+ 			$item{name} = substr($values{$v},0x3,3);
+ 		}
  		elsif ($type == 0x2e) {
 # Device
 			%item = parseDeviceEntry($values{$v});		
@@ -374,11 +389,10 @@ sub parseVariableEntry {
 # Ref: http://msdn.microsoft.com/en-us/library/aa965725(v=vs.85).aspx	  	 	
 	  	my $stuff = $segs{"{b725f130-47ef-101a-a5f1-02608c9eebac}"};
 
-	  	my $tag = 1;
+	  	my $t = 1;
 	  	my $cnt = 0x10;
-	  	while($tag) {
+	  	while($t) {
 	  		my $sz = unpack("V",substr($stuff,$cnt,4));
-                        return %item unless (defined $sz); 
 	  		my $id = unpack("V",substr($stuff,$cnt + 4,4));
 #--------------------------------------------------------------
 # sub-segment types
@@ -388,14 +402,14 @@ sub parseVariableEntry {
 # 0x0c - size
 #--------------------------------------------------------------	  	
 	  		if ($sz == 0x00) {
-	  			$tag = 0;
+	  			$t = 0;
 	  			next;
 	  		}
 	  		elsif ($id == 0x0a) {
 	  			
 	  			my $num = unpack("V",substr($stuff,$cnt + 13,4));
 	  			my $str = substr($stuff,$cnt + 13 + 4,($num * 2));
-	  			$str =~ s/\x00//g;
+	  			$str =~ s/\00//g;
 	  			$item{name} = $str;
 	  		}
 	  		$cnt += $sz;
@@ -406,24 +420,41 @@ sub parseVariableEntry {
 	elsif (substr($data,4,4) eq "AugM") {
 		%item = parseFolderEntry($data);
 	}
+# Code for Windows Portable Devices
+# Added 20190715
+	elsif (parseGUID(substr($data,42,16)) eq "{27e2e392-a111-48e0-ab0c-e17705a05f85}") {
+		my ($n0, $n1, $n2) = unpack("VVV",substr($data,62,12));
+	
+		my $n0_name = substr($data,0x4A,($n0 * 2));
+		$n0_name =~ s/\00//g;
+		
+		my $n1_name = substr($data,(0x4A + ($n0 * 2)),($n1 * 2));
+		$n1_name =~ s/\00//g;
+		
+		if ($n0_name eq "") {
+			$item{name} = $n1_name;
+		}
+		else {
+			$item{name} = $n0_name;
+		}
+	}	
 # Following two entries are for Device Property data	
 	elsif ($tag == 0x7b || $tag == 0xbb || $tag == 0xfb) {
 		my ($sz1,$sz2,$sz3) = unpack("VVV",substr($data,0x3e,12));
 		$item{name} = substr($data,0x4a,$sz1 * 2);
-		$item{name} =~ s/\x00//g;
+		$item{name} =~ s/\00//g;
 	}
 	elsif ($tag == 0x02 || $tag == 0x03) {
 		my ($sz1,$sz2,$sz3,$sz4) = unpack("VVVV",substr($data,0x26,16));
 		$item{name} = substr($data,0x36,$sz1 * 2);
-		$item{name} =~ s/\x00//g;
+		$item{name} =~ s/\00//g;
 	}
 	elsif (unpack("v",substr($data,6,2)) == 0x05) {
 		my $o = 0x26;
 		my $t = 1;
 		while ($t) {
 			my $i = substr($data,$o,1);
-                        return %item unless (defined $i); 
-			if ($i =~ m/\x00/) {
+			if ($i =~ m/\00/) {
 				$t = 0;
 			}
 			else {
@@ -447,7 +478,7 @@ sub parseNetworkEntry {
 	my %item = ();	
 	$item{type} = unpack("C",substr($data,2,1));
 	
-	my @n = split(/\x00/,substr($data,4,length($data) - 4));
+	my @n = split(/\00/,substr($data,4,length($data) - 4));
 	$item{name} = $n[0];
 	return %item;
 }
@@ -464,13 +495,13 @@ sub parseZipSubFolderItem {
 
 # Get the opened/accessed date/time	
 	$item{datetime} = substr($data,0x24,6);
-	$item{datetime} =~ s/\x00//g;
+	$item{datetime} =~ s/\00//g;
 	if ($item{datetime} eq "N/A") {
 		
 	}
 	else {
 		$item{datetime} = substr($data,0x24,40);
-		$item{datetime} =~ s/\x00//g;
+		$item{datetime} =~ s/\00//g;
 		my ($date,$time) = split(/\s+/,$item{datetime},2);
 		my ($mon,$day,$yr) = split(/\//,$date,3);
 		my ($hr,$min,$sec) = split(/:/,$time,3);
@@ -483,9 +514,9 @@ sub parseZipSubFolderItem {
 	my $sz2 = unpack("V",substr($data,0x58,4));
 		
 	my $str1 = substr($data,0x5C,$sz *2) if ($sz > 0);
-	$str1 =~ s/\x00//g;
+	$str1 =~ s/\00//g;
 	my $str2 = substr($data,0x5C + ($sz * 2),$sz2 *2) if ($sz2 > 0);
-	$str2 =~ s/\x00//g;
+	$str2 =~ s/\00//g;
 		
 	if ($sz2 > 0) {
 		$item{name} = $str1."\\".$str2;
@@ -548,10 +579,10 @@ sub parseURIEntry {
 	
 	my $sz = unpack("V",substr($data,0x2a,4));
 	my $uri = substr($data,0x2e,$sz);
-	$uri =~ s/\x00//g;
+	$uri =~ s/\00//g;
 	
 	my $proto = substr($data,length($data) - 6, 6);
-	$proto =~ s/\x00//g;
+	$proto =~ s/\00//g;
 	
 	$item{name} = $proto."://".$uri." [".gmtime($item{uritime})."]";
 	
@@ -601,8 +632,8 @@ sub parseGUID {
   my $d3 = unpack("v",substr($data,6,2));
 	my $d4 = unpack("H*",substr($data,8,2));
   my $d5 = unpack("H*",substr($data,10,6));
-  my $guid = sprintf "{%08x-%x-%x-$d4-$d5}",$d1,$d2,$d3;
-  
+  my $guid = sprintf "{%08x-%04x-%04x-$d4-$d5}",$d1,$d2,$d3;
+
   if (exists $cp_guids{$guid}) {
   	return "CLSID_".$cp_guids{$guid};
   }
@@ -625,6 +656,10 @@ sub parseDeviceEntry {
 	my $ofs = unpack("v",substr($data,4,2));
 	my $tag = unpack("V",substr($data,6,4));
 	
+#-----------------------------------------------------	
+# DEBUG
+#  ::rptMsg("parseDeviceEntry, tag = ".$tag);	
+#-----------------------------------------------------		
 	if ($tag == 0) {
 		my $guid1 = parseGUID(substr($data,$ofs + 6,16));
 		my $guid2 = parseGUID(substr($data,$ofs + 6 + 16,16));
@@ -632,13 +667,17 @@ sub parseDeviceEntry {
 	}
 	elsif ($tag == 2) {
 		$item{name} = substr($data,0x0a,($ofs + 6) - 0x0a);
-		$item{name} =~ s/\x00//g;
+		$item{name} =~ s/\00//g;
 	}
 	else {
     my $ver = unpack("C",substr($data,9,1));
-
+		my $idx = unpack("C",substr($data,3,1));
+		
+		if ($idx == 0x80) {
+			$item{name} = parseGUID(substr($data,4,16));
+		}
 # Version 3 = XP    
-    if ($ver == 3) {
+    elsif ($ver == 3) {
     	my $guid1 = parseGUID(substr($data,$ofs + 6,16));
 			my $guid2 = parseGUID(substr($data,$ofs + 6 + 16,16));
 			$item{name} = $guid1."\\".$guid2
@@ -649,14 +688,11 @@ sub parseDeviceEntry {
     	my $userlen = unpack("V",substr($data,30,4));
 			my $devlen  = unpack("V",substr($data,34,4));
 			my $user    = substr($data,0x28,$userlen * 2);
-			$user =~ s/\x00//g;
+			$user =~ s/\00//g;
 			my $dev = substr($data,0x28 + ($userlen * 2),$devlen * 2);
-			$dev =~ s/\x00//g;
+			$dev =~ s/\00//g;
 			$item{name} = $user;	
-    }
-    elsif (unpack("C",substr($data,3,1)) == 0x80) {
-    	$item{name} = parseGUID(substr($data,4,16));
-    }
+		}
 # Version unknown    
     else { 
     	$item{name} = "Device Entry - Unknown Version";
@@ -697,7 +733,7 @@ sub parseControlPanelEntry {
 #
 #-----------------------------------------------------------
 sub parseFolderEntry {
-	my $data     = shift;
+	my $data = shift;
 	my %item = ();
 	
 	$item{type} = unpack("C",substr($data,2,1));
@@ -726,85 +762,105 @@ sub parseFolderEntry {
 	my @m = unpack("vv",substr($data,$ofs_mdate,4));
 	($item{mtime_str},$item{mtime}) = convertDOSDate($m[0],$m[1]);
 	
-# Need to read in short name; nul-term ASCII
-#	$item{shortname} = (split(/\x00/,substr($data,12,length($data) - 12),2))[0];
-	$ofs_shortname = $ofs_mdate + 6;	
-	my $tag = 1;
-	my $cnt = 0;
-	my $str = "";
-	while($tag) {
-		my $s = substr($data,$ofs_shortname + $cnt,1);
-                return %item unless (defined $s); 
-		if ($s =~ m/\x00/ && ((($cnt + 1) % 2) == 0)) {
-			$tag = 0;
-		}
-		else {
-			$str .= $s;
-			$cnt++;
-		}
-	}
-#	$str =~ s/\x00//g;
-	my $shortname = $str;
-	my $ofs = $ofs_shortname + $cnt + 1;
-# Read progressively, 1 byte at a time, looking for 0xbeef	
-	$tag = 1;
-	$cnt = 0;
-	while ($tag) {
-                my $s = substr($data,$ofs + $cnt,2);
-                return %item unless (defined $s); 
-		if (unpack("v",$s) == 0xbeef) {
-			$tag = 0;
-		}
-		else {
-			$cnt++;
-		}
-	}
-	$item{extver} = unpack("v",substr($data,$ofs + $cnt - 4,2));
-#	printf "Version: 0x%x\n",$item{extver};
-	$ofs = $ofs + $cnt + 2;
+# DEBUG ------------------------------------------------
+# Added 20160706 based on sample data provided by J. Poling	
 	
-	@m = unpack("vv",substr($data,$ofs,4));
-	($item{ctime_str},$item{ctime}) = convertDOSDate($m[0],$m[1]);
-	$ofs += 4;
-	@m = unpack("vv",substr($data,$ofs,4));
-	($item{atime_str},$item{atime}) = convertDOSDate($m[0],$m[1]);
-	
-	my $jmp;
-	if ($item{extver} == 0x03) {
-		$jmp = 8;
-	}
-	elsif ($item{extver} == 0x07) {
-		$jmp = 26;
-	}
-	elsif ($item{extver} == 0x08) {
-		$jmp = 30;
-	}
-	elsif ($item{extver} == 0x09) {
-		$jmp = 34;
-	}
-	else {}
-	
-	if ($item{type} == 0x31 && $item{extver} >= 0x07) {
-		my @n = unpack("Vvv",substr($data,$ofs + 8, 8));
-		if ($n[2] != 0) {
-			$item{mft_rec_num} = getNum48($n[0],$n[1]);
-			$item{mft_seq_num} = $n[2];	
-#			::rptMsg("MFT: ".$item{mft_rec_num}."/".$item{mft_seq_num});
-#			probe($data);
-		}
-	}
-	
-	$ofs += $jmp;
-	
-	$str = substr($data,$ofs,length($data) - 30);
-	my $longname = (split(/\x00\x00/,$str,2))[0];
-	$longname =~ s/\x00//g;
-	
-	if ($longname ne "") {
-		$item{name} = $longname;
+	if (length($data) < 0x30) {
+# start at offset 0xE, read in nul-term ASCII string (until "\00" is reached)
+		$ofs_shortname = 0xE;
+		my $tag = 1;
+		my $cnt = 0;
+		my $str = "";
+		while($tag) {
+			my $s = substr($data,$ofs_shortname + $cnt,1);
+			if ($s =~ m/\00/) {
+				$tag = 0;
+			}
+			else {
+				$str .= $s;
+				$cnt++;
+			}
+		}	
+		$item{name} = $str;
 	}
 	else {
-		$item{name} = $shortname;
+# Need to read in short name; nul-term ASCII
+#	$item{shortname} = (split(/\00/,substr($data,12,length($data) - 12),2))[0];
+		$ofs_shortname = $ofs_mdate + 6;	
+		my $tag = 1;
+		my $cnt = 0;
+		my $str = "";
+		while($tag) {
+			my $s = substr($data,$ofs_shortname + $cnt,1);
+			if ($s =~ m/\00/ && ((($cnt + 1) % 2) == 0)) {
+				$tag = 0;
+			}
+			else {
+				$str .= $s;
+				$cnt++;
+			}
+		}
+#	$str =~ s/\00//g;
+		my $shortname = $str;
+		my $ofs = $ofs_shortname + $cnt + 1;
+# Read progressively, 1 byte at a time, looking for 0xbeef	
+		my $tag = 1;
+		my $cnt = 0;
+		while ($tag) {
+			if (unpack("v",substr($data,$ofs + $cnt,2)) == 0xbeef) {
+				$tag = 0;
+			}
+			else {
+				$cnt++;
+			}
+		}
+		$item{extver} = unpack("v",substr($data,$ofs + $cnt - 4,2));
+#	printf "Version: 0x%x\n",$item{extver};
+		$ofs = $ofs + $cnt + 2;
+	
+		my @m = unpack("vv",substr($data,$ofs,4));
+		($item{ctime_str},$item{ctime}) = convertDOSDate($m[0],$m[1]);
+		$ofs += 4;
+		my @m = unpack("vv",substr($data,$ofs,4));
+		($item{atime_str},$item{atime}) = convertDOSDate($m[0],$m[1]);
+	
+		my $jmp;
+		if ($item{extver} == 0x03) {
+			$jmp = 8;
+		}
+		elsif ($item{extver} == 0x07) {
+			$jmp = 26;
+		}
+		elsif ($item{extver} == 0x08) {
+			$jmp = 30;
+		}
+		elsif ($item{extver} == 0x09) {
+			$jmp = 34;
+		}
+		else {}
+	
+		if ($item{type} == 0x31 && $item{extver} >= 0x07) {
+			my @n = unpack("Vvv",substr($data,$ofs + 8, 8));
+			if ($n[2] != 0) {
+				$item{mft_rec_num} = getNum48($n[0],$n[1]);
+				$item{mft_seq_num} = $n[2];	
+#			::rptMsg("MFT: ".$item{mft_rec_num}."/".$item{mft_seq_num});
+#			probe($data);
+			}
+		}
+	
+		$ofs += $jmp;
+	
+		my $str = substr($data,$ofs,length($data) - 30);
+		my $longname = (split(/\00\00/,$str,2))[0];
+		$longname =~ s/\00//g;
+	
+		if ($longname ne "") {
+			$item{name} = $longname;
+		}
+		else {
+			$item{name} = $shortname;
+		}
 	}
 	return %item;
 }
@@ -855,9 +911,7 @@ sub parseFolderEntry2 {
 	my $tag = 1;
 
 	while ($tag) {
-                my $s = substr($data,$ofs,2);
-                return %item unless (defined $s); 
-		if (unpack("v",$s) == 0xbeef) {
+		if (unpack("v",substr($data,$ofs,2)) == 0xbeef) {
 			$tag = 0;
 		}
 		else {
@@ -894,9 +948,9 @@ sub parseFolderEntry2 {
 #	}
 #	::rptMsg("");
 	
-	$item{name} = (split(/\x00\x00/,$str,2))[0];
-	$item{name} =~ s/\x13\x20/\x2D\x00/;
-	$item{name} =~ s/\x00//g;
+	$item{name} = (split(/\00\00/,$str,2))[0];
+	$item{name} =~ s/\13\20/\2D\00/;
+	$item{name} =~ s/\00//g;
 	
 	return %item;
 }
@@ -907,7 +961,7 @@ sub parseNetworkEntry {
 	my $data     = shift;
 	my %item = ();
 	$item{type} = unpack("C",substr($data,2,1));
-	my @names = split(/\x00/,substr($data,5,length($data) - 5));
+	my @names = split(/\00/,substr($data,5,length($data) - 5));
 	$item{name} = $names[0];
 	return %item;
 }
@@ -919,9 +973,9 @@ sub parseDatePathItem {
 	my $data = shift;
 	my %item = ();
 	$item{datestr} = substr($data,0x18,30);
-	my ($file,$dir) = split(/\x00\x00/,substr($data,0x44,length($data) - 0x44));
-	$file =~ s/\x00//g;
-	$dir =~ s/\x00//g;
+	my ($file,$dir) = split(/\00\00/,substr($data,0x44,length($data) - 0x44));
+	$file =~ s/\00//g;
+	$dir =~ s/\00//g;
 	$item{name} = $dir.$file;
 	return %item;	
 }
@@ -958,7 +1012,6 @@ sub shellItem0x52 {
 	
 	while ($tag) {
 		$d = substr($data,0x32 + $cnt,2);
-                return %item unless (defined $d); 
 		if (unpack("v",$d) == 0) {
 			$tag = 0;
 		}
@@ -967,7 +1020,7 @@ sub shellItem0x52 {
 			$cnt += 2;
 		}
 	}	
-	$item{name} =~ s/\x00//g;
+	$item{name} =~ s/\00//g;
 	
 	if ($item{subtype} < 3) {
 		$ofs = 0x32 + $cnt + 2;
@@ -977,7 +1030,7 @@ sub shellItem0x52 {
 	}
 	$sz = unpack("V",substr($data,$ofs,4));
 	$item{str} = substr($data,$ofs + 4,$sz * 2);
-	$item{str} =~ s/\x00//g;
+	$item{str} =~ s/\00//g;
 	return %item;
 }
 
@@ -1058,4 +1111,4 @@ sub getNum48 {
 	}
 }
 
-1;
+1;
\ No newline at end of file

From 44a0b6250bf56e9d0ff8e2f30c8f381c55d8d7b1 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Tue, 17 Sep 2019 09:21:51 -0400
Subject: [PATCH 147/192] Added wait cursor when loading report wizard

---
 .../commandlineingest/CommandLineIngestSettingsPanel.java       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.java
index f87469c4ec..87de04edf1 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.java
@@ -170,7 +170,9 @@ public class CommandLineIngestSettingsPanel extends javax.swing.JPanel {
     }//GEN-LAST:event_bnEditIngestSettingsActionPerformed
 
     private void bnEditReportSettingsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnEditReportSettingsActionPerformed
+        this.getParent().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
         doReportWizard(REPORTING_CONFIGURATION_NAME, DISPLAY_CASE_SPECIFIC_DATA, RUN_REPORTS);
+        this.getParent().setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
     }//GEN-LAST:event_bnEditReportSettingsActionPerformed
 
     // Variables declaration - do not modify//GEN-BEGIN:variables

From 6b2472d538b6e017d0c65d49989e3b6a1da381ea Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Tue, 17 Sep 2019 09:56:40 -0400
Subject: [PATCH 148/192] Changes so that scroll bar is not displayed in CL
 options panel

---
 .../commandlineingest/Bundle.properties       |  4 ++--
 .../Bundle.properties-MERGED                  |  4 ++--
 .../CommandLineIngestSettingsPanel.form       | 19 +++++++++++++++----
 .../CommandLineIngestSettingsPanel.java       | 16 ++++++++++------
 4 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/Bundle.properties b/Core/src/org/sleuthkit/autopsy/commandlineingest/Bundle.properties
index 81ce425798..9200d5dd2f 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/Bundle.properties
@@ -6,8 +6,8 @@ CommandLineIngestSettingsPanel.bnEditIngestSettings.toolTipText=Ingest job setti
 CommandLineIngestSettingsPanel.bnEditIngestSettings.text=Ingest Module Settings
 CommandLinePanel.jLabel1.text=Ingest is running from command line
 CommandLineStartupWindow.title.text=Running in Command Line Mode
-CommandLineIngestSettingsPanel.jLabelBaselineConfig.text=Configure Baseline Configuration for Command Line Ingest:
 CommandLineIngestSettingsPanel.bnEditReportSettings.actionCommand=Report Module Settings
+CommandLineIngestSettingsPanel.bnEditReportSettings.toolTipText=Report generation settings for the command line processing mode context.
 CommandLineIngestSettingsPanel.bnEditReportSettings.text=Report Module Settings
 CommandLineIngestSettingsPanel.jLabelReportConfig.text=Configure Report Generation for Command Line Ingest:
-CommandLineIngestSettingsPanel.bnEditReportSettings.toolTipText=Report generation settings for the command line processing mode context.
+CommandLineIngestSettingsPanel.jLabelBaselineConfig.text=Configure Baseline Configuration for Command Line Ingest:
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/commandlineingest/Bundle.properties-MERGED
index 81ce425798..9200d5dd2f 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/Bundle.properties-MERGED
@@ -6,8 +6,8 @@ CommandLineIngestSettingsPanel.bnEditIngestSettings.toolTipText=Ingest job setti
 CommandLineIngestSettingsPanel.bnEditIngestSettings.text=Ingest Module Settings
 CommandLinePanel.jLabel1.text=Ingest is running from command line
 CommandLineStartupWindow.title.text=Running in Command Line Mode
-CommandLineIngestSettingsPanel.jLabelBaselineConfig.text=Configure Baseline Configuration for Command Line Ingest:
 CommandLineIngestSettingsPanel.bnEditReportSettings.actionCommand=Report Module Settings
+CommandLineIngestSettingsPanel.bnEditReportSettings.toolTipText=Report generation settings for the command line processing mode context.
 CommandLineIngestSettingsPanel.bnEditReportSettings.text=Report Module Settings
 CommandLineIngestSettingsPanel.jLabelReportConfig.text=Configure Report Generation for Command Line Ingest:
-CommandLineIngestSettingsPanel.bnEditReportSettings.toolTipText=Report generation settings for the command line processing mode context.
+CommandLineIngestSettingsPanel.jLabelBaselineConfig.text=Configure Baseline Configuration for Command Line Ingest:
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.form b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.form
index 1582dba4d5..ea8344c216 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.form
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <Form version="1.5" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
+  <Properties>
+    <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+      <Dimension value="[810, 422]"/>
+    </Property>
+  </Properties>
   <AuxValues>
     <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
     <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
@@ -16,7 +21,7 @@
   <Layout>
     <DimensionLayout dim="0">
       <Group type="103" groupAlignment="0" attributes="0">
-          <Component id="nodeScrollPane" alignment="1" pref="864" max="32767" attributes="0"/>
+          <Component id="nodeScrollPane" alignment="1" max="32767" attributes="0"/>
       </Group>
     </DimensionLayout>
     <DimensionLayout dim="1">
@@ -31,6 +36,9 @@
         <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
           <Dimension value="[0, 0]"/>
         </Property>
+        <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+          <Dimension value="[803, 553]"/>
+        </Property>
       </Properties>
 
       <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
@@ -40,6 +48,9 @@
             <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[100, 100]"/>
             </Property>
+            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+              <Dimension value="[801, 551]"/>
+            </Property>
           </Properties>
 
           <Layout>
@@ -53,7 +64,7 @@
                           <Component id="jLabelReportConfig" alignment="0" min="-2" max="-2" attributes="0"/>
                           <Component id="bnEditReportSettings" alignment="0" min="-2" pref="155" max="-2" attributes="0"/>
                       </Group>
-                      <EmptySpace pref="1362" max="32767" attributes="0"/>
+                      <EmptySpace pref="362" max="32767" attributes="0"/>
                   </Group>
               </Group>
             </DimensionLayout>
@@ -77,10 +88,10 @@
             <Component class="javax.swing.JButton" name="bnEditIngestSettings">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="viking/commandline/Bundle.properties" key="CommandLineIngestSettingsPanel.bnEditIngestSettings.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="org/sleuthkit/autopsy/commandlineingest/Bundle.properties" key="CommandLineIngestSettingsPanel.bnEditIngestSettings.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="viking/commandline/Bundle.properties" key="CommandLineIngestSettingsPanel.bnEditIngestSettings.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="org/sleuthkit/autopsy/commandlineingest/Bundle.properties" key="CommandLineIngestSettingsPanel.bnEditIngestSettings.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="actionCommand" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/commandlineingest/Bundle.properties" key="CommandLineIngestSettingsPanel.bnEditIngestSettings.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.java
index 87de04edf1..070c7dccaa 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.java
@@ -98,9 +98,13 @@ public class CommandLineIngestSettingsPanel extends javax.swing.JPanel {
         jLabelReportConfig = new javax.swing.JLabel();
         bnEditReportSettings = new javax.swing.JButton();
 
+        setPreferredSize(new java.awt.Dimension(810, 422));
+
         nodeScrollPane.setMinimumSize(new java.awt.Dimension(0, 0));
+        nodeScrollPane.setPreferredSize(new java.awt.Dimension(803, 553));
 
         nodePanel.setMinimumSize(new java.awt.Dimension(100, 100));
+        nodePanel.setPreferredSize(new java.awt.Dimension(801, 551));
 
         org.openide.awt.Mnemonics.setLocalizedText(bnEditIngestSettings, org.openide.util.NbBundle.getMessage(CommandLineIngestSettingsPanel.class, "CommandLineIngestSettingsPanel.bnEditIngestSettings.text")); // NOI18N
         bnEditIngestSettings.setToolTipText(org.openide.util.NbBundle.getMessage(CommandLineIngestSettingsPanel.class, "CommandLineIngestSettingsPanel.bnEditIngestSettings.toolTipText")); // NOI18N
@@ -135,7 +139,7 @@ public class CommandLineIngestSettingsPanel extends javax.swing.JPanel {
                     .addComponent(jLabelBaselineConfig)
                     .addComponent(jLabelReportConfig)
                     .addComponent(bnEditReportSettings, javax.swing.GroupLayout.PREFERRED_SIZE, 155, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addContainerGap(1362, Short.MAX_VALUE))
+                .addContainerGap(362, Short.MAX_VALUE))
         );
         nodePanelLayout.setVerticalGroup(
             nodePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -157,7 +161,7 @@ public class CommandLineIngestSettingsPanel extends javax.swing.JPanel {
         this.setLayout(layout);
         layout.setHorizontalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(nodeScrollPane, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 864, Short.MAX_VALUE)
+            .addComponent(nodeScrollPane, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
         );
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -165,16 +169,16 @@ public class CommandLineIngestSettingsPanel extends javax.swing.JPanel {
         );
     }// </editor-fold>//GEN-END:initComponents
 
-    private void bnEditIngestSettingsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnEditIngestSettingsActionPerformed
-        displayIngestJobSettingsPanel();
-    }//GEN-LAST:event_bnEditIngestSettingsActionPerformed
-
     private void bnEditReportSettingsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnEditReportSettingsActionPerformed
         this.getParent().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
         doReportWizard(REPORTING_CONFIGURATION_NAME, DISPLAY_CASE_SPECIFIC_DATA, RUN_REPORTS);
         this.getParent().setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
     }//GEN-LAST:event_bnEditReportSettingsActionPerformed
 
+    private void bnEditIngestSettingsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnEditIngestSettingsActionPerformed
+        displayIngestJobSettingsPanel();
+    }//GEN-LAST:event_bnEditIngestSettingsActionPerformed
+
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JButton bnEditIngestSettings;
     private javax.swing.JButton bnEditReportSettings;

From 4d11d4a291520bb60aae281a153e68764ec0511d Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Tue, 17 Sep 2019 10:27:14 -0400
Subject: [PATCH 149/192] Changed defaults for
 ReportWizardFileOptionsVisualPanel

---
 .../infrastructure/ReportWizardFileOptionsVisualPanel.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardFileOptionsVisualPanel.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardFileOptionsVisualPanel.java
index 9465ed33d3..b333b5e04e 100644
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardFileOptionsVisualPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardFileOptionsVisualPanel.java
@@ -19,7 +19,6 @@
 package org.sleuthkit.autopsy.report.infrastructure;
 
 import org.sleuthkit.autopsy.report.modules.file.FileReportDataTypes;
-import org.sleuthkit.autopsy.report.infrastructure.FileReportSettings;
 import java.awt.Component;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
@@ -73,7 +72,7 @@ class ReportWizardFileOptionsVisualPanel extends javax.swing.JPanel {
             // load defaults
             options = Arrays.asList(FileReportDataTypes.values());
             for (FileReportDataTypes entry : options) {
-                optionStates.put(entry, Boolean.FALSE);
+                optionStates.put(entry, Boolean.TRUE);
             }
         }
 

From 12bd88e8d318cd22cab991e4caa6869f169b8eae Mon Sep 17 00:00:00 2001
From: esaunders <esaunders@basistech.com>
Date: Tue, 17 Sep 2019 10:59:45 -0400
Subject: [PATCH 150/192] Added bcpkix jar to fix NoClassDefFoundError.

---
 Core/nbproject/project.properties |   3 +-
 Core/nbproject/project.xml        | 364 +++++++++++++++---------------
 2 files changed, 181 insertions(+), 186 deletions(-)

diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties
index d9f4d9824a..d85eda3bc1 100644
--- a/Core/nbproject/project.properties
+++ b/Core/nbproject/project.properties
@@ -3,6 +3,7 @@ file.reference.apache-mime4j-core-0.8.2.jar=release\\modules\\ext\\apache-mime4j
 file.reference.apache-mime4j-dom-0.8.2.jar=release\\modules\\ext\\apache-mime4j-dom-0.8.2.jar
 file.reference.asm-7.0.jar=release\\modules\\ext\\asm-7.0.jar
 file.reference.bcmail-jdk15on-1.60.jar=release\\modules\\ext\\bcmail-jdk15on-1.60.jar
+file.reference.bcpkix-jdk15on-1.60.jar=release\\modules\\ext\\bcpkix-jdk15on-1.60.jar
 file.reference.bcprov-jdk15on-1.60.jar=release\\modules\\ext\\bcprov-jdk15on-1.60.jar
 file.reference.boilerpipe-1.1.0.jar=release\\modules\\ext\\boilerpipe-1.1.0.jar
 file.reference.c3p0-0.9.5.jar=release/modules/ext/c3p0-0.9.5.jar
@@ -16,7 +17,6 @@ file.reference.commons-io-2.6.jar=release\\modules\\ext\\commons-io-2.6.jar
 file.reference.commons-lang3-3.8.1.jar=release\\modules\\ext\\commons-lang3-3.8.1.jar
 file.reference.commons-pool2-2.4.2.jar=release/modules/ext/commons-pool2-2.4.2.jar
 file.reference.cxf-rt-rs-client-3.3.0.jar=release\\modules\\ext\\cxf-rt-rs-client-3.3.0.jar
-file.reference.dd-plist-1.20.jar=release/modules/ext/dd-plist-1.20.jar
 file.reference.dec-0.1.2.jar=release\\modules\\ext\\dec-0.1.2.jar
 file.reference.fontbox-2.0.13.jar=release\\modules\\ext\\fontbox-2.0.13.jar
 file.reference.geoapi-3.0.1.jar=release\\modules\\ext\\geoapi-3.0.1.jar
@@ -55,7 +55,6 @@ file.reference.mchange-commons-java-0.2.9.jar=release/modules/ext/mchange-common
 file.reference.metadata-extractor-2.11.0.jar=release\\modules\\ext\\metadata-extractor-2.11.0.jar
 file.reference.netcdf4-4.5.5.jar=release\\modules\\ext\\netcdf4-4.5.5.jar
 file.reference.openjson-1.0.10.jar=release\\modules\\ext\\openjson-1.0.10.jar
-file.reference.opennlp-tools-1.9.0.jar=release\\modules\\ext\\opennlp-tools-1.9.0.jar
 file.reference.parso-2.0.10.jar=release\\modules\\ext\\parso-2.0.10.jar
 file.reference.pdfbox-2.0.13.jar=release\\modules\\ext\\pdfbox-2.0.13.jar
 file.reference.pdfbox-tools-2.0.13.jar=release\\modules\\ext\\pdfbox-tools-2.0.13.jar
diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml
index 967399cc20..06fcd10d1b 100644
--- a/Core/nbproject/project.xml
+++ b/Core/nbproject/project.xml
@@ -350,49 +350,29 @@
                 <binary-origin>release\modules\ext\commons-lang3-3.8.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jempbox-1.8.16.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\jempbox-1.8.16.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jackcess-2.2.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\jackcess-2.2.0.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jericho-html-3.3.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jericho-html-3.3.jar</binary-origin>
+                <runtime-relative-path>ext/gax-grpc-1.44.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/gax-grpc-1.44.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/cdm-4.5.5.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\cdm-4.5.5.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/httpservices-4.5.5.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\httpservices-4.5.5.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/xz-1.8.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\xz-1.8.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/commons-validator-1.6.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-validator-1.6.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/sis-utility-0.8.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\sis-utility-0.8.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jna-5.1.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\jna-5.1.0.jar</binary-origin>
+                <runtime-relative-path>ext/opencensus-api-0.19.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/opencensus-api-0.19.2.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/gax-httpjson-0.61.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/gax-httpjson-0.61.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/boilerpipe-1.1.0.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\boilerpipe-1.1.0.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jbig2-imageio-3.0.2.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\jbig2-imageio-3.0.2.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jsoup-1.11.3.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\jsoup-1.11.3.jar</binary-origin>
@@ -401,22 +381,10 @@
                 <runtime-relative-path>ext/sevenzipjbinding.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/sevenzipjbinding.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/apache-mime4j-dom-0.8.2.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\apache-mime4j-dom-0.8.2.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/mchange-commons-java-0.2.9.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/mchange-commons-java-0.2.9.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/pdfbox-2.0.13.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\pdfbox-2.0.13.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/xmlbeans-3.0.2.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\xmlbeans-3.0.2.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jackson-databind-2.9.7.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\jackson-databind-2.9.7.jar</binary-origin>
@@ -425,41 +393,33 @@
                 <runtime-relative-path>ext/jai-imageio-core-1.4.0.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\jai-imageio-core-1.4.0.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/api-common-1.7.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/api-common-1.7.0.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jcl-over-slf4j-1.7.25.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\jcl-over-slf4j-1.7.25.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/curator-recipes-2.8.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/curator-recipes-2.8.0.jar</binary-origin>
+                <runtime-relative-path>ext/okhttp-2.7.5.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/okhttp-2.7.5.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/tika-core-1.20.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\tika-core-1.20.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/tagsoup-1.2.1.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\tagsoup-1.2.1.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/StixLib.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/StixLib.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jackson-core-2.9.7.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\jackson-core-2.9.7.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/sis-metadata-0.8.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\sis-metadata-0.8.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/bcprov-jdk15on-1.60.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\bcprov-jdk15on-1.60.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/parso-2.0.10.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\parso-2.0.10.jar</binary-origin>
+                <runtime-relative-path>ext/google-auth-library-credentials-0.15.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/google-auth-library-credentials-0.15.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/json-simple-1.1.1.jar</runtime-relative-path>
@@ -473,18 +433,10 @@
                 <runtime-relative-path>ext/commons-codec-1.11.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\commons-codec-1.11.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/apache-mime4j-core-0.8.2.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\apache-mime4j-core-0.8.2.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jmatio-1.5.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\jmatio-1.5.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/sleuthkit-postgresql-4.6.7.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/sleuthkit-postgresql-4.6.7.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/tika-parsers-1.20.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\tika-parsers-1.20.jar</binary-origin>
@@ -497,18 +449,10 @@
                 <runtime-relative-path>ext/commons-pool2-2.4.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/commons-pool2-2.4.2.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/commons-io-2.6.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\commons-io-2.6.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jdom-2.0.5-contrib.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jdom-2.0.5-contrib.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/SparseBitSet-1.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/SparseBitSet-1.1.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/openjson-1.0.10.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\openjson-1.0.10.jar</binary-origin>
@@ -517,38 +461,18 @@
                 <runtime-relative-path>ext/isoparser-1.1.22.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\isoparser-1.1.22.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/c3p0-0.9.5.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/c3p0-0.9.5.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/xmpcore-5.1.3.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/xmpcore-5.1.3.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/zookeeper-3.4.6.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/zookeeper-3.4.6.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/javax.activation-1.2.0.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\javax.activation-1.2.0.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/commons-csv-1.6.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\commons-csv-1.6.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jdom-2.0.5.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jdom-2.0.5.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/rome-1.12.0.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\rome-1.12.0.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jackson-annotations-2.9.7.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\jackson-annotations-2.9.7.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/javax.annotation-api-1.3.2.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\javax.annotation-api-1.3.2.jar</binary-origin>
@@ -557,49 +481,25 @@
                 <runtime-relative-path>ext/vorbis-java-core-0.8.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\vorbis-java-core-0.8.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/netcdf4-4.5.5.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\netcdf4-4.5.5.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/java-libpst-0.8.1.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\java-libpst-0.8.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/opennlp-tools-1.9.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\opennlp-tools-1.9.0.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/sis-netcdf-0.8.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\sis-netcdf-0.8.jar</binary-origin>
+                <runtime-relative-path>ext/okio-1.6.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/okio-1.6.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/curator-framework-2.8.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/curator-framework-2.8.0.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/sentiment-analysis-parser-0.1.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\sentiment-analysis-parser-0.1.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/commons-collections4-4.2.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\commons-collections4-4.2.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/commons-dbcp2-2.1.1.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/commons-dbcp2-2.1.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jgraphx-v3.8.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jgraphx-v3.8.0.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/juniversalchardet-1.0.3.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\juniversalchardet-1.0.3.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jython-standalone-2.7.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jython-standalone-2.7.0.jar</binary-origin>
+                <runtime-relative-path>ext/google-http-client-appengine-1.29.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/google-http-client-appengine-1.29.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/uimafit-core-2.4.0.jar</runtime-relative-path>
@@ -609,26 +509,26 @@
                 <runtime-relative-path>ext/jackcess-encrypt-2.1.4.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\jackcess-encrypt-2.1.4.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jhighlight-1.0.3.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\jhighlight-1.0.3.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/junrar-2.0.0.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\junrar-2.0.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jul-to-slf4j-1.7.25.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\jul-to-slf4j-1.7.25.jar</binary-origin>
+                <runtime-relative-path>ext/google-http-client-1.29.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/google-http-client-1.29.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/postgresql-9.4.1211.jre7.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/postgresql-9.4.1211.jre7.jar</binary-origin>
+                <runtime-relative-path>ext/bcpkix-jdk15on-1.60.jar</runtime-relative-path>
+                <binary-origin>release\modules\ext\bcpkix-jdk15on-1.60.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/slf4j-api-1.7.25.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\slf4j-api-1.7.25.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/google-cloud-core-1.70.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/google-cloud-core-1.70.0.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/geoapi-3.0.1.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\geoapi-3.0.1.jar</binary-origin>
@@ -641,18 +541,10 @@
                 <runtime-relative-path>ext/jdom2-2.0.6.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\jdom2-2.0.6.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/httpclient-4.5.6.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\httpclient-4.5.6.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/uimaj-core-3.0.1.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\uimaj-core-3.0.1.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/curator-client-2.8.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/curator-client-2.8.0.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/sqlite-jdbc-3.25.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/sqlite-jdbc-3.25.2.jar</binary-origin>
@@ -670,65 +562,133 @@
                 <binary-origin>release\modules\ext\grib-4.5.5.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/fontbox-2.0.13.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\fontbox-2.0.13.jar</binary-origin>
+                <runtime-relative-path>ext/gax-1.44.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/gax-1.44.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/activemq-all-5.11.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/activemq-all-5.11.1.jar</binary-origin>
+                <runtime-relative-path>ext/jempbox-1.8.16.jar</runtime-relative-path>
+                <binary-origin>release\modules\ext\jempbox-1.8.16.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/dec-0.1.2.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\dec-0.1.2.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/Rejistry-1.1-SNAPSHOT.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/Rejistry-1.1-SNAPSHOT.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/dd-plist-1.20.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/dd-plist-1.20.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/sevenzipjbinding-AllPlatforms.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/sevenzipjbinding-AllPlatforms.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/bcmail-jdk15on-1.60.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\bcmail-jdk15on-1.60.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/vorbis-java-tika-0.8.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\vorbis-java-tika-0.8.jar</binary-origin>
+                <runtime-relative-path>ext/jackcess-2.2.0.jar</runtime-relative-path>
+                <binary-origin>release\modules\ext\jackcess-2.2.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/grpc-context-1.19.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/grpc-context-1.19.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/gax-grpc-1.44.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/gax-grpc-1.44.0.jar</binary-origin>
+                <runtime-relative-path>ext/jericho-html-3.3.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jericho-html-3.3.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/opencensus-api-0.19.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/opencensus-api-0.19.2.jar</binary-origin>
+                <runtime-relative-path>ext/httpservices-4.5.5.jar</runtime-relative-path>
+                <binary-origin>release\modules\ext\httpservices-4.5.5.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/gax-httpjson-0.61.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/gax-httpjson-0.61.0.jar</binary-origin>
+                <runtime-relative-path>ext/xz-1.8.jar</runtime-relative-path>
+                <binary-origin>release\modules\ext\xz-1.8.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/api-common-1.7.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/api-common-1.7.0.jar</binary-origin>
+                <runtime-relative-path>ext/commons-validator-1.6.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-validator-1.6.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/google-auth-library-credentials-0.15.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/google-auth-library-credentials-0.15.0.jar</binary-origin>
+                <runtime-relative-path>ext/jna-5.1.0.jar</runtime-relative-path>
+                <binary-origin>release\modules\ext\jna-5.1.0.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jbig2-imageio-3.0.2.jar</runtime-relative-path>
+                <binary-origin>release\modules\ext\jbig2-imageio-3.0.2.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/sleuthkit-postgresql-4.6.7.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/sleuthkit-postgresql-4.6.7.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/apache-mime4j-dom-0.8.2.jar</runtime-relative-path>
+                <binary-origin>release\modules\ext\apache-mime4j-dom-0.8.2.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/pdfbox-2.0.13.jar</runtime-relative-path>
+                <binary-origin>release\modules\ext\pdfbox-2.0.13.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/xmlbeans-3.0.2.jar</runtime-relative-path>
+                <binary-origin>release\modules\ext\xmlbeans-3.0.2.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/curator-recipes-2.8.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/curator-recipes-2.8.0.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/tagsoup-1.2.1.jar</runtime-relative-path>
+                <binary-origin>release\modules\ext\tagsoup-1.2.1.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jackson-core-2.9.7.jar</runtime-relative-path>
+                <binary-origin>release\modules\ext\jackson-core-2.9.7.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/sis-metadata-0.8.jar</runtime-relative-path>
+                <binary-origin>release\modules\ext\sis-metadata-0.8.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/parso-2.0.10.jar</runtime-relative-path>
+                <binary-origin>release\modules\ext\parso-2.0.10.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/apache-mime4j-core-0.8.2.jar</runtime-relative-path>
+                <binary-origin>release\modules\ext\apache-mime4j-core-0.8.2.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/commons-io-2.6.jar</runtime-relative-path>
+                <binary-origin>release\modules\ext\commons-io-2.6.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/SparseBitSet-1.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/SparseBitSet-1.1.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/c3p0-0.9.5.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/c3p0-0.9.5.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/zookeeper-3.4.6.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/zookeeper-3.4.6.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/commons-csv-1.6.jar</runtime-relative-path>
+                <binary-origin>release\modules\ext\commons-csv-1.6.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jdom-2.0.5.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jdom-2.0.5.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jackson-annotations-2.9.7.jar</runtime-relative-path>
+                <binary-origin>release\modules\ext\jackson-annotations-2.9.7.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/google-api-client-1.27.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/google-api-client-1.27.0.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/netcdf4-4.5.5.jar</runtime-relative-path>
+                <binary-origin>release\modules\ext\netcdf4-4.5.5.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/sis-netcdf-0.8.jar</runtime-relative-path>
+                <binary-origin>release\modules\ext\sis-netcdf-0.8.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/sentiment-analysis-parser-0.1.jar</runtime-relative-path>
+                <binary-origin>release\modules\ext\sentiment-analysis-parser-0.1.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/commons-collections4-4.2.jar</runtime-relative-path>
+                <binary-origin>release\modules\ext\commons-collections4-4.2.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/opencensus-contrib-http-util-0.19.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/opencensus-contrib-http-util-0.19.2.jar</binary-origin>
@@ -738,21 +698,57 @@
                 <binary-origin>release/modules/ext/google-auth-library-oauth2-http-0.15.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/google-http-client-appengine-1.29.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/google-http-client-appengine-1.29.0.jar</binary-origin>
+                <runtime-relative-path>ext/jgraphx-v3.8.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jgraphx-v3.8.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/google-http-client-1.29.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/google-http-client-1.29.0.jar</binary-origin>
+                <runtime-relative-path>ext/juniversalchardet-1.0.3.jar</runtime-relative-path>
+                <binary-origin>release\modules\ext\juniversalchardet-1.0.3.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/google-cloud-core-1.70.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/google-cloud-core-1.70.0.jar</binary-origin>
+                <runtime-relative-path>ext/jython-standalone-2.7.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jython-standalone-2.7.0.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jhighlight-1.0.3.jar</runtime-relative-path>
+                <binary-origin>release\modules\ext\jhighlight-1.0.3.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jul-to-slf4j-1.7.25.jar</runtime-relative-path>
+                <binary-origin>release\modules\ext\jul-to-slf4j-1.7.25.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/postgresql-9.4.1211.jre7.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/postgresql-9.4.1211.jre7.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/httpclient-4.5.6.jar</runtime-relative-path>
+                <binary-origin>release\modules\ext\httpclient-4.5.6.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/curator-client-2.8.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/curator-client-2.8.0.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/fontbox-2.0.13.jar</runtime-relative-path>
+                <binary-origin>release\modules\ext\fontbox-2.0.13.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/activemq-all-5.11.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/activemq-all-5.11.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/google-cloud-core-http-1.70.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/google-cloud-core-http-1.70.0.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/Rejistry-1.1-SNAPSHOT.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/Rejistry-1.1-SNAPSHOT.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/dec-0.1.2.jar</runtime-relative-path>
+                <binary-origin>release\modules\ext\dec-0.1.2.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/google-http-client-jackson2-1.29.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/google-http-client-jackson2-1.29.0.jar</binary-origin>
@@ -766,20 +762,20 @@
                 <binary-origin>release/modules/ext/google-cloud-translate-1.70.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/gax-1.44.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/gax-1.44.0.jar</binary-origin>
+                <runtime-relative-path>ext/sevenzipjbinding-AllPlatforms.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/sevenzipjbinding-AllPlatforms.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/google-api-services-translate-v2-rev20170525-1.27.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/google-api-services-translate-v2-rev20170525-1.27.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/okhttp-2.7.5.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/okhttp-2.7.5.jar</binary-origin>
+                <runtime-relative-path>ext/bcmail-jdk15on-1.60.jar</runtime-relative-path>
+                <binary-origin>release\modules\ext\bcmail-jdk15on-1.60.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/okio-1.6.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/okio-1.6.0.jar</binary-origin>
+                <runtime-relative-path>ext/vorbis-java-tika-0.8.jar</runtime-relative-path>
+                <binary-origin>release\modules\ext\vorbis-java-tika-0.8.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>

From d99a8822456744aeac12c129ce3c2738e341d981 Mon Sep 17 00:00:00 2001
From: esaunders <esaunders@basistech.com>
Date: Tue, 17 Sep 2019 11:59:28 -0400
Subject: [PATCH 151/192] Updated version of opennlp-tools.

---
 Core/nbproject/project.properties | 1 +
 Core/nbproject/project.xml        | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties
index d85eda3bc1..945b30562a 100644
--- a/Core/nbproject/project.properties
+++ b/Core/nbproject/project.properties
@@ -55,6 +55,7 @@ file.reference.mchange-commons-java-0.2.9.jar=release/modules/ext/mchange-common
 file.reference.metadata-extractor-2.11.0.jar=release\\modules\\ext\\metadata-extractor-2.11.0.jar
 file.reference.netcdf4-4.5.5.jar=release\\modules\\ext\\netcdf4-4.5.5.jar
 file.reference.openjson-1.0.10.jar=release\\modules\\ext\\openjson-1.0.10.jar
+file.reference.opennlp-tools-1.9.1.jar=release\\modules\\ext\\opennlp-tools-1.9.1.jar
 file.reference.parso-2.0.10.jar=release\\modules\\ext\\parso-2.0.10.jar
 file.reference.pdfbox-2.0.13.jar=release\\modules\\ext\\pdfbox-2.0.13.jar
 file.reference.pdfbox-tools-2.0.13.jar=release\\modules\\ext\\pdfbox-tools-2.0.13.jar
diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml
index 06fcd10d1b..53c318a22b 100644
--- a/Core/nbproject/project.xml
+++ b/Core/nbproject/project.xml
@@ -521,6 +521,10 @@
                 <runtime-relative-path>ext/bcpkix-jdk15on-1.60.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\bcpkix-jdk15on-1.60.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/opennlp-tools-1.9.1.jar</runtime-relative-path>
+                <binary-origin>release\modules\ext\opennlp-tools-1.9.1.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/slf4j-api-1.7.25.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\slf4j-api-1.7.25.jar</binary-origin>

From 643f53368e224eeaa7e26c13db4a6f92bdb0d839 Mon Sep 17 00:00:00 2001
From: Ann Priestman <apriestman@basistech.com>
Date: Tue, 17 Sep 2019 14:38:58 -0400
Subject: [PATCH 152/192] Doxygen fixes

---
 .../autopsy/casemodule/services/Services.java      |  2 +-
 .../autopsy/coreutils/AppDBParserHelper.java       | 14 +++++++-------
 .../sleuthkit/autopsy/coreutils/AppSQLiteDB.java   |  6 +++---
 .../org/sleuthkit/autopsy/coreutils/ExecUtil.java  |  2 +-
 .../report/caseuco/CaseUcoFormatExporter.java      |  4 ++--
 .../autopsy/timeline/actions/AddManualEvent.java   |  1 +
 .../ui/detailview/datamodel/DetailsViewModel.java  |  1 +
 .../filtering/datamodel/CompoundFilterState.java   |  2 --
 .../ui/listvew/datamodel/CombinedEvent.java        |  1 -
 .../autopsy/timeline/utils/TimelineDBUtils.java    |  2 +-
 .../ThunderbirdMboxFileIngestModule.java           |  2 +-
 11 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/services/Services.java b/Core/src/org/sleuthkit/autopsy/casemodule/services/Services.java
index 02f98f2887..81bc6a643c 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/services/Services.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/services/Services.java
@@ -80,7 +80,7 @@ public class Services implements Closeable {
     /**
      * Gets the artifacts blackboard for the current case.
      *
-     * @return @org.sleuthkit.datamodel.Blackboard Blackboard for the current
+     * @return org.sleuthkit.datamodel.Blackboard Blackboard for the current
      *         case.
      */
     public org.sleuthkit.datamodel.Blackboard getArtifactsBlackboard() {
diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/AppDBParserHelper.java b/Core/src/org/sleuthkit/autopsy/coreutils/AppDBParserHelper.java
index 538ea07098..01771f0581 100644
--- a/Core/src/org/sleuthkit/autopsy/coreutils/AppDBParserHelper.java
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/AppDBParserHelper.java
@@ -283,8 +283,8 @@ public final class AppDBParserHelper  {
     /**
      * Adds a relations between the two specified account instances.
      * 
-     * @param selfAccount device owner account
-     * @param otherAccount other account
+     * @param selfAccountInstance device owner account
+     * @param otherAccountInstance other account
      * @param sourceArtifact artifact from which relationship is derived.
      * @param relationshipType type of relationship
      * @param dateTime date/time of relationship 
@@ -316,7 +316,7 @@ public final class AppDBParserHelper  {
      * @param readStatus message read or not
      * @param subject message subject, may be empty
      * @param messageText message body, may be empty
-     * @param threadId, message thread id
+     * @param threadId message thread id
      * 
      * @return message artifact 
      */
@@ -347,7 +347,7 @@ public final class AppDBParserHelper  {
      * @param readStatus message read or not
      * @param subject message subject, may be empty
      * @param messageText message body, may be empty
-     * @param threadId, message thread id
+     * @param threadId message thread id
      * 
      * @param otherAttributesList additional attributes 
      * 
@@ -385,7 +385,7 @@ public final class AppDBParserHelper  {
      * @param readStatus message read or not
      * @param subject message subject, may be empty
      * @param messageText message body, may be empty
-     * @param threadId, message thread id
+     * @param threadId message thread id
      * 
      * 
      * @return message artifact
@@ -867,7 +867,7 @@ public final class AppDBParserHelper  {
      * @param accessTime last access time
      * @param referrer referrer, may be empty
      * @param title website title, may be empty
-     * @param programName, application recording the history
+     * @param programName application recording the history
      * 
      * @return artifact created
      */
@@ -884,7 +884,7 @@ public final class AppDBParserHelper  {
      * @param accessTime last access time
      * @param referrer referrer, may be empty
      * @param title website title, may be empty
-     * @param programName, application recording the history
+     * @param programName application recording the history
      * @param otherAttributesList other attributes
      * 
      * 
diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/AppSQLiteDB.java b/Core/src/org/sleuthkit/autopsy/coreutils/AppSQLiteDB.java
index 6812f6daf3..bb8a1ed227 100644
--- a/Core/src/org/sleuthkit/autopsy/coreutils/AppSQLiteDB.java
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/AppSQLiteDB.java
@@ -95,8 +95,8 @@ public final class AppSQLiteDB implements Closeable {
      * AppSQLiteDB to help query the DB. 
      * 
      * A list of AppSQLiteDB instances is returned, one for each 
-     * match found., 
-     * .
+     * match found.
+     * 
      * @param dataSource data source to search in 
      * @param dbName db file name to search
      * @param matchExactName whether to look for exact file name or a pattern match
@@ -174,7 +174,7 @@ public final class AppSQLiteDB implements Closeable {
      * @param dbName db file name to search
      * @param matchExactName whether to look for exact file name or a pattern match
      * @param dbPath path to match
-     * @param matchExactName whether to look for exact path name or a substring match
+     * @param matchExactPath whether to look for exact path name or a substring match
      * 
      * @return a collection of AppSQLiteDBFileBundle
      * 
diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/ExecUtil.java b/Core/src/org/sleuthkit/autopsy/coreutils/ExecUtil.java
index 9a211c57a0..022b507212 100644
--- a/Core/src/org/sleuthkit/autopsy/coreutils/ExecUtil.java
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/ExecUtil.java
@@ -206,7 +206,7 @@ public final class ExecUtil {
      * @param terminator The ProcessTerminator used to determine if the process
      *                   should be killed.
      *
-     * @returnthe exit value of the process
+     * @return the exit value of the process
      *
      * @throws SecurityException if a security manager exists and vetoes any
      *                           aspect of running the process.
diff --git a/Core/src/org/sleuthkit/autopsy/report/caseuco/CaseUcoFormatExporter.java b/Core/src/org/sleuthkit/autopsy/report/caseuco/CaseUcoFormatExporter.java
index 03bffed89d..d3ab17ffe9 100755
--- a/Core/src/org/sleuthkit/autopsy/report/caseuco/CaseUcoFormatExporter.java
+++ b/Core/src/org/sleuthkit/autopsy/report/caseuco/CaseUcoFormatExporter.java
@@ -198,7 +198,7 @@ public final class CaseUcoFormatExporter {
     }
 
     /**
-     * Exports files that are tagged w/ the following TagNames and that belong to 
+     * Exports files that are tagged with the following TagNames and that belong to 
      * the following interesting file sets (set name attributes of TSK_INTERSTING_FILE_HIT
      * and TSK_INTERESTING_ARTIFACT_HIT). Artifacts that are tagged with 
      * the following TagNames also have their associated source files included.
@@ -208,7 +208,7 @@ public final class CaseUcoFormatExporter {
      * @param tagTypes Collection of TagNames to match
      * @param interestingItemSets Collection of SET_NAMEs to match on in TSK_INTERESTING_FILE_HITs
      *                            and TSK_INTERESTING_ARTIFACT_HITs.
-     * @param outputFilePath Path to the folder that the CASE-UCO report should be written into
+     * @param caseReportFolder Path to the folder that the CASE-UCO report should be written into
      * @param progressPanel UI Component to be updated with current processing status
      */
     @NbBundle.Messages({
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/actions/AddManualEvent.java b/Core/src/org/sleuthkit/autopsy/timeline/actions/AddManualEvent.java
index 5d02925db9..33220b173a 100755
--- a/Core/src/org/sleuthkit/autopsy/timeline/actions/AddManualEvent.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/actions/AddManualEvent.java
@@ -127,6 +127,7 @@ public class AddManualEvent extends Action {
      * Use the supplied ManualEventInfo to make an TSK_TL_EVENT artifact which
      * will trigger adding a TimelineEvent.
      *
+     * @param controller
      * @param eventInfo The ManualEventInfo with the info needed to create an
      *                  event.
      *
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/datamodel/DetailsViewModel.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/datamodel/DetailsViewModel.java
index 8bb257867c..f37cce6035 100755
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/datamodel/DetailsViewModel.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/datamodel/DetailsViewModel.java
@@ -102,6 +102,7 @@ final public class DetailsViewModel {
     }
 
     /**
+     * @param uiFilter
      * @param zoom
      *
      * @return a list of aggregated events that are within the requested time
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/CompoundFilterState.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/CompoundFilterState.java
index 6723242141..e85fabe4da 100755
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/CompoundFilterState.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/CompoundFilterState.java
@@ -121,8 +121,6 @@ public class CompoundFilterState<SubFilterType extends TimelineFilter, FilterTyp
 
     /**
      * Disable the sub-filters of the given compound filter if it is not active
-     *
-     * @param compoundFilter the compound filter
      */
     private void disableSubFiltersIfNotActive() {
         boolean inactive = isActive() == false;
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/listvew/datamodel/CombinedEvent.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/listvew/datamodel/CombinedEvent.java
index 62e60fb597..4d4badb58c 100755
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/listvew/datamodel/CombinedEvent.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/listvew/datamodel/CombinedEvent.java
@@ -45,7 +45,6 @@ public class CombinedEvent {
      *
      * @param epochMillis The timestamp for this event, in millis from the Unix
      *                    epoch.
-     * @param fileID      The ID of the file shared by all the combined events.
      * @param eventMap    A map from EventType to event ID.
      */
     public CombinedEvent(long epochMillis, Map<TimelineEventType, Long> eventMap) {
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/utils/TimelineDBUtils.java b/Core/src/org/sleuthkit/autopsy/timeline/utils/TimelineDBUtils.java
index 5c67852ae5..5fde45aa13 100755
--- a/Core/src/org/sleuthkit/autopsy/timeline/utils/TimelineDBUtils.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/utils/TimelineDBUtils.java
@@ -63,7 +63,7 @@ public class TimelineDBUtils {
      * into a set of X using the mapper to convert from string to X. If
      * groupConcat is empty, null, or all whitespace, returns an empty list.
      *
-     * @param <X>         the type of elements to return
+     * X         the type of elements to return
      * @param groupConcat a string containing the group_concat result ( a comma
      *                    separated list)
      * @param mapper      a function from String to X
diff --git a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java
index f428b455cf..3f1daa1a1c 100644
--- a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java
+++ b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java
@@ -411,7 +411,7 @@ public final class ThunderbirdMboxFileIngestModule implements FileIngestModule {
      * appropriate artifacts and derived files.
      *
      * @param partialEmailsForThreading
-     * @param fileMessageIterator
+     * @param fullMessageIterator
      * @param abstractFile
      */
     private void processEmails(List<EmailMessage> partialEmailsForThreading, Iterator<EmailMessage> fullMessageIterator, AbstractFile abstractFile) {

From 5e3a283658e2d9b9d6dd61ff9404cd86d0e63e5b Mon Sep 17 00:00:00 2001
From: Ann Priestman <apriestman@basistech.com>
Date: Tue, 17 Sep 2019 14:54:15 -0400
Subject: [PATCH 153/192] Updated carved files icon

---
 docs/doxygen-user/images/photorec_output.PNG | Bin 82308 -> 83724 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/docs/doxygen-user/images/photorec_output.PNG b/docs/doxygen-user/images/photorec_output.PNG
index 168e8b0272b8429f465c5fdda15db20cba016efd..566e6a4652f827ea48bbd1f045552f49e8823bfc 100644
GIT binary patch
delta 63479
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
R7f9ekQcO;?<b$5y{{aXl;Nt)Q

delta 62052
zcmZs?WmH_j(lwj}O>lPzAp{8S4uJ#+?!kh)yUPhq(BLw-ySoN=cXxMpcn`VvK5Knz
zeXKJ-m^m}uU0q$ZYwtS2p)fw)Fn?s<t-d8hMSV?iVr)>R)+z&B-&FT8FJCuoxS|IP
zR>8daSmq;Y#m&Mpada?-T=#zZuvTKh7$wO%`xi`FWjLhwAjx<rDpKlh*0@xVQoA3C
zb`_D?uv&g^$eQ*|@9g1GFs}?HPGsu$Y79E0!O82JPet}m$`Oqp>3bt+xtn>GhYe>{
zOO`GR4V#W5E}o`<bB#BixzG9e>G}9L_cj@aRQNekNlZzhTx4Wq+Ujq|`}OueIE<kP
zphANeY3N@@0&iVm4Gm&iT3XShmAQMu#OLAX!7^kLs2skLuojEAK^9e~Wy5Zv{Ux=6
zCZs}QCC-Ea#8BkAuMPMRuxY;E*)kKysyoDE=DvsbdJhk@IlY1F3T<U%ONN7k!y_d8
z$juFTc-W!S_x$qrq1VQO4q+-<#G#_1qD(n`3TJbn&URySv&?F>&3Rmg<d}<mjmZ%n
zuqZDtk9b~)TR<th9*Ac)?CI~<9ZeVdU<LDU-UHB~v$%;yMG@i_78aS|*~a)^zhbBb
zjOdj80g{qvS>F#hkKNYEVhVMX{F{_u`5OucL@98U-rn9DTU%Z3eT`bJZ>TyI5O|p*
zTU!Or&dxF!wnzih|3DzrFr+UF@nXO-FDfoB&drO*rq@8+QJ<7b<Y=9(Fsxe-<<4YG
z7KVj|bvmq?uD#nUP^q`e!wmS(`n}#uMF0Jrm673ny$qy)zfD!d5)Og%hp;d8l<W6r
zGQ8LwytKJsLjQdO9IMTYbbS9(jOyRGFK@mP`FGFDZJ$WhC;s~tfjDO6O!)u(gX&54
z|8qYe0R4YI>jh8vpRoi`zpeb=y#t?_Lb#6}hu57}_^7a6h7e=8Poi>s6n<xbJhIa$
z{!ReZC!WIUWt>&Hllfyn<()S6xn}dTr5yMp14y13`JbDbnh+5YQQ@J-*8X(rtOimS
ze-EM+l9j;(d<zR{FonYBu%QLwS}%~{vQQ03WAzQcgGOawhYrm)wsUlh3=ePZ=DT7n
zuc)9n49?F_<goTiOiZkVN0%Ijhkk>If)WXC<A?tlVT%JJS?`OY;@$my@9;1MH8q0d
z_*i)shLCK}z`!>}MFqv^m*HMa<^ymJ`H*qs=cB_zmnzeUzJ1wU8(Uk9tx*;vMa9VS
zoczz&;x>0QX6$5N+jd^|8N3)`<E@}6W&<SNqiS6rEzTS|5WAfSyz%^-na+`reLAIP
zIXX5b=<4b!r(^Uv{p-t)O=R3&mwuv%>_?h+L^jSiUaa!J67^`w0s5tw9J;w<PapHn
z#6jB@Gv_gKtlQtegY|w`f#Y9UbX@K<s2H7|X1DmL&jU%wX5`_K03CCCIE4ZgUaMjj
zJ+uVvWoH?JZU-!uZY~{_iz$tscnh0ogN`5O;iU_g2Ub<s+ADP=m$nto-hp$;kT6Lb
zwsI_Y3Wpp6!1H}&RaKeUEK_mA5!cfh{d2^?z<|#v<P<uzQ%Acuf?UtgFcJb0mzGA+
zC}B_g6@JPN{)R17XMKF^^6cPflJp36pq0-ve-%|^zb)}rmemCr`sJ;B@|k}+-&~Me
zH!9NIRglLOZ>g`+vn@i+wn5p}@9H>Rq$|X2j?6p2d5`WZi>Pb(G42osimpQT<8OYV
z5DCycY^-y!4K3Hak^9WQb@0f3qMxFHE`smL%)>LF8^+t^dfe3ga!A^I5pE}P_&SxE
z&!Vjxa>&soR}bs=i`V<8OFoj3c_$_kf_`x7(gf|@Y8>DA1>E&oA584BGybq~3yFJR
znD*w$%_li6N2Q;XZP_8Q$eZi}5oX835URy#<*oV`w`Rg8N$F#}ccs_F)R3!VgG)n)
z^R5+mdY~a>u*O_lpK_R>L3Q?|CyjAi*|MzMc;5TrAU5q<<Bpua;n|f(N7ABNs_5`7
zp;{0p?%C-|-?|;8uWU16aed#$-5WdL8NA<Y8>2FhUifzIameCF|Kf}5-`ZR0WPl-<
zjOS`b*X?3dghr*@2L=KAWOmpi#(saw`gE-`>M$M+5w>pCj{x-Rjf>rJ*$>;G?-7lw
zOTHZHwt*a5s{<~Mxl%D1-=o&|NomIplJa=pvH;49B~)mo<McgS0e}k*tMW>>aZvh3
z<wzPa=4ks+_cPq2IuCK5p-X6}Zex=Ri*##(t4h@+&V$Z4t?c%z5x#5k=BG`~lc4VD
zzX<%R`<v3j>fU+BtCjnf+MH@Le+q0;_o?_a?{#tIc3Fs-3AgVoO3TF*clodn3ubS#
zp;X{RP<=Sbt=iBq$bbgN<In(zP!Kj6JoHT`y+>=LG@q!Fl9Hal2>9kH4seR|Fsb>d
z7=_AMal7hIVzW1q*HgB-n__EY11`G*jNy@y?SKEi@@OF`nEd<_3AJOiuhfa8##lm5
z8dMu_miN@0WF}w1&_3`-iH!f6Y`D?%C)UqPODm~5-UNDa)pUo@Y@2&L1~~1e$~@L%
zolj3<S7+~4j`4Z<ijU`Z%J>iP^>Q2n%x~)ytoer>p5ht?+!!19zU*@h?JqE~@owFL
zkz|X&_&9xPbhH(Tec^AqP!JeR^z`&folbRP=+yft_)g#QUFJz!-yhag==Gv|+|MtE
z?j{>x1Ff8nM})Jpvoxxe0pNnc%q9rNpWdFHFS3}JLapHPl9D7fHB<6ZUcv|>4u>_{
zx@*2ez;m?;^;A)qO@+|!MjZQxa<$UtdaUbkT($nbQr!sTlRfJtX3ndQw3PF^E_&P8
z)t_C5wqZwYHLJs?hjuox=^rl^<Fcy{fz6g9Qz(7j=b2mNWwl3Sb0WrO+|cfUqeaa%
z(~_q|GNRwZ?2{01XbIgh^$DGn+9LIa7z_%jZ&SJ8Bm>|hd&1(f(<tAi+zuF~hla6h
zY-K|%)(&PX-uj9uZ~U|!WYq;&$h}@7)HzIOuToXE*WKQar$Q}L%1x=KC%_SEK{GeC
z$`c=(FKyi(WB;~$`B0}l=Uf?|t<nWYM8hqr#rZSWqv<8o!OwGZ;=De6-B#v>r?6uy
zhP|2l+g)FKqr+}+2hS{x@vaM>I1APJx}M9Lmxq~KD$>$ZX&Ydw7rVyH@3?E8*SR0u
z;@<?{ol!t)(yb=r_Qw_60g|cnu*+xqex=P*sCN6VJ4$e(%QE%#^&ghK|C9BaGm#1L
z@z-`nGca**M6&3WOMd~6(?C{J6H!p7SAM?R8b*p%yC0G)f~`q{FaYp_pdq|ciy>fo
zUw^YNT6W!tiJ7@~V1STJmG5Q+itcCauk@X?`+oYCL;_2ok#Q`VR>IJbB39Fb6a14~
z2lqJ^wPHEmX4>-R@VZ4pWP0TQL*KteXf@1?(1Wp_dx88s>r}k*ScSi6TRkSFAGm#L
z83hxug_QuR0dyp>HwJ;??*9I|spdWY<>lp#8=qI}d-|3KCXJHVy}dokaEze*d}wc7
zxOmt%fG6c>x-mY5baG}%3H=8*5W5V#L{)HW^VDCGy<d>83a-PA<T~@iW=zmRu#M=$
za|m<TJ&Mou(RTd#{vRm>Fv&Y+>m}?YClj-o&HN3-qJG7jf8Ir4c@mlO@R4@>TMCbJ
z#L$ow4K@OZm{L-PBgn;ZiHT#3(_sVvRD*)Q@xJrhKcOD9LTp5bk6TceJO;Kgg}@l=
z#c(WokDJKA%gY;XZ@J{WO=MBK3cKWXKIo%E7VpdVy1t>Ix3`xR4D$~UZZDsW_k@fV
zzhvlkm{2z*aAxq#0xQ83-;SEDHC~oRUDDWARI|io40)xb>CXE22t59@pHzHt)3=?H
z<!m5c^bx1A`iGi);@?|!xvou3PIhkdKRY*r(TRzJ<2x9e9!P3Fl5wyv+F{_~;X%Lg
zwC<Fg`M*&WhgF;HX8mig`RPGq*mi);0WKN@FrZ1}@P>4DcX!iraww=sBL?E)S66}6
zsBg+MnlF|%U<++%Xt-6*j_NeaY;fh+#Zv~SlkNRhnkkj?9SjUiBA0z&Yip}D1?+bR
zaYM&)Er#!!nj|VJDj)uVub1B-W?0?U#}4u(u&DI}@gzyfG(=88pQj;5Iz<Xn6da65
z*KknoGcNznGEhbCB)~q2Uk(cIfQ>T)>v})m;$?JT(@f*s>L7=8nPCW1L7)7Qvp}5o
z8wz&zScqkFe0X?xrI5x8+{RamEDQq&2k}AB-<Q-3V@GK6<^CY$?Bp(Id}(ET?z+rl
zl1+m()0}69vj|D2qRWiKd|4hJ!uNPBdTZ!FTbhtm0+6h&>Wf%mo2{rUzJcRbFJz3$
z$R_HlTk6hW+?==0ef>E(nK9&G#`I^?xxL0*B@a1J)efPWIVmjrvO8B{;8K!dPO`7F
zhs7rM%uUVj@=Y5Y;eDGhs)5g6Sxn!70SVCS!0>9UVk!I*P)R8$D9o#Au*LP7Ucjz4
zU|`z@r|E3R4SCWIY_3o`-ncx$c)oHk)KvVtWsJ>fd_MeVx@UEeU`2~U-4t`~x=1(r
z{ClSCa<e5-L3Pu+0>`sl(OD&)dNbigL~3M*voU-j9DNv+3d=`QHd>{w8&@Y=zWPw-
z7{jk^C$h^fKg`uyTZe`M{&F`uGy7LH02$EBcGCsnRrI@pQm8%`OnIfkPU)UjQ6DKN
z4CT}u931A%_4V`uYX4c-XighHMcq?zvAf>>-sqgav)&#u+enuJdOsV9g`ws~)f1|O
z>2i0y8!s(Cf64=Rll0l^_;NQ4e~sndGIi<kVq?bYsj?E@sF(;82xnq8u)Cu3DBg_7
zF6U9x++yYqQxJChp__jB0zIkZSkFGaoc*VFHj#m?5%6I;kA#`gwJ(7eR=Wmsey{9l
zE@oFY0f{j4d_|az_#m^O0AYHOh|uI$Qi+I2$<)DYJ7@}z+id%$Fn5SOpmD_?oq2qB
zT6Qhi8V3&%oh_UfX~+jUqo$P`WS_FF!Vucr^d+Ek($WOPgg}%Q=Ml<scF<+>6Ptwp
zT~3n=;{1M+U9y#2>8iGapXRYkg5_g;G)c)E+g%j@#3VI&%&hXM2^rCxcJj|nUDF-o
z7K?r3Dc-ECjjv`M9Z^a(W%*iac5{14Zy&i|(~t}g?Ikr{T@V2UKVH3h|4Q_mfI>R!
z?Yd;2N0>cQUzZzxSgmqJmkb4AtFcW|QdlVcSao*0MmH&b?#iw{<J0HBW{)vO5~5AU
zTTS)WDUR29n-Gn3Q~B=-gi8{wks?kvvP}~1YTUbX8A0hc`r0-njd3d;g!0=iIIOzU
zERx)27S~iElJh?RtI~5+Q%v7>2z!_&nBw11B;@CR{%@T%b9vJYZGK=lt9<mv%}>}B
zW<U1zjB*pWWc<{{?y^a4=er{oj;W({+~G5`)(Y8>5e#MdGws>CcRwsmH%h4m*mL8K
z#4ykeJ~_07Z2UIvx0-EV+$5MCaq{6cowCY2#pMP_>;<~Vx2A8u+mS5>_s)$IJRvDG
zdQjRF2?Noru1<?Jp^5|=Fv**<A#nC-m2+KV9DE^o?Ui%cB62^DH%1#GPZkd}jHlO@
z!wl>vn=KW3DC*&2fpDw`UV?Wc-SUUCWSSqn7?7FHG+vPRhLI|Fvu;5dt>kKIWV4U@
zFCZely}QintJ9^F#_>c0$L>7wlro()j$sBMZ}$*a-f}PNKn$+MA+AeT+nW9DCv9mG
z*9wIB{R~~pfum^9>VbB$+&!>UO|=17C2Ur?WXZM0scZI4#e?++A^Z0Vi`1VSrd6lP
za|(inhHUT=-i^&6$^Ey!ZHr<BHZJMDQ?X_r(;4a}3Y(3EY%9(ymtAVd;4HNTD%G5B
zgky%#)CdtxTjzQzvB%`-qq;@`X>{WIUB(Na`|$hN`NT6uQ?RN#m@_(~n$l?u-8&ia
zlR^j!luJk&Xol=RjpnB0@`8bOU$-M9zUA<KN~r5=Nb-3FPd!F;kqv0%>D569XQ7E-
z?$4ct$P?Z+Cbg(sF+KKp*Is30$aPf)rKy#D^U%;__lbRvlHdD}I&)JYKNO>fJ+3N5
zC0{@8Yd$A{xKZ@*rPd~JXXe_pEFaFs(nl)xZb{ctd>uZDblO$!^BW(b3=Fr9e)z+t
zR!z;3mj&;7*k@eKfkY}dEb^<`5W<7RZz*-PPa(1FiO;Ag4aj@acajgk2hw2+KhIz%
zn42Bg_4iLHS(!n?ijw-#H4Xjg^ZFA4c-7xG_7(Wuse|D;`P1C8{ysHFb^fn6?-zuM
zOvi0j$TbX!3f{dFCYp8nL${9~g>@TVuGVC&`v5N`*Nn021#EH6;MS3JS8zWyb?nsU
zn-}yfv#G+;)5i8jLX)m;=M@xCpQ)`aJ@crwG#HCX+3ihG5xbQpq&!_1zCGt8L^<og
zkhU6^WdDx=7#(<<QM#e7g|h0d`G?OOiPOs5Y{pql{n_P5l=%+#69*iSEr(L<W{05x
z!#TkeFW~)8uC9=kMz<UIV`6Un>qj-ELcPO;)07`cAZYROqIP<^1@O+7@}(EioRc68
zznBe&K2lgc(21F|R^mqFLs%BBK86-}K@Cb3_Qog-)QOq6vv3#Lz`gZ)pXu3U$c~QB
zoNS}(Xh$T%`z|$X9-iLL_*<BjS%P2AGIOiH9`KlGG^-i7FB#hc?w_sa`B7O0Pa~Cw
z!uGEFeFQoOiN_5onEEl7uYNNgBcY&(Xwa+H{yE<srT}2bt8Ur^JCD;RvRA$fZ)Ezw
z`4=UNr3hEBRvsHceFNds`%G_Mbqole$zU>F7jeBGue$orzPfD8&9VDGjVY!EgO{Ix
zGbNP@xOhzoROq-aQCO*D9#MfOEJP$EMi!QiDv|~+6NH>?TID|pe;IY`#|{dz?EMk=
zR~)0$DaDMaJ2&A@*7Nhzva(<y=`wp~-Mu*Cj6!I<y4^%SWIS-P!gYz9+KjX6QE;!^
z)1K-4N$H6R!`HD0la(PEPv35hE9v0@5Tb$C8-|cb#20+C&*!20QT6<+f7JGpzDb3o
zF*cU_ttXTgZF+5%C)?j6Ghti5F<#`TMdCyY?jfkE2@!i)=3(~0q`*C<z9_C-3&Ehq
z?N;rAv|7=O*<u7#NV|76xhFu&>QrNDbo6KDGp+Y0Bw8CT6y(l+2g!C~09!<nuG#4o
z+Z5(_CaW$S4>BD3S9FkvSy_612)?3sSore-C;MTfET!3jrpryn-Qh!30_VpW-LO-X
z=Mxm&Cjywzs*@jn{{AW&wNd2k8q%)wZ(qgW>_yJj)Fi#<rhp6$4PE?HKfq0j`0y~(
z9q9G(Y<7`UcFj7KQokM;nO)1O%8Y>`wbr36$;{05%%&AOb^n~FFRnarLy%{9;lw*A
zPHjIyW$)KvGFOO&DgQP8jbs8r!#u4c$X410<|S+xlz&uBRCvjmS#KzQ48);fGnYLJ
zq<pyZM&Vm|yk1^^c`ZM$15l+_t%AQ8?~{@iBT-p3RK){<o8o1mJnIDsBc0c_Xi?vq
zWwX4q6<1`s(3m1yIf{F}#AmM}+Z$77sN!(hpn$MZf|HrIjYZ|7AUS+nBL)W!J+j2!
zM;v;Mjf^n9HO=R3{xD~H*Hyvd`dfpul7`UcFusl8W$EEMTb|1ac?^zmqgX})I?B9E
zo=o(IkjqLyhBKk6lY6d{TDG|qeop<Ht=@v<_irjelonLFHQm4GiMgs>xb>ZGJzJae
zBwv|wM$dfc-Zvg)3*qCy@3-bYtYsw;%2ITC)QaUZ0Ub$x$dR3U>!6CaS;Pez+&C1N
zAw88!BedhD>*QV6+iA_=zWbx~IeL%q=BXc{z&QX(yxqyz2&tLSk~b0LCZD)txtN6{
znbH6Fa2&0mB#(}UEmf^V9YtjyHE}niVa7aci20$2O?dhXb=uT)Fp|~12~`zUn*K_@
z@z}wyB&e#a89}(Xxe26o9xWa|mcc4|u8;`TP<9-FkdTwCn29?<=6WzRz>l|f2H|Wk
zumZHorC&b(K=rw$u(D7ui@?!vB3-?Y)YjAbb)Ap^pUgk(+>(;k+`NHO&1D=qfXoon
zQyXu+9F#);;adW0BGru+tCW>iY8_|%`k;9|E0XijCwQ+vznu0HCG{SeUl6XvyTmHf
zqfpiDPY!3ldYMKR2g@{{(4W)3LW>CF?g7WKsvxvPePtE>d7?5{GUcc<hE?+GcqOM&
zv+ZdD_=((6dQ5&T9zMQ~o}Ld_#R&@wgPbe0w}678kfP!%5MG1z28gqnn3#I{`qE2E
z!azpX#>OTy=7klZ3g5X!4EXzz47L&k)c|fX-vvXz$UUp{Ln8A+@(cej@p03akHqzW
zk%|?Z?rH=E5N<%<AdW$^L}<vksRu3P<Z7bMcYCW_WB+`O_vI_=M$$yKiE&xZU5d_P
zea=bu3<l`<K@!f;AhZ`rX8?^WI9HZHyVVF|WSrHLlcw?&fx#bJ9CqYnr8GocqRuU`
z=TEkAxCY!S6z3t}95vORC&V4&;GCy}Noe%?`74y7kfcZl43ebo*;Nd$Pj|+>X(a_n
zF8kE=kcX^%XZike&=|VDOQ;Z4x||A3OgvAWiHQl0U+s7A1X0EMhE+_C=(qud;mi&}
z?$XQr3bt5E8qVY|uc7wOCimkDw!`C<1^IL_g7@Zt`F-s+F~yK;oAbQ$UGnI<ohx5*
zrT^h#`}kqTRkDKyo;|VTxDjxd{9V=T$w4vbObHww8adP6%k%e)oMLp%l1q@M=WAhM
zFGOVI@oC5Kr>EC<cXVU(^TV?h+nlyrguuf(-jdTgZJs_@+}2To5t79;!EdV|gqf)2
zEdVBw^lxG|L7%$!pI{j8TkeUQ%b62-U1OM^hc(X^j-Jubu?@Okx47c$hYjyIKcAsh
zp6s7kr(F*x^Y&A7uegT!j1LZFluwLyfMUnj-I}u|5|ZD1BndBK!WIjaqpbKgjY;0z
zJ83zP{=Yf21o}rajzP*HK0Y4$&1=BL)s>2pQVS%SjS_^xau!qy7Ci1Lva-S2cME@=
zc1&X6%>XLExM>Y~-NnU4Fcxo<H}sp4`SGt|={xr|&%A)U2nsLnyE#SiT3&|lmMOyT
zQ@?E^q~<I)helAl?(C|!9oEp}xfAixJ$Qt*MU(H>y5DmX9;#V*fP@85FZ~qU$NJnu
zpiN<^*{0T%cHVvSLc-OBf$r;ROGU;3*0`VsVLPiI<h&WZd|IIS7zld!2#ub;zV*=p
z=h^xB?G}4W?`Ev#P+5k?I|KwgT-*<!iWQ6)&nOHYKq)QB(zpui*E<oaZi5aduCHZE
zA#~XX;yMm&>$pH-z~8q*0+n%$w7S=k-=_yOAS5|m;>S*YefIP^z-;$(qly6cE%TF2
zfk7#Tdm@;O;0fu>p(!48$HvFMIy-Y}KHp7)r?V|xkBNr|@e2cPW>HZ{b2FcUB00#5
z6c^L+J)N3nRfFa<C`<jVPRY5XGn9?+g&>T?Fns45(86yG6PleyJ_qNN5fYiuCHc4a
zdAOZm;p>gMZfsfZbk}uzx4S(?N`|+)-$m|2&2sy;<wQe92&Z%~FL++jI3(!2&d*lK
z8eI>J^jcC=e>J&Y3tw5Pmob^hj+XI%WZ)ruPtELqzRh)e;w_(>-*<9iG+hO<W7)<a
zKUxley4p}8XZy-uhSpblAL~_Hg5=bYx-K{JA(c_}3=;Si_QZn5!^FQrdhZNvXk`S8
zO7L<fy}wdrNY#89k89p0Cd|^P?lD;gkG-s57mHWMo}eI-h}_zNsd)a)D)7j4y<mgz
z3XoIjO)<hZk@-3vH8N-Ar`ulQjXy{5oCMg{Jjn2`raUNVJjC(~xtH)BITL?wWQ_m@
zoP)O`RbI3-&kW{x_@RdG(6f_lN$X|6Wx3hsjfkw4mDQiCD~IByD^-x-1Ghj>Q4v$<
zH_dx478aj$%AXFi`h@%*iJ+jw#1vsQG9%gg530pkgh$dnui4d|aP*~$0$(fqv!(5w
zMg(CWisj5$X=UX4v2V>lO!Vz-;+OXfS0Mz=t^AJ|sEFvehAEa07{_k9g}+bk1->rz
zn69KO-4^UX>6~>XZ~FmG{*F(iL(YiX2*3WFy^pbW*i})0mI8cm?#1=Bf5#w0dpnt)
z!JhgAINwp05G{tD9-s$42wUARyA@PT<@n<#MJq~Trikbsv<1)_7!sF-jPsyGj08CS
zyTho@xb!IYIN*})u!IW%(bcrH;)K9I@5^J9<i_?w2rcc|a@a7!L86#PFsyK(Nb+Bp
zigh@|7xG+M()bd#0iJd+M{roLLASTJgA-c6zAsY-Xu!9@l%iZ~MY_1SD6vBtT@|o~
zP4Cg(W_4$m89kv?cX5fWs!GL`n#QUquk-_Eb(;I<4H(KNWfn3?whPR&1{gy-jPqKt
z(Y~dz;&+{v(Bg4tkphvtF9l}+s%79#T`8Dx2V6awXW?H^oTl^6N?cJ*4!78s&L;q6
z96UzvQT2?B;y^wPRJm%FJ-FE*A^QC>vOj+gfLR*c*$=3=+D=XZAdu^gmP_|tZ5xlm
z#+KD_BjPL0jG^rc5LN%WMk#f0hlml9+c9VCpc8qo4xaqB@6a!DgoBl+fvl^=^qe(}
z!U6Eu4Rd#QS2}A3rqKF&pdJ)4GC}qC=*R+OX<r4VGcYj;IyhjHJl}NRu9H0X_!zWb
zxEj+^tu<)3qH<?<9*<2c)++cs%-iIJ;((cm;=q=louXtvi|lT~24t+o$q~F501)<c
z4t54XVeqk`%JdEng2H(PCN{QCnKFm-*~f%z?J{Lhq4?PdIE8C5{Eb%9c)R13TT?=S
z^j&g2*nz%6g%?8=m(D?;?!?P>H@-q^qGePRuF*`o_Cw7J)W+wrIM4<HYx>QM!Grg9
z=5A5)MeK#I2vA{#%>kL9lwlEJVc6s5dpZys>VY(Pp>mnmyhTHZnq^aTG_{fyD23aA
z(Gz%~#D|jj+d=>P5R^{-(PW_yInZqtukXTlRkgnhZyenl-8Qi(J1)Cdq8EF*<@796
zDp<>rT>#8$#bYwp+>grsB7E<?-UkGrj(xSXqzAo74)q16ih)dR=H@Yo<D;H>I*Pq9
z`knSye%6k3wmkH=SZ!h{VZcMn0GQ-Vqkrpcw?9<ms?cDUmotNA0R?5-wT`#V&yUZM
zz6dyCAt3JkDfoY-rR1e$7=tZzXnsD8Mx*k(uc$s$`l{V4h3dABQNKhde|UKC4f9?T
zDrs1=8V)CKCYTnJ($mwIFCp!CfAJTARjIQfC%K>L<^Y~}nt-N7u%BTtRfnCf+W2E5
zZq7m+XvUX|f%XkW(*8=ONxzP#w8vTG!)X|xH>!_Ns`o1&rj}!*TTw|<;KvVa(7qqJ
z?@honw6kMG#>^bKU(!Mx)XC%>xEQK7Zq@%t0sh<ohMt%Sm;nm^igweOM3!A<kUYW%
zb)v@uOLDT9pyPo=c5ra;pV-*$lM{x7?C|)!6935fcq&%ff0KC+|G}!u226&pf^an1
zERtamY_bf%lmbRakaV^YHI#+qRlocr@ST24ND|ctkJ^gP9@>!0>;>%pTaGkz=r^nX
z+=BIc1zex{Ks_S|Fs=>C-U4x87s`9jRQwj}g)3;y+Cxk2X-1F7!?w}Nd+q0v7Rj{q
z@1#Ro<xI@Dg!rWN?A&$r$>}bva~ey{N=GCDaT(vCyMN{9gJmld1H<2y)F%MUEqkV5
zz^$C{<*)Jv!7U}S^xWf#WKT-G%%=*%Feo9aPSz4SRRC3PWeBeJaC=$L67ubh0R?lx
zQdHaV$^NpNNJq%~fWPq&v_vqQay8WN?C+D|D##*gI)L%Z&cR`9a?&?jYCE<9PQ(kg
zc^O2F));fx$I7G(;~lM0ck8Wbl$3#9=^Q7SKa1B%j;$#vS9L+&fb2Fzr^Cqbg14n$
z;tw`3M@W4B;A>Httz(kE6<><sBQvfvUg<+Hb29{}^)A;T<BeTBKT+_BXjnKH-4nV#
ze$EF_Qd;)4iR;9rfej%NSF#dC7RmAR4np>1lJczP*WsH)5e55Y#-sL^4E_@`MEUe*
z-#@CCsEywXT%K+`0{zq_544@moC}vt$EUz;!_|tCqWt{bV}*ZH*thwZyC})(_?E$Y
zcqu@W1k?>kDYzjAg)}sQ=$F2U+GSwJOHj6FOOtuR#TTkTIbn4#;kzUJ+(n&~>yQs&
z8HfoNcW0B;axw4I^?wwv6M@S<NKHWh(jHcjpDd=i1H~d7tT2vwYsI===`}e^2wZxa
z=KDpYx7FU3S*FF{JGf@HQp0B#x(32F57ZzF@mqa<xU#I}VCd-dB)uc}apvf%F}Ccq
zNm+A1lG(EA;h}o^%186rir(W=h?tgd2x#EQC7E`ir{^h+Wy7OpI)^TG2oMRXDK8f&
zDX4kAm;Fra{#Nq*e4XA6PjD9p4)D7<b?LnDkin#0o@)u>K3?dY$AP=mR8%6bEL!GQ
z<9x~*c|@zX+;{?;T!tINR+MS*p_&XiE=NV&?Cubg7I`nOF30DmrKK%Nwz(T_cfxWw
zUGFeCV^%lFuw_SIp@g1zC_w+^(b2MJ%eXb6`aPd-nOd9~VYAP{51-ca8|Y`mr-H9p
z&LBg0TQAgk$<Fm=^`xU>w_8#1tGGB4n^2kpifNpPK=5ugzG}J~!};jfuj;H=q)CP^
zY{4V}`yFHTPYjY{$LR8m9+C5y54PUELZ|zbQYuHe1qKbwvYjeaB{XT1)Qp4z0o`+h
z4IFpvO_c;K$8*Um2+o`|Ku^E6b|>>mXe=92?YYK5zvpI+Rn95vmwW5bGej%|o6GgU
znzKIY?%h8hq__i_dPQO9nh2Y0aUj#X4gLK`n?r^kz2fGQjem_?*6vA%Zs)@w^HZ<B
zx@<I~L2DnqO{~Lim1Qd5<pKgLD3;%k00|X<(K-r6=$W<%HA!^~Fqjw0&bfGsZ^`zI
zE^Z)YBU}X5+tZ^fjPMbA?+%=-W=trhnAT8hk`BzXGRp}~nc~$<PJZ~1Ax};mj*ubC
zhWmmiM?w%*^(XLHD<(oll90Vx-Cbea>6{u90V3`M;fe|*|H1w%D?Ux~OGP?2#%(dm
zleHLEv`$)$PlSLWGa+a^xz5)KNIKtI11p@lHPn=SCgq*~8t3|R^$ETyn)t@(a#2cf
zWqqa=6li=}-CGmM(1KgjFTeqT?QfA>Y~nYRj!e$JOIaBX1csU{QAPmkKg~6c))W~?
zdo$}9W{Y(}HFuZm7l%|+UUsM7ud|h``|OGM2W9*jodJwR6zgN}Of$$WImE1d@Hd?a
zv-?&>=?LC20B!F>U98gQ<wXwN+ZK_QYD5O@PtU|N(hi1b)h)pv9(TktlbMgDN(%Bg
zavaHiKbpAXm&Hv*Y1M+!yz5~Tvdc%cI5ZVHT5)Nq3cP>NH<yX^EocH{m$(O?N_W{S
zjE!cf0nn{f8!I~#sedrA`8QaR6Vc#>e2UKIFwtz6)^$gqWo7dYW1SIGKM1okK9^M+
z(?RufSO`b?fzipTIEt3TI0}KjMF>I{PKOrwwYfY83)Dm_wY_zGg1M$a;r(;{;Kst6
z7Otjz+xH{cNu|$rOUcPjy~@>Nh<f>fY5!dd(9;w*p`CtD$|i<0TrI%|LWmenjMm>+
zlIxEo?ldW)+q=lZcf(qvUX)_k@tm>Yj<bq1pKmyV==v$RzqVg*p;an0?;oh;nw$Ui
z_V=4QZHScI_m%^z2#7XK@3(aFxB!TrxnDYGhS<EM3K!kLG03(B2&QL<4)%V|7&!%g
z6mme2o^CJTCr+VG#-~c*E7r`eWasPKGxvXz3NhmFv$;gR2OzOAYaa^F9zPC{$q_jr
z?>nvGT<?p}0Z}b#b<xsv1G=kTKl8(uyOMlTYP-4l^wx`>heqE$*7_pYsNDEcoD?wq
z;W>;%G@_DXI_WcVr~7#VPj76Rv9||A0*(aq2kHnkhVtrmM0|5kMI6^(cQkIdnBDZX
ziGiyHmGS%cX7gs{P!+u>dXZpkt{J?yw_;)a@>JE2i{A(zgIF2vAq)$LON{rPfh9QK
zGa`PlJUZnoDVDEpR%3beBC=7@LOT18A|cG0sIvL>4s$p_mzQ>Oo~pecMGh$YsUXoG
zD*PZt@xv5665K`?++=9TFL!j#m#v0ab};yLFDpwUL>o{rT~Dj_Seu1kWSaTad#LD|
z38$D|aDh!90XZ|2q5p%0SEKt<8n~HGZiUBB!h33gvlcKs$b_}s+5Qj9vPy#vgIb&d
z9xXM|5$UvJYgoWm>|aKSBb_JcXIW$tyg`J&a}>Mk1TL<}LN3>#yfkjXr#Flx_r$E1
zBHsZb3iatv_Bt`d*tEK5C9EwZERwoKvrRe%WLL?|4RA05ap42^j2xVG2(>5SB=)5U
zthiswHo~jkrwH9nm)#^ldRq2e&TMRVIIfN<#Y{Afrp^E{)%}2@n2mz0Dv4t*{Q|1&
zUUT-heo>(gK}-^e40CiPsr6aO!oZ9H`DOL!>*wk_F}I@|=0d6;6!Ss$^MUCyo3v~p
z)s)tcliia(<5)tiqcMLCj3ngZK|=g<aCsi(DplNJEhI3njQq+t_?tC*E5~Mh?oWA6
zzG@y!HC`Z^uZB39iiRn3T4n)L3`Me>;nR!5fk&@X2)*Tnngh`h{68!^dGucyWC=@<
z0e2;{1xs=q1SMl+9PLoSh)8Jguqt-9I>jwz0p#MA@r-=;>RB_5^P>w)iWiA(>tAMN
zeM)Aj)F*s6dyBiTSDjXxb6Ku|r|sLJ8e%;sF6<xJbZ-&PY;IQC<uNxjr7Vu#<e7r~
z2T@TCxx8Q#n(@9Wo4gsQMVB}3T=g_BNh`PO^v0E88QK%4R!{h?8KH+W$971nP*?HQ
z1Q2L1rKO41q;RUY_|cijO@j!O#glouYb6dWJPZUTccE63Y*2=Y4giY{c1>`JAdF0a
z8TuIv0z<I<B_`BC<=$9Brc`-P^<Q)87RXlqgNbHr5X?40k#QC}jYdj)TCm9tg9E+w
z#Y|(80MLTzHBkkYpjl}D_vZYR+flCfbbk1=?FIjr)ndA%r|C|ccCbdu%H)x(1pZ-C
zpWo<~2|F$GXYd6JO#NLyx9t4|m11A2=<MXE9E3=Cu$|89k42mGO-^7*!SE^4rZd$J
z=g)3%t{B)HVZ2w$b5eZcW_kI2BO~vjpr8<u_nt+vbs3pjg2v=<o+gmn6!TL#cw&!^
z;{Pm<@2y-!g?D?VN3EUp12}!bLVHGCwjzrYv&B0l8TEVn(BAo&7lcK+AYCW=HZdOE
z-ud<f?doWeVD{a+cj;G}d~P3&)!g0P?HugE#!wN4Tu_YJXj)y>=Hlkw-P;qC&q=%Y
z0a^X@RG;cG4qB#`g205ePnEP9V!G$PKHb%0vfN!odh^w}wmT32O8VV4+zI>CSN+=#
zoUC9@r6>|%PaRa*VvcFOEyK*<1&6=h?H7dBY8~0PkHuqU+m^XsOh0F5e-<snsR{1B
z9$jaM5{XK(#y=(&X)6ybhfLfeIz-eO4jj5#b)fZ(-iB=IU>1sIQ)kt_Tg;mbXE>CY
z9Dh7Ja_6}iyf=CVR#@(ABHMlz{97%;ztvvP$PzDAQXO4^TA1kU?(zQm#V+%Po?&EC
zw6BotNad(v3^NTj*d;g0aw6Tm@Mx|P2&w#oB8fSz5YO_H_n_Ewj@H4wCNp8}uI%<H
zn^Uh_NnBKvwt2+9>S1tFYi63A-GPV0>{8(laT~a<Cbx<1v)SJ$o}LH`@JdfM$<NDS
zv@;*#n4UPO{6s?rVp_q?J&<QGOU#vOeE4Bl(W(@ZZ9+-)8TuaEBu~4>aLt}4IgHpJ
zVFPOZf4u~4$oW*SSsrTh5$&UMPmioqqXgs=%bDgR<A{%!2)C12D@qVLnfBHK07&jb
zvfuYQqlB=zDWdvEr`=ZyBE?GM3D&BjMWH^%hM$v<VjYjy!{MG2uBDRJ7vlNTDYy8Y
z_iUO@A5~d-nt$%C$xW06q|8$AjH?^=&IJv!V;m>_*69B>jP~?|{)yCTYpxbANJuyJ
z8Zn3OE+9-QC9R^tf2rBS<^FDW7dTvZGh`=uJY_MIPWjNyl$a<B`fM)62{B<d8hT{T
zg#-K1cZ8Nd>F5>MT2S`n(ZMD`AF9phvp><&*60L&a5$_LNx~z0kG~h}95PKzpg59}
zE5d(DpLMmt(K(}x60Md?X_3~<*tvZqtH1G&GaAWK?x&_QzFZ61jvWSgT9z}D9VZkk
z7L8#Fqm*Js_Cl)l@f8{KbS1^zq*@B1h=lkOYB1w9Ew$0et%K5|RZ|2wy5NzR8?tv#
zj|QQy&3Nv?J)x6}Jf-OKAXthSamS(OrDL@JIPhEe2hWp^75}n>*~Vko(75vvqGdI)
z?(=<3C>A?@?U5f8+$8{8TY*GeLTt`3Q#I-)A8&E7eJWOJy!GZ_g=lNKK;t!>ZYV^e
zSzNJOe)79(5tj>u>e`8e7VBB(Jb~2?BgwSdjYOil*gz}^avLrMv@v7hlf3U}ILecf
zwliO!{8}%xnuzDkEE^SURzH-ocF@ZXf043vKr(mJ{yW2MW)$f2KeV*XUze0}Z0v#z
zwsb_qM<&V^L>^Asvp6A!9PS0m_+)-Mt8`uX?$r|R5-j*B3IxI*t4-q;B{B3r@-Ad%
z!Oq7OYdd_--=~z1z^y^A%QhNaFLj<J_OLlB$ZYQOCE>Qvq@6hE!uZX@B5!NU!~g1G
zhj*oLhC1Ik&k~TxGYvP!6WYspVciZ-AIjsm!$S0(FHmJO5etPnE1l$n&wTeeS~(w!
z<?=aDv7BW~*UXker?Ee?tMNv|C4QRT2Y1yMf8GeszhG*>BK<<|NK)5D&LM)&GPfap
z?29jB9}YXO9Z9!cJVb`*?YLk)83$f`yqi;YWbwHn;C!Csc)ROQtztEvUxruW1Nl{b
zes_d3{aVBhcnVu?549hUMAmA6@;Lt05P;3z(n3((aH-4I$X2uO^tpT2hrqMTxWG{L
z_TzpEqh;+tFw&wjL51YPM>XuSH;l<4;+#+Y17Ud=6dJdZ_IFNe2KD>eKSZotT<dT9
zzQT2z0ZqJ%y5AHIo<}vq(28pfs1V-8pngOU_wz~*K_zVNIr)MDR{KWr2r9R`u3scQ
ze&si%C)EFGJ7uZdQ_p$;B~+7H9XBz}=`WFWULy@b@ocK=iMHajMcfgDx~MteHWAI0
z7zN->qZU~1<rbHA=f6`$LK5%%@l{+IS2>9g$TiQBD3jH6{`H-JO#^HWf|}D1u<tiw
zuc|~JE;&_O_uG*SXiFc>4Vo0Stu<9}i^k1cciML`y)iDdOv~yrpd80H%c8pysjs}v
zr8WNj?Id{JN6h5;i-IGqCT)>Ea>Cjy?QGZZTH-MOQIoMm*s)`xtp55&jbA;*j}cTX
z0FPO`W_@bSE}nTRoM9cGb$5jx_WFGCZ-ral0kMY5ErTUd2)%^@(ocdF11*0jjrmtV
zGbXY>OKA<1)RwoRFROeUacK69hPO14Pb4f!ORYp0opaR9bfL*fQp4)jn;S#8iITC5
zZ>vUOE--|JewJ9@wu5kx5{|f#**ymEfx=V#(nxnf%P9r|di;pJ$b(+Cz;R<{jrOs^
zgTX!157V5ouIu*t!B}>}XlM}PVLugh$fI=UwL%}I#s-;6L)kQke0^?w^u5!iwnI_x
zl)wi$jUC(UBK7ly;wsVKxiilhVQtL2Jc|NSQf$t%BqFlqJp*;Y1Bv}3EJ&;jz(9`-
zNi%y`>0XN)r*k)0NGz5Spp1;D_F_|iT+TmRk#UgOFqLX<C9)_~iYad>vpI{_b<8lv
z;)sIfv2c~h><X)?@=2$)_K~lsqpZNjf}-u+_3v^~RaGseV$H}Vc;rZ$>eYn2)MaRD
z5tr1T_<b_in|ExC&&T9`hGzoriE={8wkzeP3RhX+3&uV>UA;0Z%-{UQz0h+lV2nlA
zLX=a1H)zZ;><Ad<`q+FH-{U-*_7x~xeCaqj(91D)`Ou;}jxo#L<QzF*nUh{0?8g@H
zR=Z0yY<DYO4m@v<?X`WpoCKPC&Ixcw&#)v($6HFtUmq^o=U)wwu>-$^UT+IHty;`n
z@wXz>68a%-uQt8GWu`HFH|B2b)1Q!KH7%F>F6(g%-mS*{z@En%`skgyzx3-%=*H65
z2QA)h4Xf;MtKCVdT^o=iuA{kV7v0`MS<|V%kOK_Mibn-^+!E5*V&UA;Aq9S{lpg!+
z{w2L(Rt++qWG%7D>u<odu2~WV*_*XlNyWcI9dOFO-B_CqtF^2?PjeTLy|fo}EJg^)
zLv3g_Ac`MhY4v`Q_s7NCNo(0=;oauT%sEH&Zhsw9^g#G7?*U(#s>Cd-b@YpAZ9x>M
zBE*ae3_XEckxxw-WHM7vNhGqM92B_jFk8-5^HowZg6TuGEO3}Ufm`;LwH%>4ALaZ=
zlyRCpTR;<5(wagl09z*Hl2(Bo?*q4Fp1ph!9a+=9x_8+^P>?Xef$oD?6v_DxQksRe
zkguOhFf(j-WoS1i#d=f~7^cS=DeD)B!mWi*&&ZvDxJ8KQLPg|Q2AzKzAur2Bw2T5S
zKT()&Wr4u}a48I8B3<AWg`o2=U-RiC|F-uy4#)W@6-^8x_Cn?7;@WsgpN1Uwz4r@t
z*E81K+5AU1TJy)3Jrn8_E4>I6EulGcHM>sll8Y_m<wr033JJ!tD%qD9%dRNYrVT>C
zN|h|ym3)><8nZPX0j2cQ7%vM}IJ@ybFut)t2duP-cucg?O=!L9j1Zafa>L%#>|Qgq
z`0$*+-`hW!wm#F6L75lQR~e%;rs|(YS{Qa~L_6MqGHViO9EjI(Y+0D&yTgc~o4qJG
zqu(FeVC<Cw3pQyK>1V8Kui1qM@$=eUTv7${O_uP*wIC)e%#^KLe9rFL3K(alr%4rV
z0M0^yL4!`zq-9Y5VBEAgilwmdP<N}#Pw!sB6;iQA?<3V9>gL~8j+!a2o|MNk{P4PA
zUPQmie8COlk~`1UA=rqD=+Msq7Y9?MAI~gSAd)U~ElXZmk1`fN5YjdcaU*&gy9H;J
z?p8NE*bdl|EaLb(A8))};@V?Pl6kKW6#GE9(%kFE*R6>?#^3rXeTrS2=XBh2;v&#0
z*BBl^P0ag77h%rP9ZC`}dM(yi#<gl1sWK)<wh0n7<X*P>fzgd8Z3u6drNvfNXrh+f
z=_wwIj1s!EG;zqhp+F&lfr;hYdtANI&7ivV3e62ah#A#8Sc<^}l>}QeRoflFUg0{u
zw#c!1;^=Sny!W^{heM@MkU^O4vKep@vST4=ZFF8O^HW>WYEYN9mX&s{WyC_omXKiZ
z(^{{StaV9iVeo-Zw|;H+49j&t58%agc989->UPz!nc9L?5?W+EgqLH6o=CRo5~7qW
z`p*#=uZq?ex4Rx3*b}zc0C|h8-P1nu>QEoN=~Qb8nFXH8Q&Tsq>_`Mdsd4Kw_vBlx
zO`i|!*f7W`zgT@&jQ!K~t!!~_XyqZqB?ZbeDfj$H$<uZMc1o{#Y>6kRFX@biYmwG%
z5f>NRD%#B*+wtLe=ClLWKJH+%PulYk;E%|U(wdY%NybV?I_o6U0j`m}Kz%VO9=E(A
zy@7i9R{CGjYBvhGp$Z4Yp*dE^3Wvc(<Fe@R@ZPiZd9wTb{5Sa6;$6W_RE0xO6ESl#
zgsZ+ZIYA?KT}ScHt?|`NXB;wp7kP2yYz$w+xe`t#^bn=Mb45sS925Yl2_+8WS5u96
z*dtd*ZN$EFo;`vEqVlBS+_9^Gr>Lj96rwvPf^Bh`8$~DDC}PXD*ZnX~TRuzVhmex?
z`+{F&E=!t3p39cM*w~#AZ;zfIFNXRI*kBFQkve{}+^mH_1yn^B@?-GQDLzM_1sN;?
z16@9uTw8jdi<$9U4W`+bIATws1-J}Gg0}A!W<z3Q%%+=wZ+zL@yi4ve2amb~IBLsX
zk27wk{~kXXE?m4%G2C}#@1-vSt4{{<0~a@vP`INYG23GxxxpQzqNCl|S6tz)&;PQ2
zzFo1S*d9*aI%ENBZxid5Vwu{4poVAr(@dC96>sJGn88D)pzUL~0@u3fNZqO7bT+IP
zy~YRFC7*-`pY$W8riLJFOPyaaqOn(Gh04bZ(Z>5Fk2;vC9@OPjymrZRk2`|BcB|LW
zc6g8WuXBFxyAt&Fs=mh%(X%6{Cp&LFVtueMcx~|VsZXBP&_Fudw1MMGZ;o{4U8UnN
zH8yhMolgMdzh$%j)KEGbhB??$S0MQpl?)0Lrd4}-2lWM>CUwt{P%dn$sv;f;_^2II
z!S2Ak;q(~WOB<?673G(jd))Jz)tC`AxAbPDCgs``KW*m9-5WnBGCTF!FI$@=>)FE!
z->UV2J4HUXbG*8HaGioZ<L-GcC8ixITB6<D*cV0CGwjXs%pG8zhUyNt3FnUUX%DdB
zJr*k0|Ec{|k@Y{{YW#uZ$PvZ3Pu%ldcTVz8wUW%_>HX^#CuE*py~KNlS}jeFM2np#
zkgEqgpULtWH~9@9BH-cOy@9p78#<xD8qRij69xrmvB0dICJ0tmpE*VjSX7ic!U`sY
zC9M-L0mBcb5k5bXaiF!AP%R@oXITCbK9uOKuQmAGd>q4wLJn{+F-skfmwKLxsDB94
ze#S?UgksJ0gGNU4ghGYSf2F6l6Xc&i2R@Mkwp_lb1nA=EL4H2zACu;COcWNr-Qt}M
z9|@b<q$<==rs!yb8$v{*LBni12nRks17sD0w3&?_BJ#;g=jmAwnKgUH4W9IBZtDp4
z2t2H!7pXP|e6H-`nA~Cd7N}wA+fPJOQ3eWLTK;-r*Zr_(4Ftb+wEvTU;J|`+FYm(l
z;e{Xo3y;6ezN#iOhv6t`paX-K)mxY$H(YP|MvHx)&~X-cSe6Ok7oFL}FFLzdup$Zy
zl3ynU!;=-DL%Rj=B#k5|71(!m(vFI6-n6GtM%6#uy|gOIi4_flT9RK(48Gaw^&_1a
zmO2BK7!@5r3FINfk|h?ezz3n~J~57Foa_?hQs-rYt&LdNvgosAavCav1=I8?f*`At
z*!|pXdvM!(4!mf^FXASXlA-K)r$6>C7j{ERWm2jb11>se8j_Y3WzR`~FhedHyh(1p
zFfi@fOJH%yB>c{&Lrgh<GK=nE#`@kQ&44}mJ9Jh&J_KvqQ&mh*HpRe@02vZ{xVjTo
z5^?t#r}>Y%r4YxSoa7=h4j;%puwt_No=@X<^Z}F}mel0Yn`st?KN1J$Pv_dwbCdg^
zGStWZ6<_lk@|5sxQD;y}M3ah|Vc#ZRG*>hZ*?~>?Athq2o|jj7R!V4ND3(mwa|qZ%
z#gOXP5rR!_1?%?)5g85-*(lhElcuU@tq7-vd^>J2q@<i!tu{!NBNKgIh?XZA=-k`*
zVot3e7;@JKwY4|}Ry27T1GwSFr(@XV4dguRUpV&GuE$Iyq|sl*Jr<Th5pz)l)-FC{
zU!kbDx9s4NVmW;zIb2V(ToSp5%lVCu`|?<Nz~A5IJ2~F*dIdE(kZp&e%{q0{U5?X+
zp8cidBg)rU_x!3WsbNiT-vSWNB>|V=>(?XvsCpmazmk1!J=m|kaxfHIoG2XH`i@ie
zsgLq@cDCa-D6pHI%K$M9Qf{}T?t#Ot+MeDMSTQSNzK`72v~BbPr$0s_f`L+hZR`KT
zmRNh7@r0JC+xQxjCmp`lcIo3=w2vulnsH-3U5W>Gsw6H5K?X0*%}?i#%7oz0MvgyL
z{8V6VkSqNuHSZ+t7zNsk0bQn+i9ZN@ehSuKaRM#6|GNia=(1wpQM$o`DEFEGN+Qc>
zs>14Lb_qVzz%k|jQSA~IbH@K8)vZ-q|Iz5#ZTb2lWF9%T2b>Qf6Ey&41@A`C^1PVn
zDE2MpJFh<u9<`4D7>f>)p|KanqWPRoQ@M$0=vp6SR%tJIcU#k<(n>^CBqO)Fr0~ae
z4gS*PU5*kyd0m02Z?7v`#4b)y#gw+0ljmNKE7tA%#Gk}KTZxUiHsib-!>K<=+w9Fa
z$3H71?Ib6*<K=*D1AEp<aYzSsOP&;av!R3gxHF1@Mjw4jyvcqR)X-ZZ9Pn9s`AekK
z0`~79GfV5`Ns5Jel5%-^t_eU~BMFyvK_PN7JGCTLUPRp<V{X}r>QNhsEvxHKg->^w
z<@OD&OAQ0JmZiy;GET~|g_#$5@1>pgE-a@cW-I_uPtA;3hZ}I0DP6Y!@1dG_MLs#1
zt!q`PB%_XvEqLdYI%>N!{%xQC$pe31jdF?ZlmO&<rG*VXktFYC?mx^1)T&gOME7ER
zq%XphM;paWv#4@-T#Xo96|kKjkCB4Ju6+tIa8-u(B^IpWlmT0=#u;3<Hb7bW{m}Ih
zA)xb_fWHi>GJa}Cy0b+OKdkF<_QH;T)V>1)wJc;WUZKUnLn6!aw9hhsJhG@@SMUSJ
z&i=xGA)nOhP9$P(tE?w8p$s1W)XpB!Cu(u}BkEuIY1((pIG+rs_cB#%yJ#+qr^nZ*
ziUL-wx(`f@!e#!9PYB!E4%9(Hs)4Q`ve{X=2B>)p6sa2biEGA|sfN5X>=YvKWL2KF
zH{JL43~Y$&U!PD9lY)<}xmjZ*@MOVI%I~c(qnu4X7aC-^UaZQAHsO$r$S6s6ejI<C
zDVtmLGjbypBJEr=He%&@6*&6;7<<dGD%!U1+dx6OJ0zsL8)-%9Zs~667?B16X=wog
zanapKH;eA>u0`iNc%IjLU-dlC{m~D&t!=G2X8!Tp_xVt$<br)^&TRLiyod8?wyIue
zUKTSp;V;`^z#ebgDqR(KLP6Q=O%;a=Q$_SUJOXyBm+ivj+@AD;i8LoAC|qSU!+BR<
z_qk>HiMC7?Gmi*!SK^??{xTGvE0RUv7>-JtL47UvbW-p^9_Jzrkuw|2?pMHw+bKs{
zb%-lk#JRiN37`B)nuPtQKPYmSQ)VUO)P&<%D+jQuuZoU=qpJ({=xAByPk;IfHVl^G
zmEOp6+n>s&r^TQkLtu|8vbnLP%}bzcHi+;te;S4_U^PPSjj}c;U$%8;cQ|xu>$Aq!
zhNrgh99?>L6U}(GQA>*w>7}PVElMCu8AYfzp?MbV`a9dqEeT-bk|-}X+N^+-w8#p`
zD3pu*N)!;hpelm{f3j~GVrp#h7dG6wP=b0ltNsHTS|fDwp%*MrmX_<zC`i%zL#K#w
z1ynhTg!>7dLI}TaS&HDFE1w$FSBlrB8Op~M%T##fOwX%G7*b<;<3rCS&W+f`1U2jO
zLL;`kc%$<1li$q!&|1gB<b@dkBq<@&wKjWb7p+5h7hTuyK>r0I*3WwnF08E6FP=>3
zdG4)}gn1nEWW7QiFhw!@yfbLbP6-}?u5&OJE^5?jhR<cOU)r@`jQ;}HVoJT(Y%r30
zRJCNV%S!?;JB=GLQ8hSh*g8oxrPecP9_Db%=J{-F_qS&$?Na_Xcq-s?n#)p@<+Wkv
zMr!DDn@og`?Bay?JVHiz6)F_(R^qnYhEno=Lfl-;wkPR0nxaEIWG7DFz|r(q7V5jR
zOcd3t`!Ip}DktO~GXBS30lYKao;32qpmh+w--?Uj**zcDQfhM@iEV7BwT&ggzD()|
zKVQ7ErV`Wv=mT0a6@IM!Hm-}VaJL8vXYY41?OnXSq~eVU*ZDz_IgD|c{LAyzkVfj(
z?&tV@m*Z^0YwDfFF1%E*<;ln8L9@9bBum>{y-6IwaNsD}3<q0CenK&2$!nq=3p(bO
z_?(Yc8b7{Z@Oa#jEb*O)bI9SoQep#jQs~nW%>p5mQ6Nr5$;YX_H~*pL>u|3}n0il$
zEToEZ6jBM~81Bl`pHX|>9d&s87&*`Tm5|8#bXH{y`q6uw>N7|C9|4`WbX|9Tbl7oy
zvG|?_Zy;s8AgdGWJ?+;YZ4Nv`-~G*e@^jvn<#Oq!8#V>t&TP6RM{AMw+mg)>+pCvH
zS7QOFZQ1R-5K}JMB&_5GlO!$|wZ5-dWxq-|qol0s9T-ew2;a8_bypH8m6(h_l3R_`
zR4-J?qS~q*Fy2knU2t2`!5p)wXO~GhP&RR;Fw%-Xb;#Vps=3cu=3v!JWYE>sjT%A+
zslc++y5v=Lr_c5OCbxlq*V_Tq;9Q5{#LBh3puN7zw1khR%l;hn>B7%dzme1w5znNm
zk(ainOfh@4>ki*JRldn1#+ZUSQnTI-v>I}?{=;6Tm2sMaz=rl5bZkfVd=&??`E6Fg
zu3((Dh_VC#eY7FG`D5oJS}Pv2{a8N(Q0>!hMsfL>QoP>Nyy>BF^M3(Cir^%{dP~hn
zy|*=KSn`Wy2U`De>~?&EBpZ}W)|G;D_EeOX#KqR^UqP4l4K00ls0fr8DV)dqQ9;#f
z1147yIrm!)gU};&`C^Z?PH7H3gOxq?dp~)vOEV>Nu!>|D#%Xq6`I(;Ja|;|8o0=Y9
z3aABFC%$TvvVXXiKgZG#yxI8ly~g~VGS}$$z+c-)KFm7xk3MBAy=?yQ=AGVQ#xJaI
zG*c_Tm)^oi7F`v!whenalXCV1eRQ%BW$Hg4@+!nC>G)jQBem$PAL}4l3Bz7sJgiM=
zS$!7Kml^+h*8KbPvB4Zk?oYsLg;(e*l<s4kOmHiI#;S}N8dR7(L4d)J>}vfx9hJ40
zg@7y$SNqa42_atOjpI*^9dgQST&g24r@?_rV@CbP6jg{?$isjzIyH+u)#n(EB?*7o
z*C4C*B2Ys1<##Db8>R3?H)2E?O%i7l55M`Pq4w~CM$Gh_3=2XaX<Wh~d~Y};C0fgm
zg)nJ7r*Hd5%~S{z6U||9-E&KE$hbSP$>5LlUiBFnP2OKd3t~)MyJubSI)6%AQMdtK
z@NSUNNRB_K@U*sA@oDYgV|-#oMJ^OoBuNh?3|>-r6V3;6m&9_gZZD(b?(s@Kp9^?*
z{%O~S7n)KH5O=%@eJZ_W?%zJy3mIbL7UJi}-af-Iam`O<`zC3hnJJVt*PS_FHlE5<
zU+JfcCxGHSrsChxuJxxw3XJ$m)~g%xJ{XLb2rv}TxuR5thK0Frq`JBtmz>U)A3x`m
zRTq$DA=|Jzzvt++>)Ys(Z<2E{eLkgG3luA=hTj#QYkUKg9cjQ)s)#idj-}vLoOMVl
z)~J?*L+?Fwenz^=dHk|5-A2G78aEnO?9-EHgfA*YNdgB`WbDm7%{N|#6Cfj<D=69H
z{~X1$#Z%%a!)@T%`BD8;+#!1;Z3J1V_mgIVrztDPM4tmy&&(cQs|HDqSx!N+8W8n_
zlheW>1+UH`X)^xI>3%StvDb5_U%Qg{Uf7B*BCX-vPJ~6<Q)J=RGi`yRk6h;~V$6J&
zLdoZ!)ht|r3|R^hpUsDFM1|AxCRqq1b|On>@LDhkB?Hza;<>+4l@pEJ9+3VpBzgYn
z(KQE5y;qIu1^>vd;;-TkaqiG6mL7l%t);Ly*`GfD_ABypJ~)_In(2s<n}=(1kSJ4J
zo&A^AHEJ#$3-DOFm{?lM(2GuMfmOXb+<@iLBDSPlLDM4v*Zoxn{Y%7aAZo45o0PSl
z6SzK?e|k8C)(}=U!Z%*HWxO}dTt47j-&>QK3wWW;%L7d=fnIFv7A$fAfEbL0Mx{`<
zLmN!fvVYu_{^|feATEE4=JvDIosYJzn@lK0=mY_^D*wFdVVlO@LCDuUogi|eHDP*x
z0*7TSuQYW2)y-yE{HEtGa9Z)gm<lnfYLO!&<f$TF=0Bn;9pA>_86N-qvYar{&&UAc
z^=iTrcq|M{gnqXmj1+PB2B_!cbZ>mj$r*^cxfFeLw<&(G+BYRw=Kd{hth>mYLHmw%
zbdZ%x+Ps`og2|T*dhbTEKZ;HnmsMP9(ILoO$y|!6!W}xnCt=s|O+F^1??qy}A-6g_
z8C$l(uiWA*S2pw44Jz^13Q4guua?1SkOy}UC+BR8Iv_TG6ybUZG^6=^bsBM(BK3^$
zk~3TFggWf&M2NUSlP51~!>SiQbAhC(qpg&gM<u%3cRk;ja1Xpbr=fDIDUu8dEsf~!
z9LNoG6*Q-K8)fxnN$82N3uEcPbwR$c=B1WY_7{)7hGTv)eN4s{N4`vu<%k&m@N;q+
z#!g7fzZ|eHWds0|&(z7Jtt->?P2l#BM{bMS3oA{6$KH7ee~czl6s_g@?yROp^?uO(
zA)|-fkt-$i$zcYXPRA&O&(zW0MQfwNBK0X2!M?{$VXe5NK&>YM3@WJzi}}F0`Wu7r
z)rf$98K*%Lx~es&@lw^BfQ_?L@l2VI9Q_!Ek)F2qKx6p~E?R^soESdL3ibrin3x$s
zAe@s%yupu=Hn1q@b>c)1-n&l*odhm1!8o1$CIkdBOD-Yz;8$7ALP#^{>O}V|`ypEJ
z$&!_mi}#r7&!=X>ei$;an=d7Jc5`Ca^gH~1Yvz&H28#$7C|XT<bq82C8jD-pCvFi8
zya&bLVgEwmJyrKhQNuPbSz}hB_8EA;I45H@{HdRKW*(6xs1eRW7Po}~Fkd)P4VQi3
z16ec6eoDf4j~R5{Zhz&SuW-bd^yQ7Fi)XG2XM7g^CKBt52%n3wgW)@=we8$mi4J`h
z9gp4HQ}r(~F6&!hjaAX<sq2$%FCx-;2Y`!`7aftZ_J+q?^CxMfE?&DVYlzn9(s5j6
zTmOIw%)fShBkQN<c4iM=CxalQgVc+q@d3}d!$v{+%Hg|CKA+ulbFH9L@2s@qbFtoH
z7y&b*?A*+p>FG3Nwuq!C)wFkbm+xT($|Z{GOT|&^a_8%W>q~u}g+3TC_2SVDSz}7C
z$RS^fx-K-HNgFqvP5(=dQ5c`tmxwex%%H)a6e`&fvC(9eFY{d*?*_AGac0}?BIWG2
zFWAyN&fE(ZO8Vc=p`S!zbkiDXSVw<f&qd#0QwZJ;4&TBVq7#Zj&LWp?79c77wuS%Z
zyGyR@xk$RejEgX|fIqqb;FabuVTkP0vb*c!FKxf=t<p@j$_^<sh0QYC*p90e=uNl%
zy3<OW-*uj1r>3D%J%WY%2B|WEI1FTW*{jTXy^p|oND`0kwT(uT+U>}~O`eDI@vB$h
zvjF>|<9F+?n;PYVvfL$@;0?*?$Ftz8DUrLdtMx|F)72RHq=Roj2rb&<IMzn$CqG|j
zR(EHyHcrMBV)`o8D!st@okfutFeL-0koG2L|5hC_CMJdn2%Io#8ry(WeQ7V3IyS2)
zND2oBp2odr9Z%{A^N`9MRpagWrmNCQCpCk@$JHStd)1YD5`w(k)6>NUPeGhIUOg9l
zO!aQoZ0&9@8{Gksr6QO3BqSs{O-4jBRdzh*^Z4@^O}If;wre>wPj=aL)*|-x1jQ}b
zf7=VbhEj}_UD)@*+U(j*a2s9`Ws8u0h;)2(x_7YmZiQM-Q1#;-t)VuO6N~4ZLCaC;
zM>6W26v=p-dBaO0bB;)<OIJu$SGaH;!$RhS2c@n&sa6F*nx1;Lo#zR$36C$+^sJ~?
zH=PI_bKgEiRn^`pp0DR&m#{9;!z;UCigW#u=JbuJYB;~MVEUkby0Wl+Hh8)lXRh#%
z4t}*wi*|$K>a~QcC(PD<w`!!*w9@bhclkN3lr!VA4{tF?12?z@bgGqGiCehti*rWu
zG!WeV$pH_7d<C3tUsefrMucp`5|KxFY&rx1jvx9Yk&lnQASoFPdt%d@{y3Menb}x=
zY=-YD#-@cW;Jr7IW|~@KNup4fc4?Z*A;3Q#)^8@1x}=7rAaM02e9}r1$WOA*%f0Q3
zC~^@Rr)=A)sKXyB!Jg<aJTE#GuwEs7NlHv)BLp<uqkc%5Dl7Zw>}=m$>ufz)?%wRf
zVJ2TTHPo9^<*ndB1^!&z#jYR7(i`%E@H*uk9Su_=A_nMNa!B4_encHgCMZA`TANSi
zKVwm<v?XXHeR2}x)BG$Ap)O3u0s=wb7fCkl!!j78nFyb2$r`$oEZeY=4600mH{#nJ
z8vzKI$Mq@C3byNSF0|%T)XL-H=3KnDY~zZgMzjOm?5)cyTp9*&CaQU1J(>|sZlT>r
z>fiX>qj?%(GRzIfNy9#uQx<8!t|G>R0OCFzd-G*Rq$wr~E0_1C1?grzV8LN-YzEhk
z7yJ+_%eKkGt_fi{1!U@`ADcb&*XN0Vo!jJPg(Q{i1dBMzEN(Ta4fhg?9#p74q!5Rr
zE)HDuvBqC9<1~WEA75qw70^cfs9SQE>0Cc|iaR^O@4ivVV}J4+>u`1<UO1H|O?=|j
zXaaaQCRtvu)J<RSYNL}QCSnOmUa#j7_ITnD7_Klh6-BOOizk;nOrn5~YWfOL3!P6s
zMp3&q%W|uDnWI<`)7mD~@Udy+*EblRY&_~oi_KnqQ}zjKh2cI_$tAF0ov4E1pujT0
zCHT?Au3c`_rguSoVY{DE8B;a`<@=H+&+u#+8Ta{wVsas6egkqSa;8aGykVM~BdGDt
zC4-ELMKQ$!28~^24!1;g^Y)0q=fSgGlF81!I+x?+66F*@?tu|_RJ9kh3b}0|ukgn?
zIlrUNPnlVHxEKdx(<#Y?7ds4yZJGt2F`dk7>@Vm>9jV~ws?Acq77MU9&B`$uJ;Zp2
zoE10KhGkJV5IvWw0dZ$A6-7zvZZ*7q89vFr^GLlna!R34s)5QSu8h<ZFkORiL9?}z
zwZ@`!-R<J$Jf0wPCU=^SBx8Iy-CyW(R)Y*wfIF^~<m=)fZ>u;&Zl|E`cQsGrXNsyF
ziFoD@qmo?GuBU8xEA_dnP{WSS^YjHfD_xtS3I|Y`HD+G?ZXzY#xJ}2m)>~AO`rSNo
zHQ=4~#7vZQL;B1@g4QGp&`a483aqBn*Z<t2g~682<~v?t9rX!L^k@Gq+Aifqdn#-=
z$^Fc0FGKornW>?k*C!MUYemq=uUfN&@oY_*J(zpe=<c}7G$$u#vf5!K^I3$hm<3na
z@OHlLy33oo3bPveNIW#u!y6~~YS@4PQ<ccgVXN~C;#e^#5h?LAAe4_qmN|DM!y@}2
z+`~Rv6a^rDDMws=8r5}EoHj+PXNInB5mm#T!5-<YSeg~i%%Ajwm2r+%(-9vtv;}F1
zQPGZUC_nP69Z!@G&C~9|WA_^HDUHd`&#zHt%0v?x3F~u$Xv}hU&vHEL5qi&1Ag=Ob
z+R$%pCV^kSH!f%munZbg(938zc>GGMVRBk#u^FCBrADXlq-I&ff5RI%Y=++{h3y(W
zc3xk*9!*TR8iTN$LewL1h3{|tv_}u_kKS#M(KO{BL+=uY({DLWp(54UcgWOF0wkAv
z@Vt5@Vmq-Eopu^tseHFCscl(y##e%P8C3ft#tti1?L&V8!SG=LtMq5yKXy~%&lqqA
z8K6cb#8OwHD|S?@t`Rj}DzSi`=7vp*`u_ViWes9^bbpvf1{Cn-&bm8px~(9*7(dU)
zJHl4$1DBb+L~t24NKmR$K4l4F(#;$0-1VGuIp)8t7lUrChNJzi*%IU^3-!{A>Sg$-
z>tK3pe;WvN4y&Z1B@t8aJCuway1}JdoY4j-A;xW){A7^{1dmJ8;w@`s`z@-N=aaUu
zG6V2<KJ`T4dw<q2Zm*&_$<wb-|3!IZkh6eQ+O*29`Rrq)0S(5>`KCcRZlS>3syf3>
z$@rh@;v<1ubTBPG9b2U>@nbD<^Z_Tmrb0iW!WsbF_+g*zW(x{qfA=@o73{(eGiaA>
zHX^HY2eq{)_cD)FFRO^Nu`g3>gNeB07gJIP9Biqf@8#Ga%!|4MdxEzsp4+|OSfp}X
z5pqT3W{WbO#UQndU(Uu@C$TMGgw3QFDCKbml~N)rR#J;~`=I$=u)clCM@%!g!hsvh
zF$Gj5d6(6DQW)bR6kN{W<qs*~p^9Z8W_#d|*GrU{a9f6milVCtJ}l=0pU!v=4?A=j
z^%hf#NK;0N-XAqw+pT(@FLc@YT(e}~r~8;#rhQ`9R&|zJ{G>;1J&-2cxrJ5q#D3j6
zZA$PxbbEE8F^&nqw=^e>pyUjdfkU7IuwUG`HFB`gkg{V4#y!c>(Ez`GwwrOp9t4Xd
zV_wqlxoH`b)Mr+t>-I~Pm}0UkSu|fWSIhZg(~vsp9}Mq9*OJ$Mx!vr(S5cN7IdxvE
z@QYP~DK{p4j4zt6CrUrk$wh1BGt&6r)Kqs3LF(4jXZ74aKH>#6<QEwrg|*017_w-;
zBo{#NQ?O%5mW6ujlbx$STT^;T*ZyaPywalVTQO6s{C)*uDRmLlgyhk|H{A>|;m<b&
zxv2;uJnadj%C^`93k!~WasSvGjqEqrTv$Hr_?Fwe*)P+T11jv1kJ#P$<(bin>JSFx
zcD{?cP_!-x`QWAJI{`kCS#=3)W)4CDyhpE}oL+LyclP4Qe0kp%rVPXE{({*naTp(w
zf!)u@$txoCRUshQD8kl5NPJND#G4m)*K>z5z!{U%EB*}6O^#3_xfxR*?J*!iIfYIR
z&#QyZtldQZRYA&amyuGOZq~C6phRE@&&#9BgR=n9b~x>?&fxwnJCYQ$vxT1I`J)`M
zpXRy_Clk_cTNjKY9HIRQI$i7UxMR;!6VsOZKBl29-0WR(O!ou`&v>CEUhXXB_pu{<
z{;<H$+tP!>v$g}u{+H!Xjusz1+?U;-<Y;P>SXHq)tl}rnyE#~tK)buudA&`a%ce>~
z3s_XHrjcrH0Pl1|n2CB-f52Db2&~DhX*GOaF+YiVx$+M!I;&KE0kk%W--5x)<Kcj)
zegOr+`lfHw#@b0_wfV>nABS_&gx<O0-^%@mBY5vSWlVtI@U`=f1b1~bdhN(P7!pBH
z956n^l<YUvPO!bEQukSf3|``HR)0DN4yx6_IY)#Rc1L|qx$g(2$L_lH;-JOH89YR<
zfVq<p*IC<4ek3T|*^h!eEGSN#y6*S(q8sci(kF(GRROnHx6r>9<YlUSklc*v)itnj
zsKZ6}3bDwUCuje1R01+CF4K7VHu+^hJUMhOPW{}aO0(gN{@kk5DtD?B;Pi|DH~Fgj
zh~t2MNlIJ(py}y1)3aShU0o8LVp|d-ZX3Pgg}$i~YnPMKEgP~}1_gAujAvfA8PYWj
z)nN;ysf(jWMuMliFi=1zC)Sd0l2Jy}1t!a5j^4ESikV+8Q*>}=gW@99K&fNuFE1il
z8}!DsT*_x)VW1L7g*rhZj2Q-o-cN;Egs(#LDYa*typqRi)RHzWxuJW*>!vni+b^}%
zPA6=)m`ofUm2gBB@ZB`V3=ifTdYA`zw4t|xKSvX<!3V<vMDJoOVNCgcMSe{A`anS%
z^@b;VG$vc#c0GM`^8TV86a0N_yo?qNRPSc<&ZkBW-2u|O2oHWwiQ8SWdr5Dnh3_86
z-8B8KeG;)jpJed$u^y|uRGeK^#Mj@IQ4e`dr<>=GxTuIm-1jrM6Lcp^)YxgkJt}2o
zVu>j!)|VXhq}K()`VA(GIb6{q5SuaU-MPA|{gwEvg|Rof-{K&pUcEz&r?Kq={MO}-
z(@YIx!2o=x+&_!D`F#(LT=}%6#iF!DCDa6$o%*(r!d?w98}L_ivjwMMFTUMp?aB*F
zNlU{|987kc?alNz@B~h@6}2xVY1eFpJgPGcDEJS{a$(pev#}7`YsAiB4nacu{zhwt
zZb1aJ+CV~wY)bVKAtDuaNr7U$_uvjHRzyPfHLgcABc7F>Av7>iI_suxOnXTxeJ;*!
zsDGZ7Ckejpn%t#vjR%IQIo2>%Db+ib-=H<mP-fM>EqLk?L~p|tb1oGa%rw4Z2x`aU
zi1KY>wWbZrCYa@nF$r<94V^B5)grBe{ZdB@u$(r+;a<xxu(><BXq?06JMt?)xGW%O
z(G}i6oeY`ziag=fwlgNULar=_7Y;la&4Hfhzx5qD@obmYu#~}XqT^Ix9_a(Q?IW)?
zc8m_0^9CwW8#mjs)&K!6Fs*~3S@EYL8nCyZHz4zq@JgMdk8+lOo_-lk(EhemSl|)x
zm)*fWC;=lp2T}U>9+6`0Urz35U9WWn7m-)wXr;WJpr2e?^EuQDo?1?DG~IY+x&It<
zEw)N)Q$oG8$VqXTvT84`wQR{wJL3>&oIcfvL@%1yR|<=enjYS5_t&)<F;C@rW#8tf
zEICU%2=lOrf*wye@=*#}fLmvQN3~i%;5*%3_G3|+TJ*l=p5~#keczefsSxr~OFwqs
zWB~FKVFTV1{_JQf*~87@2HZ>8v9-CGPhmanOC`F2-jJw>nAC>$BH);SCHQ%?zah#u
z*vYVNed3h|!l3-sGdwqnUFJqJc0qCDkuUBP$XBbiCE9MB(@o}Q^#z-QfEw%rV^D)u
zXRPZ_q7pmRjkV5+<Mr~)g8bdeo!LAsG3Oc>6DhHP4P8JQk039iN@7d*+DCrQf|CYC
zG&%O4OOa38LY`I$V_M7voxR4VAXw>krxiMn|4JoV5NUo+OTJ)BaVz&cn*3Tw>GR8c
z`bNSKhwBYj$B)a{LHcgK3qbv$Kw+InGK!tm@E3QTSsUf6eMg6^(-nG;k}}1sP736X
zN5uY89E*FD(NoH;axug*F~3gO3mnyYR<FmXcy~^9I4LrB4{s{Awb;tE`QAfx3rFJ6
zi!+V*h|auD7FV4Rg>qw{JDYp~X$%O7PG$VHN}D~0C!7?Z*1e%p074%5`is#?-b~Y9
zc1az1WJ&l<e;&-8`dJm5W1*L+34!;-wzFvZF!egb*Z@C3_08BS>yf)1W^d3aPDe7H
z{ove=0b^>MK+Q{pFif7Ry(>;>YB`7HNw>GNoEr^CLs-EaI`#Sy$We}U_S3QZv~$|M
zZ7BHS&=zFugWM^MKtRd1(0;rWtBv!Q^O5k49K`Sp{S69RX{cROMWAGb_FepN>u6|=
zNcg1o?&Uw5uPW^2oVbY!@PSmk=2GW=Hf45MbbcqzJafj~>X-HA=HzAiUCVvz+QDQS
z^#00p+{L-nMOJijvv#>})qr{Sqoy|v!Mm6}z~VbP^-7`ZwHU8h*3ZEd`(f}JqSu3`
zH(ItCf<=dWI6RN}IjNR8zs!n=q#H}xI#M^|HL2-PUz2t5-Zh4hn?#lw;j=<a!_(_(
z?+H0QL6^{&&JOph-_7)opKZtTmcX@U*RVdu?C2jTJlX9+r&IcoLTIp(lJ+KW=sjGK
z6L3dNO!g^&q|CEXnL!Krs{(n-)X%L#LSe%YgYr_rMa?wD$Nj=}$y;q&{b=Sc`=3ah
zP`A7F8%P!{FWHEC#(pNW6*`U^LG!&T)@xL(lp*}33<m|J+VY=#O<|MP9$6FmloRrl
z6Po?}cFsQs;$%$R1RzZ^bf>39fbQe%EMTHhTeh)SUG~nUi2pRXVH*pmmwmiF0KLiZ
z@VPJ8&c45Vb-I1usGaJ*eXr7VKM{PDdw-W$3yTSH`{HYd-QsUb(PQL~k&3rJilqq8
zP!$J2C1P{U;jvAw$?{zUA6G2wrchs=Nc5f2`irMl<)M0he);B`Img{{v-Idi2=MlF
z)u~A}@)k<-E9kTEg63`mCx%Ap;Ygf8<{lzJ-K>GHx}%6$_J(Uk#qFime0x0P*zIU>
zv{-eA<+qtIj9|ZJgOn6lW-WRz>$DWemEz+ZxC%vkawtvaL1Q+sK2=PbW9B@b4=`vK
zR{QP3((?r5BL-=ERD(0eIr5h-fdTcw$ytS(ze98>Hp?&9dP!Y;I4k{O;8Alt4+f)N
z|3L7L^PxYfB1KSmfCI`j?^HJZEqOw-m1DGH)MG{WveK3BxI)KWqtHbIWesQgnpELf
zMIMZUsr}kWZ-oJ$a}p&Z*~5eT+op|#rkhvS`}e%*SKpG!kVSyjgvMjEn`Y1XHoyA`
zU=<~q+x}>0BEzECWkqe?Z7ktJ|Ngw+>mvSMZ^VUr+vGQw%ojdi*x0#Xi>mAWso>C8
z@Dj~A2V>0*Y2`A6r>WpSQBNHQ->}%;@Ba*gFK<yO|5nszYs~;A4=1E1B=|4Emd3Te
zAXfoX6-itSFw4@r!e`8121DIni+Av67&prU?iT%mo_Bk%<I@H2-hr#gtM{L(hgNHn
zzn7IQaafUh$mX?VT1B7lrl5Zmo|>*HJN$jOBqA7=rhGHkRrbhh^JxOxsbxeWaZ2jA
zyN%YyZ;8M<(k95h!Vvgi?zkaLdN4{$G@|r3l7L~NUSNt7)?KQ2gYhqasu5!Hv+7pf
z@Z0NQTS3!noQc3gB9~TMOg6H`mz=x_wuHvt4Ua7y>fNgu)91}`yV%)dTlO$PTO_tp
z@1qOPqvI6!N39wd=&K3xp4o$IROahVI1n$k7JPh(?nkN~UkvE`fE($?OE065ro4de
zz~MWN5ss9^0oYP<lkWXnt%||i{yujvFV$Xl=m;hFwftsAizsHtKm&&`-}!<!oYK=k
zp8CfJ@XR#n>a&+|WKmEC!2?eQFbIo~O<BAMS@}Yi{NZL2j)q!)MfPCJptJMtxW4`;
zafT>`kx%)DVXfJV&S2!wKaD8>>grudFrPi<0bo3{;A-*g1AQd#Z)lgco$h0&)>EaD
z^lw1r9qDGT#<L6#ni|l3rM2XqzKRjK#A2@9q|oy|Rprjt@2$AEWdMp-w3ugUA9|h)
zwNCY~m7pQg!1XmUn{0yhj|ZX<@p@mC>!^aR4TZw)R6VjfsuIA3%NXk-PQjf4wc($7
z$Y2W{Eh4-!Z61JU?cW6}%3A*F4|Dw7)>_s08~-MR4PHDHHd$q5F)RzU$`87INl^MB
zY}TsN+dwOHb!ZQ&bUez&<A_N%IbMBRt9Nh8T$hu3;(i`vyWFL`5Dx+5K~4YSuPTM(
zvYt5(eECE%BKQeXE3r3g4R0lP-0F6iz_`y;E?uy-Szo9*o0xfT+&u(KSKaXxT<%i-
ztzludGvSH%%~ktRi!9g<it-+Szg2%_Y~dgbQFmep7K+4!i+i4u)*S;SLYs(5<i_FE
z%+%}mxFuwW21Ggg-*GaC(2Al@znh(P-`U{38Fq*uyB10sS6m}~sHnr|@BGg^1Cib-
z|EqQQXXgNau?6)RfI&%Uy_+tU!`wGBf@Bu{k&sO<OZlcvC`#@r<rp}241#N%<Q{!g
z&Hddib;J*}{^*H*@<Ot2;)_qn@}6I_BJ3G=*^qF{KHRSsH&9=Yg?*(XO+e1PTzTY1
zK_Dg0ra}=sj+gDJf_s1sXK;CWB_8RhZjaX_#NV8^(&@H6wNc~K$<5&`J}4qZm4(3f
z<sd1&g@pOFSo@)Ykw?2wgFTwF$`8+AV=1J|5*ZO760AbbQ1Zbl<WCdwAl%C$tR3!;
zZPYfjEHWWef>rO5lPgpq3EU;Wnq1!5(SbF@uZzovZUfizd|%aNh`I9N^)qq3Ym6dj
z!WSQOT~KeRz7NRW1n_(AvW!k0H7OK@FXZYGHOb$?&}<cB<Y%+>t{2F&QEx#05B~1`
zZ7-ULw*ERh#@dmDO2@V*rHT-D#uGP{ABIL0pN`?4ICZ{yg7}2KWUxBaO~Kb6yiki*
ziJqcCjyL2QplN|n*rDs_$Q0$a+5H8}cJlS}G4K^07T)@d;LBK^IGvZgZ~I59QhIH?
z)Oh{7`Aeu<&wf+Lrxq+l06xy$!}M9z{pzZ5@AcEuNxRd_Z6+hOf~Xr!8;Ge9XtJEi
zs))U-rM6r0b>h~vBhCtP8C}K=vQEcrw+f^Ld8w=KH=zXA-M1)Yx!9oGilyhZ>q+4R
zxkm8h4C0s%-k?{ATPW?PeNHf*PZomk__v=h4mGmoVe?iT&H~!4!|(bGmecguBOD_m
z5`5GHhxRe*z1!zHz@JES^R?rH!lF%mmVRLm9%f;vteH9<84QTM?e5&%++4gOnVD?#
zuB$oks8+wK;MH+r;1R<3px##vaXw!rkcoL5xboNoH!-a}s1=V=jsIRvhcqTp6zsM8
z5Y6J!!k2-+i<|YW1+ByB^V(Mb6&%V(^wRKdJ@qHOn^UYX^H`wDgJITO<ohvG?G(|v
z6zqd*ddEQ3jj0|5q_%2$+?+4DLcQ11#HBzZHCOLIA-llzc)kn0q}@Ze@3=~3K1waM
zb^Bar&sEPxd&1CGVsAB6FTbFN+{hV?90HUp6K8@OfvE>%H#BF)x~I7UBy`nN5(WDL
zl9?ekoH!kM0b%mw6p0#J&ASg~<QdyCGPNQb<FL2?b4p}QWX0Z`&cl;^X3%4U4>Ha`
zIs7LPRINwYN7YhnJZr6M#LPT-OX4s6z(sl*5fR7#Zk>RC@lNfacdFiP2uE_Y{3c#a
zKfl45tmoj`7r`pQ;wJ|mF(d@Xg;MY_ovi%@uk5hwLGj;R5i%v}e|AN_r5h3s7mjrX
z<B5>*#}$x!g}a6!!O`uYNiKOqx}Y0QWx2ZD3cyf9mupE${yLFFf6pUdI(Wj$HBVBS
z(#GP<FjLEe@^AArV1_n8V|z{h=)h-UEc^bxY2ivmcboJzouqKCcyov!y)v&^u2a75
zNcVJwu6gQ?TY{5-{QU)Kefpix-j}#0&0eXaGs(*pQGA#L{z+T|IWk(z<Q}`MJka4a
zDq=&^+ocey()0GM`s0J6*&bOWK}pf*_5<)T>G)C=J3Ij{Bz`d^P#g)JA8id=q2c3W
zlarP<!!Z~^1#ym`O)j{1?3+RUVwa^74RS3{--@xNn_RVQNU+Sc6BQK&J-Yp&Z|@7@
z70dgQXbRjy2Ylp=a}uYPc6$jB;9kYHY$(E+VQ-8-r+#HN*c-ynBGMSolZ#_xVp65M
zAvcEkE6g3^1N?F`8}Dro_Cnpg)Fa{1Yc3zYkMeX4N+DXh#WKEW%CxPX9JkY)HHpNJ
z{+sNx5X@4uL$GNVHCMr)-%4$nX*h_eb^9<6%=ACRd9hO2acJq_u!si5zdN+Q4BE^x
ziW%r1|Jk4+Q4NaV8nCL>-<$rPkzUQU@G*}j?Z3jsGhYM?t#|3<43Tl{mp)uC20VoD
z!h>lA1c8EDwZ2_7)Dg>sosX~J@;5aGfIu4>?V<*k$`iJ0Jv^C=4d-LN)SLW)s6NGr
z8;_K-5kfqj;z00;G0?yH9*Rrxi;D}5hVT9CiXjAa_&BD&!I+kWfC6W;*)B@YLoq?d
zsY`{Y<}FIN0@H9=U}W0slsiMg&0Pd>Iv!@}BLd;T&I;B2J}@cEtFEz`$mIjr9YV1>
zJKinl@Eyo5k@D#H+<$y<YI?^l31P`CC~ouKbsy~-hA0~Fb!CyF%e~}IhHwAJrHNlp
z5aN#6UTVvrDKo6!aT?l{Y*Z!LjfU1&{nDK#e=@5SoUBGEo=Er)mOyU;{2iBQ{4#PP
z7@iX-cmPXJS^s-9>zW3w=i_~hN$-ypY(n9d+FmmC81vUlqx@k9|4FRDL#v|z(dS-5
za5uMKjKx(Kkgp60hUb?Dx#Tr}`?eHwpOYRffKr0<|5mQy&WiwhGEmT+Qb_jj@gxjk
zb+hsxH0oAYT|I7kTU#{0A;E2VSxO&|FU8RNG_5Oin~`fIq#_A^u#4E&(p|%v><5On
z>Ho@#Re!7D2-g9^bwt8-%qq5Zl2cL`PfLv=0iSe{rt1jR^RM|j@VU_*6V2|X_XYJ^
zBz9s@Jh*`&eX^zOm9qCxT5f$u@?@4Ng=tq)k3fzQcW|_*Y9@!YRFP%iB<<PG;;1Bh
z@c4mNC9NPBGa&yDCDK>6VTC5tgJ-w3)_$a%@(q83fT*oMG`oY)%z3UU2=Gj*JLl;d
z9mOW%vDGR6UGk2$z*J2uRdekx!=+c}rydLsUwsr9*@wm2KfSF{7Z5_(IeF3%_6}o|
znnr)=B$0sA8CR&PQDMu9W%c;n8;q@W=hW~LC^_G>?MNU|6M7E5@-x3<qxdUGj`xp<
zKpoH5?CoAz5rhG=^te2-(a4tgJ6s&lk){@Y3CVo19yMG2Z7(Ku(s&4onz(zwStC65
zgQg=EIy|pWxx>J-@enf0k%LX|2#3Oc?M#)LgsFh)970+r$b0YdvR9t;{uPLx>YV#B
zNY3V?(+fS6(*@s`UOsh^L*OT~(XHK!(YcH&659Z@zpp%*Z(7m%!$)$%uAE6`?fX?J
z{uDyby7+mSiYp98OsWg(qzjqB5E9qnaxLNAL)MIt6AYjGhr#`;b>MIFGs-H+JzseI
zp2O26zOWGNKdT}@KgTj@x4vt^E#NVAQi;}s1HRztp*2D1rL$LS<p+5C|A^&KE1eYg
zHO5YT!S>Y)hQ1WRZlVSER|$IVvKCD@yPQywv!4%eDxBZ{-yZm{Vel?D=Y4*ntDfIv
zPGaZU5KvV&-?tTG#(M#wsg7;Up5te6$lQ@B6bAq9X-IyBM_YI~xSggzYJG9i`rQ_y
zP|=_>Kq6FBZ4bWM0=ktbcv(+wDQ7CNI4KDtWkj#)N|8iIAz-1ko*eU+Oz!_{8{>z%
z-xz3eI1X8_p*tPYal(&k>gAY=63)g{Q=iZfwL>h-O~@cV#lfgM9<XsGP+>9O&o3Vv
zXL<Y2bu9lfy*z7Ic)_#O7{|N{2N+!b2lEB~-_8NbnB07l!bLGW5@0<Gg-vs=HXliJ
z{pkinSl9I*Q<!PK{ewTSZNGnIpNqz2H-KUIk<&j*(wziB+_<VF^df_EUqZ97)%zJV
z+>QsM1^G=Kl3433UO3ifUCl?4hq6dw5$F>a<W)UIxl9p*;`oPy85zl^{|U(iBtT4z
z6U!jKsjp7KV}*=LbH1Ae1_wvVb*^Ass#rh&Qq*opz!*7!{v5ksAc#$+hgX;||Af&b
z<SgKAb_*{GngsWDD(rQlo7lQdkwp`Q$N($dNT}lqJsl=l$v0>%BY@+6CgH<>e=T$#
zJEltFPS0RgP#Oc)p<CH?-_-TL7^)dCFw5sHZS9}3#^aJjyyR?ofW9h4=DHsW5M%RV
z@M1zB#sbq-@RtM)4n^n1qm<+U4h~4y22M@A*aVIlH5w0{BS^kjl!8y|)@+`;#4h~1
z52b?!=T{lP>I;Roq5?yZ<+M`Bz<j)XCro?SBq9??C2E!=^a@RhMciAF{ZSt47AfW2
zq)3?G;0L(KC1=7t(hQbeY6IeQ`&_>A*Ja`H$9b5xEs{I|A-C@(6IH1{n~C~*oxm+$
zRP?wrt()ZaInjHq+#IB{Af3*=PE+C5D%+hp!3RyIt<!;mi$D2#TO^1ER^ZFWzRVYM
zaQbJmEUBH6g+PZ-{L_xXvjN%I(+xGf{|1-M!}fW~Cy&AI4@tXSVW{FRJ}Z_Ufw1*m
zR?qqrSlgDk$kJF%xMVmNuKeBG9{PA-07flkAV`VvJe=q5p*2`Cz^v0nW=qhEiH2_u
z=v+y<29Ai^LadHTpFSaO0jZkyC{=6cL<AJ^FBly~qM)m4H(W<sag_hksfw;(ddARW
z9l(;KP-58Gj^+zzS*5D^6S&Z%bpMsR8;>0{6+W<L13`jnBr!JPq9kDX!+@Y7krP_i
zXRb#xSy(CjK3{Uvywi4EtvT)sE<1ybvB`subYWOL`)D9t+R2`yK1=q{A!WeMQ9o=%
zqmA*u`^&Z+D32zCzD@rhzAbg;55T5Z5INPe)002D7e6m!Op-!aX?dH<V*eV7(?HGo
zM=b&WT`p<*7dtqdE8U6-VX((JDU>SiLv}uZP-!rM`1%cubhACk)u6HOXY0khnbEvA
zTkJOZPaOYr3r*bK3{E;7r05DQlOk%{avz;U#r0Do)a<u4o)WVNVkF?oD2LTaI%@g%
zv2Fbi-3@S%TfN2RqtX3+>GljK@EgD1Ta`XD<*RYNgIcKD<CSnn`|{*l>aD~fbW|g~
z`JY8@cAJ#bx(;@{k>(~FxuvaRwyC!u2v=Ef{O$OFVQbH)!cpTz@bbd(apk+~q_wO#
z_p(2>m5cqMX_CPS{JHk=xQt(#U7GKB$6)}Fv(m9|CImNE@$qDF2x;S2j?W4b8}W{&
zq00q<Ho$h-9VBm5zQZ?VCF_;F*vhLRR{{~Duo?y&m6R;o(2X9c7r3U~Sjq$xX>7Rf
zDe02^lsNQJ!88<|a*F<eD(dY_#Q$t>RZ#kaKJaTcE-D=do}v(3&#_7^@iuK8@CS%x
z2W(>#tDEr$)~D%()J1=`OptlRUY~m>L|%&Y$opJzqzNlX&f=esV0U~~lmB$k@$@9t
zv%PcJ_zk=DyDReHyqc4i2FiZ&-jBcfdO2zi68mNIozm7FQTsV|g7Jc8ReXvB3mu!J
z(qN|IUca)(di>^64Fzn}un+(>il1t?qa%g=laRFrb}Y90OOgAH+V*f&?c`e<s)O*+
zs43y_NiHmuJ$gf;EoC09s<CaIhlq#%LB9PT)f<n>M-a?F!W(-%rGQ9Q0!H1+;!hD<
z2@&O620ys-!(oOt2jk_cy#bEkp15uER#Yw$f1+t=ZnmVLYD@bRs2}Fk|1{EmY)&q8
z>Rf{TnY`>}qiumoqt@l{AHa!^t3~ZvpmvMIDYM_?+Z$7Cns4#1I0#!5<2PE+zm~Fl
ztudHe7YfKr)`2a2q0*V5bjJep4Yx#>BDOW1l1U}vrEgRQ_P)?E0M2ps{vR5(_5BPZ
zZ&qHy7SZVM+&V{MCe^G|uFYZbrXxr!{9X~69|$N@x7g%ayjdC&4TJTbli;#6hNh9W
zVinR4GYP%53Dpd$nASFUAOy2`xBJBl8vS%r2eXNfjn0WKq=YzK5{i<51W4K$Wa6E{
z*m}6z!Zy>r455dHopwT4zv=eFbJ_w@jyjO?JF$BU)PU6T&|*{Bj9Qk*S2<?9BhCgk
z$r0#T^rIIpWgi!4P3s~e;z^87ftaW7W*E+Mtx=I*UxcY7d$Zduc<f#q(yI1n`hhU*
z=m&4L^;SlG=QTP434q9Di4jE+5*Rrb<&*MY-So*9KWm;vi?&E~U4V6?KiF(s?8*v(
z<W+PG*2>3^AJs6pd&QRm6bbDvd(odzr3kl}ZbisoD6_E?QF$@0Kc422cj5|OdF64f
zYg5?fc<SC`!#!PMo890MxTWd*IoV?8cm=%H2<(;&kH-MpR=R@vu!{PKce<!Yi<9OM
zqdi>e2x6lVB9@%Zl*AOTfDtp(!BNeV*(<T^qK2=%3+Hs)`YsiMssmULv{rq-(eQ68
zMQQV|!4o04oVeGV7(7Y9mp9bZFgx(m7fBh;-d&~=r}DNh;pr{%u-ruK6wX(=wW`5L
zlHV`r0+-S4hvn7<@p{-ixZ>&o;|OR5m(R=^(!!)9VoB1P)N~of*0)s#*er7w-U<0W
zix>aVO$>sY4d)%#)vF|ACO5848x<o(Lm=I<Ms`8Wb4#|ck;8KTl*jANu4V}a^g0XN
zCso<O%Jwt+9q|O@58Kzp93iz&Ui8KA`b)(DHPv+Z(sWys2%qEra%BH($jIAn>@Vx3
zT$_okq_1w$?G0|3aQ#Dy-c%(eB!n+B4dj(1B~NY&%5J^pncK2)ekjYp*CCb@c!miz
z>B17WyFDS(*(4OdnQ{uYNv<Y(cC^5gJ5&2{hNk9Xc<*LE?*I_*L_Sz>V8XMVrD#A0
zg<|r9&!2JKTWvSW<#o4C$wed1$5i+}pMdisup$6PxF^HnW{k8y?@pf1G|aTI<_yI%
zHFd(Oc)nrL5pU3?RR*0g<u6gQOJcAYOHMb9wBiI#T|Pn9I<0Bdv-B|QdNd=2%8tj9
zHk1lv3%0v}!uqP7LRGB>@$+A6B~vHIUYaO1`CQl|J=&_!!77hq`0o!~y=iUd-$lyt
zC^jhEv|9cjbRdQn^gle!*b38E7p%}=cxh%*P|D*-gA4&+HJ-n=dgPGiF4xv?x%V9}
zuVTJeNqA(29IbZ@6_Qck(gV^Z+{Y((0-r2Qp#$L3?dE4Y<0S?oE$-a^gz3_QJI7T6
zbV*YHfv;;ck@wNyi!TbVf5%bSsv*RYK8%&A4cdQwEI<R7YF9a4IC1H>qpNe2Q2^+8
zZMFBUnkIs8`zoAhO6)D%qVt}=%}C}w9<5s21``SM=!v48#XzgVhn530?ytw2OGe`V
zSE}Eiy5{D%H~UYruMFCg2S)V-l!Qn~K6=#-PalEg0dVXtKAO_U*zo)9bMTep;QP#(
zHO(I|)j(6{7Grc-7-oMDn&O{gKvaX;my$Gv{!f}69!c;0$k9DjM~`I>0^xrq2Ra6H
z>VU|SeNm(B!0+Gzl*#~cgsUvZfSfL=YlOP+b_Rx?rEpWEojR&n|Lb^akv}#FKxny)
zlu#@ii3hb>_M>N^d>ApkTOZA*Q+`{t`K^R}B|yQ!^?vt!sD7yCz?m+b)2MpO;rB3I
z2-Q=AVB;?VIH=hUG}u|f;`SEa5_QrqE?uy;T-m=OGxZW8gXI9cva+($i-!RmgkH)A
z1VMG-E0j(lu$*p$^-n?zJVdnNh$)T_NkS{}6XFNtv%1)ji<BZ!QB30KOteVgJum5p
zrtKx^4q+cA)PrkYp!!Y=3q!@0;UQFKdXtW&Ez!W+niudS|A$>*h^I$4HkLP=VRpE-
zgL~+`>p${aai6Hq#WGP{S`g{kH`+*_2Q7_JBl>~LlX^MfqCqEq_m!viw*1h(e2R4S
z)nmjzA?R%Jt#vuL(YJl=udyk_Y;5|GUIqPF<k$4?Yo#+(kef=PD>|{rv#__}CrWL7
z$3WSR@0$660gIrO>^<`v^+W{H*Ctsf0drJeoM>h(P*vAC9=OPv+1^+ZgJ8W{AUqsI
z>Qt`2-Vpw^PTxNpj~CMJr;N?_M?q7hkDxeYt-k=1D87OI)x>T()3IlNPg2Qy6UYQO
z5IU)+fZd&xI4>xqgI8DvtQ-R0W+P`Tg%sCCE$K~h8kuzR)_NYb1-(`IkzikKkJV|{
z2Y=j-Y$vZv^#TCnLlQ>Vg|+h%!Mk2T@StdQJYBdVy<dwucqa*7@4>${yB=n}o+%eJ
z!JeURnzXF%ZaJk0AJISLe2M+7C;4(dd)iaSK^a#;c{mL$G8sKVpW|{NnVlU{sM#BV
zIdK_FlsVWkr>wIIi+&)M0mA38U$d44ZSmM&%L3rRwEvqtGx61Xu<{tZuZ&UUaAN7f
zY<X+d%sIk1!f|zC1?)2aWgP18tFFpVb5JAF_kAKEPiL?;kq&(G%;WId1K~#?ex7~7
zPwUtZoJbeJdB_-0{4MM3w>)_nQG7-3!IScS_5-q+lTDm{7Vr|Gvg|zhx_VFE^>_!b
zGm(c)>EX2bDuYuzDq}nk{D%5BzlV?v`d=oVuEZsimA+|ntg|4I?{Td!j%HeSX*XZ9
zFT``~Qe(hy2BPe-T;fsuIN&f0avkbpGUl6~Wd<NR#DbZjq~(Ab8=%6eDHW(xt-A~g
zp=O`|a9(zr<1e(IPgke72)71g=Xuu6<m-9HU01ABj96<X33WD{&)3oWh=<22Xa1ae
z5GxU41oMfBDFY{843AHct;Vr`U1NT?10yS4yz$B{1U7yxlVn7uH+scD4N901BQOHG
zhtPf@;vik#aB|BM!Y9_Q;A>T0M=SINfrx6N`yV0lCfHmQ-FkHg46<~ab#Kl#;c_F$
zR`Sf!H^Ba*&sHqkxdoBMG8&Fc#NmUUM0emw@2=;_E;9;CVTA~lAK@JvC4aVN`TMeS
z(J3*w{^n(O`X&}yvul?RyMR}kwlkHsLxgFM+IuT1z?7tZ`EG3{f1qMmLcPr0Hi4VR
z3ZlkhW2g#*=kQoAY=85Z9@+h7xnP6GTZ$UN^*?|mo8(5{>MBEuFo$2xK<36c9=-Qo
zfX-c`e92`gWaf@K2HEmrrQHt9FnwMvBcNa&@eh6OFa*-6m!)9f=u(^U9f(0z4o{7>
zM;YaQ6J%4w<awCK!FX=6<Nvt(I~gY8nxFM(7{@n>b}y7%JkCH2xdki(p0T}z1*hv5
z*c58fucmn<?4;PXS@#pY6>Et!;rlaF_GB0YGQzePnVhGr){5rkvJ($AUo7X$*ZxGl
zQPG=s0W9>(yvo__K)lercFb8h65XOw=&ykxkAv`Yhm+q6Fvlxto${^Ihe5zgc;TSG
z0=M4KU8)O1L>#L#bNCEJ$*yT$nZP!r&mSoDflbAK;q-zks@cSr62@QDt*hC3Q2b_I
zN!!@mZ|8`meu~@)JUtnGXs4bcrtR#1rpb0|v;<9)-jyzaRGoBB1f3BCDYC|cd>W5B
z?ny50dJ?=(i>wIa{T+h(oUWQ&Sw-*k4{@vYA=-Pr0?M(jvbs_uv$MdOA;EHrB#16|
zf4zj7vpytC+b%8X?~aOd*tgPh$5Fd~wE+X8Mgu4ci~Cuu&8wlyQ_)i~X%HFbY;!uN
z_VA$F)_F(?y|!F@&PUHPi~`ROs^gJ(3g16GhKr-CT^Eb0SCFa>k3;CrXvkKsNDiJA
zqw^>v^=c6I#8Lf3NodG&Sdv3=LQrq7OV-*Nr6KJ(quI`m6qOQ34IR?t1gS0%#sk0s
z4_=9WgEMvu))s}!ujP@dJ|enm1985ZW`$btqlIRTnpCR)I$oq5?qRMqWKkr&$Q6BV
zIbkFuR<Bog8k<L=r=o)OHr$Px2%{+s_aPkY50p(<s@*3AZz%rR1_!@|g*}zgSR&F_
zSKD|=NK#e(WdYBOFCQ54VzHRO?a(JJl>5bOKbYQ)?oe6xSz+%Uq%dWhYwx;i4`mdr
zH*27Jo+6JhkY$bso8_scj{nWc6^_;@|J~4NF5$(1K(6HmBnrO@@S%~Wk#o2Rz`N*2
zYFep<R58ulbN7GiY@b8PIj|kPvn9Uh1%hCNkDoLOAk<xfsM~keRi3Bw!kL=-+VF@P
zAzd6zxBNY)9?XOoiY{(<TFwP3$&is><mLrEfWS$X3CY6*6*xeZHh=#t?Ph7i&C(4I
zdVj%<DpF$BOmltjo!CuzPvy!A-qgX&+on#qKPp5yg_m0olc(R^?jfE+1`>*1tTRhQ
zSX0dnefRFYWtb4?jbM#+Tyeyw_~{t6rc%o~+rM3>pbno;LcKb}2Uj$7C;yM8L%)ys
zs}%TdRu_vP1p9Z+sa1#%4#sNFBbA}h!C^hFj2Jk=j#(*UbvmZ9^V*2h@mS-^zCA7*
z5xk$wvi6vPU!wzw@Xv!(Al~S3U6@+$wu?;@84f$~^;3O<I7;VW_#*I~lioUoG<OoJ
ziQ*{j`!h6<Q>DLF&m?g2uOGN{vVR|G|5qF0Ao!3Ag&xc?$eT~j{jW<3;9r0-4Tibx
zT8k5ppRV^kuSwN>g|;Ohii-A<P@yaDyPJK1)x0Sx==}}%JnUdz_aYPVK1J9)(68x=
zNuaX9#J2NYiXaREEdLU@j8I7e^Z3wfvPtQ~FoBJ1F4*qnw0PukyS9hB!wohKb%%S$
za|g<DAPo$(xou~w&3%m$6tw#D%lXTC4lJ!aYsPoLWR`nIsg_-gjNyTmMS1idy1KQ!
z`@KxrFNWZwH%^DNUh$#MNFZX2%^dE|j)tO^tC>ni5mF0cF8D$#E~|0J;|pG>AkDIA
zh09>rsMdiAoq+$|*PyjOGdBh%-~`?xkSlV{2NiMs?Rbr&ZoAS!B&;+t;3QIq(s|aq
zKJLPHCwv;VF?qJnGdwoc{LD(=@x_GSO8q^S-)YF_Vfyh8701pq2;bb@nO0qaj&|?t
z7iD31ynhCF<pZkoG?->BPY;aI3l_%ItX_i$qlFo5poygGIHnVLtFDeW;SDUxVDK>b
z%RInEVhrZIU7u31K2NuggDA=3fWSfdjS7|sOaW2I&dc%tqwKAts%qE1Q3Ir;yAhS{
zZj_Qn=|(`hyP49hBHi8H-QC^YE!}nI(&u^4x8MEjea<(=@(<K8oUS$3ysuwgU~q;!
zY3gbB#+j35oG%YYA}nskNAVQ2<x7#EzBlE>8%_%F89G;luS7lwa+q<x{|SZ~?T3iB
z3XR-XZ74G)nh@+Z$>t5lW57eDm+S!EvzXNB9;ih!uim8k(+;r;J!tHoy7`dCZ}BHO
zv0dX?JYoZ#0#2riAC%xVFfUA;{bRvYG?f$^e#c%28ltgbhbR{~GlMHTdq=U-O$-+)
zaKqLR1X8M#q6{ZFCh^~F)273OsibB+PQ@6ksmJt|_u43Iwn%or^#e!c9e~cJ3F5qz
zY}fIzpi+Fa|I1LS)kKp2nXc*1y3%5a?ssrqxxSf`n3v=0D?WJQvO~MMp1t)`-)=^}
zCtI1P{ryxYPQrAcp3xE0(}uXkjDJ8528u9AFv%9=j(%Q&K}laLa(K-ku#XX7fWzE5
z^=__TLrh8T1?q`}**_S+oJtmW`>g%m?c*KL6!1jM$0{<2l2$ZT7WU_xZOO7M$3jVv
z2!|e-z_t%#7)Af(^GX^LI%!y7^^L+*e3a%6;o$%W*?9b)o0c_V8E+kPe``D-Ge2nY
zN4Za`KJcr*)liCh(4tJHdK}!VrUtcpd|*{%03D*;$H(<BhspKlBK#%YC*CkAlHoxn
z>%g`K9#rwy6=2}Mw-L;@|CywR(wG|N^H#sNDc3IBQ94Uj)*gjF65GTf_-507H2OV>
zC-&izMSz0vN~;t>)5@olj@TrV@Rv6Tc|hJvR2gIGeC>5NfF=ZDEP;%igZys-V_SBV
zGOrfz*};tcV$pG5ii`Np#<Sd$LsyUI&V|z@emhf{Jp=1cIBeL4e9swp^UCz^)n=?a
z2)`sfO1j0I3dJU202EU2N(c9#JTll?A2G5@YVAf_e?rr{t`vwP<{9hTH1idHhT>jV
zLGh6<93b2H6-x5lb65m47mB@w03#Bb@6DWAyc`f!d>4!p!Siatk|o=6{Nxm;LoVYC
zVK-G31fAns`nG2(2~!>oDXD~X^OXG0dr%mYN(AgbBfAs-5rr!RUq=m?^?>qjY89)J
zhOlOzkC<h8oO1UENj*!aTTz1+B|c!ObAxPxUw{oGx8%kl#!dJ9khh~WqwA>JzOP6N
zWft~db+hQBu$GT<T?5d#6#Xqvqj?exb|(m!IXSosPG`#pJpx`j@VYCtox0@8DIYuc
zTfEdms1s{<^*Qs7D=stTh|ZyaE$QNA$0(#fs7x$x5-kq|>LZ^KgB+zjo{_Y#GYobh
zlNPcEggds@SZDRE!8{?BRGfAIQ@)hWo~6MrGc4;MAtDHLw&Ww-TZUwRhW48x*c;ZQ
zww-)NF+Tuq-cjF%n0V8s|1KI>`du{eyJtXiww27wu#Go__Q#BVbdlHCJK!2TMc*s4
z?W@9MeIf$GeB1l`>wQ(f!bOxt+Py&cqb%ep2|gBEH5?WcZon1U#*3HE?TGKXW@#k}
zVo3Po=%KNrL6%Mzot(pcm1C`o42PesC7@@@am>Ye`naS?om5J0lk!;C(O!}6+b~He
zBfl!cjG=HcC~trsNC4G)qTOwT!=o`yV(%wpS=$z9b1aETgLz1d8slG0l`7imA2-r;
zS@>Y3X~(Np`SVWP=5I5BX=pEKh@2=JCyM{e1W16(-!TLnBm8PSuo;Ez^LGUAZDn`}
z^-&;E<@S@B|3qQi6~R`$`PM<58uC~Hv~j1wK+(S#|MZW$C0<Bq{t_W<6S(F5Pq2r&
zDFyybpen-uiYHzDcSBxqG8y<CNaAR&|9Bpf88ri3X3l8v9n#~{<g>nj82qSHbN(Qf
zaCfjE1%sed@C~yu5$YK10l%_|yLQ7Zt!~%w;8u;ohf>Tf!%WlPH2{;Lw7;|(2X@t|
zrEFQjzC$CMvP$D~CQ8Uu?_9B$=@>jw>3qQM>^51Kl<!sM&8`f7<F$>p_jiHS?h-l4
z#Au3uxP!T>INPhS;FZj-PZ-#pq%C}}lf@VU0<ZC;=?&rN2Q71pvrl-ep2KBGPF;z=
zV7-A`eu|-z>ZZ3B2I~7D;uu;Zp)7E{P_(a}J>Xmteb_yakA+K$ATi%92<q*a>g$`M
zJ1~j-uDCgn`+z4^WWO*zMg|O&XC?gqOI~S$Suf8JNb>4Wb-~}w1(U0wSlPzCI<;y!
zP%wWc^i`vzRq=xZePRj=?q^7Xaqx_WkKikaCU+B?46UslgGKen<>$ZrMi~GIGy1Vr
z7k5ixmy+K8zc7PnCAZE(FMpem3CsFnyybnlhRtn^)Az`_KWM}JT(Nq@z(KETa39eo
z&8fJKSjXVQaKFSCh06-A+Vjnvzp4zxUlSVURnk>WNG{@|h6bJ2Dm#hpV<G8JNzq#A
z+7(Qw0rZMfO)B{E)J34N`2Q+vZ*LzC^AO10Xo*0d6s-fCFcvNyYd%4+dY*CKCN5a{
z6RKjRW&k2YG5A>y@aOAuVG%|CWsI8^g?l5fZMB&l#Rt4Vd@nnlxkAEH>zACF^0ecX
zF@hO4ETRYw6|wV0$(Uop^EZNZVwZ>`Y6P>2HCp((f9z~~F<O7@Y~0fuVnz|g#^vs+
zW<{75w|RE4dqz#p4J0A3$Ib_na+w*<l%FJQRRYqTdBY~43?zKB17Nb?|IYCPV37YG
zGhft@L&;_OA53Ru@!<nw5bvzln{jg_qzuuFc*B(%-ULm@c0xAaX1xIC1aFw1-n($;
zhp>z|$E)M<&@v(IomyxsBZiNuGpCiQf@%eVH3S#CxS2`-pHKnn(5MdAR7mBF&S}L@
zUpYniI(;pu=nBC!@V?Yn6IY_p%O?EySifRcbBURC-f^-6`MyeVc{Sg+iS>n!_%gaV
z@C5VyXWc=+jhFgw08}{D2ug~;5DH8gnD`C+*wJuO=T)3X-}?Dw^Ls;<KQKt+65X#4
zQN;0?_71ey@Qu52+F#`e5ym!ls;p3EltM$+BPH>Ob99yNH)Tnu!-B{WeArs9$MuJh
zsQw;0JN#L_xvTun^B;YC>%CYpV}E%xB522RppE7LicEwP)ou$?$T;`2<bcJk!l$#o
z-Z4O*TF9?t0Dr)f-dDUD?ozmC(q=Hw+Bq%a!&^9KL^Zo<EGTWO|5UROX9|j@;d4G^
zEw&#JZ|^%?MC`p&!ttZpWK)*GoG-=VS>NT5$gv_HG9YV&6tU!Y_v0hn{7U2XWwX<*
z7|g7xTHS^PC9h;b^zE2`Lq{UOX!8zl;BPTw!cKFjVpx(l2nNOxtRk2Po3<k7h~2NW
z&FfcQ+ffqmS~yx_P;3fG{?7H=Jj(*DLtU`gs{8RSX*Nr9At&{bE5x)sKd@zfdH`VY
z$3#7a0x7bJFvH0K+34XH5?q}W^IVQC&_3d=Gj3o@TF#fc0F4}CG@hOduCX?Z{BKzw
zPWq>4y;JheD;@q;{K*VC{69Xn|2C$5WcjYw{Pf8{^y_uI!6Yx;+NReKp%c&wit>E<
zgJOQmH9(ui03|ALg?g@t(DNnB?Y?>Dm@X@FawzAsiId{#2g%o!{anoxC%SCmd7tP5
zG&b_P5>>8^2W)aCGZpQ=C@re#RfX2jg>056f=tfX_W8%dhX@az{y~))UxguFPR^Xb
zB#W0k`HHVWmv(aRhIPge<|FWm=kV4GnNK+?!GIVco0)zoYp{O2NYgDxtHHVa=z5EI
zKGps4yOwMb-?d%@a4{7Au%DCzJhafB>(QZqB9al(6NiJtBuT!&-wAyJy0kydW50CL
zOQ#k6uo95%Mb>3Nnpop@lr5U+`0y3p5q`%*NJLotu_$8ddIzSjY6$2HvnuT6i3V$K
zdPmWzp7b(16rcQ+Ff|y|cWOlQC_RIoIqRP(<=OH~+f3?9C89AyXr)^F%K=_Cl-T5W
zgv#o!Bg=a|Z!w|!cnWtu;O4d4L!J~4Z*Bv2_H4N=)j1T=+8>mb#VQ-w=|?P0OkP+Q
zO!+xl1_DG8fq$IH<zZ8Z$kJAH(jH(P*6+Aj2$hrNpd`^|t5g*07k&t&*r5%+m-Z1m
z{FEKNB4+6;k?2!%juRcFNia9yx#lrUk;?(ggDZqDiZ+Xw-f5|avHKBaVCh5p)#C$2
zog3z2tUQjvHI2%%{h|KvEa@O9$(#Y?&QiamIo_t;9h2<C*NJ7f;`e@Gs3yVt1nDnu
zs0vkdtusQS>}EOn`15HHtccGDiMebW!W!}Y<9-8Ri$CSGb&vb=r(R#l8}`81>0Chc
zt2XsfrS|^RyS2`f?}aUTY?9K^Vcj`9=CsZH&hcL-sSNH5HN`%$<zV9apA!MpPYdD^
zE4mgAnCx~=N4?iL%<&uoOz|zu(teV>3taav75v06I))~U*6j9(^Mv5*bIT{sNGbV}
zY)Gu=e(~6B4SwEqKeRctIsLBU_}+OtHDb_+>wVA+7%O4g-Q86#H)J%BMm!qyh;cFZ
zzV5Q+UG!;aEBjP9L)B)g;pbxsG`8NoOU=f;YJJWB6r3~7`|j@@`0r#Bzf!TrNKpz?
z#Z3BTQMz&WZ7cum2-;PtuYOwK4#z%??{piHWeIHf>>%i4AQtva6j(t|ulH262Gl;Y
z)yLl(D5##T+gVuemKbWQ1{4j~75iVPBe^XG=SAq_e|;X+$9T=Y$(HpJ_#^>!ZQrOv
zA`U~S`T;C+Gc{=u<Cem64o~@LcvDM>Mrmk$%&WWp>Yl>~HMn)=paMyKq=%IzlRS8+
zFeumPG|Eg3#as4n?%ZLt<PaDh9&Wyw6PoW=(&w7ep<~P4l4xs;JvG%Yt4EL$4X`X1
znR)*rmovqfZU*oAbF>>baHzX9czZQ40u0{sp0rplA}U+~jm;jmve=wCUt&i>5rX3%
zP`=uvQIg3ru!WLUT%qURyly&o;wXG#1%dy)2`)Aq`n0~%`md@d9XG)egHY&=T<_!f
zaDf~YDMwgJA6eR)X#1e2m}jEzueVBH$6{JIucy4Th4E;mfT;xZRW&~8zzJ$Z#FMC#
zn3ofB<coZu?yCe#?yV+%a{X#pQ~Y&vM*GJP83PwDG2vzNaA){Sx6%wQLp00QDlArX
zjF|uZW9U<nE*82vQ`GbGb9EdUX10_Ma(Twt+n$Ep0f}^^i&(Kdw2rSe&XnO+B2LG@
zTog@cDB<9C10<5JEl|s^(pRB^SKCPRNi}$V{lAcfdIky+)y`;gd43|r>ex^=p-Mja
z76ZFV_hCM~m=;z*FJGn1x3g2^4{y;AJ(#iE!gykw)s%W4?kO)DDor&irqTW~Bpv60
zp~n$Tq-!*uSfUJI7({P!OkH*2+x()qZaylAJqOGsocZ!NI~Rr7yO8CVSi!1lQZEi+
z8E{`nZm(5Fm+2D`6eQ=zX6}Tpm?9Zg8I11RR@h5pqBwcd2FsXuE}|sPJKexy&sI5%
z;7$3ZI0;y(*6quUzIrdC1eK*yKlv;)JE*DqO9GyNFuA9B!?)MY8aJ(D;Nkfja_7zg
zlLUBpy%nW`E?S>Y!@kp2i(k!{@NX@9+zU4~T}RqQwhA?!o`~>Wzz~lK3TI)Ge>*!}
z%z^9d#H23L?Cs4f>fRtE#^0J(4&=Yy{Z99*$Jfnpfp$WL#3oV{YGGPeE!PD}n|K!K
z!^qJbGuI|dCA9XdlG7O8D<XFidb5;9zy*sGTrfqWRw+p(fZ`oX`f2>@?XL!MnPz$8
zJo96!7q>E{cWKntsN=rAe4p3nIb!kNCe*7Jopng4ocd|$Y}i$4ypc*936C2}YLaeq
zZQne6vs{^W?VR`8x|OdylfuI>JNrq_RWz0<f@d<jD|8J+i=6;9b%o9L2W%&R{{l^k
zt|`!_?RETP_x-em#!#+8-tQubBT%Ss4}l=KY|y-w)mvGpaw%+Hv!(X&(JH$xSZ3it
z<@d+`8w`j3u(LG&ycf7JwNkxDSyKnTznic_cb3H9?dYnz_FNVh{A*DVPP~K`f_?0-
z?TepV%qan48Kb}d4B^S~vi!*896kSwU`9r+_kx0iQM4+pn0-ppJ?wm3t>S9beMR@W
zHP1nr)VRCy@L+|$!Hj^D?+HZ?Xq)hc{_1F%YiM%3Ve~NI48soS(}JsWTO6%DQ<x15
zt9LJJetnCa-|8H4jd`eYf8&q@vV9>P18evI@%qB0wAJqV;cz)=QGGFeRb~V|%{d!>
zcXz<G(&a>>zTyGqW?ayvbjFtK4kLsOYf5<r3fWR>@S{c@8%lKA6>Dqx_IG@*4F;{Y
zliWL4>*M+qfr<oMRcAEFwRSi-9B#lZ2@>!!cF)L>JMC#9mp)wB>F>VKk_&$asOw>2
zO=6==zTR`$QJCrY+9$<6?a(zHt_G7Q$sIsq-u7&u@LfD#li2XJ5Q+o7?cnKoWp0hD
zP>$~x+HaqFYV^i>DU(zL+2WS2G)i;_*hdtMVzzo&+3OT5G|4iQ?<3;e8TY65i3suV
zWM_uP>JsI~O3dci6lm#K)nGJFft>Xtt(<_ACRudBB?WYY^P$IwBrQ4YhYXFkOEc-?
z50BZ9Uk@9Hv*91%tS~K8jxHjr)QXfmB%oJiy*wG>cpCON^;{2?-7dr3;<q01oViDe
zG+ow`CN3{*bG06Cri6(opKi3~Ioo`Pm%lhhL$0<SinSiInM<~WmY)ZX?oKZ75+w@1
za>>8pO}us){Ze!?c)B$`Jp6HBX+?2=>c&xVh%ru4`Z~}}skgJzY>wuT9si)vdbf4I
z9)8Gzt*|J<CP$wzQcY_k6T8kL*QhBHG|d0~Ev`Ahq*g2jb8_<+16BEbYOv+m&p*89
ziWsClF(UYt&<{wO7Zer2kQC53Tf#dZ_Pf9ugi>xiw<yw?tze+uH<N^#GjzbBt5lg5
zG`{N08o@wBIYdZtb~7}4AG_s*oJ9hg!OMP*i0E3l<F1MH7!GF6CYKt&fsaO;L#fT{
ziFCVWLj3EKqIw>T(WVO4s@2^<RG3=s`f_DSndO!j)4-iuw*I|JmQA#ByM)9Ac>lJ{
zjSpxO2#>aG!lCv?IM5<R%@|z`$8t4eE`KEF8OLf9gCPv{G_YPdoy8>KgGu!3)Kp{s
z?rT-2Tx3~u@U>Obwv1@gy6@uwn-r@{8K}T@>^4q2Y$O_FT;yLI;U7lmbd~H9Qk5%+
z&Gg}t0&H?c{@@h5l0jv^G@j~a&f_QBWR}-->l?%4zxk8enXD3tXnJVvJHO`H?N*}8
z;Lqmwl%tdx2n5i*$(BERSnOgW=jcrQV~^irT%^=^*{o)KQEe1LsnTdO5MB?Liq<$l
z@ppOY*%i{j`>gOuoMig|QvLeu^F%2q`{^0X3t%eQ6l`Q>n{&AT+V!w%QV%#sN44?m
z-5(@DQIMKH;qhL5np!g$$-r0Oa$*wq+&~DM#7QzvI$+BtT=^MKW&Y;?w4kc!tgXs2
z<a(l7!;G@wYI5&DZZaSFH-WDUKUU^n9UnVQv`Spq$2SD>4SgXWQ}4`YRLXs-T5#cI
zRR_#7Nlqc<O!5S%!sS`-WldffGv*hDTb5Yg_g~Q4@v9pBP^;jULuK3>+D6;boh<nz
z%{!#LOykYTG049lc{Y)tcbJ8d{u5qaWEO{|-zR_t5z#Ik({KYmz8*Vfu`EgytQzuC
zG~hlU#4VE6JXAksoDXYoy}m6P2!!TE_W&G;-94)j8$1>lIld9v&%Tb)Y^i|WD7)SX
z@~Wd1ZC!(5j;n-fskA3WEjBr*erCmG#N4Bltz5ffS%FrCi>x#)$VKUD&#`*OdWq9m
zHZs4PY9gKoJ`k@5D>YoM%IK>sU6)@PynxBh%cFl~s*ix2;`p*kBaJs|Gh^yk$^t;M
z5V_Q{Rt6rQhjEQIeG}qk14o0OVM>xX{lQ62d`nu&=R=KIg!p&0pciJ8$epIsapuHe
z{Tsn;$L@UfqwQk6s(PM|{nqS!j*e!+PCYO7El;~wSc+wL^v0_%KK7-8<KeA_tF6j`
z9f;>Nn(5@3V}Uk;ho!dHc6u{1P=Lemit&cnS5fW~T6oOf#yc{XEwuOS_F6cYr1ZQ+
zQ*;(U^OE0*!BPfaxrX*#+{*?JKQ}`uGpJJF5ccFtme?!AhG-(@xL3#zgHJR-FIE5P
zMuH1XV4mGrIsK*3uoQm6jnKT1_DH-?t;A&!yeC7`l_E)d8u0Lh{Ke48FQ7#CZgbkA
zX0OtYnLXYg)sFLQ%M5oXPJE{PdZ&+XpJ`~VB4e~{Rb<YiEq|?x>af!v!#UnN7XC%b
zg;}k&uskadP*JPY50XkjanzSaH6GCVg6R_jn?B%b(8i-~8OUJ0@_Vk<a7=-JWKRtz
zjgSnJ&J=rl-XtgH2K*WTCu@W?%FeJrI6K_G2J3uGn$d5(=&j?66XNwl-wDsORfyJt
z?5yV|=L7T7;uby6c;Ls--_OUa8A=hNOmszWIX|D`vc!F?%<Rsbmh6ACbOw{2MJ<rN
zP&ijwg&t6@>i}ctVnSF=RSEVCsAI5y=Q+c?ff=&C0oLD1&&zK%91pJ^By*!vagB@#
zx9>D->esR&rn;0GnbCD?{YZpeWkY8N52Jyu@=pcKiHDnhYDXfq+o66-<%oqfDCSkM
zf=9h(5)(SVWH>MMo$rkM@k>-MR5hY%P@bBTP4(^$H>oay$+I4YlNN?s`$d>$1J$NB
zetX^sK!SZy-RE%&fk2cTlWMI2mz!V2ng_1AW&}e?9Z4762utGuPI2K5C%_9oAJd!+
z{XMeUeuV^-)m)un2=$F=zp1NzrNdb6fH4t1{sW)SlHuGoB^SZ#Ra4Z*5EAugrgIg3
zU=_vJHS!_r&Gjc1hy3!S$zO#7(04P`#)b_f0p}fs#K6(>uAy}ljk?J~<h{4(C|^B)
z3~8U93CUoik_x?Sn^O1Sa2pu23)Hg#&uHf?<?Jf_0gji0n9*YbX|o~II=llJoexoR
zzA=>sy^xyzL~|rTPQ)SA#4Jn~{Vnzdo+#O=a%Dn=y#0z&lef+9GW6o<8m8TJCF$9K
zb?e%cXvJSCxKlO-f_8&2iEbAvc6V3D^IMyBbElO_;Exjai#u-030&pE2|QOx6U`5g
z`45+mcd<8GkM}0K*pCN8@@J2yIS;^9E!S~hQC>^cqgF<^?Bmf=qs}WT>vuKQuS6s=
zE~)7CSHuxo1NASs<*R`fd!FUdwkQB^OzMG8K9@k)v=c$FEV5S#XLm+c1LKj7$dWRu
zJrK*=iJ0uBiRZQ+kApYe-EBGhW{3YS*Op@2=N;R+ZO)dq_JeiX!4!$4ZG}MRpuO_)
zb+>C?nXz9@<Q|*D(7-NdWG^`p0lMbFnNqnHTlZJ-J>st^p%^_FuIu7Bgc5+)i+~mm
z;5LZ-Dm8agC&`(Gq{_`$CN)EoJ1&V<ns#b$>%_SL@qOH=+BOqSv{Gy4zz|lENZ6zY
zHHtyd7~g#fFRf#o{czaPmalR2#Sg3mp*&<Q8*|8~-|z6h5%4B6pH$j&Y!63R?v~W+
zR=$v6Aj~kZ%7~9i<GVu*Z)XL?lxc)^Wnr5DhnBW|LyclXz$`e36h;uv-ad;<ay4yH
zFka!}@KM%)*-D6FKPlnAiYB7sD&Vk6Pr8(rVqhy&b~=|;)N~W3JG`3a*y@zM>rn!1
ztz_8t1^3J;l|Se|{D7@3>8g}hd?-dX^V2m4e5SFyp*sf+E|y)cJnGBE7kM8``CIau
zu0G)5;Z^UARnaJ0F)!f|5$S^|J6Tjul5q^MVD56kMJDlU&bZ>js=~{Qq%YSWl-5bJ
z5fR;*yKAgiSjD-VYBYC(qDnWBo7#K#%<DvBH%E6W%C5QLst*hs7f*zwr~M`|-l8A_
z;Nk#piLZH)<5q`+RnPo?mtvftAWKJZmOKhCes5@x=qp;CKZ4!jx8}c4n<_J&pvnPV
zf>=BgC(E#>=*P>T62?fuEosXtSgR5E-!TG(i~np!J(6^VsYb~i7l8xsTL%DA7Yljy
z+j*3sq-GCv2Ihf3BgBB~%yXcAgO#%1#?kmHE%%o=x;nO=zP?;^YNg)Pkwx)8EnIEA
zBPtamwQjqtVc<PUzV`Pizgrb41Y>p;pnV?%6svt>cX8)P<`4a<it1&a$Lmmn27|+v
z6NfengtRq7KuFRx)4j#L=r2f05Aw=p0zpb9E%Z+L>IrpJ@$9jcBDZ@|DDxJ_nM~6v
z-r|5>Uel~JSHb!(&>UPX%5&Q0Ha<0V8WMsmst5i*)K|e+VsE9qYN#~j=nl(HxXuof
zo7GUsF-DHO$as7J{YQ^5lI_W1SMAfHHa-?$K#JiNzvO$A+^#AwLdUsAajJ;OUhp!M
zpZxbJw))c#=?t47SDj&op8lYU#zvyA<)svsXz%AQ>`7~&z<Zqd!KqqRk91n3j=Aog
z0Z!6n`}$2<L-t45i9JCRgwgq}C}>V-;C(dXTw|4A(^;j}`qjG!K^5@duKt3GjAVJ#
z>`nyS9j6kfUByVRq|3#~$cBn%*zo%HeBl~0k&A@s!Xzog5T}%{kD#mjepFvK(YkN!
z*Gwj(Uxx3@yah4}sob_hAqMDAXJ;@YiNR5s8JqpPh3gN8CGL)#uqMH=!1@!Qm5&AV
zF0i<s?8ji{&Jdx{NiQhf#;Q~(MO)A<az`XeWOP9a7Vdl@r6h3wI&+1O-ohc`ZMF)<
zg7?HIe7QCBH`KW2<Rv`^JjmZi>cS3R9bZrhn1nbroaLe<f<q~9Cl+R_pna3Ms`V1)
zG?{-LBA}XZQ10O9q++)EV@}#Mh;+T@SJU$kDN&U3Qhs?6j%)+yq~W(G3?=?ySomK<
zHWjfoN}wFu{lLN-Jy(ZI&BP<#_7QZicwW1oRS)MRdlp&-v)8L8foT5JVFm`9oMO;B
z(2EXAB+^MsY#TGCn-R#jEU~FiSD_R4b#`hT-UA?_vpIAqh%}-wy&LG1MbY1il%mdZ
z)kmB$bzgJn_{O><q?DnTNIf;buR7su6sB{o6mlkexnz4eYrCZ};2dga$%KJ~TgKy^
zKP+wUA1jL^rH&&}Qk|065p>pWt7>Jwtr1DrR9OGqyKcvlb2{9uWLDSolkthqEY|wc
zIly{a3d&1A9ADB~6%ZN}r4Bt0NXD<D4~D;<S)JHM@;h>5x@e&F4xIS~MS9R)Ng*$i
z!eVxuYUc;%#1nI0l?=aF9H5M$w3q3LZQ+?bC+*Tct^6deO)UMEp__#DJqlHNV~WQ^
zm;o*qZ!|i4NJxkrGntN1kA3mGY4+>=c)(TKxmSA2lIF60BB{v?Dy~d`>@ntphyRQR
zc2vh%&mcX&o7?GQ?L;Z6>a=B?Nyxo*uR+GK;e4V@!)?Z3TJ+cM2MeC18f&+K-cNm{
zn0Zac8A_zh1&dx2`BAkqu2=o6YFdu#<gP2BNtSDfRT~d<7q6M>K8jPy_OR@Hi3Q|k
zAGssO{jx*8y{%zL)ZxjA{upKD)eu^x<<zU%LV7UG+(uqb_^oHLPAHgykVUVl44kLh
zIpVidf}X_jK+{`IeTglo!BqOduH8JgnvupGKO*zV4M&A>?n&XZxkRjbT(y;7NcFTt
zL9FI&OIaUteav+&Js>P54w}h36u{g1`q!_9{rOW}zA0P&qKAFf#YHWFd6Z5A3-X_C
zlQs2s)ol_%$DFt!sN|9kxI1ve4dXQ*R#XWJclr`xYiCyc$Etd?DHoF6&$i0BMM=Z>
zx!38itKXuw7vTD_`yK05N}UeLdQDz^V@0ZC#P`(gmotCfIBcS$pEb`UUk7|rmx{}P
z5@1AS(YRNxDU6sdn{CsYUaq7v57gL`HRGYyqtE)*e-f@cCFwf8N)(?{O_e36UAv@J
zGX>Tr;fnC#=z|36lPk$RhpVo_EbE<41P$>9D(Iar_L^|P3B<2C6QP#p4Fjp^{7M2?
zg6JNh^32_X+glJP;kR_u+yJ}3%>=zK#kyaT_nn$mOZrm3@pP?=54$uaE!M@>PUfEN
zCBy$g(N*b(Wr4o1g0+1#ibhp+!F+2Vvu_#fUnYD9F4qaaB$_^dPIMbobo{WR4Z-5)
zRRCJDfAvTbZ;InrLvzC@J|Txv<W3Lf(E)9E?~d{v=!Y#p2w9_iG)7`SS!}PHr}aF=
zBp^ACjq6<7G{DtLH!=~xdnG^bQAaEH5+LriK;f@zy$W*PdpdTPsM3_Ek2opY&^KYs
zAAK&bM(Y(JqFyn}!))ZQnCEV6R)m!pEvrdKJvEeDl{U>v-*u~herK>oL~+htu#Sfn
zcw>E7(|QLm!H~CIpQgR7qD{fr2`7?#myyEn?)e3t>?dARmFr(@Zdjt|DJoU8pYG|{
z)Slp&>&?*%5DKRUXlV009g?as7fhdyA)Jso*ZMnFeeo5YHZ%_@?SmQFXDHRF3^GoC
z!o4qr;;)-&VTwc^O33@>uJ*Gyl-n7LpS3QqSjVl-!KSCVT|!Z~?+c#9(3J<XZAor5
zK5NenIG8!!X=u2?Y1=Tu{lSQR{zS;HGMI+M+_qJhm+VsQg#Cr~4G+RxW;ML-$Oqmm
zgk19w2!4>)Jd=v@f+FIf)r@6o3$U|r%l`7<Gu~rc;%gZZOU<Zukk$G^zhcuL=pRpv
z&~_I29;EOaPy#unN~^T-Vm10M)fy|u5(8C~n|f3mZd6%(y)|@@?urR%K=@YA>t%NN
z!&4kQu~5mD4~5<%B`k(NaDq>(njAgp6`6**&`F6bb*JW`R^31XVcs5*_EKlGf$m}O
z&eo!cs(UZP!P*n4a#JxCIAE+?CmV8<G$Y=nA#02^va@?{6RMP&1#K~g<c#Ki$5zal
zyihn|PLV`sk9KA&Z25b%gq{2s6!~u;(y_GvOiIK`7t8kT2mS5XOysF^d}#5(yfeZ^
z-B`_a-f-B}N)U1@odGjsmpx}fF^+o@>ss&nqk1k8#4IDn_AC^H6xvRe@?0{;)e~Ad
zMQjeZFd_@4T@$R^r8uX0Xqx(4-fL}bc3^AK+|*oS1=08Rb8&Rmu&?#7r0G)nige-<
z$}n?9Ztfx&%?_$37i#aEv6;Ewz-#KW0mR~Zn$c|hZZjyO;y_BN6T+xqVr#i4Tp{>-
znMT)@2V@%~OKWw8SryrhPm$xE4JU>??!!sV4n)!$WPSej9pp~otWLWHwNij1nk*Tl
z^>!(}MSNu1MI<IUG&`B9F^`6RTQ$YtXp!(UDc@A-vtdlD)$DYBgWh<&=Y>56R;gKi
z#ouCo6&zmJ0qACCY%lHTA^~l-<gHfkJ7c64>MB}=0i-qY{eiQqiP)wu8T%ErbT+KJ
zS`|YzvK~eoM3CuZso`>+c3mZ>ptd6qXP>_Z)Y`g*KjP!vd=0f(Gc*pjJ+W>W#irLA
zAa)Okm|C#!si$dOAatzC{wauO`XK$xoI94jZrT7yK_ylNd03t|U|jKibfj6`#nHAP
zvgO^n%3wUf^1;2II21-Pg_S^qt%)4(!bawvz$=0F<s5rxka6Mm$8wy?n@LKWxihsg
zo@UmaRbRa8Hj%48A6rk7O8ImkVp?*1|L@pP+f7N=T!<CQKSBg32iqAk3XMv*ausJx
z^s3@(=r$s)YR|-fl^G)(#H>&G`ubY0r3?I#CwkOuUc^s7k{)(xuJ&#yS(!U}pAy#)
z-xlmac3?s(I1myOhW1-7kDfajMbx`AmbuU)0|gP_SDBNSqnTR)h5fWHswawA&*mEw
z4^Mxo9?+*xW10Il9E<6+U{IecK%;Q3m5Uvu;%6pV_ZqtcP4KP{)ac(Wa3s~<m(gf|
zVF|F?E_QrkqQr1SXD}XbIpH~i+WZwu2$DL&;H{Y*s=(SMcAa{eg6~W%62gkB&-JT$
zh>r~%j9GFwTCSt+;WY0%_(wsVP9v#NZv}8R-^BI#9ne$#X#c}wCQ+Sb$rR#4o7l>I
zYd7!GRq#jqq6E7@6w1#p`o2Hal?;{!QCXLsM5JZMNrc=<$oFr>qm#WSCXdR$-htc~
zJlOpoA`gKTp9B9tWC7scbb;S!L>?D>3&tWn!TISrLPGiAiX)G(X{bBKhTtYk%L?&u
zvvfksj66Zn`Vw-f;H%XXfgm82Eu>Q{uOE*C9)m{19{P#y8YSNDUUt#cvZU(@903Bg
zrIsy3ltFr@6-3HHkBu#b0@%(OIY?Jkek_R?ht@V{;NhW(Aen;f*s_Nj%-C+Z{!5Me
z2Oj(XL;&)5UvF-lpN!_d^aukVEmd2JQII<{VotT7vN>9Z{{2Up=muX~O<t!Rg%mV|
zZJ%RSVYv2*4oaY?q%qf#7OjQNs~T=?EOwhAv5DM!_dKNn+9+{tPZt&eA9P?^wuh*L
zh3Up2py~2|=wMw8{xQmUTdGqrDzIWdC%9OQY|Kd$e~&1hfzJiIz{*D!tkJjXL>hWX
z&^5`7pmRo>iL{5DwmfmPhH*)aj!&Yf-vRaM)lbnFQ#q`r^>gACQ1P|xD+E7>k-uh$
zOJ=u8Iui)v7Jb%S7VzX?AHMH7SXKx^G*k{bWmp@_c%ZiCZ@F=|l`LW02dNq4UyU+E
z^MbRo@?RNu`d0gWq?k*dIPyUh5Vb*<d`G%1GRAVhhJ;4`zPKPkG@Y;x$XuCZUK!l%
z+5bT5KX=f!H96*{eUEdqB&WK=QYE0IxI*yly-C@k;ZWH@TXmi|l$8Pg;!OQ75-aL1
zHfkF&)U-Jyu+!0PyR!9a|3GLvnNsb8zTV*6(uX1+rp*br!r<%kL+9O`9<Jz%>W*Dv
zSckEd-oW0rc2Z5%(%iu@z>^(q&GMIOjejTFNjo|g4Ma0r0v@3MTEHb&BcGPNvnsgZ
z`wi1vtujnJOk7V$dh@xZHciKsH)(|I8@a$gLp}l)Z@D8g;&HuVA>tzzJ>kMiPiLV6
zg1cvV1vkiA$+#CWccPkJahD|`3MV~+A5k!E3=b8sD6XXTgX7(sz%;oO=LTDriuV_X
zgfBk*r1fYMd$T45@8Ga(J8iw%5_9~f{rRU@S1b*fx8DfKO;tCI;`T%Bb!b(JL@szh
znm+72<%WPqF2BF#UXVp4n>enCe$7ZOTa)~tuJxvZX&hJ|Iv-ximDh-gtb5ngky>4v
ziuRQP2*cB-MVeZ#JXVEk6<C{VL8>>?8gTk+&$W|!FHt-_&j~t&Nd-HQ=Bxp1`0Uol
z5Q+@Zw_~_gX(v#F|3IJ8MD(Heve>HCo)g`hzMdZQtV)Zs6#49^#`D=`Io&HWn7tXD
z2{$*wA9Vn5re{GMSd@M<H<xq{n{T(w^kAl1ynl?|o{D?;o>XKU^RwJ$GB_!y6E2*o
za*oJ$(J5^HWFzmBJ>wCNn5k}xxM6hu63az`M@`q7PgJE`gWzpRu_zwJyLVnPM#Sj&
zFv(>ZK@~)zo@#o#NJMmvjBL4n^~4GN^`A}NfDhumF+-GTh$};XW5Q*L#g^OM<~IM<
z1JU(o4w-kD4@vZv!&{4Aya%?sp+%$tSO_zUP6@7%4O6{?Q@jstx)U`{L=ivV6q1^(
z8zV#-TL>jgTz{30Azm?T#w64~ee~Uc7qNFag`((Pxno*;E3Yl5TDB7kQy9}wMzaAx
zh1zZwPmhVLj6$Z+zL_P1`|ZHGnC*691qU@t(DNlMg7iF3<MI1Nw?m99=?5e!>XTlC
zTXAF<Ok-)*x#z7NIk(1I%y}2^rvn`>S)(>NXE<PLE^295^0y~|6L4p_WSpy<Y*n~H
zsrV8*E)@H41$XoPB?DKc)r?+HHc(Ww)#?~q0=JN-E4KW`vpU3LUMM&_Wo35;gJgDG
zh^1J}VxQde$}=E%H~^jDr5x$raWSW*NG|iv{Mc%GLk^*V{mBQ90|-}ZA<^i_<fw_p
zt5LIUnSp;eL49glDb;7H;w|+;HQL(ThbRk|Xlm0EZD*J9xOdyeo#CYxAkm&$O<=MS
zKu&|xSm#17b49dTb(pldpA%M($=hte?^YI5+aoM5FOGWReH=6RiiVlj!d*lES6V=F
ztYno=R{MNg>vc#!!_r$a+fu~l8B^F;!YK}_cH?XK(^ytp2||-b|H2r}yc+8P5TPC*
zJrt-_ZB}>%B{)=!1_k5-;``&`7`<E^Wc9N<MTSkLKb}TR@;?!LP5G1Zsyl*#EAj;*
znwQnX1-8tQF!ia6=|H*2fuU+4v=qrA`wY5;N#?|aaG`>k&AU3n0^Trgl&ql_%LYM8
zX<~cBW01)=M6B#7lAU6@<x%VU`bGa;q}ZIMa|8?;;}e#+q`|KMzRRY!x@OT^dOx;~
zLe0%;M!c9;lI0pf$JX=O=WoO#XQ*O9#x={ASMJ(rOFu6Ek^5l`5YWx&;f!!nmqA#}
zBs_a_=bUZQR?Byt(vJT3gj{TyZDE-FxUS+WjeIiMMD*qUV9(Ihl*Q<14;53*ROKKv
zKxBKw%NLk-)0Xd+v*+^D<#54tOU!pPdObbw_gIWv0OuUhd-^VJPDP?v>Jt7^4_J$G
z?7lR%ca1F77+`BN4IkRCYjq2rJC&MOE(j86`TW0V0PMUa@XbY2fq`*LhyyK|CF_@y
z7~hD#kR-%naDa2N?pk0<C}4#}JDPWEoNQ(qZ-Xd7i&L?3D2EZDzM@e+CO(g&Cq*fs
zf3WgHV59M9EGtv>U@y+}N8E!M8IpX<JI1&Gvou72n9MKnVVdofDT>QnPAilNBXP`D
zFR@TPrpe67PCfU5n#cV8f(873b0c*y|9a0$?U$G}AD*>uZ3tv~egue?78;^%d|yD&
zKfNCy4%VhwS%n2<!%C^b%$J1HKlb(srkFl{qAo1Nu^RS!ss_=GH{oy-+f1y!ICHly
z+_csudRj-%(I3@fC47$x8HcqmNZ?L%N>odl7iF0n3B~2R%@9m5M3&mjGnA^pWA6?Q
zAziy|D1K@(X-E%b5q_LLqT)$ZnYGo+wvWq<MQmy1su(p)D0J5+l^36()@zz>kd=O3
zJ6*vxo14DB;oq(EOq;7Nqi~|bSZPW&8E2@imz6>RED!n3N-qi|M$G1_)d#jbgwZ^1
z2hQsx2?`Q3Sep|_h5VG(EL6H#&B(uQqc1tBozr(+1R&&yT6lkfa`N<D0@S=ci<W)K
zP%D1>A9}inmsI`4bm<>)eUI&M`*R^1ghStBqXl2$Xb=#`wP84VWl51gUPh{r?{`%)
z4A}~8Zx45K%z#8-=AA9G{kP?=r7B_K+82_?%lO=_T)=Z%Tx^twd06vXy4DA&_Sss)
z5Cbf2x_)*)Mw9*s<FAT&_n+tKs$Py&5aw=(<wO)yRs9C{Av@OfXo`KByYA(r?FF;6
zO2OkNM8(dgWk?9rTc5-&RXMeO8(PQ@Z`sH%n!0aGqN=U06+o)EY;z1*r^${tPq84k
z2awu=qfFOze=iX~O2j7v`_?1P8@l<Qq+2?&nU2`oVssJWK)l|87~46wv)ss4mo4AI
zx3IMb<p#W!W0&q<e4o!D3P$*-B7C==!;T=T!a|&tMeLm^HqeVswDMQwOw5R3DeP;|
zXQrJpMXqAz2Hb0i%EX~hB!3D2$DzLx9vr$-*j%YmR!8`OujpO|PM6b+?l${X^LBH!
zG5CW}c20lrZrVX}=y{?f>Z==qUgi3Zd3Vxo!I38kDW(P@1oLK4=tTL!G-aIepJ{{p
zJPis5x=>pHqXnB!-~4lZw~7=m#dB)7DsVjQOXeoA@dHv7pQ|a+G$D0q$c#**>Fkt#
z?+X(LFT{6sGt{q9;Bi?+I*Fh=Ag;HbeP;L;H{pMjOGKuTA^47vMBoD(hH9!`p?_H1
zf$%=I$oKwrhw0J_gvh7eLE|_g4i9ImrhrA?_eOm^#1iQFuZalgCwXAPbpAqycJm=z
z*CMlvo^2@`ORq?8ylDn&8C!5(IRHm_=Ntoh@NK3tcz|QU&)FZWjQ9~PU-gv5b8<G%
z-6BW8Qhffj>g{~a+WuAjOB?*?Im0n3=|#^q8|dR{{1_k2jlVO>ifftdpKvD{1ki;&
zfyNCE#bbW|Vtc}m!Ns|5WS@_K%DYPu<&#aM*Gu`E#)9+_Ia8u{oHkJ65!#stzSgEO
ztY0M}AdN0Hnm>&b{+r4;f18hX+tI7x*bp+;@ys0~6%i3}LuA|UqOp0CoH(os(D$jo
zKhbT*K~F<xVHvlY`T178#C0RwbuI06etAXd-7J5kI69Q}`~NYm75sD<a<D(#SShNo
zc3q~)0!`pq@T(%(ynk$Lrk&5SR0WJ)F)!`rD?4G&Rz$fh;DL%tYC%U-R?RgM%oZQc
z#`tmBOGMY^s~Bd$_3TEidNY#S`dSuUm*8$k^Y<b{Oj#wRu2kV5P8;K|4oLphD%pr<
zG-Cyq){OYxHYqR5><F=1!2|X=c+ZA<@dMs*4@LOrh#8N})|&)=4?7f9Ma=yjHM4`<
zk7rHQ=Sz=DIV|9(g#l_-cYO~~MGvdQMuvvVg)&P3>8gI>$8E6K{e3pH9t>{wrgyHy
zNTfLRD5Wr00sU2t?F{CV;E*iQ3?|hR$#`4m#`a%QD7Gesjm6hf+QhM&gGtTc9<GnN
zg{rb$4G!~QI}3<WqCNAyp5N_PB-wz?{PP!qnAFn^E)M3mn`)CAv{0(@^Aw_4qhWjB
za999Irid5Gztx+G4lz)@@d+x8$(Rsdg!qp1u|g$5z@d0QC~bf4B9N^~tg7~7)2Y}p
z9`w?^0Go3{!SBO+6v_Xr)`;nOOEH1f`m_DW$kGrm&h+|IG^jc7Ax9l93z^LUv-fCE
zKr;@5HxuS>`3rQ8kXmB3azX4Z>Lc#r@2PS`$?demq;~~imO-VZTsB>yb4>0nh%;+P
zSfn1SnLS^lwkJsSArXVBe4Q7R8=k8E0o0h=>6sKeVWDE|z&sOZJg~-Ri&fJQ(q)pC
z`i<e<M{9uLE#Fq)m2RZp56syfq)&42X#ohjlvwQJWsaeV(bCj|hz)(C8&eAE`Vp`v
zAM3(2Gm3&xF0MsU^rJu_C!+{RMm9h=Ipp&A%RG{fz3+l^;v4-|=aYIt9Fq~-otxT`
z(e)nVm(w`{Y0?EBi0d<-@n0Y|kg?x#{qNrAJAN5U3ef!Q8yqEqivhtH|7d>hMKA>c
zMFJV3vjVIP1ylgZQl=MDLEDd!K5c?!_~ITpoh2jKy*`~Z9ym{PZV(7v3F3Nz??x&k
znxoJvc-yc6XeuTv{`e4~a~xbz9j3kRrG0Tw|J{xIaE<-LBj@F1H%yz;v)rRcR}U|~
zOR^ZU2uWrxYmd+|;%AoTEFD7don)iwSb(Pju%2|xz={a6vmbMXwVtY-jvy?<qbSAH
zFo~zg`)5+R$ShQ?W5f#mARNhmSGsZ-gzo<<Iv7Z_=MZV%LHXTn1d(CsJ#2EEEeDf`
z2i*EAe{<4w=CbHUH*4hE{7lW;(Vcoxw5g4ai3n>(on&Xt&m*C}4S<Zg@ON!ziPS6!
zZ1ez<#?Pd$6<49uKk4*(FzaZyHqA5!v<h+u*q(3O*qB1wqx0Gd$8#_RlA#8z0@nEv
zTHz$HHa`vAtG^%eKYGf0gM<ofd=8Dbo#k)Wz|xl=PkD!*G!Kggt{{g6lWW`33|yD6
z+`_E!90!rp44xjN1XhjeO<6yEy01~tE=UAnY!k(*#wKRP>J|hkh)8DBH=t4c<6yH|
z-R^yUVS`g^d^J_E$zduh5iq)S{UbSx+H>sH1Gr^vlV}Oae%b8SnC{P3X`|ORmcvsu
zPRAYC67CjKE8Fj1j8gjaIvR9_8G#;P!Pjdvs_CFj^xYh&_TxpWmYJN6W!-JAexMY<
zI=wtsnXYPn$ZSU1pQ&N%=tW%==6<?Lbp0OAlc8$*qJj4=qY4Ol-38OF7B2~YEB?r?
zAhCJWjxMv#XE2mFFjraHP5$n;$dCLpR&=N3#n+S+WDZWpSh*}2Moa4-9${YbL|j8%
z=Ef@*L-!N$P46M(<_H;!Rw$!|_HSx4i{^w9wsju;U$xiWK>jW!A`2iXe~Xn`zKoYd
zJ-)W+g0;-Jh+#>+-hqlYO8k3?+pYaIA|?q~IyHN<?zZ&XG5nWd7^IsfU2op+R}~se
z<SLw=VU<7zXTtI=xRi7`c@%HX&VTZ~+A~|Y;y`?_>UzFA;M^t!Y+F$@IERZ-iOPVU
zp1FW8-&Wz<cly3PN4f<)kC~YU2Q|8;yUezD5&cQ8P}>(?B)E;)vZ)NP2O+i@Hx31{
zzA>>179SkIiJ36I?#C;gx$8U(1Tj}Yp?DvUQen+ZMJ|}b?AR?*-RV5cUo_}AiE;r{
z2gvvSVmN_+qd3{LIw1S-?*6xKNrw1<^C`Z3z5D|kL1QCM=>oQh5074!4To=;(#Td%
zU^1KMfZG)^c-hII`Bo+I!cy1b`}V8*)AkUj2Z>NsHUR{DbDM$^EzrrzN)j{^{ae5U
z(v;I`ijR4s3X4=Yja4c^dAGopnsiggPCZ;8HG86Y60@(U&1y=HrP5ouc7JVj6mp}8
zLZoN=U)PLDCbdaQzy+SgA^j_J*fmg_Oz|R<60~u;w(^UL4E|XRI!*&S{n0b)f^B)}
zB>X>0hvs*z^b(YCi<4j{za@?XnvgM(mzg4qh1|VZNT(;I-;93K7_)@FSRG@TpW%3b
zn7*V)5|ijJ?+J{D@$mCIwb}IrErY>Q!Deh{ss8<NHD6=)z&xWd@gk?36s?GO&}W)?
zsu{ytT4laqtTK;LH>v*^C3j)H+f5_GX+O~Zf%aF6bw?oP3a>^(xD9|P{)#A`GnECL
zro3_a>i*dVN`g(u#QudkSZ0rn0tseN6fC>8PDG2LOSoIn3IJW78~-!v8xFZ{94Nea
z#iH=lPOaCXZ3#EIkK=6L=5_T!9qcVTs>xm|>tYsi3-#{-zc>=u)hL|gZYo|;m&VOB
z;g-)sRSkKiK9QZII+rKxlCNIm9Z?!pOI+|WqRhBTol&;WB{^PKZNTDg(DA{itEdNs
z73{{^I*1~E-WiRPkerh8tuK;hC2)f}YaO4MP&=a_Vq@x|q+Ap{d2;`0tOrc#$h2MU
zH9k+nG2116`(8}7kwVE1ZbiG=d0AazV(+&2O~|8$qBU*)LO7$VK-jBN-piV8Uj;YQ
zVE=%=OM)S+)9&qJYfQLFCHKO>H?6|u0(p|5bxjPgAKHwzk!N7QfrI0+g(B-)lAhu6
z^Uk68m9(j)R@SQd(7vcxoHbxs<}$DuGW|STg7<bj8zNqAUshS<wGUn*xTSSis5Ia7
zMQ2Q<gOQ1hY3!kZ1XM~F!zfA9V-%IJK_^5$><=c$>DukXi9%QT8O3-BiCXFZkgj&f
zwudh4qJzK{H^#HFKcuPYnylgS2#LF{Rk){$Zg~Oe{YOlKtGM~BhqI@nMsU1j;HilC
z&+1Ywb4n^YuZB=O(!O5i90~Jb#>e^XYlrpCPKd%J>l(6-b`6>$W53sDPln?7g{<bn
zIV;c)Ua*~H&aH2Ry(ph?uqklG9&3{y5HWlE+ow1HXqC$THY(zs7fo)d<iCsnrw_|q
zQ;7@(GSkv$&=OG^Pn)M51AT9}cK290(39LeY(@lp$RLo5+vU7lK(VK=NG^X%4vZiS
zfw0Z-ECq(c{e;Fq8tLfbK@eP=q8!eVq6xYw5r_T!oT$WQ&TLUZ1&NOn=*09N!v+G;
zZRSR1pQ?jOWzC9y4TbSn4U?&@x$y2JzrUPrErdfnLj^MC-kQ88v00$?@K;-kfaA;S
zK;QU8n2>C7Jl>AYrx>$T4p)*DcqtpxOeRmFs31G0tsCA<aLG_#^bcCp{)@<@96OQX
zlF`ed;amayV$Qq#&ZxC=&Ss9iN$tzV!V+#`^cOr(v!w4yYPhfgDSxfA+c*mq18|Ay
z^CDi)g5%mAJ8h=Nrt_PplM7d$K$WA~)Qb1X<JRz#q#FT)Yk@Z)t;jBkGawmw?>gU7
z)rU%h4WakU_e*GTt>jDz;rgeXU~h-*0S^Dm9@11#%beoBQ!)P+07Kqz)yMW=L$k`)
z(Q+F;!2NG8!B;Psi_@#M@7VVbHCu^gZ!A9s+ET5xd`gZ!8+{XIw97(UWj5m_hY~>!
zjEq6k`EQ^x={AD$=*{Nr0j9nZH`FSTt<2!MGpe_n;jd&m&A@`w<r$&RehHx9{_6W3
z2>qhd3k$yq2VvQ4jz2jhK(Q+Oh`+6psdl)b!v?!0fUCd9MdN*nN%sjfwQVkQJlZmk
zC^<wnB+32|r}~I%q&v)jO*RVRtx!NQIpVeD(eUa*Xq>z=$L5zltZBxWCk1iEdOS@0
zzr6islP6}R>wclcyrfnwE@dnH`T%G;cb4g#9f4#iC|+ly5TQXW)LEYSD4XC&dr&h>
zjG_I?Y?~0De_<J|{KdKf7R-Ic*{;}EbE|%t_WA8#iZoaT+h;yrRqY)D>AFjg;A6|<
zyegnNrl{YxutVKcekjV<jdg3LU*8Ek_6OREVMr+mL~R5n)Jr22sUUo=DR~50glu}4
zk!%cdvrh@e8hW6-c&H>L7>TJ#aiE=1-}_pa2=#-+*Q+8CD_(>5%~wkYn88-uT!>--
zwkYOKNpyW9Iqvra><1Smo%I<x6@CyQ3mKjGFekotBQ;LVLdc5h7n*Hrw=5<@O)ppw
zD;mArvy)CJkM$R}s$jzxk_lHfPu&A;FcdIrH(baE_F#7=KVMtE3g|t0W3TL<<4Lmq
z&k4F2uT!57?ycBF*Kq8MfTh~6LxHCXralT!GB9$!aJ@E{Pi)2|l(5$3>2Q=~OrcwQ
z;quy|=_EYEdL~xwoY4q8Z!ACS(jw^)kiDldJ_`H-2|mWif1uMaLt)L7$^B7pt7b!8
z_|3f4(eQZJbKSCEtd9(4<X3Ux(oVDaZ~Z|MgILC})(#g`O@IR14e#KD3x9M!LffK|
z^rJvFT+-(Sc9MlJ!M%n*v<G5YS=iYA>?+fzv!qi%9s~iw{+tsrXru13`1WA)>o64A
z_Y_Kg<?;F%%;*d4|AY?cEr_H)u&=Z+#?um=rKq7uY%hjaumZK5lUyYB9Fh*>EvlfA
z<dZIVRbX@xi`Vm`cD3x->Cu=03KLzF*o@ggdF{)@#I};2Vu(W%^7?4@uV5jZPlz^#
zj5Rb9bg(?UejfbINZo#hba!tLbXMt`3S91nvm^gMjh%N`Q)`#@J;#D5MFpgHrHImd
zRq03*1e5>)lnx0HdfN&DQa$tzDjlQ=h}1|Eq$D6E^iUHzN)<xFZ1l{``_6T~nQvbg
z|3KJm*x}jFTI+Y;H*ZfY>q8bNM0$AnM^=>`AndsgcRZK*?qagx@;Cg{7>hLb#=2<v
z!mLZH@)tx6w?BpXBTw(#6mauLul?+$ZszlciHlS#H{uz!QuKl?A#yd6_|Z7NkAf<{
zgo*;lN547F)@xwg@k<jqBHcy`rRbY)M`V`vH&jK>v)7-h5#QXi7Di!7^W;Fw<1feA
zwN$TEAS*SDG_tO+D%>O(eZ0D%*8BeJ?6#kq&CtRhQ~Skh(w2z3=S;=OYGvN!_QsJj
z%|72>pP)z^K!vLQsF`({xTn`v5ndyC`8=ghWcki%O<{e=0xlFt3To;HH@j=W;<M<|
z2P&!&$iK3~!2bykYhqkTveGu7+04bZo9eZrtyggspG3+}XX^TwJ3`J*d2cCzS<?m(
z&nOd-F(7`4-8>Gmj<8=otA>inEq?gzYww;Gv?);n_<7UV!h7;25HkLErxotY1@Nvb
zpVErqpgsKWyP6EfKm4EYZ}n2EFD{%=1Ws?5nc4q}5{?4Jf>&Nfy-;~r`k~BeG%yab
zd3b#oU|AJhFsuW9M@-+|-moN_`B)LJm7gyPZiud*v7rVYHYQ?Pi<8R)lA+-X<%Nrz
zpj&RL&Bs7EHL&8c(Ea0&yPBckmA(3$)^q>WJ7XP)*iuIXje818q`V%-R1ChDcOLg6
zhI)I`zfjuW?~0CqsD0~|xxvZOq8mJst}9L6`I~n5e+NptW98$q0~F_CeO!Uao&PVS
zfa&}6w7+lL!4-8q3ithC&6y)i$a`d9R$4<V2IQzs{G|Qce%A1ax`$iP^}H+-5>o&l
zfN%_knOjM`#i9Gy;1D6Joy*T8{Q5R1qlJZ_R^I8F_IpPF<XLTR@zsM@#O3OoO=XtE
znAM<T0}|CDIV#VJcT(ZMu+Ij=md8XRf#%er^v#AO*)7MY`@ee2Alp0@5FUbHk9J@E
z`2?IHSRVH=D*6%cm?3&u>jR1-M5ss}6{oo+FPR=<2kxGHt)|Fg>x;+$<!K2QfM`Bl
zQ^0*9m)wu8CxINXbvgHb_J<)EmiF<|<(+3BOw)=}JU&(143yIP#=f&YbV-=EB|AE@
zNfE7eeu>(%IQh+Dj<zd7J7Pu}y0cBJp85-#L#y3~KRExYxrQS43?}IlPC-mF_m8xB
zLy^4|W^ImLU2Z|6sJ*qI*8mLxI8R36IVe^NeC}cTB^dOddX%xXIn#?$P{JW}4t7@2
z77H81n;n!^0U+7zF_7nAFDRt6`TbkG`PwHCycAc<6rQ%p<2@tK*{)w#D=pe{W2!71
znIn3sTq9^8bcjklvqdMC%Px!Ke^fWEDx+s$Ab<U@)y?>8w?<cFTfkBiK8BDw&R<6{
z0;4q<DoC<GR3kFJ`WidJWw(-^aQm-~mL+%UR5`iq12X?jNXmnRWDVDwo@Ut4$O9S7
z8(OgO`Qc8Iahe2Zi1D~V8#;w>mRD5{WZm0i%8W3%;W`YgWgPP8Rqw!Dbej@~2k{Pv
z7Xpw3E7(8{BR*r_XO+(%viXdlLs-W8dT*fC_WIukeZK<1F551EzBlFP?^S+ZpZUk>
z$RFRYM3TM2g*k_U(~$(|B)G0lvlQHY3~J{{-z!e3$L*((R69VH%frLI#;!#)YbW6=
z)?ug<R7|B=Id`I_!jNKjQ{0xv@oKJ<-dFeGT%)6^PVx(sxBf1j{+G%rl(&GT;^oNy
zsGL5p9ws6vV-BP7Q2SgS<zY}oTLSz+wem=|uDejgQcsj7yXIFXv?P{H9UgtM_pB{!
zLXs3ko{B#CTIVAs<ass=Y1RuvstFf8PrDrY)E_AVMq2O5Vx48$a?j5f3!AeBW+%(l
z+4YR2(g+o-cyBHKZ0Ubb`eLz}^_Gw3+}wPn3x<uf-g}3IUAjH3^^et6VD-Vpj3`Zp
z9CLaGuQu(h!UgX4(QH{?k0r02YvfYl@~YX_jPjDg?YM4>zXs=}%#F4f{7!e|S9(>S
z#L1ST-A}dl1Idp1s4xYA_TA`aqVWcODWWuHO{*zXjQ{tHh2)_;s5OmWx|FSjhRREi
z)a28yJo*xndzX<`7Z6P=Kn>^%VnTL~a884seb61u=di#o-(8K%-Y{fDVApGe_m};(
z45^(4)11i`dvVwjC5?zH`a#2)^r}||6+0mtm3uLJ^)<O@AX}~uNgf079sa9M*t|G*
zov23L4`;#WGmD$k20axzIG$EGp1MJt*$l4_BIY^=?&}5t-w&t}aeMDLF4}CD-F>Bg
za{PxbMfTG4)2^TWRake7%bG1r`YQLT`}b#QD;d$&s*^9c6=hO*pfAOTR#&-_&%Exx
zjidx}+H$I)7SBQOo4mgAd|T&riu)UrR!fmZjy@zu&x%B*eF@0JZ#^#5DFR`R5q;n|
z;7&eA(xbctzyV~3R`R$&dgoL;`8T{n@gmm(+ZVFF@Uw-|dCWVLL<-8b0HQH|mTSy<
z_=vPd@6AP+&cgCe4t~O^qCY?py`!GA>2P?wBab{ZEpPS`Q##Qh%RzdHRoFFYYBi&9
zeII3y<a30^*t;J<vvvY#`Mq&I>Xb7jfVJ0752TX%3~+J@m>%nE#^~`(SN^yei>yj&
zQ=G6~NnmuwVHv+kY+TrMfh`WiJ>4$2`cg&^#^$>$uuGl2wEOi%=BMI5|An`mllQ!(
zb9q4sSDJOKSG&%pvzyi}7mtn0U>;I7>4<1Iz76pIpzA0*yvRJnB|^pAX+*ONlvreL
zxGd__eeLC?w6EU6nH~xjgcqmB4EzKBSTX6bXL7se4ITKOV*{z@bkwqP&V~L1?T<>I
zQ&yMuLRt~VoOYXhX`sj!4d$SQ2fOf0T8&chp35KeeaCrSgDL^KC%Wde4$S3CNk|~Q
zaSQe873IN>IDnSg(*C{|ZKsi=T%F=if>A0pA>^bs<WLX1o$Bi)-b^+lYJXe+xp~I$
z0)C?onEo6#h=vgBji@X5afIt<IS&)g-i%WgmsBzxbQRHQd=cJ=L`j)c;7mE>Xg9vd
z#xQGttM2*~1g^hLhgw#e;B#Eyf7R-V>In)p_ZU9(dsi5B@!#iZa*KVc95dmCkAje$
zRW_1JkR~Q@c<wE~BVVUjf7NeK!zFtLCf-OLerZl*QJ|N^;-JzG2FE$i+y(vr-NVtR
zO`q61)fZfgw^J#XZebo6l<m}5qt}lMGVlhg>DNnh9g~`ky`u7;ur`>KL=WYo7Zpnv
zEkq{nG|hb3XbVtf{4Z^NFzQsGPK4h$>QR&MaL!<oZP3Xg_Dg!=x{Xgi_K+ud%y4Up
zRLKEpPG}??4k#9*n)iTGEHURfsOJl8uUT5&+A<*$iK{VXF=;R0e3I*iUD&Y_Cg!>l
zsaSUOl1LEv-ZYZ1-3fW;R(iA~bdtkQV8PbitFp>j1;3LZDPB?rXUS<0;v0J-dwCz7
z+}c+@et<k)I(Z5^s3Q!A^<fE-nP_GRv(dt+6wrsR?x?C>AxOTFT$d}4We1d9TsmA)
zxRrd+FhXBOZ_7`Y5i6I};!o<WMwh-AQeMT7#g^od+AD_tQ{ZpVipYHXmUGD4rFLe#
zEgxdn+0!^s-aNH73hKznZ#pai+*<c!i}e||`o|7M;ukc}pkfL>&AWpTQ#G)>tyj5<
z>(XGEvaFYvat?@CaN6Z_JV1U(2TrQ9rjBvg?-Nzw<Bw-82Y6A;xMT)}JE8A^#4<GL
zIfkyuy(mq+f-KfbwonaR`lmq<-WuU~MDR6j{`F?NCt11mbI2$|Jug-fT^;^$n^;&q
zlPUFPiP__LTUaO~PYD1#n%NXK?1QD?4NwqwYGe7g!alVgua*jEV;0OE^xP$SB_KAb
zWowmJP$sGD8nm^J@4$sT-NW?lw*k<CMf5yq{)~mRyaHR}g3*PVdU=NzNAYtkfux;d
zOC2daX6R;mlzJVB(tGAmXOyAiGq|Yd0&Gt%haKMPvRIqbN!M{%L+DWb2!Xe~?YkoE
zNo0cg?X(uttXDwWb>NB_G)DRB>Fz{R!^YL+oq(NM|MB`Cuxv%rg^$T_*F}b@z>psU
zQa^Cj6>ht8m)@n*W$W4cU}<um^y)B!jr4FLtDO5QwaMJ=M6f&GjWh>%SqUV73>*l*
zN9uI+2iO!K?%=E;mM!Azr7~z+$==3+mx&j<n8-6j!EKB_7HnMv-pP#iVf;tv-jsqa
zkl5VM(twaC{o|(-$**1UNNVOxQwMWEwwy^tc3+bfJ5g#T#%rjyUPdH_S#m%+i?{*S
zUqQ!5(aZH2h1fBz-mLL@{zZ8qy)FOH5$|%_#`BGaox^^HjmYChiAthw`E<69Ur5R&
zOwJQPiJ2`x68$tOD*3`xy`LQOKC2ymI^DsK<hEBYc`)oS<q{uMSMYZDp~aeSLPn&H
zJD8zrT<@sKdNAWwO6sNiHSl7X1TvMCmFtbY?6)pE2W^WKCtdQzFU16`Q!5sPN9qdb
zvaH~n4QZld1dJ`36O&A!alLYilBoJBT3~yGJ*mcbz9T~O4~eepM@?g=H+m}V=aK3Y
zyn1s>+6a0=JAB9-(J$d%effUqdVno;OE~!WN$^IuS^4;++Vm!Cs$K+w^$mNdXw3Wn
z@<EIkcP7>Q(1j2~@^}pL;*Z+0L2|~`{kwRfZjSZrBF9-?G8qMr?AO!7Z5ufRf%>z(
zvq#}b^r$km`vwl<Bm`rV?-<?c<;wY8$n8*qMM4@40lG*Wdtg?7d<#YS+Lgq8@bqu?
zq%XTQgd6CiJjJt<K)?0SUtTYt7*1QYQbCx&I692@_GF#K^9DCXPlDZ(2Ir(H2k_LO
zSns!sOf{G5jmU{zv;Wj`o=Q1Y^Gtxh=b3#nr!MYMQ55070#LxRd@Ygn8R$F%o}(>b
zA&q@=fq({(9CTphILDuMx2~z4j)qh90_4VC)NPdJ88{SE{HA?>MZX6NLr-UB^4sie
zv;S5Wf)iZL!lCFGb4w48#LM)%C%im7jsP7vOW)*(*!JQ&6<f}gq;Ok2^u^uJy0{Zr
zNv(sRNsPKZtUo0W{43j7D&QvMXrHbo!Ct(x=_?b3HfIbK@qc9cPc|@$V06#OEnpO^
zA)iw#9sgCWtQ_!jE*!jS@%H)Hg@uJo1^;AlReW@0y-N!HVPjE~Zfy4XMz9OmHh!34
zZ3xvs=&+b20w7h$_&N?0*bnE*VIl>Ku+C@Ygph9s%{z3tmL<o8Ed+7{+2=CTxDKO|
z5e4`(tbK1jy^Nj{-cVo4c7JCgn#r`_eZhVsM88>gVp661(g?n>@nHMq7H1HF<bcYS
z{R$a88?Zklm2py#{_fm7*nH!BeF*<F25+?Yt49L;)@ag)oU1#H)kVfJHO^;UC7FY5
zyZQ@~3|rcoY$>M=y3&OXTD2=i%<6HrOGRE}C!=MMor%^?RHNxir;5={FUNgthW~m1
z{%tOU3ofHpR~w#dS0AoN;D?tFcN}+*eLZKse}(19AdFcfyNq;RktO!h0s3zFiK~0J
z;PB1MbguP}EPJf{lTx%B+@NCqbcqZ4`2>gzl4+fW`V;LNVH~<tT{*DWVyUy#Z|BY;
z22tVt&G@0*d6SMP_w(~$Pf-w%pEdCD*XhmdhmQn}<Hy&G5)s**J$9zh&UO0rt-b5b
zVF~*Sw`TAA`X^Q1_3^_1h@PJ_RY#lr1ZgzUWY6mzw0ZxFQt8&l$|EFcuOdpxiQ>S$
z3hP?GvP6`8AWtZh=hjjX>h&cV6UO0frzSO%Xa8R&H7=k2!K7wHD`(T9e0QdNl$h3!
zoCOr5Jv}1_;}V(<NQ5RO*ZAsocH!+g88t=uE;4R*_oH>;trOVu))xn#-ovK+UXLfT
zwe)#ez%xbkF6h1bi?`7YG>!qcmSb~cr+QUe$clB5HrjmP;H1vmixXyM!g3PhwNabE
z0~>;CosIAwc9_0HE5&&&??z2%^ap+d@Xo-sr$AgoXXZxK{rmLcFbB@}H<v@ARM?uR
z0}a?8jg{MfyU!MktI~N%^Q4-g(2IE#<>#_sy;W{J6h4Tzw-x7hLT;U?Hkyc?$l!yr
z5$JmEVqW4qfA#5`I^7RvHmB9Z7_7RA6Vi0wIcNs=Ppb<J##>%1dvL*yaY=<d7f9z>
zeEfQWkCQ#i+ROprJ2xoShqFGGty1Bne_G<!EYEoJQTgs>ret}JW_QctZmwOGK970-
zJHL@3O~pd#_{+#_a<S4!{Q0z9iX*s`wCFHC6BP<|OP{z5DRdS-v>VYxL}7hT+SKI<
zi{!f5@(%3H<UE7jSL1Hv=|}HK0#83_4SG4tC9Q=->lD^wyI86Q#4z4y<Xa4smnD{l
zTB^b!Pj<`I(E^W_A5#@?TE9-1UQ$5dw6WdcP{uIw(g27J_xMQjH0qGUkE#c6i+-}?
zLYii5T|TJh)OB$=SW)*<@?5-r^+%i22)JRhL`r^lZ)PVnL0NrRQ#gPiGBSrnVJQ<*
zZ+DMT%l9Pp`j!u^I9tm0qNl@a!%|X3Wz%y#U9xZ4Rhr{^$Zf5!g<4-Xa*@7K#s49u
z)5Ci3O<sDKrLaYZ#@^%S&%mTS(`eOPZ_Z%>oBM;bALyUd+(=?P%RQ+PmD>N80Zl<w
z=CVdgsz7{Yx0UqQ3|3wmAolaS7lZtnj_qkintg>|_1XjYUuegDdSvxQSi5<bVs3>3
zokEN9lJC9E{*7;hzMICT#mGvA%Yf>+euEZ2X98b;Dpkf4tp?N8GAvtmSP4Q?!z7}z
z1KM!(qV1)zC3(ZAbWADRA#v5$LeO2ZFs@hg1~attI^~BFDFy$fYG4#|?K~u?`n9&0
z9zW+oBF)pKlqB++;M(MK=Po=Z!;!j6kv?&H#;_lld92U=SNK_JX{j@}#vRk$F~^T8
z8QZVhHN)%kr4Cp#W^h3mnKrBPt#n|IVh)RpGLR5Xp4W(T5R-s^Z6fU+Z#wG9h14F_
zWxbHPO=xwLCd9qX0a!)X5f|ELZtp{sApLc8NVnx(=ZXzGZzKe$`B*<K*0c>%|NOah
zMi&hW!mH|4xIAs{axtS?pIzUV%6TFOrsG}Sqhve$_SD(=ef3w)Ke;7VYbhPqoQ5Sw
zi^YP)k2rX<eW+Gvpdux@ov&ykpBarzRXwn|ht{XcPurT>03KX_ygt5?teHr0jW*(e
z)vb|h5%*k>V1PLyX?>~+Blc1*_XcOEBih>3Em2CZk%eBDb>zc<310#?MmUxEf&2qm
zbMyz<==@~-BE9N-tNdUxXGOdO#fSc_JO|N)n~C)W?W4lNOsF(5JqUi>ESgdILbALx
zXBL>VQEb<C4oEOfp}`rUIaJ@Y-~A@`GQ=%X?fQJ+?s{BBUCTE#dTd*WiC+*WA%5po
zqO;+JcKtgy`~0eh05gYmztXnOs|*bAzN`g1rL_5;ZAzFKl;;YAo161Tnwc*J6W*KN
zsUb)GdkPqd+>=Xh|N2HEypijg^iXU6$}mN_pHNy>a~24&h@L~42UHyEdd~PFGuA^?
zE^n!qXOTGl8}W@YMY>d7UTalwE@@+-3as7bZ+xY_DGbbVeS_^#)p#lq+5IcIPpPdK
zF6>RnGCO$}k=EEV1CF|8&Knr!+2Q&A40TUTq#)_}mS}f!QTQV!2f*LZ_nlEle4p#P
zn?cgbE5OIrNw*VtU0dZ}whviYRm7&-KV@2d%(PXU6c+|f19);vV+fhPEV&|g$R2Wz
z92{AY$}dh5SNZj>Q7#=WXHfuNBh{}J`;XjbkwsE5)v=0$6O7(-(2_Sg+T?gOOUq-P
ztfi!!oOvaT$>Gm!8$olD6k6VGo)p3S^k)rv8%RV~JsG^0G>sz#A<{m>rd;X9{0IXT
zG!oI>SmQmqx*DOnqHdUd_(sh^vo$uem2qsW0`qe{g`L-R@#@8B%VEseC;yC-X$#zb
zp-FwSUyT2n1e?;2!1M@(84fYVJBF|5`P6y)CA5rF2jcrA(5<%@2dxcN8rF|}x}GF(
z0ik9WZKm4ZYrk2d*9J7f7j576kk&i8&*pNUbD77Yi;*pm6C2y$q10_*;TzAl;jWiy
z+8GUhEZvwhGMc+aQnYhrVHK1MdBXt5r>|XJtR+umfAY*RxmQp=#?B+h=wVvq5+7~j
z<UOyZ7V4AFe(COgA1&f=_w;xVombZ~fO}*?^~m>LcK*9sX@AuwT)z0z6&7^(O|RZB
zFe%BY_YU5+ayf>`Ky`FGg&3<dZnNo~&h3ZtYj`7ba>+;ZlUMuXm$0;8JVuatA6E@+
zAq0{tQ9{0Pfdbg0x}p7Tj*X8QUnW{2W+@`8xT#$iXtHwE+4F)Hg$-u;!r4Inp>kJ-
zqW$yO`>LQV$rQza*Jve$l_*Gdw1KX1!%$#}LtAS>Decoi{d*N26NfiKrVqyz!YX7{
zZ;SQ@XLE3tJ}aebV?9W{8V{S%)o>3^Bag7;e$7W4HD180p}YNO#39PvP*)xGB`xn&
zqS#Pb$@GCFx9oW5p9ad*ylLwjIKWHRL|^L~L|nsY+uq)ub?=&%3BS&*#5?Zl&oxrC
zapSbLOZMa6Z*YiBGsoyxN73fZ967S>*II1#31M@x$8ROMiW&6{cj<tCPll~BA-d0D
zP*3<x{~(X++e|cK))3RrN;9c)T>?T`^F6gjFf#~_c$wbZf^T-P(~Y4$2<T<)`ZzS^
zmP*)*9x}suayp`sdd>Sx*Pv5kv0o}<9v33c8VgozQ~2dT51W`i!?wrr-4A2pDIVwv
z1$Z6p$>HZm3v@ljZ;#hSVv75mR<kpri9N)9F{FIRa7+#%FGC9cQB?N>oEQPk3flX8
zCq5%XLU7H7qJ0*XmEk-EH1-}HnM;n27P-K-)52f>s8y$HA&p6S#q{~{Xjh7c#2JMq
zaaVdjjOOmY)yyCDC*e9gTS5JJ$<W*;<h=rt&<<%jwoVl2Eq!kW#f5N6OZ^FX4XJ~<
zt&df`g?ns<Q4TeSH5=RMZnM>Vqz{~CrV2PmX8G({;zEx%<OH(@cz))%!Z2P-$;*q=
z3=h%xp*pvCaos$3JxcY=nKNmcD)%1Yd8}JRO~4ZeUA=ft+GAN*O3@q_LLG`g=u__U
zWLkJS6N4I;Cioe>N?56aTmJMv%N5Mc0Unhu494g1IrJVgK?e$I>gv8Yf9y3>Kidn5
zUth1J`%aA4eqqISae|WU@Z9OK&&H;BZ8lslP#yenr-#CrH!|e+$xhskf4V&+|MlsQ
aKb2CVJ7z_#Q77P4p3zj*RVlx38T=pYLwFAW


From 3f8d5727c9dfaaee940c69061396a5f19c6c9dba Mon Sep 17 00:00:00 2001
From: Kelly Kelly <kelly@basistech.com>
Date: Tue, 17 Sep 2019 14:56:08 -0400
Subject: [PATCH 154/192] Removed call to super.createSheet.

---
 .../autopsy/communications/relationships/ContactNode.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/ContactNode.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/ContactNode.java
index 33b9d16724..462bb6f8fa 100755
--- a/Core/src/org/sleuthkit/autopsy/communications/relationships/ContactNode.java
+++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/ContactNode.java
@@ -70,7 +70,7 @@ final class ContactNode extends BlackboardArtifactNode {
 
     @Override
     protected Sheet createSheet() {
-        Sheet sheet = super.createSheet();
+        Sheet sheet = new Sheet();
         
         final BlackboardArtifact artifact = getArtifact();
         BlackboardArtifact.ARTIFACT_TYPE fromID = BlackboardArtifact.ARTIFACT_TYPE.fromID(artifact.getArtifactTypeID());

From dda667d064930bd536a690ad291e729f2b1439d7 Mon Sep 17 00:00:00 2001
From: Ann Priestman <apriestman@basistech.com>
Date: Tue, 17 Sep 2019 15:10:46 -0400
Subject: [PATCH 155/192] Updated portable case doc

---
 .../images/portable_case_folder.png           | Bin 12149 -> 14228 bytes
 docs/doxygen-user/portable_case.dox           |   6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/doxygen-user/images/portable_case_folder.png b/docs/doxygen-user/images/portable_case_folder.png
index a02bd4e087bcbacf3ab2ae96422d5939ab65420c..1e3a5b98df05eb8df9607de5b48f31217540cbce 100644
GIT binary patch
literal 14228
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%0AMNnv18)K88NNC8q<Q
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

literal 12149
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

diff --git a/docs/doxygen-user/portable_case.dox b/docs/doxygen-user/portable_case.dox
index b476206a38..34dcc7bf57 100644
--- a/docs/doxygen-user/portable_case.dox
+++ b/docs/doxygen-user/portable_case.dox
@@ -2,7 +2,7 @@
 
 \section portable_case_overview Overview
 
-A portable case is a partial copy of a normal Autopsy case that can be opened from anywhere. It contains a subset of the data from its original case and has been designed to make it easy to share relevant data with other examiners.  
+A portable case is a partial copy of a normal Autopsy case that can be opened from anywhere. It contains a subset of the data from its original case and has been designed to make it easy to share relevant data with other examiners. Portable cases will contain a \ref report_case_uco report detailing the contents of the portable case.
 
 
 The general use case is as follows:
@@ -29,7 +29,7 @@ A portable case can contain tagged files and results and data from the Interesti
 
 \image html portable_case_interesting_items.png
 
-You can tag any additional files you want to include in the portable case. See the \ref tagging_page page for details on how to create tags. You can see what tags you've added in the \ref tree_viewer_page.
+You can tag any additional files you want to include in the portable case. See the \ref tagging_page page for details on how to create tags. Note that the outlines from \ref image_tagging "image tags" will also be visible in the portable case. You can see what tags you've added in the \ref tree_viewer_page.
 
 \image html portable_case_tags.png
 
@@ -39,7 +39,7 @@ The portable case will be placed in the "Reports" folder in the current case.
 
 \image html portable_case_report_panel.png
 
-Here you can see an unpackaged portable case. It will be named with the original case name plus "(Portable)". The portable case is initially missing many of the normal Autopsy folders - these will be created the first time a user opens it. 
+Here you can see an unpackaged portable case. It will be named with the original case name plus "(Portable)". The portable case is initially missing many of the normal Autopsy folders - these will be created the first time a user opens it. It will however start with a "Reports" folder that contains an automatically generated \ref report_case_uco report.
 
 \image html portable_case_folder.png
 

From 7d2aedcf95f390bf41d22597e382c4ce60718d30 Mon Sep 17 00:00:00 2001
From: Kelly Kelly <kelly@basistech.com>
Date: Tue, 17 Sep 2019 15:13:40 -0400
Subject: [PATCH 156/192] removed commented out code

---
 .../timeline/ui/detailview/EventNodeBase.java | 26 -------------------
 1 file changed, 26 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventNodeBase.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventNodeBase.java
index 1977d3ce6d..19aada1393 100755
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventNodeBase.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventNodeBase.java
@@ -293,32 +293,6 @@ public abstract class EventNodeBase<Type extends DetailViewEvent> extends StackP
 
                 @Override
                 protected String call() throws Exception {
-//                    HashMap<String, Long> hashSetCounts = new HashMap<>();
-//                    if (tlEvent.getEventIDsWithHashHits().isEmpty() == false) {
-//                        try {
-//                            //TODO:push this to DB
-//                            for (TimelineEvent tle : eventsModel.getEventsById(tlEvent.getEventIDsWithHashHits())) {
-//                                Set<String> hashSetNames = sleuthkitCase.getContentById(tle.getFileObjID()).getHashSetNames();
-//                                for (String hashSetName : hashSetNames) {
-//                                    hashSetCounts.merge(hashSetName, 1L, Long::sum);
-//                                }
-//                            }
-//                        } catch (TskCoreException ex) {
-//                            LOGGER.log(Level.SEVERE, "Error getting hashset hit info for event.", ex); //NON-NLS
-//                        }
-//                    }
-//                    String hashSetCountsString = hashSetCounts.entrySet().stream()
-//                            .map((Map.Entry<String, Long> t) -> t.getKey() + " : " + t.getValue())
-//                            .collect(Collectors.joining("\n"));
-
-//                    Map<String, Long> tagCounts = new HashMap<>();
-//                    if (tlEvent.getEventIDsWithTags().isEmpty() == false) {
-//                        tagCounts.putAll(eventsModel.getTagCountsByTagName(tlEvent.getEventIDsWithTags()));
-//                    }
-//                    String tagCountsString = tagCounts.entrySet().stream()
-//                            .map((Map.Entry<String, Long> t) -> t.getKey() + " : " + t.getValue())
-//                            .collect(Collectors.joining("\n"));
-
                     return Bundle.EventNodeBase_tooltip_text(getEventIDs().size(), getEventType(), getDescription(),
                             TimeLineController.getZonedFormatter().print(getStartMillis()),
                             TimeLineController.getZonedFormatter().print(getEndMillis() + 1000));

From f542ca7520f9faf71cec235530668d87549f224f Mon Sep 17 00:00:00 2001
From: Kelly Kelly <kelly@basistech.com>
Date: Tue, 17 Sep 2019 15:29:29 -0400
Subject: [PATCH 157/192] Updates based on review comment

---
 .../timeline/ui/detailview/EventNodeBase.java        |  5 -----
 .../ui/filtering/datamodel/RootFilterState.java      | 12 ------------
 2 files changed, 17 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventNodeBase.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventNodeBase.java
index 19aada1393..3ee088f2ad 100755
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventNodeBase.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventNodeBase.java
@@ -24,15 +24,12 @@ import com.google.common.collect.Sets;
 import com.google.common.eventbus.Subscribe;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutionException;
 import java.util.logging.Level;
-import java.util.stream.Collectors;
 import javafx.animation.KeyFrame;
 import javafx.animation.KeyValue;
 import javafx.animation.Timeline;
@@ -82,9 +79,7 @@ import static org.sleuthkit.autopsy.timeline.ui.detailview.EventNodeBase.show;
 import static org.sleuthkit.autopsy.timeline.ui.detailview.MultiEventNodeBase.CORNER_RADII_3;
 import org.sleuthkit.autopsy.timeline.ui.detailview.datamodel.DetailViewEvent;
 import org.sleuthkit.datamodel.SleuthkitCase;
-import org.sleuthkit.datamodel.TskCoreException;
 import org.sleuthkit.datamodel.TimelineEventType;
-import org.sleuthkit.datamodel.TimelineEvent;
 
 /**
  *
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/RootFilterState.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/RootFilterState.java
index d33a32ed21..e3c8b8d6d5 100755
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/RootFilterState.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/RootFilterState.java
@@ -161,18 +161,6 @@ public class RootFilterState extends CompoundFilterState<TimelineFilter, RootFil
                 Lists.transform(getSubFilterStates(), FilterState::getActiveFilter));
     }
 
-//    @SuppressWarnings("rawtypes")
-//    public boolean hasActiveHashFilters() {
-//        return hashHitsFilterState.isActive();
-//              // && hashHitsFilterState.getSubFilterStates().stream().anyMatch(FilterState::isActive);
-//    }
-//
-//    @SuppressWarnings("rawtypes")
-//    public boolean hasActiveTagsFilters() {
-//        return tagsFilterState.isActive();
-//             //  && tagsFilterState.getSubFilterStates().stream().anyMatch(FilterState::isActive);
-//    }
-
     @Override
     public ObservableList<FilterState<? extends TimelineFilter>> getSubFilterStates() {
         ImmutableMap<FilterState<? extends TimelineFilter>, Integer> filterOrder

From e41e53b478c422a8c280fdb93a8c9a672d131d42 Mon Sep 17 00:00:00 2001
From: William Schaefer <wschaefer@basistech.net>
Date: Tue, 17 Sep 2019 15:56:32 -0400
Subject: [PATCH 158/192] 5338 rename AccessLimiter class to satisy codacy
 complaint

---
 .../{AccessLimiter.java => AccessLimiterUtils.java}           | 4 ++--
 Core/src/org/sleuthkit/autopsy/casemodule/Case.java           | 2 +-
 .../org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename Core/src/org/sleuthkit/autopsy/casemodule/{AccessLimiter.java => AccessLimiterUtils.java} (95%)

diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AccessLimiter.java b/Core/src/org/sleuthkit/autopsy/casemodule/AccessLimiterUtils.java
similarity index 95%
rename from Core/src/org/sleuthkit/autopsy/casemodule/AccessLimiter.java
rename to Core/src/org/sleuthkit/autopsy/casemodule/AccessLimiterUtils.java
index 9a84ac4657..3b2a201e07 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/AccessLimiter.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/AccessLimiterUtils.java
@@ -26,7 +26,7 @@ import org.sleuthkit.autopsy.coreutils.PlatformUtil;
  * Class for methods to check if access should be limited to a feature
  *
  */
-final class AccessLimiter {
+final class AccessLimiterUtils {
 
     private final static String MULTI_USER_ACCESS_FILE_NAME = "mualimit"; // NON-NLS
     private final static String MULTI_USER_ACCESS_FILE_PATH = Paths.get(PlatformUtil.getUserConfigDirectory(), MULTI_USER_ACCESS_FILE_NAME).toString();
@@ -43,7 +43,7 @@ final class AccessLimiter {
     /**
      * Private constructor for a utility class
      */
-    private AccessLimiter() {
+    private AccessLimiterUtils() {
         //private constructer left empty intentionally
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java
index 2fb17fdd36..0a4586dd42 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java
@@ -1049,7 +1049,7 @@ public class Case {
                 /*
                  * Enable the case-specific actions.
                  */
-                CallableSystemAction.get(AddImageAction.class).setEnabled(Case.getCurrentCase().getMetadata().getCaseType() == CaseType.SINGLE_USER_CASE || !AccessLimiter.limitMultiUserAccess());
+                CallableSystemAction.get(AddImageAction.class).setEnabled(Case.getCurrentCase().getMetadata().getCaseType() == CaseType.SINGLE_USER_CASE || !AccessLimiterUtils.limitMultiUserAccess());
                 CallableSystemAction.get(CaseCloseAction.class).setEnabled(true);
                 CallableSystemAction.get(CaseDetailsAction.class).setEnabled(true);
                 CallableSystemAction.get(DataSourceSummaryAction.class).setEnabled(true);
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java
index f49f91a490..789913d78a 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java
@@ -61,7 +61,7 @@ final class NewCaseVisualPanel1 extends JPanel implements DocumentListener {
      */
     void readSettings() {
         caseNameTextField.setText("");
-        if (UserPreferences.getIsMultiUserModeEnabled() && !AccessLimiter.limitMultiUserAccess()) {
+        if (UserPreferences.getIsMultiUserModeEnabled() && !AccessLimiterUtils.limitMultiUserAccess()) {
             multiUserCaseRadioButton.setEnabled(true);
             multiUserCaseRadioButton.setSelected(true);
         } else {

From 029dc57e8fc9cee9dfdadfde86978008125a941b Mon Sep 17 00:00:00 2001
From: Akira Ueda <ue@gol.com>
Date: Wed, 18 Sep 2019 10:54:58 +0900
Subject: [PATCH 159/192] Fix Codacy issues

---
 .../autopsy/keywordsearch/HighlightedText.java  |  2 +-
 .../autopsy/keywordsearch/Ingester.java         |  4 ++--
 .../autopsy/keywordsearch/LanguageDetector.java |  4 ++++
 .../LanguageSpecificContentIndexingHelper.java  |  5 ++++-
 .../LanguageSpecificContentQueryHelper.java     | 16 ++++++++++++----
 .../{MiniChunks.java => MiniChunkHelper.java}   |  7 ++++++-
 .../{QueryParser.java => QueryTermHelper.java}  | 14 ++++++++++++--
 .../sleuthkit/autopsy/keywordsearch/Server.java |  3 +--
 .../LanguageSpecificContentQueryHelperTest.java |  3 +++
 ...ChunksTest.java => MiniChunkHelperTest.java} | 17 ++++++++++-------
 10 files changed, 55 insertions(+), 20 deletions(-)
 rename KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/{MiniChunks.java => MiniChunkHelper.java} (91%)
 rename KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/{QueryParser.java => QueryTermHelper.java} (90%)
 rename KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/{MiniChunksTest.java => MiniChunkHelperTest.java} (67%)

diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedText.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedText.java
index 0532bae16a..99d4f40820 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedText.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedText.java
@@ -440,7 +440,7 @@ class HighlightedText implements IndexedText {
                         if (contentHighlights == null) {
                             highlightedContent = "";
                         } else {
-                            int hitCountInMiniChunk = LanguageSpecificContentQueryHelper.queryChunkTermfreq(keywords, MiniChunks.getChunkIdString(contentIdStr));
+                            int hitCountInMiniChunk = LanguageSpecificContentQueryHelper.queryChunkTermfreq(keywords, MiniChunkHelper.getChunkIdString(contentIdStr));
                             String s = contentHighlights.get(0).trim();
                             // If there is a mini-chunk, trim the content not to show highlighted text in it.
                             if (0 < hitCountInMiniChunk) {
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Ingester.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Ingester.java
index 6bae2abcb6..be0b93088d 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Ingester.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Ingester.java
@@ -152,12 +152,12 @@ class Ingester {
         try (BufferedReader reader = new BufferedReader(sourceReader)) {
             Chunker chunker = new Chunker(reader);
             while (chunker.hasNext()) {
-                Chunk chunk = chunker.next();
-
                 if (context != null && context.fileIngestIsCancelled()) {
                     logger.log(Level.INFO, "File ingest cancelled. Cancelling keyword search indexing of {0}", sourceName);
                     return false;
                 }
+
+                Chunk chunk = chunker.next();
                 Map<String, Object> fields = new HashMap<>(contentFields);
                 String chunkId = Server.getChunkIdString(sourceID, numChunks + 1);
                 fields.put(Server.Schema.ID.toString(), chunkId);
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageDetector.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageDetector.java
index 391a84bb0f..f527a2fc0e 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageDetector.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageDetector.java
@@ -30,6 +30,10 @@ import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.util.Optional;
 
+/**
+ * Detects the language of the given contents. Only languages which should be indexed to a corresponding
+ * language-specific field are detected.
+ */
 class LanguageDetector {
 
     private com.optimaize.langdetect.LanguageDetector impl;
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentIndexingHelper.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentIndexingHelper.java
index b17aa4c3b1..d0988c83f3 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentIndexingHelper.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentIndexingHelper.java
@@ -29,6 +29,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
+/**
+ * A helper class to support indexing language-specific fields.
+ */
 class LanguageSpecificContentIndexingHelper {
 
     private final LanguageDetector languageDetector = new LanguageDetector();
@@ -63,7 +66,7 @@ class LanguageSpecificContentIndexingHelper {
         }
 
         try {
-            updateDoc.setField(Server.Schema.ID.toString(), MiniChunks.getChunkIdString(baseChunkID));
+            updateDoc.setField(Server.Schema.ID.toString(), MiniChunkHelper.getChunkIdString(baseChunkID));
 
             // index the chunk to a language specific field
             updateDoc.addField(Server.Schema.CONTENT_JA.toString(), chunk.toString().substring(chunk.getBaseChunkLength()));
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelper.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelper.java
index 644d77248e..b008e6767b 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelper.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelper.java
@@ -36,8 +36,13 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+/**
+ * A helper class to support querying documents which have language-specific fields.
+ */
 class LanguageSpecificContentQueryHelper {
 
+    private LanguageSpecificContentQueryHelper() {}
+
     private static final List<Server.Schema> QUERY_FIELDS = new ArrayList<>();
     private static final List<Server.Schema> LANGUAGE_SPECIFIC_CONTENT_FIELDS
         = Collections.singletonList(Server.Schema.CONTENT_JA);
@@ -48,6 +53,9 @@ class LanguageSpecificContentQueryHelper {
         QUERY_FIELDS.addAll(LANGUAGE_SPECIFIC_CONTENT_FIELDS);
     }
 
+    /**
+     * Holds query response for later processes related to language-specific fields
+     */
     static class QueryResults {
         List<SolrDocument> chunks = new ArrayList<>();
         Map</* ID */ String, SolrDocument> miniChunks = new HashMap<>();
@@ -74,8 +82,8 @@ class LanguageSpecificContentQueryHelper {
 
     static void updateQueryResults(QueryResults results, SolrDocument document) {
         String id = (String) document.getFieldValue(Server.Schema.ID.toString());
-        if (MiniChunks.isMiniChunkID(id)) {
-            results.miniChunks.put(MiniChunks.getBaseChunkID(id), document);
+        if (MiniChunkHelper.isMiniChunkID(id)) {
+            results.miniChunks.put(MiniChunkHelper.getBaseChunkID(id), document);
         } else {
             results.chunks.add(document);
         }
@@ -124,11 +132,11 @@ class LanguageSpecificContentQueryHelper {
 
     static void configureTermfreqQuery(SolrQuery query, String keyword) throws KeywordSearchModuleException, NoOpenCoreException {
         // make a request to Solr to parse query.
-        QueryParser.Result queryParserResult = QueryParser.parse(keyword, LANGUAGE_SPECIFIC_CONTENT_FIELDS);
+        QueryTermHelper.Result queryParserResult = QueryTermHelper.parse(keyword, LANGUAGE_SPECIFIC_CONTENT_FIELDS);
         query.addField(buildTermfreqQuery(keyword, queryParserResult));
     }
 
-    static String buildTermfreqQuery(String keyword, QueryParser.Result result) {
+    static String buildTermfreqQuery(String keyword, QueryTermHelper.Result result) {
         List<String> termfreqs = new ArrayList<>();
         for (Map.Entry<String, List<String>> e : result.fieldTermsMap.entrySet()) {
             String field = e.getKey();
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/MiniChunks.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/MiniChunkHelper.java
similarity index 91%
rename from KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/MiniChunks.java
rename to KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/MiniChunkHelper.java
index 0545a8b032..842026b9a7 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/MiniChunks.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/MiniChunkHelper.java
@@ -18,7 +18,12 @@
  */
 package org.sleuthkit.autopsy.keywordsearch;
 
-class MiniChunks {
+/**
+ * Mini-chunk related methods.
+ */
+class MiniChunkHelper {
+
+    private MiniChunkHelper() {}
 
     static String SUFFIX = "_mini";
 
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/QueryParser.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/QueryTermHelper.java
similarity index 90%
rename from KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/QueryParser.java
rename to KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/QueryTermHelper.java
index fa0469c0f9..264b5a163f 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/QueryParser.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/QueryTermHelper.java
@@ -30,10 +30,17 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
- * Parse query using Solr
+ * Get terms from query using Solr.
+ *
+ * This class is used to find matched terms from query results.
  */
-class QueryParser {
+class QueryTermHelper {
 
+    private QueryTermHelper() {}
+
+    /**
+     * Result of {@link #parse} method
+     */
     static class Result {
         /**
          * field name -> [term]
@@ -43,6 +50,9 @@ class QueryParser {
 
     /**
      * Parse the given query string on Solr and return the result
+     *
+     * @param query query to parse
+     * @param fields field names to use for parsing
      */
     static Result parse(String query, List<Server.Schema> fields) throws KeywordSearchModuleException, NoOpenCoreException {
         Server server = KeywordSearch.getServer();
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
index ebe6015243..2db4bd6638 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
@@ -39,7 +39,6 @@ import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
@@ -1660,7 +1659,7 @@ public class Server {
             String id = KeywordSearchUtil.escapeLuceneQuery(Long.toString(contentID));
             final SolrQuery q
                     = new SolrQuery(Server.Schema.ID + ":" + id + Server.CHUNK_ID_SEPARATOR + "*"
-                        + " NOT " + Server.Schema.ID + ":*" + MiniChunks.SUFFIX);
+                        + " NOT " + Server.Schema.ID + ":*" + MiniChunkHelper.SUFFIX);
             q.setRows(0);
             return (int) query(q).getResults().getNumFound();
         }
diff --git a/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelperTest.java b/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelperTest.java
index b457348f54..4c7d64ece8 100644
--- a/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelperTest.java
+++ b/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelperTest.java
@@ -24,6 +24,9 @@ import java.util.Arrays;
 
 import static org.junit.Assert.assertEquals;
 
+/**
+ * tests for LanguageSpecificContentQueryHelper
+ */
 public class LanguageSpecificContentQueryHelperTest {
 
     @Test
diff --git a/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/MiniChunksTest.java b/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/MiniChunkHelperTest.java
similarity index 67%
rename from KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/MiniChunksTest.java
rename to KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/MiniChunkHelperTest.java
index f123c1622b..27336b8297 100644
--- a/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/MiniChunksTest.java
+++ b/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/MiniChunkHelperTest.java
@@ -24,20 +24,23 @@ import org.junit.Test;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class MiniChunksTest {
+/**
+ * tests for MiniChunkHelper
+ */
+public class MiniChunkHelperTest {
 
     @Test
     public void isMiniChunkID() {
-        assertTrue(MiniChunks.isMiniChunkID("1_1_mini"));
-        assertFalse(MiniChunks.isMiniChunkID("1_1"));
-        assertFalse(MiniChunks.isMiniChunkID("1"));
+        assertTrue(MiniChunkHelper.isMiniChunkID("1_1_mini"));
+        assertFalse(MiniChunkHelper.isMiniChunkID("1_1"));
+        assertFalse(MiniChunkHelper.isMiniChunkID("1"));
     }
 
     @Test
     public void getBaseChunkID() {
-        Assert.assertEquals("1_1", MiniChunks.getBaseChunkID("1_1_mini"));
-        Assert.assertEquals("1_1", MiniChunks.getBaseChunkID("1_1"));
-        Assert.assertEquals("1", MiniChunks.getBaseChunkID("1"));
+        Assert.assertEquals("1_1", MiniChunkHelper.getBaseChunkID("1_1_mini"));
+        Assert.assertEquals("1_1", MiniChunkHelper.getBaseChunkID("1_1"));
+        Assert.assertEquals("1", MiniChunkHelper.getBaseChunkID("1"));
     }
 
 }
\ No newline at end of file

From 1efe17014f703ed59939ed4b939090aaaa46a395 Mon Sep 17 00:00:00 2001
From: Akira Ueda <ue@gol.com>
Date: Wed, 18 Sep 2019 11:32:44 +0900
Subject: [PATCH 160/192] Fix a test case (expectation was not correct)

---
 .../keywordsearch/LanguageSpecificContentQueryHelperTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelperTest.java b/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelperTest.java
index 4c7d64ece8..d8c876592e 100644
--- a/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelperTest.java
+++ b/KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelperTest.java
@@ -49,11 +49,11 @@ public class LanguageSpecificContentQueryHelperTest {
 
     @Test
     public void buildTermfreqQuery() {
-        QueryParser.Result result = new QueryParser.Result();
+        QueryTermHelper.Result result = new QueryTermHelper.Result();
         result.fieldTermsMap.put("field1", Arrays.asList("term1"));
         result.fieldTermsMap.put("field2", Arrays.asList("term1", "term2"));
         assertEquals(
-            "termfreq:sum(termfreq(\"field1\",\"term1\"),termfreq(\"field1\",\"term1\"),termfreq(\"field1\",\"term1\"))",
+            "termfreq:sum(termfreq(\"field1\",\"term1\"),termfreq(\"field2\",\"term1\"),termfreq(\"field2\",\"term2\"))",
             LanguageSpecificContentQueryHelper.buildTermfreqQuery("query", result));
     }
 }

From 8a2b06722651515b53777275d91651e9935f6d2b Mon Sep 17 00:00:00 2001
From: Akira Ueda <ue@gol.com>
Date: Wed, 18 Sep 2019 12:55:50 +0900
Subject: [PATCH 161/192] Fix Codacy issues

---
 .../keywordsearch/LanguageSpecificContentQueryHelper.java       | 2 +-
 .../org/sleuthkit/autopsy/keywordsearch/MiniChunkHelper.java    | 2 +-
 .../org/sleuthkit/autopsy/keywordsearch/QueryTermHelper.java    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelper.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelper.java
index b008e6767b..a3ed8a7876 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelper.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LanguageSpecificContentQueryHelper.java
@@ -39,7 +39,7 @@ import java.util.stream.Collectors;
 /**
  * A helper class to support querying documents which have language-specific fields.
  */
-class LanguageSpecificContentQueryHelper {
+final class LanguageSpecificContentQueryHelper {
 
     private LanguageSpecificContentQueryHelper() {}
 
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/MiniChunkHelper.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/MiniChunkHelper.java
index 842026b9a7..9e958587cd 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/MiniChunkHelper.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/MiniChunkHelper.java
@@ -21,7 +21,7 @@ package org.sleuthkit.autopsy.keywordsearch;
 /**
  * Mini-chunk related methods.
  */
-class MiniChunkHelper {
+final class MiniChunkHelper {
 
     private MiniChunkHelper() {}
 
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/QueryTermHelper.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/QueryTermHelper.java
index 264b5a163f..39a050c47f 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/QueryTermHelper.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/QueryTermHelper.java
@@ -34,7 +34,7 @@ import java.util.stream.Collectors;
  *
  * This class is used to find matched terms from query results.
  */
-class QueryTermHelper {
+final class QueryTermHelper {
 
     private QueryTermHelper() {}
 

From ba24db42ba632c395300972bc68e6e6749886c8c Mon Sep 17 00:00:00 2001
From: Mark McKinnon <mark.mckinnon@davenport.edu>
Date: Wed, 18 Sep 2019 09:24:38 -0400
Subject: [PATCH 162/192] Update ArtifactSelectionDialog.java

Fix index out of bounds error
---
 .../autopsy/report/ArtifactSelectionDialog.java        | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/ArtifactSelectionDialog.java b/Core/src/org/sleuthkit/autopsy/report/ArtifactSelectionDialog.java
index b0655dfa2b..4ab05a11aa 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ArtifactSelectionDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ArtifactSelectionDialog.java
@@ -54,7 +54,7 @@ public class ArtifactSelectionDialog extends javax.swing.JDialog {
 
     /**
      * Creates new form ArtifactSelectionDialog
-     * 
+     *
      * @param parent The parent window
      * @param modal  Block user-input to other top-level windows.
      */
@@ -110,9 +110,11 @@ public class ArtifactSelectionDialog extends javax.swing.JDialog {
             @Override
             public void mousePressed(MouseEvent evt) {
                 int index = artifactList.locationToIndex(evt.getPoint());
-                BlackboardArtifact.Type type = model.getElementAt(index);
-                artifactTypeSelections.put(type, !artifactTypeSelections.get(type));
-                artifactList.repaint();
+                if (index >= 0) {
+                    BlackboardArtifact.Type type = model.getElementAt(index);
+                    artifactTypeSelections.put(type, !artifactTypeSelections.get(type));
+                    artifactList.repaint();
+                }
             }
         });
     }

From 3a50acb90003e728ae45036b9f87c7fda578f670 Mon Sep 17 00:00:00 2001
From: Kelly Kelly <kelly@basistech.com>
Date: Wed, 18 Sep 2019 10:42:39 -0400
Subject: [PATCH 163/192] cleaned up ContactNode

---
 .../autopsy/communications/relationships/ContactNode.java     | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/ContactNode.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/ContactNode.java
index 462bb6f8fa..985351ce10 100755
--- a/Core/src/org/sleuthkit/autopsy/communications/relationships/ContactNode.java
+++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/ContactNode.java
@@ -116,10 +116,6 @@ final class ContactNode extends BlackboardArtifactNode {
                 sheetSet.put(new NodeProperty<>(bba.getAttributeType().getTypeName(), bba.getAttributeType().getDisplayName(), "", bba.getDisplayString()));
             }
             
-            // Don't need these values to appear in the Contact property sheet.
-            sheetSet.remove("S");
-            sheetSet.remove("C");
-            
             List<Content> children = artifact.getChildren();
             if(children != null) {
                 int count = 0;

From 5050825193cf2d8a35e1cb2a7a4e6a0e3954cd14 Mon Sep 17 00:00:00 2001
From: Joe Ho <jkho@basistech.com>
Date: Wed, 18 Sep 2019 11:33:47 -0400
Subject: [PATCH 164/192] Make adding interesting files faster.

---
 .../dsp/AddLogicalImageTask.java              | 157 ++++++++++++------
 .../dsp/Bundle.properties-MERGED              |   3 +
 2 files changed, 109 insertions(+), 51 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/logicalimager/dsp/AddLogicalImageTask.java b/Core/src/org/sleuthkit/autopsy/logicalimager/dsp/AddLogicalImageTask.java
index 6c0bc5a0d6..67dfdccbdf 100644
--- a/Core/src/org/sleuthkit/autopsy/logicalimager/dsp/AddLogicalImageTask.java
+++ b/Core/src/org/sleuthkit/autopsy/logicalimager/dsp/AddLogicalImageTask.java
@@ -29,6 +29,7 @@ import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Level;
@@ -198,7 +199,8 @@ final class AddLogicalImageTask implements Runnable {
         }
 
         List<Content> newDataSources = new ArrayList<>();
-
+        Map<String, List<Long>> interestingFileMap = new HashMap<>();
+        
         if (imagePaths.isEmpty()) {
             createVHD = false;
             // No VHD in src directory, try ingest the root directory as local files
@@ -214,7 +216,7 @@ final class AddLogicalImageTask implements Runnable {
 
             try {
                 progressMonitor.setProgressText(Bundle.AddLogicalImageTask_addingExtractedFiles());
-                addExtractedFiles(dest, resultsPath, newDataSources);
+                interestingFileMap = addExtractedFiles(dest, resultsPath, newDataSources);
                 progressMonitor.setProgressText(Bundle.AddLogicalImageTask_doneAddingExtractedFiles());
             } catch (IOException | TskCoreException ex) {
                 errorList.add(ex.getMessage());
@@ -241,6 +243,14 @@ final class AddLogicalImageTask implements Runnable {
                     callback.done(DataSourceProcessorCallback.DataSourceProcessorResult.CRITICAL_ERRORS, addMultipleImagesTask.getErrorMessages(), emptyDataSources);
                     return;                    
                 }
+                try {
+                    interestingFileMap = getInterestingFileMapForVHD(Paths.get(dest.toString(), resultsFilename));
+                } catch (TskCoreException | IOException ex) {
+                    errorList.add(Bundle.AddLogicalImageTask_failedToAddInterestingFiles(ex.getMessage()));
+                    LOGGER.log(Level.SEVERE, "Failed to add interesting files", ex); // NON-NLS
+                    callback.done(DataSourceProcessorCallback.DataSourceProcessorResult.NONCRITICAL_ERRORS, errorList, emptyDataSources);
+                }
+                
             } catch (NoCurrentCaseException ex) {
                 String msg = Bundle.AddLogicalImageTask_noCurrentCase();
                 errorList.add(msg);
@@ -261,7 +271,7 @@ final class AddLogicalImageTask implements Runnable {
 
         try {
             progressMonitor.setProgressText(Bundle.AddLogicalImageTask_addingInterestingFiles());
-            addInterestingFiles(Paths.get(dest.toString(), resultsFilename), createVHD);
+            addInterestingFiles(interestingFileMap);
             progressMonitor.setProgressText(Bundle.AddLogicalImageTask_doneAddingInterestingFiles());
             if (createVHD) {
                 callback.done(addMultipleImagesTask.getResult(), addMultipleImagesTask.getErrorMessages(), addMultipleImagesTask.getNewDataSources());
@@ -332,13 +342,67 @@ final class AddLogicalImageTask implements Runnable {
         "# {0} - target image path", "AddLogicalImageTask.cannotFindDataSourceObjId=Cannot find obj_id in tsk_image_names for {0}",
         "# {0} - file number", "# {1} - total files", "AddLogicalImageTask.addingInterestingFile=Adding interesting files ({0}/{1})"
     })
-    private void addInterestingFiles(Path resultsPath, boolean createVHD) throws IOException, TskCoreException {
+    private void addInterestingFiles(Map<String, List<Long>> interestingFileMap) throws IOException, TskCoreException {
+        int lineNumber = 0;
+        List<BlackboardArtifact> artifacts = new ArrayList<>();
+        
+        Iterator<Map.Entry<String, List<Long>>> iterator = interestingFileMap.entrySet().iterator();
+        while (iterator.hasNext()) {
+
+            if (cancelled) {
+                // Don't delete destination directory once we started adding interesting files.
+                // At this point the database and destination directory are complete.
+                break;
+            }
+
+            Map.Entry<String, List<Long>> entry = iterator.next();
+            String key = entry.getKey();
+            String ruleSetName;
+            String ruleName;
+            String[] split = key.split("\t");
+            ruleSetName = split[0];
+            ruleName = split[1];
+
+            List<Long> fileIds = entry.getValue();
+            for (Long fileId: fileIds) {
+                if (lineNumber % 100 == 0) {
+                    progressMonitor.setProgressText(Bundle.AddLogicalImageTask_addingInterestingFile(lineNumber, totalFiles));
+                }
+                addInterestingFileToArtifacts(fileId, ruleSetName, ruleName, artifacts);
+                lineNumber++;
+            }
+            iterator.remove();
+        }
+        
+        try {
+            // index the artifact for keyword search
+            blackboard.postArtifacts(artifacts, MODULE_NAME);
+        } catch (Blackboard.BlackboardException ex) {
+            LOGGER.log(Level.SEVERE, "Unable to post artifacts to blackboard", ex); //NON-NLS
+        }
+    }
+
+    private void addInterestingFileToArtifacts(long fileId, String ruleSetName, String ruleName, List<BlackboardArtifact> artifacts) throws TskCoreException {
+        Collection<BlackboardAttribute> attributes = new ArrayList<>();
+        BlackboardAttribute setNameAttribute = new BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME, MODULE_NAME, ruleSetName);
+        attributes.add(setNameAttribute);
+        BlackboardAttribute ruleNameAttribute = new BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_CATEGORY, MODULE_NAME, ruleName);
+        attributes.add(ruleNameAttribute);
+        BlackboardArtifact artifact = this.currentCase.getSleuthkitCase().newBlackboardArtifact(BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT, fileId);
+        artifact.addAttributes(attributes);
+        artifacts.add(artifact);
+    }
+
+    @Messages({
+        "# {0} - file number", "# {1} - total files", "AddLogicalImageTask.searchingInterestingFile=Searching for interesting files ({0}/{1})"
+    })
+    private Map<String, List<Long>> getInterestingFileMapForVHD(Path resultsPath) throws TskCoreException, IOException {
         Map<Long, List<String>> objIdToimagePathsMap = currentCase.getSleuthkitCase().getImagePaths();
         imagePathToObjIdMap = imagePathsToDataSourceObjId(objIdToimagePathsMap);
-
+        Map<String, List<Long>> interestingFileMap = new HashMap<>();
+        
         try (BufferedReader br = new BufferedReader(new InputStreamReader(
                       new FileInputStream(resultsPath.toFile()), "UTF8"))) { // NON-NLS
-            List<BlackboardArtifact> artifacts = new ArrayList<>();
             String line;
             br.readLine(); // skip the header line
             int lineNumber = 2;
@@ -363,47 +427,36 @@ final class AddLogicalImageTask implements Runnable {
                 String parentPath = fields[8];
 
                 if (lineNumber % 100 == 0) {
-                    progressMonitor.setProgressText(Bundle.AddLogicalImageTask_addingInterestingFile(lineNumber, totalFiles));
+                    progressMonitor.setProgressText(Bundle.AddLogicalImageTask_searchingInterestingFile(lineNumber, totalFiles));
                 }
-                String query = makeQuery(createVHD, vhdFilename, fileMetaAddressStr, parentPath, filename);
 
-                // TODO - findAllFilesWhere should SQL-escape the query
+                String query = makeQuery(vhdFilename, fileMetaAddressStr, parentPath, filename);
                 List<AbstractFile> matchedFiles = Case.getCurrentCase().getSleuthkitCase().findAllFilesWhere(query);
+                List<Long> fileIds = new ArrayList<>();
                 for (AbstractFile file : matchedFiles) {
-                    addInterestingFileToArtifacts(file, ruleSetName, ruleName, artifacts);
+                    fileIds.add(file.getId());
                 }
+                String key = String.format("%s\t%s", ruleSetName, ruleName);
+                List<Long> value = new ArrayList<>();
+                if (interestingFileMap.containsKey(key)) {
+                    value = interestingFileMap.get(key);
+                }
+                value.addAll(fileIds);
+                interestingFileMap.put(key, value);
                 lineNumber++;
-            } // end reading file
-
-            try {
-                // index the artifact for keyword search
-                blackboard.postArtifacts(artifacts, MODULE_NAME);
-            } catch (Blackboard.BlackboardException ex) {
-                LOGGER.log(Level.SEVERE, "Unable to post artifacts to blackboard", ex); //NON-NLS
-            }
-        }
-    }
-
-    private void addInterestingFileToArtifacts(AbstractFile file, String ruleSetName, String ruleName, List<BlackboardArtifact> artifacts) throws TskCoreException {
-        Collection<BlackboardAttribute> attributes = new ArrayList<>();
-        BlackboardAttribute setNameAttribute = new BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME, MODULE_NAME, ruleSetName);
-        attributes.add(setNameAttribute);
-        BlackboardAttribute ruleNameAttribute = new BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_CATEGORY, MODULE_NAME, ruleName);
-        attributes.add(ruleNameAttribute);
-        if (!blackboard.artifactExists(file, BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT, attributes)) {
-            BlackboardArtifact artifact = this.currentCase.getSleuthkitCase().newBlackboardArtifact(BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT, file.getId());
-            artifact.addAttributes(attributes);
-            artifacts.add(artifact);
+            } // end reading file            }
         }
+        return interestingFileMap;
     }
 
     @Messages({
         "# {0} - file number", "# {1} - total files", "AddLogicalImageTask.addingExtractedFile=Adding extracted files ({0}/{1})"
     })
-    private void addExtractedFiles(File src, Path resultsPath, List<Content> newDataSources) throws TskCoreException, IOException {
+    private Map<String, List<Long>> addExtractedFiles(File src, Path resultsPath, List<Content> newDataSources) throws TskCoreException, IOException {
         SleuthkitCase skCase = Case.getCurrentCase().getSleuthkitCase();
         SleuthkitCase.CaseDbTransaction trans = null;
-
+        Map<String, List<Long>> interestingFileMap = new HashMap<>();
+        
         try {
             trans = skCase.beginTransaction();
             LocalFilesDataSource localFilesDataSource = skCase.addLocalFilesDataSource(deviceId, this.src.getName(), timeZone, trans);
@@ -417,7 +470,7 @@ final class AddLogicalImageTask implements Runnable {
                 while ((line = br.readLine()) != null) {
                     if (cancelled) {
                         rollbackTransaction(trans);
-                        return;
+                        return new HashMap<>();
                     }
                     String[] fields = line.split("\t", -1); // NON-NLS
                     if (fields.length != 14) {
@@ -428,8 +481,8 @@ final class AddLogicalImageTask implements Runnable {
 //                String fileSystemOffsetStr = fields[1];
 //                String fileMetaAddressStr = fields[2];
 //                String extractStatusStr = fields[3];
-//                String ruleSetName = fields[4];
-//                String ruleName = fields[5];
+                    String ruleSetName = fields[4];
+                    String ruleName = fields[5];
 //                String description = fields[6];
                     String filename = fields[7];
                     String parentPath = fields[8];
@@ -445,7 +498,7 @@ final class AddLogicalImageTask implements Runnable {
                     }
 
                     //addLocalFile here
-                    fileImporter.addLocalFile(
+                    AbstractFile fileAdded = fileImporter.addLocalFile(
                         Paths.get(src.toString(), extractedFilePath).toFile(),
                         filename,
                         parentPath,
@@ -454,12 +507,19 @@ final class AddLogicalImageTask implements Runnable {
                         Long.parseLong(atime),
                         Long.parseLong(mtime),
                         localFilesDataSource);
-
+                    String key = String.format("%s\t%s", ruleSetName, ruleName);
+                    List<Long> value = new ArrayList<>();
+                    if (interestingFileMap.containsKey(key)) {
+                        value = interestingFileMap.get(key);
+                    }
+                    value.add(fileAdded.getId());
+                    interestingFileMap.put(key, value);
                     lineNumber++;
                 } // end reading file
             }
             trans.commit();
             newDataSources.add(localFilesDataSource);
+            return interestingFileMap;
 
         } catch (NumberFormatException | TskCoreException ex) {
             LOGGER.log(Level.SEVERE, "Error adding extracted files", ex); // NON-NLS
@@ -489,21 +549,16 @@ final class AddLogicalImageTask implements Runnable {
         }
     }
 
-    String makeQuery(boolean createVHD, String vhdFilename, String fileMetaAddressStr, String parentPath, String filename) throws TskCoreException {
+    String makeQuery(String vhdFilename, String fileMetaAddressStr, String parentPath, String filename) throws TskCoreException {
         String query;
-        if (createVHD) {
-            String targetImagePath = Paths.get(dest.toString(), vhdFilename).toString();
-            Long dataSourceObjId = imagePathToObjIdMap.get(targetImagePath);
-            if (dataSourceObjId == null) {
-                throw new TskCoreException(Bundle.AddLogicalImageTask_cannotFindDataSourceObjId(targetImagePath));
-            }
-            query = String.format("data_source_obj_id = '%s' AND meta_addr = '%s' AND name = '%s'", // NON-NLS
-                    dataSourceObjId.toString(), fileMetaAddressStr, filename.replace("'", "''"));
-        } else {
-            String newParentPath = "/" + ROOT_STR + "/" + vhdFilename + "/" + parentPath;
-            query = String.format("name = '%s' AND parent_path = '%s'", // NON-NLS
-                    filename.replace("'", "''"), newParentPath.replace("'", "''"));
+        String targetImagePath = Paths.get(dest.toString(), vhdFilename).toString();
+        Long dataSourceObjId = imagePathToObjIdMap.get(targetImagePath);
+        if (dataSourceObjId == null) {
+            throw new TskCoreException(Bundle.AddLogicalImageTask_cannotFindDataSourceObjId(targetImagePath));
         }
+        query = String.format("data_source_obj_id = '%s' AND meta_addr = '%s' AND name = '%s'", // NON-NLS
+                dataSourceObjId.toString(), fileMetaAddressStr, filename.replace("'", "''"));
+        // TODO - findAllFilesWhere should SQL-escape the query
         return query;
     }
 
diff --git a/Core/src/org/sleuthkit/autopsy/logicalimager/dsp/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/logicalimager/dsp/Bundle.properties-MERGED
index 3e44d06104..b2e284c666 100644
--- a/Core/src/org/sleuthkit/autopsy/logicalimager/dsp/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/logicalimager/dsp/Bundle.properties-MERGED
@@ -46,6 +46,9 @@ AddLogicalImageTask.noCurrentCase=No current case
 # {1} - fields length
 # {2} - expected length
 AddLogicalImageTask.notEnoughFields=File does not contain enough fields at line {0}, got {1}, expecting {2}
+# {0} - file number
+# {1} - total files
+AddLogicalImageTask.searchingInterestingFile=Searching for interesting files ({0}/{1})
 # {0} - imageFilePath
 AddMultipleImagesTask.adding=Adding: {0}
 # {0} - file

From 716e0227dd00891475aa4914d18551973f12385a Mon Sep 17 00:00:00 2001
From: Mark McKinnon <mark.mckinnon@davenport.edu>
Date: Wed, 18 Sep 2019 11:58:00 -0400
Subject: [PATCH 165/192] Update FileViewer.java

Add check if abstract is file and ignore if it is.
---
 Core/src/org/sleuthkit/autopsy/contentviewers/FileViewer.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/FileViewer.java b/Core/src/org/sleuthkit/autopsy/contentviewers/FileViewer.java
index dddf0f6296..1b0d048f35 100644
--- a/Core/src/org/sleuthkit/autopsy/contentviewers/FileViewer.java
+++ b/Core/src/org/sleuthkit/autopsy/contentviewers/FileViewer.java
@@ -117,7 +117,7 @@ public class FileViewer extends javax.swing.JPanel implements DataContentViewer
         }
 
         AbstractFile file = selectedNode.getLookup().lookup(AbstractFile.class);
-        if (file == null) {
+        if ((file == null) || (file.isDir())) {
             return;
         }
 
@@ -189,7 +189,7 @@ public class FileViewer extends javax.swing.JPanel implements DataContentViewer
         }
 
         AbstractFile aFile = node.getLookup().lookup(AbstractFile.class);
-        if (aFile == null) {
+        if ((aFile == null) || (aFile.isDir())) {
             return false;
         }
 

From a53f0957a066f78d4cb221fcd32997cba0938992 Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Wed, 18 Sep 2019 15:02:50 -0400
Subject: [PATCH 166/192] Update Autopsy version number to 4.13.0

---
 docs/doxygen-user/Doxyfile   | 4 ++--
 docs/doxygen/Doxyfile        | 4 ++--
 nbproject/project.properties | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/doxygen-user/Doxyfile b/docs/doxygen-user/Doxyfile
index 7991a0cd95..1bb3773a70 100644
--- a/docs/doxygen-user/Doxyfile
+++ b/docs/doxygen-user/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = "Autopsy User Documentation"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER = 4.12.0
+PROJECT_NUMBER = 4.13.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -1025,7 +1025,7 @@ GENERATE_HTML          = YES
 # The default directory is: html.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_OUTPUT = 4.12.0
+HTML_OUTPUT = 4.13.0
 
 # The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
 # generated HTML page (for example: .htm, .php, .asp).
diff --git a/docs/doxygen/Doxyfile b/docs/doxygen/Doxyfile
index bf66159b48..b640c41549 100644
--- a/docs/doxygen/Doxyfile
+++ b/docs/doxygen/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = "Autopsy"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER = 4.12.0
+PROJECT_NUMBER = 4.13.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears a the top of each page and should give viewer a
@@ -1063,7 +1063,7 @@ GENERATE_HTML          = YES
 # The default directory is: html.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_OUTPUT = api-docs/4.12.0/
+HTML_OUTPUT = api-docs/4.13.0/
 
 # The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
 # generated HTML page (for example: .htm, .php, .asp).
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 5d59189544..8132096d48 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -4,7 +4,7 @@ app.title=Autopsy
 ### lowercase version of above
 app.name=${branding.token}
 ### if left unset, version will default to today's date
-app.version=4.12.0
+app.version=4.13.0
 ### build.type must be one of: DEVELOPMENT, RELEASE
 #build.type=RELEASE
 build.type=DEVELOPMENT

From cc1c5b283ad53b9691727a3beb2497cab483ecbe Mon Sep 17 00:00:00 2001
From: Joe Ho <jkho@basistech.com>
Date: Wed, 18 Sep 2019 15:03:14 -0400
Subject: [PATCH 167/192] Fix PR comment

---
 .../autopsy/logicalimager/dsp/AddLogicalImageTask.java     | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/logicalimager/dsp/AddLogicalImageTask.java b/Core/src/org/sleuthkit/autopsy/logicalimager/dsp/AddLogicalImageTask.java
index 67dfdccbdf..be85936754 100644
--- a/Core/src/org/sleuthkit/autopsy/logicalimager/dsp/AddLogicalImageTask.java
+++ b/Core/src/org/sleuthkit/autopsy/logicalimager/dsp/AddLogicalImageTask.java
@@ -437,12 +437,11 @@ final class AddLogicalImageTask implements Runnable {
                     fileIds.add(file.getId());
                 }
                 String key = String.format("%s\t%s", ruleSetName, ruleName);
-                List<Long> value = new ArrayList<>();
                 if (interestingFileMap.containsKey(key)) {
-                    value = interestingFileMap.get(key);
+                    interestingFileMap.get(key).addAll(fileIds);
+                } else {
+                    interestingFileMap.put(key, fileIds);
                 }
-                value.addAll(fileIds);
-                interestingFileMap.put(key, value);
                 lineNumber++;
             } // end reading file            }
         }

From 75c83adcec8227b04a42ea736dc95cf9d371746e Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Wed, 18 Sep 2019 15:26:37 -0400
Subject: [PATCH 168/192] Code review changes

---
 .../CommandLineIngestManager.java             |  3 +-
 .../CommandLineIngestSettingsPanel.java       | 13 +++--
 Core/src/org/sleuthkit/autopsy/core/layer.xml | 20 ++++----
 .../modules/hashdatabase/HashDbManager.java   |  2 +
 .../report/GeneralReportModuleAdapter.java    |  1 -
 .../report/NoReportModuleSettings.java        |  2 -
 .../ArtifactSelectionDialog.java              |  6 ++-
 .../report/infrastructure/Bundle.properties   | 14 ++++++
 .../infrastructure/Bundle.properties-MERGED   | 14 ++++++
 .../infrastructure/Bundle_ja.properties       | 13 +++++
 .../FileReportDataTypes.java                  | 28 +++++------
 .../infrastructure/FileReportModule.java      |  1 -
 .../infrastructure/FileReportSettings.java    |  1 -
 ...PortableCaseInterestingItemsListPanel.java |  6 ++-
 .../PortableCaseTagsListPanel.java            |  2 +-
 .../infrastructure/ReportGenerator.java       |  1 -
 .../infrastructure/ReportVisualPanel1.java    |  4 +-
 .../infrastructure/ReportVisualPanel2.java    | 12 ++---
 .../infrastructure/ReportWizardAction.java    | 25 ++++++----
 .../ReportWizardFileOptionsVisualPanel.java   |  1 -
 .../infrastructure/TableReportGenerator.java  | 20 ++++----
 .../infrastructure/TableReportSettings.java   | 28 +++++------
 ...eportBodyFile.java => BodyFileReport.java} | 18 +++----
 .../caseuco/CaseUcoFormatExporter.java        |  2 +-
 ...{ReportCaseUco.java => CaseUcoReport.java} | 48 +++----------------
 .../{ReportExcel.java => ExcelReport.java}    | 13 +++--
 .../report/modules/file/Bundle.properties     | 13 -----
 .../modules/file/Bundle.properties-MERGED     | 13 -----
 .../report/modules/file/Bundle_ja.properties  | 13 -----
 .../file/FileReportModuleSettings.java        | 18 +++----
 .../report/modules/file/FileReportText.java   |  1 +
 .../ReportFileTextConfigurationPanel.java     |  6 +--
 .../report/modules/html/Bundle.properties     | 15 +++---
 .../modules/html/Bundle.properties-MERGED     | 25 +++++-----
 .../html/{ReportHTML.java => HTMLReport.java} | 16 +++----
 ...form => HTMLReportConfigurationPanel.form} |  8 ++--
 ...java => HTMLReportConfigurationPanel.java} | 12 ++---
 .../kml/{ReportKML.java => KMLReport.java}    | 12 ++---
 .../PortableCaseReportModule.java             |  4 +-
 .../PortableCaseReportModuleSettings.java     |  4 +-
 .../modules/taggedhashes/Bundle.properties    | 12 ++---
 .../taggedhashes/Bundle.properties-MERGED     | 12 ++---
 ...hDb.java => SaveTaggedHashesToHashDb.java} | 18 +++----
 ... SaveTaggedHashesToHashDbConfigPanel.form} | 12 ++---
 ... SaveTaggedHashesToHashDbConfigPanel.java} | 20 ++++----
 45 files changed, 255 insertions(+), 277 deletions(-)
 rename Core/src/org/sleuthkit/autopsy/report/{modules/file => infrastructure}/FileReportDataTypes.java (75%)
 rename Core/src/org/sleuthkit/autopsy/report/modules/bodyfile/{ReportBodyFile.java => BodyFileReport.java} (93%)
 rename Core/src/org/sleuthkit/autopsy/report/modules/caseuco/{ReportCaseUco.java => CaseUcoReport.java} (65%)
 rename Core/src/org/sleuthkit/autopsy/report/modules/excel/{ReportExcel.java => ExcelReport.java} (97%)
 rename Core/src/org/sleuthkit/autopsy/report/modules/html/{ReportHTML.java => HTMLReport.java} (99%)
 rename Core/src/org/sleuthkit/autopsy/report/modules/html/{ReportHTMLConfigurationPanel.form => HTMLReportConfigurationPanel.form} (95%)
 rename Core/src/org/sleuthkit/autopsy/report/modules/html/{ReportHTMLConfigurationPanel.java => HTMLReportConfigurationPanel.java} (91%)
 rename Core/src/org/sleuthkit/autopsy/report/modules/kml/{ReportKML.java => KMLReport.java} (99%)
 rename Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/{AddTaggedHashesToHashDb.java => SaveTaggedHashesToHashDb.java} (90%)
 rename Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/{AddTaggedHashesToHashDbConfigPanel.form => SaveTaggedHashesToHashDbConfigPanel.form} (89%)
 rename Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/{AddTaggedHashesToHashDbConfigPanel.java => SaveTaggedHashesToHashDbConfigPanel.java} (92%)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
index 8a6d7a7644..8c6562cbea 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
@@ -114,6 +114,7 @@ public class CommandLineIngestManager {
          * Requests the list of command line commands from command line options
          * processor and executes the commands one by one.
          */
+        @Override
         public void run() {
             LOGGER.log(Level.INFO, "Job processing task started");
 
@@ -281,7 +282,7 @@ public class CommandLineIngestManager {
                                     }
 
                                     // generate reports
-                                    ReportGenerator generator = new ReportGenerator(CommandLineIngestSettingsPanel.REPORTING_CONFIGURATION_NAME, new ReportProgressLogger()); //NON-NLS
+                                    ReportGenerator generator = new ReportGenerator(CommandLineIngestSettingsPanel.getReportingConfigName(), new ReportProgressLogger()); //NON-NLS
                                     generator.generateReports();
                                 } catch (CaseActionException ex) {
                                     String caseDirPath = command.getInputs().get(CommandLineCommand.InputType.CASE_FOLDER_PATH.name());
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.java
index 070c7dccaa..9d29070018 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.java
@@ -34,11 +34,10 @@ import static org.sleuthkit.autopsy.report.infrastructure.ReportWizardAction.doR
 @SuppressWarnings("PMD.SingularField") // UI widgets cause lots of false positives
 public class CommandLineIngestSettingsPanel extends javax.swing.JPanel {
 
-    private final CommandLineIngestSettingsPanelController controller;
     private static final long serialVersionUID = 1L;
     private static final Logger logger = Logger.getLogger(CommandLineIngestSettingsPanel.class.getName());
     
-    static final String REPORTING_CONFIGURATION_NAME = "CommandLineIngest";
+    private static final String REPORTING_CONFIGURATION_NAME = "CommandLineIngest";
     private static final boolean DISPLAY_CASE_SPECIFIC_DATA = false; // do not try to display case specific data
     private static final boolean RUN_REPORTS = false; // do not generate reports as part of running the report wizard
 
@@ -48,9 +47,15 @@ public class CommandLineIngestSettingsPanel extends javax.swing.JPanel {
      * @param theController Controller to notify of changes.
      */
     public CommandLineIngestSettingsPanel(CommandLineIngestSettingsPanelController theController) {
-        controller = theController;
         initComponents();
     }
+    
+    /**
+     * @return the REPORTING_CONFIGURATION_NAME
+     */
+    public static String getReportingConfigName() {
+        return REPORTING_CONFIGURATION_NAME;
+    }
 
     private void displayIngestJobSettingsPanel() {
         this.getParent().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
@@ -171,7 +176,7 @@ public class CommandLineIngestSettingsPanel extends javax.swing.JPanel {
 
     private void bnEditReportSettingsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnEditReportSettingsActionPerformed
         this.getParent().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-        doReportWizard(REPORTING_CONFIGURATION_NAME, DISPLAY_CASE_SPECIFIC_DATA, RUN_REPORTS);
+        doReportWizard(getReportingConfigName(), DISPLAY_CASE_SPECIFIC_DATA, RUN_REPORTS);
         this.getParent().setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
     }//GEN-LAST:event_bnEditReportSettingsActionPerformed
 
diff --git a/Core/src/org/sleuthkit/autopsy/core/layer.xml b/Core/src/org/sleuthkit/autopsy/core/layer.xml
index be38d59fa4..526f727437 100644
--- a/Core/src/org/sleuthkit/autopsy/core/layer.xml
+++ b/Core/src/org/sleuthkit/autopsy/core/layer.xml
@@ -311,19 +311,19 @@
             <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.directorytree.FileSearchProvider"/>
             <attr name="position" intvalue="250"/>
         </file>
-        <file name="org-sleuthkit-autopsy-report-modules-html-ReportHTML.instance">
+        <file name="org-sleuthkit-autopsy-report-modules-html-HTMLReport.instance">
             <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.infrastructure.TableReportModule"/>
-            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.modules.html.ReportHTML.getDefault"/>
+            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.modules.html.HTMLReport.getDefault"/>
             <attr name="position" intvalue="900"/>
         </file>
-        <file name="org-sleuthkit-autopsy-report-modules-excel.ReportExcel.instance">
+        <file name="org-sleuthkit-autopsy-report-modules-excel.ExcelReport.instance">
             <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.infrastructure.TableReportModule"/>
-            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.modules.excel.ReportExcel.getDefault"/>
+            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.modules.excel.ExcelReport.getDefault"/>
             <attr name="position" intvalue="901"/>
         </file>
-        <file name="org-sleuthkit-autopsy-report-modules-bodyfile-ReportBodyFile.instance">
+        <file name="org-sleuthkit-autopsy-report-modules-bodyfile-BodyFileReport.instance">
             <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.GeneralReportModule"/>
-            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.modules.bodyfile.ReportBodyFile.getDefault"/>
+            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.modules.bodyfile.BodyFileReport.getDefault"/>
             <attr name="position" intvalue="902"/>
         </file>
         <file name="org-sleuthkit-autopsy-report-modules-file-FileReportText.instance">
@@ -331,9 +331,9 @@
             <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.modules.file.FileReportText.getDefault"/>
             <attr name="position" intvalue="903"/>
         </file>
-        <file name="org-sleuthkit-autopsy-report-modules-kml-ReportKML.instance">
+        <file name="org-sleuthkit-autopsy-report-modules-kml-KMLReport.instance">
             <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.GeneralReportModule"/>
-            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.modules.kml.ReportKML.getDefault"/>
+            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.modules.kml.KMLReport.getDefault"/>
             <attr name="position" intvalue="904"/>
         </file>
         <file name="org-sleuthkit-autopsy-report-modules-stix-STIXReportModule.instance">
@@ -341,9 +341,9 @@
             <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.modules.stix.STIXReportModule.getDefault"/>
             <attr name="position" intvalue="910"/>
         </file>
-        <file name="org-sleuthkit-autopsy-report-modules-caseuco-ReportCaseUco.instance">
+        <file name="org-sleuthkit-autopsy-report-modules-caseuco-CaseUcoReport.instance">
             <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.GeneralReportModule"/>
-            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.modules.caseuco.ReportCaseUco.getDefault"/>
+            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.modules.caseuco.CaseUcoReport.getDefault"/>
             <attr name="position" intvalue="911"/>
         </file>       
         <!--<folder name="JavaHelp">
diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbManager.java b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbManager.java
index f769061c0f..9c7e536f01 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbManager.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbManager.java
@@ -695,6 +695,8 @@ public class HashDbManager implements PropertyChangeListener {
     
     public static abstract class HashDb implements Serializable {
         
+        private static final long serialVersionUID = 1L;
+        
         /**
          * Indicates how files with hashes stored in a particular hash database
          * object should be classified.
diff --git a/Core/src/org/sleuthkit/autopsy/report/GeneralReportModuleAdapter.java b/Core/src/org/sleuthkit/autopsy/report/GeneralReportModuleAdapter.java
index fb06c39e6a..f66b1c69a2 100644
--- a/Core/src/org/sleuthkit/autopsy/report/GeneralReportModuleAdapter.java
+++ b/Core/src/org/sleuthkit/autopsy/report/GeneralReportModuleAdapter.java
@@ -19,7 +19,6 @@
 package org.sleuthkit.autopsy.report;
 
 import javax.swing.JPanel;
-import org.sleuthkit.autopsy.report.ReportProgressPanel;
 
 /**
  * An adapter that provides no-op implementations of various GeneralReportModule
diff --git a/Core/src/org/sleuthkit/autopsy/report/NoReportModuleSettings.java b/Core/src/org/sleuthkit/autopsy/report/NoReportModuleSettings.java
index e647829487..ad5fd9a09f 100755
--- a/Core/src/org/sleuthkit/autopsy/report/NoReportModuleSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/report/NoReportModuleSettings.java
@@ -18,8 +18,6 @@
  */
 package org.sleuthkit.autopsy.report;
 
-import org.sleuthkit.autopsy.report.ReportModuleSettings;
-
 /**
  * Implementation of the ReportModuleSettings interface for use by report
  * modules that do not have settings.
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ArtifactSelectionDialog.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ArtifactSelectionDialog.java
index 96e9caebe3..28386b9e4f 100644
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ArtifactSelectionDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ArtifactSelectionDialog.java
@@ -58,7 +58,7 @@ class ArtifactSelectionDialog extends javax.swing.JDialog {
      * @param parent The parent window
      * @param modal  Block user-input to other top-level windows.
      */
-    public ArtifactSelectionDialog(java.awt.Frame parent, boolean modal) {
+    ArtifactSelectionDialog(java.awt.Frame parent, boolean modal) {
         super(parent, modal);
         initComponents();
         populateList();
@@ -96,7 +96,9 @@ class ArtifactSelectionDialog extends javax.swing.JDialog {
             Logger.getLogger(ArtifactSelectionDialog.class.getName()).log(Level.SEVERE, "Error getting list of artifacts in use: {0}", ex.getLocalizedMessage()); //NON-NLS
         } catch (NoCurrentCaseException ex) {
             // There may not be a case open, for example when configuring Command Line reports
-            Logger.getLogger(ArtifactSelectionDialog.class.getName()).log(Level.WARNING, "Exception while getting open case.", ex.getLocalizedMessage()); //NON-NLS
+            if (Case.isCaseOpen()) {
+                Logger.getLogger(ArtifactSelectionDialog.class.getName()).log(Level.SEVERE, "Exception while getting open case.", ex.getLocalizedMessage()); //NON-NLS
+            }
         }
     }
 
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle.properties b/Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle.properties
index 201f4e91b0..38c1f3696d 100755
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle.properties
@@ -165,6 +165,7 @@ ReportVisualPanel2.getName.text=Configure Report
 ReportWizardAction.actionName.text=Generate Report
 ReportWizardAction.reportWiz.title=Generate Report
 ReportWizardAction.toolBarButton.text=Generate Report
+ReportWizardAction.unableToSaveConfig.errorLabel.text=Failed to save reporting configuration
 ReportWizardFileOptionsPanel.finishButton.text=Finish
 ReportWizardFileOptionsVisualPanel.getName.text=Configure File Report
 ReportWizardPanel1.nextButton.text=Next >
@@ -199,3 +200,16 @@ CreatePortableCasePanel.chooseOutputFolderButton.text=Choose folder
 CreatePortableCasePanel.jLabel1.text=Export files tagged as:
 CreatePortableCasePanel.jLabel2.text=Select output folder:
 CreatePortableCasePanel.errorLabel.text_1=Windows only
+FileReportDataTypes.filename.text=Name
+FileReportDataTypes.fileExt.text=File Extension
+FileReportDataTypes.fileType.text=File Type
+FileReportDataTypes.isDel.text=Is Deleted
+FileReportDataTypes.aTime.text=Last Accessed
+FileReportDataTypes.crTime.text=File Created
+FileReportDataTypes.mTime.text=Last Modified
+FileReportDataTypes.size.text=Size
+FileReportDataTypes.address.text=Address
+FileReportDataTypes.hash.text=Hash Value
+FileReportDataTypes.knownStatus.text=Known Status
+FileReportDataTypes.perms.text=Permissions
+FileReportDataTypes.path.text=Full Path
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle.properties-MERGED
index 26a34520ff..b2ca427081 100755
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle.properties-MERGED
@@ -174,6 +174,7 @@ ReportVisualPanel2.getName.text=Configure Report
 ReportWizardAction.actionName.text=Generate Report
 ReportWizardAction.reportWiz.title=Generate Report
 ReportWizardAction.toolBarButton.text=Generate Report
+ReportWizardAction.unableToSaveConfig.errorLabel.text=Failed to save reporting configuration
 ReportWizardFileOptionsPanel.finishButton.text=Finish
 ReportWizardFileOptionsVisualPanel.getName.text=Configure File Report
 ReportWizardPanel1.nextButton.text=Next >
@@ -208,5 +209,18 @@ CreatePortableCasePanel.chooseOutputFolderButton.text=Choose folder
 CreatePortableCasePanel.jLabel1.text=Export files tagged as:
 CreatePortableCasePanel.jLabel2.text=Select output folder:
 CreatePortableCasePanel.errorLabel.text_1=Windows only
+FileReportDataTypes.filename.text=Name
+FileReportDataTypes.fileExt.text=File Extension
+FileReportDataTypes.fileType.text=File Type
+FileReportDataTypes.isDel.text=Is Deleted
+FileReportDataTypes.aTime.text=Last Accessed
+FileReportDataTypes.crTime.text=File Created
+FileReportDataTypes.mTime.text=Last Modified
+FileReportDataTypes.size.text=Size
+FileReportDataTypes.address.text=Address
+FileReportDataTypes.hash.text=Hash Value
+FileReportDataTypes.knownStatus.text=Known Status
+FileReportDataTypes.perms.text=Permissions
+FileReportDataTypes.path.text=Full Path
 ReportWizardPortableCaseOptionsVisualPanel.getName.title=Choose Portable Case settings
 TableReportGenerator.StatusColumn.Header=Review Status
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle_ja.properties
index 88d1470d98..6aefb4b05b 100755
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle_ja.properties
@@ -175,3 +175,16 @@ ReportGenerator.errList.failedGetAbstractFileFromID=ID\u306b\u57fa\u3065\u304d\u
 ReportVisualPanel1.invalidModuleWarning=\u7121\u52b9\u306a\u30ec\u30dd\u30fc\u30c8\u30e2\u30b8\u30e5\u30fc\u30eb({0})\u306b\u906d\u9047\u3057\u307e\u3057\u305f
 ReportGenerationPanel.confDlg.cancelReport.msg=\u672c\u5f53\u306b\u30ec\u30dd\u30fc\u30c8\u3092\u30ad\u30e3\u30f3\u30bb\u30eb\u3057\u307e\u3059\u304b\uff1f
 ReportProgressPanel.complete.processLb2.text=\u5b8c\u4e86\u3057\u307e\u3057\u305f\u304c\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
+FileReportDataTypes.filename.text=\u540d\u524d
+FileReportDataTypes.fileExt.text=\u30d5\u30a1\u30a4\u30eb\u62e1\u5f35\u5b50
+FileReportDataTypes.fileType.text=\u30d5\u30a1\u30a4\u30eb\u30bf\u30a4\u30d7
+FileReportDataTypes.isDel.text=\u306f\u524a\u9664\u3055\u308c\u307e\u3057\u305f
+FileReportDataTypes.aTime.text=\u6700\u5f8c\u306e\u30a2\u30af\u30bb\u30b9
+FileReportDataTypes.crTime.text=\u4f5c\u6210\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb
+FileReportDataTypes.mTime.text=\u6700\u5f8c\u306e\u4fee\u6b63
+FileReportDataTypes.size.text=\u30b5\u30a4\u30ba
+FileReportDataTypes.address.text=\u30a2\u30c9\u30ec\u30b9
+FileReportDataTypes.hash.text=\u30cf\u30c3\u30b7\u30e5\u5024
+FileReportDataTypes.knownStatus.text=\u65e2\u77e5\u30b9\u30c6\u30fc\u30bf\u30b9
+FileReportDataTypes.perms.text=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3
+FileReportDataTypes.path.text=\u30d5\u30eb\u30d1\u30b9
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/file/FileReportDataTypes.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/FileReportDataTypes.java
similarity index 75%
rename from Core/src/org/sleuthkit/autopsy/report/modules/file/FileReportDataTypes.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/FileReportDataTypes.java
index af6c2c2a61..d185739543 100644
--- a/Core/src/org/sleuthkit/autopsy/report/modules/file/FileReportDataTypes.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/FileReportDataTypes.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report.modules.file;
+package org.sleuthkit.autopsy.report.infrastructure;
 
 import org.openide.util.NbBundle;
 import org.sleuthkit.datamodel.AbstractFile;
@@ -32,13 +32,13 @@ import org.sleuthkit.datamodel.TskData;
  */
 public enum FileReportDataTypes {
 
-    NAME(NbBundle.getMessage(FileReportText.class, "FileReportDataTypes.filename.text")) {
+    NAME(NbBundle.getMessage(FileReportDataTypes.class, "FileReportDataTypes.filename.text")) {
                 @Override
                 public String getValue(AbstractFile file) {
                     return file.getName();
                 }
             },
-    FILE_EXT(NbBundle.getMessage(FileReportText.class, "FileReportDataTypes.fileExt.text")) {
+    FILE_EXT(NbBundle.getMessage(FileReportDataTypes.class, "FileReportDataTypes.fileExt.text")) {
                 @Override
                 public String getValue(AbstractFile file) {
                     String name = file.getName();
@@ -46,13 +46,13 @@ public enum FileReportDataTypes {
                     return (extIndex == -1 ? "" : name.substring(extIndex));
                 }
             },
-    FILE_TYPE(NbBundle.getMessage(FileReportText.class, "FileReportDataTypes.fileType.text")) {
+    FILE_TYPE(NbBundle.getMessage(FileReportDataTypes.class, "FileReportDataTypes.fileType.text")) {
                 @Override
                 public String getValue(AbstractFile file) {
                     return file.getMetaTypeAsString();
                 }
             },
-    DELETED(NbBundle.getMessage(FileReportText.class, "FileReportDataTypes.isDel.text")) {
+    DELETED(NbBundle.getMessage(FileReportDataTypes.class, "FileReportDataTypes.isDel.text")) {
                 @Override
                 public String getValue(AbstractFile file) {
                     if (file.getMetaFlagsAsString().equals(TskData.TSK_FS_META_FLAG_ENUM.UNALLOC.toString())) {
@@ -61,55 +61,55 @@ public enum FileReportDataTypes {
                     return "";
                 }
             },
-    A_TIME(NbBundle.getMessage(FileReportText.class, "FileReportDataTypes.aTime.text")) {
+    A_TIME(NbBundle.getMessage(FileReportDataTypes.class, "FileReportDataTypes.aTime.text")) {
                 @Override
                 public String getValue(AbstractFile file) {
                     return file.getAtimeAsDate();
                 }
             },
-    CR_TIME(NbBundle.getMessage(FileReportText.class, "FileReportDataTypes.crTime.text")) {
+    CR_TIME(NbBundle.getMessage(FileReportDataTypes.class, "FileReportDataTypes.crTime.text")) {
                 @Override
                 public String getValue(AbstractFile file) {
                     return file.getCrtimeAsDate();
                 }
             },
-    M_TIME(NbBundle.getMessage(FileReportText.class, "FileReportDataTypes.mTime.text")) {
+    M_TIME(NbBundle.getMessage(FileReportDataTypes.class, "FileReportDataTypes.mTime.text")) {
                 @Override
                 public String getValue(AbstractFile file) {
                     return file.getMtimeAsDate();
                 }
             },
-    SIZE(NbBundle.getMessage(FileReportText.class, "FileReportDataTypes.size.text")) {
+    SIZE(NbBundle.getMessage(FileReportDataTypes.class, "FileReportDataTypes.size.text")) {
                 @Override
                 public String getValue(AbstractFile file) {
                     return String.valueOf(file.getSize());
                 }
             },
-    ADDRESS(NbBundle.getMessage(FileReportText.class, "FileReportDataTypes.address.text")) {
+    ADDRESS(NbBundle.getMessage(FileReportDataTypes.class, "FileReportDataTypes.address.text")) {
                 @Override
                 public String getValue(AbstractFile file) {
                     return String.valueOf(file.getMetaAddr());
                 }
             },
-    HASH_VALUE(NbBundle.getMessage(FileReportText.class, "FileReportDataTypes.hash.text")) {
+    HASH_VALUE(NbBundle.getMessage(FileReportDataTypes.class, "FileReportDataTypes.hash.text")) {
                 @Override
                 public String getValue(AbstractFile file) {
                     return file.getMd5Hash();
                 }
             },
-    KNOWN_STATUS(NbBundle.getMessage(FileReportText.class, "FileReportDataTypes.knownStatus.text")) {
+    KNOWN_STATUS(NbBundle.getMessage(FileReportDataTypes.class, "FileReportDataTypes.knownStatus.text")) {
                 @Override
                 public String getValue(AbstractFile file) {
                     return file.getKnown().getName();
                 }
             },
-    PERMISSIONS(NbBundle.getMessage(FileReportText.class, "FileReportDataTypes.perms.text")) {
+    PERMISSIONS(NbBundle.getMessage(FileReportDataTypes.class, "FileReportDataTypes.perms.text")) {
                 @Override
                 public String getValue(AbstractFile file) {
                     return file.getModesAsString();
                 }
             },
-    FULL_PATH(NbBundle.getMessage(FileReportText.class, "FileReportDataTypes.path.text")) {
+    FULL_PATH(NbBundle.getMessage(FileReportDataTypes.class, "FileReportDataTypes.path.text")) {
                 @Override
                 public String getValue(AbstractFile file) {
                     try {
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/FileReportModule.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/FileReportModule.java
index b90a82bdc1..cfe1119866 100644
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/FileReportModule.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/FileReportModule.java
@@ -18,7 +18,6 @@
  */
 package org.sleuthkit.autopsy.report.infrastructure;
 
-import org.sleuthkit.autopsy.report.modules.file.FileReportDataTypes;
 import org.sleuthkit.autopsy.report.ReportModule;
 import java.util.List;
 import org.sleuthkit.datamodel.AbstractFile;
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/FileReportSettings.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/FileReportSettings.java
index 37fe842305..8cde112672 100755
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/FileReportSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/FileReportSettings.java
@@ -18,7 +18,6 @@
  */
 package org.sleuthkit.autopsy.report.infrastructure;
 
-import org.sleuthkit.autopsy.report.modules.file.FileReportDataTypes;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseInterestingItemsListPanel.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseInterestingItemsListPanel.java
index a85a576523..343fd8f0cc 100644
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseInterestingItemsListPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseInterestingItemsListPanel.java
@@ -73,7 +73,7 @@ class PortableCaseInterestingItemsListPanel extends javax.swing.JPanel {
         customizeComponents();
         
         // update tag selection
-        jAllSetsCheckBox.setSelected(settings.isAllTagsSelected());
+        jAllSetsCheckBox.setSelected(settings.areAllTagsSelected());
         setNamesListBox.setEnabled(!jAllSetsCheckBox.isSelected());
         selectButton.setEnabled(!jAllSetsCheckBox.isSelected());
         deselectButton.setEnabled(!jAllSetsCheckBox.isSelected());
@@ -123,7 +123,9 @@ class PortableCaseInterestingItemsListPanel extends javax.swing.JPanel {
                 Logger.getLogger(ReportWizardPortableCaseOptionsVisualPanel.class.getName()).log(Level.SEVERE, "Failed to get interesting item set names", ex); // NON-NLS
             } catch (NoCurrentCaseException ex) {
                 // There may not be a case open when configuring report modules for Command Line execution
-                Logger.getLogger(ReportWizardPortableCaseOptionsVisualPanel.class.getName()).log(Level.WARNING, "Exception while getting open case.", ex); // NON-NLS
+                if (Case.isCaseOpen()) {
+                    Logger.getLogger(ReportWizardPortableCaseOptionsVisualPanel.class.getName()).log(Level.SEVERE, "Exception while getting open case.", ex); // NON-NLS
+                }
             }
         }
         Collections.sort(setNames);
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseTagsListPanel.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseTagsListPanel.java
index 97fa45f13f..0abd0ba6e5 100644
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseTagsListPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseTagsListPanel.java
@@ -72,7 +72,7 @@ class PortableCaseTagsListPanel extends javax.swing.JPanel {
         initComponents();
         customizeComponents();
         // update tag selection
-        jAllTagsCheckBox.setSelected(settings.isAllTagsSelected());
+        jAllTagsCheckBox.setSelected(settings.areAllTagsSelected());
         tagNamesListBox.setEnabled(!jAllTagsCheckBox.isSelected());
         selectButton.setEnabled(!jAllTagsCheckBox.isSelected());
         deselectButton.setEnabled(!jAllTagsCheckBox.isSelected());
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportGenerator.java
index c7dc4da638..7b7c68a571 100644
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportGenerator.java
@@ -18,7 +18,6 @@
  */
 package org.sleuthkit.autopsy.report.infrastructure;
 
-import org.sleuthkit.autopsy.report.modules.file.FileReportDataTypes;
 import org.sleuthkit.autopsy.report.modules.portablecase.PortableCaseReportModuleSettings;
 import org.sleuthkit.autopsy.report.modules.portablecase.PortableCaseReportModule;
 import org.sleuthkit.autopsy.report.NoReportModuleSettings;
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel1.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel1.java
index 75753c9e7b..74a9e6d738 100644
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel1.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel1.java
@@ -19,7 +19,7 @@
 package org.sleuthkit.autopsy.report.infrastructure;
 
 import org.sleuthkit.autopsy.report.modules.portablecase.PortableCaseReportModule;
-import org.sleuthkit.autopsy.report.modules.html.ReportHTML;
+import org.sleuthkit.autopsy.report.modules.html.HTMLReport;
 import org.sleuthkit.autopsy.report.ReportModule;
 import org.sleuthkit.autopsy.report.ReportModuleSettings;
 import org.sleuthkit.autopsy.report.GeneralReportModule;
@@ -114,7 +114,7 @@ final class ReportVisualPanel1 extends JPanel implements ListSelectionListener {
         // Results-HTML should always be first in the list of Report Modules.
         int indexOfHTMLReportModule = 0;
         for (ReportModule module : modules) {
-            if (module instanceof ReportHTML) {
+            if (module instanceof HTMLReport) {
                 break;
             }
             indexOfHTMLReportModule++;
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel2.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel2.java
index 9c3830e023..6fb89068b1 100644
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel2.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel2.java
@@ -110,9 +110,9 @@ final class ReportVisualPanel2 extends JPanel {
         // enable things based on input settings
         advancedButton.setEnabled(useCaseSpecificData);
         specificTaggedResultsRadioButton.setEnabled(useCaseSpecificData);
-        TableReportSettings.TableReportType type = TableReportSettings.TableReportType.ALL_RESULTS;
+        TableReportSettings.TableReportOption type = TableReportSettings.TableReportOption.ALL_RESULTS;
         if (settings != null) {
-            type = settings.getReportType();
+            type = settings.getSelectedReportOption();
         }
         switch (type) {
             case ALL_TAGGED_RESULTS:
@@ -275,13 +275,13 @@ final class ReportVisualPanel2 extends JPanel {
      * @return true if the Specific Tags radio button is selected, false
      * otherwise
      */
-    TableReportSettings.TableReportType getSelectedReportType() {
+    TableReportSettings.TableReportOption getSelectedReportType() {
         if (allTaggedResultsRadioButton.isSelected()) {
-            return TableReportSettings.TableReportType.ALL_TAGGED_RESULTS;
+            return TableReportSettings.TableReportOption.ALL_TAGGED_RESULTS;
         } else if (specificTaggedResultsRadioButton.isSelected()) {
-            return TableReportSettings.TableReportType.SPECIFIC_TAGGED_RESULTS;
+            return TableReportSettings.TableReportOption.SPECIFIC_TAGGED_RESULTS;
         }
-        return TableReportSettings.TableReportType.ALL_RESULTS;
+        return TableReportSettings.TableReportOption.ALL_RESULTS;
     }
 
     /**
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardAction.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardAction.java
index 49a99223dd..01d4b9c637 100644
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardAction.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardAction.java
@@ -38,6 +38,7 @@ import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.SwingWorker;
 import org.openide.DialogDisplayer;
+import org.openide.NotifyDescriptor;
 import org.openide.WizardDescriptor;
 import org.openide.awt.ActionID;
 import org.openide.awt.ActionReference;
@@ -86,7 +87,15 @@ public final class ReportWizardAction extends CallableSystemAction implements Pr
         if (DialogDisplayer.getDefault().notify(wiz) == WizardDescriptor.FINISH_OPTION) {
 
             // save reporting configuration
-            saveReportingConfiguration(configName, wiz);
+            try {
+                saveReportingConfiguration(configName, wiz);
+            } catch (ReportConfigException ex) {
+                logger.log(Level.SEVERE, "Failed to save reporting configuration " + configName, ex); //NON-NLS
+                NotifyDescriptor descriptor = new NotifyDescriptor.Message(
+                        NbBundle.getMessage(ReportWizardAction.class, "ReportWizardAction.unableToSaveConfig.errorLabel.text"), 
+                        NotifyDescriptor.ERROR_MESSAGE);
+                DialogDisplayer.getDefault().notify(descriptor);
+            }
 
             if (runReports) {
                 // generate reports in a separate thread
@@ -101,7 +110,7 @@ public final class ReportWizardAction extends CallableSystemAction implements Pr
         }
     }
 
-    private static void saveReportingConfiguration(String configName, WizardDescriptor wiz) {
+    private static void saveReportingConfiguration(String configName, WizardDescriptor wiz) throws ReportConfigException {
 
         ReportingConfig reportingConfig = new ReportingConfig(configName);
         reportingConfig.setFileReportSettings((FileReportSettings) wiz.getProperty("fileReportSettings"));
@@ -120,13 +129,11 @@ public final class ReportWizardAction extends CallableSystemAction implements Pr
         // set module configs
         reportingConfig.setModuleConfigs(moduleConfigs);
 
-        try {
-            // save reporting configuration
-            ReportingConfigLoader.saveConfig(reportingConfig);
-        } catch (ReportConfigException ex) {
-            // ELTODO should we do more to let the user know?
-            logger.log(Level.SEVERE, "Failed to save reporting configuration " + reportingConfig.getName(), ex); //NON-NLS
-        }
+        // save reporting configuration
+        ReportingConfigLoader.saveConfig(reportingConfig);
+        
+        //ELDELETE
+        throw new ReportConfigException("test");
     }
 
     public ReportWizardAction() {
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardFileOptionsVisualPanel.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardFileOptionsVisualPanel.java
index b333b5e04e..4efc674473 100644
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardFileOptionsVisualPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardFileOptionsVisualPanel.java
@@ -18,7 +18,6 @@
  */
 package org.sleuthkit.autopsy.report.infrastructure;
 
-import org.sleuthkit.autopsy.report.modules.file.FileReportDataTypes;
 import java.awt.Component;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportGenerator.java
index 537452928c..2a9bad9686 100644
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportGenerator.java
@@ -18,7 +18,7 @@
  */
 package org.sleuthkit.autopsy.report.infrastructure;
 
-import org.sleuthkit.autopsy.report.modules.html.ReportHTML;
+import org.sleuthkit.autopsy.report.modules.html.HTMLReport;
 import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multimaps;
@@ -127,7 +127,7 @@ class TableReportGenerator {
             try {
                 // If report type is "all tagged results", then read all possible tab names from database.
                 // Otherwise do not load tag names, i.e. run "all results" report
-                if (settings.getReportType() == TableReportSettings.TableReportType.ALL_TAGGED_RESULTS) {
+                if (settings.getSelectedReportOption() == TableReportSettings.TableReportOption.ALL_TAGGED_RESULTS) {
                     getAllExistingTags();
                 }
                 
@@ -220,7 +220,7 @@ class TableReportGenerator {
                         });
                 for (String accountTypeStr : groupedArtifacts.keySet()) {
                     /*
-                     * If the report is a ReportHTML, the data type name
+                     * If the report is a HTMLReport, the data type name
                      * eventualy makes it to useDataTypeIcon which expects but
                      * does not require a artifact name, so we make a synthetic
                      * compund name by appending a ":" and the account type.
@@ -346,8 +346,8 @@ class TableReportGenerator {
                     NbBundle.getMessage(this.getClass(), "ReportGenerator.makeContTagTab.taggedFiles.msg"));
             comment.append(makeCommaSeparatedList(tagNamesFilter));
         }
-        if (tableReport instanceof ReportHTML) {
-            ReportHTML htmlReportModule = (ReportHTML) tableReport;
+        if (tableReport instanceof HTMLReport) {
+            HTMLReport htmlReportModule = (HTMLReport) tableReport;
             htmlReportModule.startDataType(BlackboardArtifact.ARTIFACT_TYPE.TSK_TAG_FILE.getDisplayName(), comment.toString());
             htmlReportModule.startContentTagsTable(columnHeaders);
         } else {
@@ -384,8 +384,8 @@ class TableReportGenerator {
                 rowData.add(file.getMd5Hash());
             }
             // @@@ This casting is a tricky little workaround to allow the HTML report module to slip in a content hyperlink.
-            if (tableReport instanceof ReportHTML) {
-                ReportHTML htmlReportModule = (ReportHTML) tableReport;
+            if (tableReport instanceof HTMLReport) {
+                HTMLReport htmlReportModule = (HTMLReport) tableReport;
                 htmlReportModule.addRowWithTaggedContentHyperlink(rowData, tag);
             } else {
                 tableReport.addRow(rowData);
@@ -475,13 +475,13 @@ class TableReportGenerator {
         progressPanel.updateStatusLabel(
                 NbBundle.getMessage(this.getClass(), "ReportGenerator.progress.createdThumb.text"));
 
-        if (tableReport instanceof ReportHTML) {
-            ReportHTML htmlModule = (ReportHTML) tableReport;
+        if (tableReport instanceof HTMLReport) {
+            HTMLReport htmlModule = (HTMLReport) tableReport;
             htmlModule.startDataType(
                     NbBundle.getMessage(this.getClass(), "ReportGenerator.thumbnailTable.name"),
                     NbBundle.getMessage(this.getClass(), "ReportGenerator.thumbnailTable.desc"));
             List<String> emptyHeaders = new ArrayList<>();
-            for (int i = 0; i < ReportHTML.THUMBNAIL_COLUMNS; i++) {
+            for (int i = 0; i < HTMLReport.THUMBNAIL_COLUMNS; i++) {
                 emptyHeaders.add("");
             }
             htmlModule.startTable(emptyHeaders);
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportSettings.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportSettings.java
index a5e9168daa..4eeee3942d 100755
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportSettings.java
@@ -32,9 +32,9 @@ import org.sleuthkit.datamodel.BlackboardArtifact;
 final class TableReportSettings implements Serializable {
 
     /**
-     * An enumeration of table report types.
+     * An enumeration of table report options.
      */
-    enum TableReportType {
+    enum TableReportOption {
         ALL_RESULTS, //NON-NLS
         ALL_TAGGED_RESULTS, //NON-NLS
         SPECIFIC_TAGGED_RESULTS;   //NON-NLS
@@ -43,8 +43,8 @@ final class TableReportSettings implements Serializable {
     private static final long serialVersionUID = 1L;
     private final List<BlackboardArtifact.Type> artifactTypes = new ArrayList<>();
     private final List<String> tagNames = new ArrayList<>();
-    private final boolean useCaseSpecificData;
-    private final TableReportType reportType;
+    private final boolean loadAllTagsAndArtifacts;
+    private final TableReportOption reportOption;
 
     /**
      * Creates TableReportSettings object. This constructor is used when user
@@ -55,10 +55,10 @@ final class TableReportSettings implements Serializable {
      * types to be included in the report. Only enabled entries will be kept.
      * @param tagNameSelections The enabled/disabled state of the tag names to
      * be included in the report. Only enabled entries will be kept.
-     * @param useCaseSpecificData Flag whether to use case specific tag and artifact data.
-     * @param reportType Table report type.
+     * @param loadAllTagsAndArtifacts Flag whether to read tag and artifact lists at report generation time
+     * @param reportOption Selected table report option.
      */
-    TableReportSettings(Map<BlackboardArtifact.Type, Boolean> artifactTypeSelections, Map<String, Boolean> tagNameSelections, boolean useCaseSpecificData, TableReportType reportType) {
+    TableReportSettings(Map<BlackboardArtifact.Type, Boolean> artifactTypeSelections, Map<String, Boolean> tagNameSelections, boolean loadAllTagsAndArtifacts, TableReportOption reportOption) {
         // Get the artifact types selected by the user
         for (Map.Entry<BlackboardArtifact.Type, Boolean> entry : artifactTypeSelections.entrySet()) {
             if (entry.getValue()) {
@@ -74,8 +74,8 @@ final class TableReportSettings implements Serializable {
             }
         }
 
-        this.reportType = reportType;
-        this.useCaseSpecificData = useCaseSpecificData;
+        this.reportOption = reportOption;
+        this.loadAllTagsAndArtifacts = loadAllTagsAndArtifacts;
     }
 
     List<BlackboardArtifact.Type> getArtifactSelections() {
@@ -87,15 +87,15 @@ final class TableReportSettings implements Serializable {
     }
 
     boolean isUseCaseSpecificData() {
-        return useCaseSpecificData;
+        return loadAllTagsAndArtifacts;
     }
 
     /**
-     * Get report type.
+     * Get selected report option.
      * 
-     * @return the reportType
+     * @return the reportOption
      */
-    TableReportType getReportType() {
-        return reportType;
+    TableReportOption getSelectedReportOption() {
+        return reportOption;
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/bodyfile/ReportBodyFile.java b/Core/src/org/sleuthkit/autopsy/report/modules/bodyfile/BodyFileReport.java
similarity index 93%
rename from Core/src/org/sleuthkit/autopsy/report/modules/bodyfile/ReportBodyFile.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/bodyfile/BodyFileReport.java
index de25f8b1b2..a0d43bf4e5 100644
--- a/Core/src/org/sleuthkit/autopsy/report/modules/bodyfile/ReportBodyFile.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/bodyfile/BodyFileReport.java
@@ -40,14 +40,14 @@ import org.sleuthkit.autopsy.report.ReportProgressPanel.ReportStatus;
 import org.sleuthkit.datamodel.*;
 
 /**
- * ReportBodyFile generates a report in the body file format specified on The
- * Sleuth Kit wiki as
- * MD5|name|inode|mode_as_string|UID|GID|size|atime|mtime|ctime|crtime.
+ * BodyFileReport generates a report in the body file format specified on The
+ Sleuth Kit wiki as
+ MD5|name|inode|mode_as_string|UID|GID|size|atime|mtime|ctime|crtime.
  */
-class ReportBodyFile implements GeneralReportModule {
+class BodyFileReport implements GeneralReportModule {
 
-    private static final Logger logger = Logger.getLogger(ReportBodyFile.class.getName());
-    private static ReportBodyFile instance = null;
+    private static final Logger logger = Logger.getLogger(BodyFileReport.class.getName());
+    private static BodyFileReport instance = null;
 
     private Case currentCase;
     private SleuthkitCase skCase;
@@ -55,13 +55,13 @@ class ReportBodyFile implements GeneralReportModule {
     private String reportPath;
 
     // Hidden constructor for the report
-    private ReportBodyFile() {
+    private BodyFileReport() {
     }
 
     // Get the default implementation of this report
-    public static synchronized ReportBodyFile getDefault() {
+    public static synchronized BodyFileReport getDefault() {
         if (instance == null) {
-            instance = new ReportBodyFile();
+            instance = new BodyFileReport();
         }
         return instance;
     }
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/caseuco/CaseUcoFormatExporter.java b/Core/src/org/sleuthkit/autopsy/report/modules/caseuco/CaseUcoFormatExporter.java
index ec20e8c977..274f3b2cb6 100755
--- a/Core/src/org/sleuthkit/autopsy/report/modules/caseuco/CaseUcoFormatExporter.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/caseuco/CaseUcoFormatExporter.java
@@ -239,7 +239,7 @@ public final class CaseUcoFormatExporter {
 
         //Create our report file
         Path reportFile = Paths.get(caseReportFolder.toString(),
-                ReportCaseUco.getReportFileName());
+                CaseUcoReport.getReportFileName());
 
         //Timezone for formatting file creation, modification, and accessed times
         SimpleTimeZone timeZone = new SimpleTimeZone(0, "GMT");
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/caseuco/ReportCaseUco.java b/Core/src/org/sleuthkit/autopsy/report/modules/caseuco/CaseUcoReport.java
similarity index 65%
rename from Core/src/org/sleuthkit/autopsy/report/modules/caseuco/ReportCaseUco.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/caseuco/CaseUcoReport.java
index 75ddc1a718..b5fe2c28e2 100755
--- a/Core/src/org/sleuthkit/autopsy/report/modules/caseuco/ReportCaseUco.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/caseuco/CaseUcoReport.java
@@ -23,65 +23,31 @@ import javax.swing.JPanel;
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.report.GeneralReportModule;
-import org.sleuthkit.autopsy.report.NoReportModuleSettings;
-import org.sleuthkit.autopsy.report.ReportModuleSettings;
 import org.sleuthkit.autopsy.report.ReportProgressPanel;
 
 /**
- * ReportCaseUco generates a report in the CASE-UCO format. It saves basic file
+ * CaseUcoReport generates a report in the CASE-UCO format. It saves basic file
  * info like full caseDirPath, name, MIME type, times, and hash.
  */
-public final class ReportCaseUco implements GeneralReportModule {
+public final class CaseUcoReport implements GeneralReportModule {
 
-    private static final Logger logger = Logger.getLogger(ReportCaseUco.class.getName());
-    private static ReportCaseUco instance = null;
+    private static final Logger logger = Logger.getLogger(CaseUcoReport.class.getName());
+    private static CaseUcoReport instance = null;
 
     private static final String REPORT_FILE_NAME = "CASE_UCO_output.json-ld";
 
     // Hidden constructor for the report
-    private ReportCaseUco() {
+    private CaseUcoReport() {
     }
 
     // Get the default implementation of this report
-    public static synchronized ReportCaseUco getDefault() {
+    public static synchronized CaseUcoReport getDefault() {
         if (instance == null) {
-            instance = new ReportCaseUco();
+            instance = new CaseUcoReport();
         }
         return instance;
     }
 
-    /**
-     * Get default configuration for this report module.
-     *
-     * @return Object which contains default report module settings.
-     */
-    @Override
-    public ReportModuleSettings getDefaultConfiguration() {
-        // This module does not have configuration
-        return new NoReportModuleSettings();
-    }
-
-    /**
-     * Get current configuration for this report module.
-     *
-     * @return Object which contains current report module settings.
-     */
-    @Override
-    public ReportModuleSettings getConfiguration() {
-        // This module does not have configuration
-        return new NoReportModuleSettings();
-    }
-
-    /**
-     * Set report module configuration.
-     *
-     * @param settings Object which contains report module settings.
-     */
-    @Override
-    public void setConfiguration(ReportModuleSettings settings) {
-        // This module does not have configuration
-    }
-
     @Override
     public String getName() {
         String name = NbBundle.getMessage(this.getClass(), "ReportCaseUco.getName.text");
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/excel/ReportExcel.java b/Core/src/org/sleuthkit/autopsy/report/modules/excel/ExcelReport.java
similarity index 97%
rename from Core/src/org/sleuthkit/autopsy/report/modules/excel/ReportExcel.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/excel/ExcelReport.java
index bab066680c..768bbcf5ec 100644
--- a/Core/src/org/sleuthkit/autopsy/report/modules/excel/ReportExcel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/excel/ExcelReport.java
@@ -33,10 +33,10 @@ import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.report.infrastructure.TableReportModule;
 import org.sleuthkit.datamodel.TskCoreException;
 
-class ReportExcel implements TableReportModule {
+class ExcelReport implements TableReportModule {
 
-    private static final Logger logger = Logger.getLogger(ReportExcel.class.getName());
-    private static ReportExcel instance;
+    private static final Logger logger = Logger.getLogger(ExcelReport.class.getName());
+    private static ExcelReport instance;
     private static final int EXCEL_CELL_MAXIMUM_SIZE = 36767; //Specified at:https://poi.apache.org/apidocs/org/apache/poi/ss/SpreadsheetVersion.html
 
     private Workbook wb;
@@ -49,15 +49,15 @@ class ReportExcel implements TableReportModule {
     private String reportPath;
 
     // Get the default instance of this report
-    public static synchronized ReportExcel getDefault() {
+    public static synchronized ExcelReport getDefault() {
         if (instance == null) {
-            instance = new ReportExcel();
+            instance = new ExcelReport();
         }
         return instance;
     }
 
     // Hidden constructor
-    private ReportExcel() {
+    private ExcelReport() {
     }
 
     /**
@@ -246,7 +246,6 @@ class ReportExcel implements TableReportModule {
         "ReportExcel.exceptionMessage.dataTooLarge=Value is too long to fit into an Excel cell. ",
         "ReportExcel.exceptionMessage.errorText=Error showing data into an Excel cell."
     })
-
     public void addRow(List<String> rowData) {
         Row row = sheet.createRow(rowIndex);
         for (int i = 0; i < rowData.size(); ++i) {
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/file/Bundle.properties b/Core/src/org/sleuthkit/autopsy/report/modules/file/Bundle.properties
index 57faefb816..0937ab6693 100755
--- a/Core/src/org/sleuthkit/autopsy/report/modules/file/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/file/Bundle.properties
@@ -6,16 +6,3 @@ ReportFileTextConfigurationPanel.tabDelimitedButton.text=Tab delimited
 ReportFileTextConfigurationPanel.commaDelimitedButton.text=Comma delimited
 FileReportText.getName.text=Files - Text
 FileReportText.getDesc.text=A delimited text file containing information about individual files in the case.
-FileReportDataTypes.filename.text=Name
-FileReportDataTypes.fileExt.text=File Extension
-FileReportDataTypes.fileType.text=File Type
-FileReportDataTypes.isDel.text=Is Deleted
-FileReportDataTypes.aTime.text=Last Accessed
-FileReportDataTypes.crTime.text=File Created
-FileReportDataTypes.mTime.text=Last Modified
-FileReportDataTypes.size.text=Size
-FileReportDataTypes.address.text=Address
-FileReportDataTypes.hash.text=Hash Value
-FileReportDataTypes.knownStatus.text=Known Status
-FileReportDataTypes.perms.text=Permissions
-FileReportDataTypes.path.text=Full Path
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/file/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/report/modules/file/Bundle.properties-MERGED
index 57faefb816..0937ab6693 100755
--- a/Core/src/org/sleuthkit/autopsy/report/modules/file/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/file/Bundle.properties-MERGED
@@ -6,16 +6,3 @@ ReportFileTextConfigurationPanel.tabDelimitedButton.text=Tab delimited
 ReportFileTextConfigurationPanel.commaDelimitedButton.text=Comma delimited
 FileReportText.getName.text=Files - Text
 FileReportText.getDesc.text=A delimited text file containing information about individual files in the case.
-FileReportDataTypes.filename.text=Name
-FileReportDataTypes.fileExt.text=File Extension
-FileReportDataTypes.fileType.text=File Type
-FileReportDataTypes.isDel.text=Is Deleted
-FileReportDataTypes.aTime.text=Last Accessed
-FileReportDataTypes.crTime.text=File Created
-FileReportDataTypes.mTime.text=Last Modified
-FileReportDataTypes.size.text=Size
-FileReportDataTypes.address.text=Address
-FileReportDataTypes.hash.text=Hash Value
-FileReportDataTypes.knownStatus.text=Known Status
-FileReportDataTypes.perms.text=Permissions
-FileReportDataTypes.path.text=Full Path
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/file/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/report/modules/file/Bundle_ja.properties
index 7c692907e1..1db247bda6 100755
--- a/Core/src/org/sleuthkit/autopsy/report/modules/file/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/file/Bundle_ja.properties
@@ -1,15 +1,2 @@
-FileReportDataTypes.filename.text=\u540d\u524d
-FileReportDataTypes.fileExt.text=\u30d5\u30a1\u30a4\u30eb\u62e1\u5f35\u5b50
-FileReportDataTypes.fileType.text=\u30d5\u30a1\u30a4\u30eb\u30bf\u30a4\u30d7
-FileReportDataTypes.isDel.text=\u306f\u524a\u9664\u3055\u308c\u307e\u3057\u305f
-FileReportDataTypes.aTime.text=\u6700\u5f8c\u306e\u30a2\u30af\u30bb\u30b9
-FileReportDataTypes.crTime.text=\u4f5c\u6210\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb
-FileReportDataTypes.mTime.text=\u6700\u5f8c\u306e\u4fee\u6b63
-FileReportDataTypes.size.text=\u30b5\u30a4\u30ba
-FileReportDataTypes.address.text=\u30a2\u30c9\u30ec\u30b9
-FileReportDataTypes.hash.text=\u30cf\u30c3\u30b7\u30e5\u5024
-FileReportDataTypes.knownStatus.text=\u65e2\u77e5\u30b9\u30c6\u30fc\u30bf\u30b9
-FileReportDataTypes.perms.text=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3
-FileReportDataTypes.path.text=\u30d5\u30eb\u30d1\u30b9
 FileReportText.getName.text=\u30d5\u30a1\u30a4\u30eb - \u30c6\u30ad\u30b9\u30c8
 FileReportText.getDesc.text=\u30b1\u30fc\u30b9\u306e\u500b\u5225\u30d5\u30a1\u30a4\u30eb\u306b\u3064\u3044\u3066\u306e\u60c5\u5831\u3092\u6301\u3064\u3001\u30bf\u30d6\u533a\u5207\u308a\u30c6\u30ad\u30b9\u30c8\u30d5\u30a1\u30a4\u30eb\u3002
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/file/FileReportModuleSettings.java b/Core/src/org/sleuthkit/autopsy/report/modules/file/FileReportModuleSettings.java
index 554cb5526b..9ada02911c 100755
--- a/Core/src/org/sleuthkit/autopsy/report/modules/file/FileReportModuleSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/file/FileReportModuleSettings.java
@@ -27,22 +27,22 @@ class FileReportModuleSettings implements ReportModuleSettings {
 
     private static final long serialVersionUID = 1L;
     
-    enum ReportType {
+    enum ReportDelimiter {
         TAB_DELIMITED,
         COMA_DELIMITED
     }
-    private final ReportType type;
+    private final ReportDelimiter delimiter;
 
     /**
      * Default File report module settings. Default to tab delimited since it
      * was previously the only option.
      */
     FileReportModuleSettings() {
-        this.type = ReportType.TAB_DELIMITED;
+        this.delimiter = ReportDelimiter.TAB_DELIMITED;
     }
 
-    FileReportModuleSettings(ReportType type) {
-        this.type = type;
+    FileReportModuleSettings(ReportDelimiter type) {
+        this.delimiter = type;
     }
 
     @Override
@@ -51,11 +51,11 @@ class FileReportModuleSettings implements ReportModuleSettings {
     }
 
     /**
-     * Get type of the report.
+     * Get delimiter of the report.
      *
-     * @return Type of the report.
+     * @return Delimiter setting for the report.
      */
-    ReportType getReportType() {
-        return type;
+    ReportDelimiter getReportDelimiter() {
+        return delimiter;
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/file/FileReportText.java b/Core/src/org/sleuthkit/autopsy/report/modules/file/FileReportText.java
index 1048c74bfa..e9cb4f797e 100644
--- a/Core/src/org/sleuthkit/autopsy/report/modules/file/FileReportText.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/file/FileReportText.java
@@ -18,6 +18,7 @@
  */
 package org.sleuthkit.autopsy.report.modules.file;
 
+import org.sleuthkit.autopsy.report.infrastructure.FileReportDataTypes;
 import org.sleuthkit.autopsy.report.NoReportModuleSettings;
 import org.sleuthkit.autopsy.report.ReportModuleSettings;
 import java.io.BufferedWriter;
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/file/ReportFileTextConfigurationPanel.java b/Core/src/org/sleuthkit/autopsy/report/modules/file/ReportFileTextConfigurationPanel.java
index 2593016b84..46d04fe435 100644
--- a/Core/src/org/sleuthkit/autopsy/report/modules/file/ReportFileTextConfigurationPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/file/ReportFileTextConfigurationPanel.java
@@ -40,7 +40,7 @@ class ReportFileTextConfigurationPanel extends javax.swing.JPanel {
      * @param settings File report module settings object
      */
     void setConfiguration(FileReportModuleSettings settings) {
-        if (settings.getReportType() == FileReportModuleSettings.ReportType.COMA_DELIMITED) {
+        if (settings.getReportDelimiter() == FileReportModuleSettings.ReportDelimiter.COMA_DELIMITED) {
             commaDelimitedButton.setSelected(true);
         } else {
             // default to tab since it was previously the only option
@@ -55,9 +55,9 @@ class ReportFileTextConfigurationPanel extends javax.swing.JPanel {
      */
     FileReportModuleSettings getConfiguration() {
         if (commaDelimitedButton.isSelected()) {
-            return new FileReportModuleSettings(FileReportModuleSettings.ReportType.COMA_DELIMITED);
+            return new FileReportModuleSettings(FileReportModuleSettings.ReportDelimiter.COMA_DELIMITED);
         } else {
-            return new FileReportModuleSettings(FileReportModuleSettings.ReportType.TAB_DELIMITED);
+            return new FileReportModuleSettings(FileReportModuleSettings.ReportDelimiter.TAB_DELIMITED);
         }
     }
 
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/html/Bundle.properties b/Core/src/org/sleuthkit/autopsy/report/modules/html/Bundle.properties
index 36d9a646b2..14692fb977 100755
--- a/Core/src/org/sleuthkit/autopsy/report/modules/html/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/html/Bundle.properties
@@ -1,11 +1,3 @@
-# To change this license header, choose License Headers in Project Properties.
-# To change this template file, choose Tools | Templates
-# and open the template in the editor.
-
-ReportHTMLConfigurationPanel.headerLabel.text=Header:
-ReportHTMLConfigurationPanel.footerTextField.text=
-ReportHTMLConfigurationPanel.headerTextField.text=
-ReportHTMLConfigurationPanel.footerLabel.text=Footer:
 ReportHTML.addThumbRows.dataType.title=Tagged Images - {0}
 ReportHTML.addThumbRows.dataType.msg=Tagged Results and Contents that contain images.
 ReportHTML.thumbLink.tags=Tags:
@@ -33,3 +25,10 @@ ReportHTML.writeSum.autopsyVersion=Autopsy Version:
 ReportHTML.writeSum.timezone=Timezone:
 ReportHTML.writeSum.path=Path:
 ReportHTML.writeIndex.srcModuleName.text=HTML Report
+HTMLReportConfigurationPanel.headerTextField.text=
+HTMLReportConfigurationPanel.footerLabel.text=Footer:
+# To change this license header, choose License Headers in Project Properties.
+# To change this template file, choose Tools | Templates
+# and open the template in the editor.
+HTMLReportConfigurationPanel.headerLabel.text=Header:
+HTMLReportConfigurationPanel.footerTextField.text=
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/html/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/report/modules/html/Bundle.properties-MERGED
index 0033acaaaa..32f6867f0c 100755
--- a/Core/src/org/sleuthkit/autopsy/report/modules/html/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/html/Bundle.properties-MERGED
@@ -1,16 +1,3 @@
-# To change this license header, choose License Headers in Project Properties.
-# To change this template file, choose Tools | Templates
-# and open the template in the editor.
-
-ReportHTML.writeSum.case=Case:
-ReportHTML.writeSum.caseNotes=Notes:
-ReportHTML.writeSum.caseNumber=Case Number:
-ReportHTML.writeSum.caseNumImages=Number of Images:
-ReportHTML.writeSum.examiner=Examiner:
-ReportHTMLConfigurationPanel.headerLabel.text=Header:
-ReportHTMLConfigurationPanel.footerTextField.text=
-ReportHTMLConfigurationPanel.headerTextField.text=
-ReportHTMLConfigurationPanel.footerLabel.text=Footer:
 ReportHTML.addThumbRows.dataType.title=Tagged Images - {0}
 ReportHTML.addThumbRows.dataType.msg=Tagged Results and Contents that contain images.
 ReportHTML.thumbLink.tags=Tags:
@@ -23,6 +10,11 @@ ReportHTML.writeIndex.seeSum=and <a href\="content\summary.html">the summary pag
 ReportHTML.writeNav.title=Report Navigation
 ReportHTML.writeNav.h1=Report Navigation
 ReportHTML.writeNav.summary=Case Summary
+ReportHTML.writeSum.case=Case:
+ReportHTML.writeSum.caseNotes=Notes:
+ReportHTML.writeSum.caseNumber=Case Number:
+ReportHTML.writeSum.caseNumImages=Number of Images:
+ReportHTML.writeSum.examiner=Examiner:
 ReportHTML.writeSum.title=Case Summary
 ReportHTML.writeSum.warningMsg=<span>Warning, this report was run before ingest services completed\!</span>
 #
@@ -38,3 +30,10 @@ ReportHTML.writeSum.autopsyVersion=Autopsy Version:
 ReportHTML.writeSum.timezone=Timezone:
 ReportHTML.writeSum.path=Path:
 ReportHTML.writeIndex.srcModuleName.text=HTML Report
+HTMLReportConfigurationPanel.headerTextField.text=
+HTMLReportConfigurationPanel.footerLabel.text=Footer:
+# To change this license header, choose License Headers in Project Properties.
+# To change this template file, choose Tools | Templates
+# and open the template in the editor.
+HTMLReportConfigurationPanel.headerLabel.text=Header:
+HTMLReportConfigurationPanel.footerTextField.text=
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/html/ReportHTML.java b/Core/src/org/sleuthkit/autopsy/report/modules/html/HTMLReport.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/report/modules/html/ReportHTML.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/html/HTMLReport.java
index fd94f7c37a..e0eba30501 100644
--- a/Core/src/org/sleuthkit/autopsy/report/modules/html/ReportHTML.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/html/HTMLReport.java
@@ -84,11 +84,11 @@ import org.sleuthkit.datamodel.TskCoreException;
 import org.sleuthkit.datamodel.TskData;
 import org.sleuthkit.datamodel.TskData.TSK_DB_FILES_TYPE_ENUM;
 
-public class ReportHTML implements TableReportModule {
+public class HTMLReport implements TableReportModule {
 
-    private static final Logger logger = Logger.getLogger(ReportHTML.class.getName());
+    private static final Logger logger = Logger.getLogger(HTMLReport.class.getName());
     private static final String THUMBS_REL_PATH = "thumbs" + File.separator; //NON-NLS
-    private static ReportHTML instance;
+    private static HTMLReport instance;
     private static final int MAX_THUMBS_PER_PAGE = 1000;
     private static final String HTML_SUBDIR = "content";
     private Case currentCase;
@@ -102,20 +102,20 @@ public class ReportHTML implements TableReportModule {
     private Integer rowCount;       // number of rows (aka artifacts or tags) for the current data type
     private Writer out;
 
-    private ReportHTMLConfigurationPanel configPanel;
+    private HTMLReportConfigurationPanel configPanel;
 
     private final ReportBranding reportBranding;
 
     // Get the default instance of this report
-    public static synchronized ReportHTML getDefault() {
+    public static synchronized HTMLReport getDefault() {
         if (instance == null) {
-            instance = new ReportHTML();
+            instance = new HTMLReport();
         }
         return instance;
     }
 
     // Hidden constructor
-    private ReportHTML() {
+    private HTMLReport() {
         reportBranding = new ReportBranding();
     }
 
@@ -127,7 +127,7 @@ public class ReportHTML implements TableReportModule {
 
     private void initializePanel() {
         if (configPanel == null) {
-            configPanel = new ReportHTMLConfigurationPanel();
+            configPanel = new HTMLReportConfigurationPanel();
         }
     }
 
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/html/ReportHTMLConfigurationPanel.form b/Core/src/org/sleuthkit/autopsy/report/modules/html/HTMLReportConfigurationPanel.form
similarity index 95%
rename from Core/src/org/sleuthkit/autopsy/report/modules/html/ReportHTMLConfigurationPanel.form
rename to Core/src/org/sleuthkit/autopsy/report/modules/html/HTMLReportConfigurationPanel.form
index 55feb16700..333f2927e6 100755
--- a/Core/src/org/sleuthkit/autopsy/report/modules/html/ReportHTMLConfigurationPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/html/HTMLReportConfigurationPanel.form
@@ -60,28 +60,28 @@
     <Component class="javax.swing.JLabel" name="headerLabel">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/html/Bundle.properties" key="ReportHTMLConfigurationPanel.headerLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/html/Bundle.properties" key="HTMLReportConfigurationPanel.headerLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JLabel" name="footerLabel">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/html/Bundle.properties" key="ReportHTMLConfigurationPanel.footerLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/html/Bundle.properties" key="HTMLReportConfigurationPanel.footerLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JTextField" name="headerTextField">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/html/Bundle.properties" key="ReportHTMLConfigurationPanel.headerTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/html/Bundle.properties" key="HTMLReportConfigurationPanel.headerTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JTextField" name="footerTextField">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/html/Bundle.properties" key="ReportHTMLConfigurationPanel.footerTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/html/Bundle.properties" key="HTMLReportConfigurationPanel.footerTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/html/ReportHTMLConfigurationPanel.java b/Core/src/org/sleuthkit/autopsy/report/modules/html/HTMLReportConfigurationPanel.java
similarity index 91%
rename from Core/src/org/sleuthkit/autopsy/report/modules/html/ReportHTMLConfigurationPanel.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/html/HTMLReportConfigurationPanel.java
index 0ecd9c8dde..0843a7b9f5 100755
--- a/Core/src/org/sleuthkit/autopsy/report/modules/html/ReportHTMLConfigurationPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/html/HTMLReportConfigurationPanel.java
@@ -22,12 +22,12 @@ package org.sleuthkit.autopsy.report.modules.html;
  * The panel shown for all TableReportModules when configuring report modules.
  */
 @SuppressWarnings("PMD.SingularField") // UI widgets cause lots of false positives
-final class ReportHTMLConfigurationPanel extends javax.swing.JPanel {
+final class HTMLReportConfigurationPanel extends javax.swing.JPanel {
 
     /**
      * Creates new form DefaultReportConfigurationPanel
      */
-    ReportHTMLConfigurationPanel() {
+    HTMLReportConfigurationPanel() {
         initComponents();        
         headerTextField.setText("");
         footerTextField.setText("");
@@ -76,13 +76,13 @@ final class ReportHTMLConfigurationPanel extends javax.swing.JPanel {
 
         setFont(getFont().deriveFont(getFont().getStyle() & ~java.awt.Font.BOLD, 11));
 
-        org.openide.awt.Mnemonics.setLocalizedText(headerLabel, org.openide.util.NbBundle.getMessage(ReportHTMLConfigurationPanel.class, "ReportHTMLConfigurationPanel.headerLabel.text")); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(headerLabel, org.openide.util.NbBundle.getMessage(HTMLReportConfigurationPanel.class, "HTMLReportConfigurationPanel.headerLabel.text")); // NOI18N
 
-        org.openide.awt.Mnemonics.setLocalizedText(footerLabel, org.openide.util.NbBundle.getMessage(ReportHTMLConfigurationPanel.class, "ReportHTMLConfigurationPanel.footerLabel.text")); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(footerLabel, org.openide.util.NbBundle.getMessage(HTMLReportConfigurationPanel.class, "HTMLReportConfigurationPanel.footerLabel.text")); // NOI18N
 
-        headerTextField.setText(org.openide.util.NbBundle.getMessage(ReportHTMLConfigurationPanel.class, "ReportHTMLConfigurationPanel.headerTextField.text")); // NOI18N
+        headerTextField.setText(org.openide.util.NbBundle.getMessage(HTMLReportConfigurationPanel.class, "HTMLReportConfigurationPanel.headerTextField.text")); // NOI18N
 
-        footerTextField.setText(org.openide.util.NbBundle.getMessage(ReportHTMLConfigurationPanel.class, "ReportHTMLConfigurationPanel.footerTextField.text")); // NOI18N
+        footerTextField.setText(org.openide.util.NbBundle.getMessage(HTMLReportConfigurationPanel.class, "HTMLReportConfigurationPanel.footerTextField.text")); // NOI18N
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/kml/ReportKML.java b/Core/src/org/sleuthkit/autopsy/report/modules/kml/KMLReport.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/report/modules/kml/ReportKML.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/kml/KMLReport.java
index ed4283718c..28ef214a36 100644
--- a/Core/src/org/sleuthkit/autopsy/report/modules/kml/ReportKML.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/kml/KMLReport.java
@@ -52,13 +52,13 @@ import org.sleuthkit.datamodel.ReadContentInputStream.ReadContentInputStreamExce
 /**
  * Generates a KML file based on geospatial information from the BlackBoard.
  */
-class ReportKML implements GeneralReportModule {
+class KMLReport implements GeneralReportModule {
 
-    private static final Logger logger = Logger.getLogger(ReportKML.class.getName());
+    private static final Logger logger = Logger.getLogger(KMLReport.class.getName());
     private static final String KML_STYLE_FILE = "style.kml";
     private static final String REPORT_KML = "ReportKML.kml";
     private static final String STYLESHEETS_PATH = "/org/sleuthkit/autopsy/report/stylesheets/";
-    private static ReportKML instance = null;
+    private static KMLReport instance = null;
     private Case currentCase;
     private SleuthkitCase skCase;
     private final SimpleDateFormat kmlDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssX");
@@ -84,13 +84,13 @@ class ReportKML implements GeneralReportModule {
     }
 
     // Hidden constructor for the report
-    private ReportKML() {
+    private KMLReport() {
     }
 
     // Get the default implementation of this report
-    public static synchronized ReportKML getDefault() {
+    public static synchronized KMLReport getDefault() {
         if (instance == null) {
-            instance = new ReportKML();
+            instance = new KMLReport();
         }
         return instance;
     }
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/portablecase/PortableCaseReportModule.java b/Core/src/org/sleuthkit/autopsy/report/modules/portablecase/PortableCaseReportModule.java
index c10edf49c1..56bc1f8c1e 100644
--- a/Core/src/org/sleuthkit/autopsy/report/modules/portablecase/PortableCaseReportModule.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/portablecase/PortableCaseReportModule.java
@@ -227,7 +227,7 @@ public class PortableCaseReportModule implements ReportModule {
         
         // Check that there will be something to copy
         List<TagName> tagNames;
-        if (options.isAllTagsSelected()) {
+        if (options.areAllTagsSelected()) {
             try {
                 tagNames = Case.getCurrentCaseThrows().getServices().getTagsManager().getTagNamesInUse();
             } catch (NoCurrentCaseException | TskCoreException ex) {
@@ -240,7 +240,7 @@ public class PortableCaseReportModule implements ReportModule {
         }
         
         List<String> setNames;
-        if (options.isAllSetsSelected()) {
+        if (options.areAllSetsSelected()) {
             try {
                 setNames = getAllInterestingItemsSets();
             } catch (NoCurrentCaseException | TskCoreException ex) {
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/portablecase/PortableCaseReportModuleSettings.java b/Core/src/org/sleuthkit/autopsy/report/modules/portablecase/PortableCaseReportModuleSettings.java
index 81252516ba..b3d1dea9e0 100755
--- a/Core/src/org/sleuthkit/autopsy/report/modules/portablecase/PortableCaseReportModuleSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/portablecase/PortableCaseReportModuleSettings.java
@@ -134,11 +134,11 @@ public class PortableCaseReportModuleSettings implements ReportModuleSettings {
         return chunkSize;
     }
 
-    public boolean isAllTagsSelected() {
+    public boolean areAllTagsSelected() {
         return allTagsSelected;
     }
 
-    public boolean isAllSetsSelected() {
+    public boolean areAllSetsSelected() {
         return allSetsSelected;
     }
 
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/Bundle.properties b/Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/Bundle.properties
index d38d075953..7daa721463 100644
--- a/Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/Bundle.properties
@@ -1,8 +1,8 @@
 HashDbConfigDialog.okButton.text=OK
 HashDbConfigDialog.cancelButton.text=Cancel
-AddTaggedHashesToHashDbConfigPanel.selectAllButton.text=Select All
-AddTaggedHashesToHashDbConfigPanel.jLabel2.text=Export to hash set:
-AddTaggedHashesToHashDbConfigPanel.configureHashDatabasesButton.text=Configure Hash Sets...
-AddTaggedHashesToHashDbConfigPanel.jLabel1.text=Export hashes of files tagged as:
-AddTaggedHashesToHashDbConfigPanel.deselectAllButton.text=Deselect All
-AddTaggedHashesToHashDbConfigPanel.jAllTagsCheckBox.text=All Tagged Results
+SaveTaggedHashesToHashDbConfigPanel.deselectAllButton.text=Deselect All
+SaveTaggedHashesToHashDbConfigPanel.selectAllButton.text=Select All
+SaveTaggedHashesToHashDbConfigPanel.jAllTagsCheckBox.text=All Tagged Results
+SaveTaggedHashesToHashDbConfigPanel.jLabel2.text=Export to hash set:
+SaveTaggedHashesToHashDbConfigPanel.configureHashDatabasesButton.text=Configure Hash Sets...
+SaveTaggedHashesToHashDbConfigPanel.jLabel1.text=Export hashes of files tagged as:
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/Bundle.properties-MERGED
index 5b51059280..540fa1d258 100755
--- a/Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/Bundle.properties-MERGED
@@ -2,9 +2,9 @@ AddTaggedHashesToHashDb.error.noHashSetsSelected=No hash set selected for export
 AddTaggedHashesToHashDb.error.noTagsSelected=No tags selected for export.
 HashDbConfigDialog.okButton.text=OK
 HashDbConfigDialog.cancelButton.text=Cancel
-AddTaggedHashesToHashDbConfigPanel.selectAllButton.text=Select All
-AddTaggedHashesToHashDbConfigPanel.jLabel2.text=Export to hash set:
-AddTaggedHashesToHashDbConfigPanel.configureHashDatabasesButton.text=Configure Hash Sets...
-AddTaggedHashesToHashDbConfigPanel.jLabel1.text=Export hashes of files tagged as:
-AddTaggedHashesToHashDbConfigPanel.deselectAllButton.text=Deselect All
-AddTaggedHashesToHashDbConfigPanel.jAllTagsCheckBox.text=All Tagged Results
+SaveTaggedHashesToHashDbConfigPanel.deselectAllButton.text=Deselect All
+SaveTaggedHashesToHashDbConfigPanel.selectAllButton.text=Select All
+SaveTaggedHashesToHashDbConfigPanel.jAllTagsCheckBox.text=All Tagged Results
+SaveTaggedHashesToHashDbConfigPanel.jLabel2.text=Export to hash set:
+SaveTaggedHashesToHashDbConfigPanel.configureHashDatabasesButton.text=Configure Hash Sets...
+SaveTaggedHashesToHashDbConfigPanel.jLabel1.text=Export hashes of files tagged as:
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/AddTaggedHashesToHashDb.java b/Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/SaveTaggedHashesToHashDb.java
similarity index 90%
rename from Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/AddTaggedHashesToHashDb.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/SaveTaggedHashesToHashDb.java
index c7f0ada710..85f5a11aa8 100644
--- a/Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/AddTaggedHashesToHashDb.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/SaveTaggedHashesToHashDb.java
@@ -44,17 +44,17 @@ import org.sleuthkit.datamodel.TskCoreException;
  * convenient way to add content hashes to hash set databases.
  */
 @ServiceProvider(service = GeneralReportModule.class)
-public class AddTaggedHashesToHashDb implements GeneralReportModule {
+public class SaveTaggedHashesToHashDb implements GeneralReportModule {
 
-    private static final Logger logger = Logger.getLogger(AddTaggedHashesToHashDb.class.getName());
-    private AddTaggedHashesToHashDbConfigPanel configPanel;
+    private static final Logger logger = Logger.getLogger(SaveTaggedHashesToHashDb.class.getName());
+    private SaveTaggedHashesToHashDbConfigPanel configPanel;
 
-    public AddTaggedHashesToHashDb() {
+    public SaveTaggedHashesToHashDb() {
     }
 
     @Override
     public String getName() {
-        return "Add Tagged Hashes";
+        return "Save Tagged Hashes";
     }
 
     @Override
@@ -119,7 +119,7 @@ public class AddTaggedHashesToHashDb implements GeneralReportModule {
         try {
             openCase = Case.getCurrentCaseThrows();
         } catch (NoCurrentCaseException ex) {
-            Logger.getLogger(AddTaggedHashesToHashDb.class.getName()).log(Level.SEVERE, "Exception while getting open case.", ex);
+            Logger.getLogger(SaveTaggedHashesToHashDb.class.getName()).log(Level.SEVERE, "Exception while getting open case.", ex);
             progressPanel.updateStatusLabel("Exception while getting open case.");
             progressPanel.complete(ReportProgressPanel.ReportStatus.ERROR);
             return;
@@ -166,7 +166,7 @@ public class AddTaggedHashesToHashDb implements GeneralReportModule {
                             try {
                                 hashSet.addHashes(tag.getContent(), openCase.getDisplayName());
                             } catch (TskCoreException ex) {
-                                Logger.getLogger(AddTaggedHashesToHashDb.class.getName()).log(Level.SEVERE, "Error adding hash for obj_id = " + tag.getContent().getId() + " to hash set " + hashSet.getHashSetName(), ex);
+                                Logger.getLogger(SaveTaggedHashesToHashDb.class.getName()).log(Level.SEVERE, "Error adding hash for obj_id = " + tag.getContent().getId() + " to hash set " + hashSet.getHashSetName(), ex);
                                 failedExports.add(tag.getContent().getName());
                             }
                         } else {
@@ -176,7 +176,7 @@ public class AddTaggedHashesToHashDb implements GeneralReportModule {
                     }
                 }
             } catch (TskCoreException ex) {
-                Logger.getLogger(AddTaggedHashesToHashDb.class.getName()).log(Level.SEVERE, "Error adding to hash set", ex);
+                Logger.getLogger(SaveTaggedHashesToHashDb.class.getName()).log(Level.SEVERE, "Error adding to hash set", ex);
                 progressPanel.updateStatusLabel("Error getting selected tags for case.");
             }
         }
@@ -206,7 +206,7 @@ public class AddTaggedHashesToHashDb implements GeneralReportModule {
     
     private void initializePanel() {
         if (configPanel == null) {
-            configPanel = new AddTaggedHashesToHashDbConfigPanel();
+            configPanel = new SaveTaggedHashesToHashDbConfigPanel();
         }
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/AddTaggedHashesToHashDbConfigPanel.form b/Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/SaveTaggedHashesToHashDbConfigPanel.form
similarity index 89%
rename from Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/AddTaggedHashesToHashDbConfigPanel.form
rename to Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/SaveTaggedHashesToHashDbConfigPanel.form
index eb4e1827ab..ae76eeb26d 100644
--- a/Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/AddTaggedHashesToHashDbConfigPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/SaveTaggedHashesToHashDbConfigPanel.form
@@ -95,7 +95,7 @@
     <Component class="javax.swing.JButton" name="selectAllButton">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/taggedhashes/Bundle.properties" key="AddTaggedHashesToHashDbConfigPanel.selectAllButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/taggedhashes/Bundle.properties" key="SaveTaggedHashesToHashDbConfigPanel.selectAllButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -105,7 +105,7 @@
     <Component class="javax.swing.JButton" name="deselectAllButton">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/taggedhashes/Bundle.properties" key="AddTaggedHashesToHashDbConfigPanel.deselectAllButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/taggedhashes/Bundle.properties" key="SaveTaggedHashesToHashDbConfigPanel.deselectAllButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -115,7 +115,7 @@
     <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/report/modules/taggedhashes/Bundle.properties" key="AddTaggedHashesToHashDbConfigPanel.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/taggedhashes/Bundle.properties" key="SaveTaggedHashesToHashDbConfigPanel.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
@@ -135,7 +135,7 @@
     <Component class="javax.swing.JButton" name="configureHashDatabasesButton">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/taggedhashes/Bundle.properties" key="AddTaggedHashesToHashDbConfigPanel.configureHashDatabasesButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/taggedhashes/Bundle.properties" key="SaveTaggedHashesToHashDbConfigPanel.configureHashDatabasesButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -145,14 +145,14 @@
     <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/report/modules/taggedhashes/Bundle.properties" key="AddTaggedHashesToHashDbConfigPanel.jLabel2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/taggedhashes/Bundle.properties" key="SaveTaggedHashesToHashDbConfigPanel.jLabel2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JCheckBox" name="jAllTagsCheckBox">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/taggedhashes/Bundle.properties" key="AddTaggedHashesToHashDbConfigPanel.jAllTagsCheckBox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/taggedhashes/Bundle.properties" key="SaveTaggedHashesToHashDbConfigPanel.jAllTagsCheckBox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java b/Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/SaveTaggedHashesToHashDbConfigPanel.java
similarity index 92%
rename from Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/SaveTaggedHashesToHashDbConfigPanel.java
index ef7389cc26..3ad9990f06 100644
--- a/Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/AddTaggedHashesToHashDbConfigPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/taggedhashes/SaveTaggedHashesToHashDbConfigPanel.java
@@ -49,7 +49,7 @@ import org.sleuthkit.datamodel.TskCoreException;
  * provides a convenient way to add content hashes to hash set databases.
  */
 @SuppressWarnings("PMD.SingularField") // UI widgets cause lots of false positives
-class AddTaggedHashesToHashDbConfigPanel extends javax.swing.JPanel {
+class SaveTaggedHashesToHashDbConfigPanel extends javax.swing.JPanel {
 
     private static final long serialVersionUID = 1L;
     private List<TagName> tagNames;
@@ -58,7 +58,7 @@ class AddTaggedHashesToHashDbConfigPanel extends javax.swing.JPanel {
     private TagsNamesListCellRenderer tagsNamesRenderer = new TagsNamesListCellRenderer();
     private HashDb selectedHashSet = null;
 
-    AddTaggedHashesToHashDbConfigPanel() {
+    SaveTaggedHashesToHashDbConfigPanel() {
         initComponents();
         customizeComponents();
               
@@ -107,10 +107,10 @@ class AddTaggedHashesToHashDbConfigPanel extends javax.swing.JPanel {
             // There may not be a case open when configuring report modules for Command Line execution
             tagNames = Case.getCurrentCaseThrows().getServices().getTagsManager().getTagNamesInUse();
         } catch (TskCoreException ex) {
-            Logger.getLogger(AddTaggedHashesToHashDbConfigPanel.class.getName()).log(Level.SEVERE, "Failed to get tag names", ex);
+            Logger.getLogger(SaveTaggedHashesToHashDbConfigPanel.class.getName()).log(Level.SEVERE, "Failed to get tag names", ex);
         } catch (NoCurrentCaseException ex) {
             // There may not be a case open when configuring report modules for Command Line execution
-            Logger.getLogger(AddTaggedHashesToHashDbConfigPanel.class.getName()).log(Level.WARNING, "Exception while getting open case.", ex);
+            Logger.getLogger(SaveTaggedHashesToHashDbConfigPanel.class.getName()).log(Level.WARNING, "Exception while getting open case.", ex);
         }
 
         // Mark the tag names as unselected. Note that tagNameSelections is a
@@ -247,21 +247,21 @@ class AddTaggedHashesToHashDbConfigPanel extends javax.swing.JPanel {
 
         jScrollPane1.setViewportView(tagNamesListBox);
 
-        org.openide.awt.Mnemonics.setLocalizedText(selectAllButton, org.openide.util.NbBundle.getMessage(AddTaggedHashesToHashDbConfigPanel.class, "AddTaggedHashesToHashDbConfigPanel.selectAllButton.text")); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(selectAllButton, org.openide.util.NbBundle.getMessage(SaveTaggedHashesToHashDbConfigPanel.class, "SaveTaggedHashesToHashDbConfigPanel.selectAllButton.text")); // NOI18N
         selectAllButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 selectAllButtonActionPerformed(evt);
             }
         });
 
-        org.openide.awt.Mnemonics.setLocalizedText(deselectAllButton, org.openide.util.NbBundle.getMessage(AddTaggedHashesToHashDbConfigPanel.class, "AddTaggedHashesToHashDbConfigPanel.deselectAllButton.text")); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(deselectAllButton, org.openide.util.NbBundle.getMessage(SaveTaggedHashesToHashDbConfigPanel.class, "SaveTaggedHashesToHashDbConfigPanel.deselectAllButton.text")); // NOI18N
         deselectAllButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 deselectAllButtonActionPerformed(evt);
             }
         });
 
-        org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(AddTaggedHashesToHashDbConfigPanel.class, "AddTaggedHashesToHashDbConfigPanel.jLabel1.text")); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(SaveTaggedHashesToHashDbConfigPanel.class, "SaveTaggedHashesToHashDbConfigPanel.jLabel1.text")); // NOI18N
 
         hashSetsComboBox.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -269,16 +269,16 @@ class AddTaggedHashesToHashDbConfigPanel extends javax.swing.JPanel {
             }
         });
 
-        org.openide.awt.Mnemonics.setLocalizedText(configureHashDatabasesButton, org.openide.util.NbBundle.getMessage(AddTaggedHashesToHashDbConfigPanel.class, "AddTaggedHashesToHashDbConfigPanel.configureHashDatabasesButton.text")); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(configureHashDatabasesButton, org.openide.util.NbBundle.getMessage(SaveTaggedHashesToHashDbConfigPanel.class, "SaveTaggedHashesToHashDbConfigPanel.configureHashDatabasesButton.text")); // NOI18N
         configureHashDatabasesButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 configureHashDatabasesButtonActionPerformed(evt);
             }
         });
 
-        org.openide.awt.Mnemonics.setLocalizedText(jLabel2, org.openide.util.NbBundle.getMessage(AddTaggedHashesToHashDbConfigPanel.class, "AddTaggedHashesToHashDbConfigPanel.jLabel2.text")); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(jLabel2, org.openide.util.NbBundle.getMessage(SaveTaggedHashesToHashDbConfigPanel.class, "SaveTaggedHashesToHashDbConfigPanel.jLabel2.text")); // NOI18N
 
-        org.openide.awt.Mnemonics.setLocalizedText(jAllTagsCheckBox, org.openide.util.NbBundle.getMessage(AddTaggedHashesToHashDbConfigPanel.class, "AddTaggedHashesToHashDbConfigPanel.jAllTagsCheckBox.text")); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(jAllTagsCheckBox, org.openide.util.NbBundle.getMessage(SaveTaggedHashesToHashDbConfigPanel.class, "SaveTaggedHashesToHashDbConfigPanel.jAllTagsCheckBox.text")); // NOI18N
         jAllTagsCheckBox.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 jAllTagsCheckBoxActionPerformed(evt);

From 558a1682768d9330c8cb69e477486419c0170f50 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Wed, 18 Sep 2019 16:04:42 -0400
Subject: [PATCH 169/192] Resolved conflicts

---
 .../commandlineingest/CommandLineIngestManager.java |  2 ++
 .../report/infrastructure/ReportWizardAction.java   |  3 ---
 .../report/infrastructure/TableReportGenerator.java |  2 +-
 .../report/infrastructure/TableReportSettings.java  | 13 +++++++------
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
index 2023da32ee..9768547546 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
@@ -32,6 +32,7 @@ import java.util.Collection;
 import java.util.EnumSet;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.Set;
 import java.util.logging.Level;
 import org.netbeans.spi.sendopts.OptionProcessor;
 import org.openide.LifecycleManager;
@@ -74,6 +75,7 @@ import org.sleuthkit.datamodel.TskCoreException;
 public class CommandLineIngestManager {
 
     private static final Logger LOGGER = Logger.getLogger(CommandLineIngestManager.class.getName());
+    private static final Set<IngestManager.IngestJobEvent> INGEST_JOB_EVENTS_OF_INTEREST = EnumSet.of(IngestManager.IngestJobEvent.CANCELLED, IngestManager.IngestJobEvent.COMPLETED);
     private Case caseForJob = null;
     private AutoIngestDataSource dataSource = null;
     private static final String LOG_DIR_NAME = "Command Output";
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardAction.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardAction.java
index 01d4b9c637..1e5ffea430 100644
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardAction.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardAction.java
@@ -131,9 +131,6 @@ public final class ReportWizardAction extends CallableSystemAction implements Pr
 
         // save reporting configuration
         ReportingConfigLoader.saveConfig(reportingConfig);
-        
-        //ELDELETE
-        throw new ReportConfigException("test");
     }
 
     public ReportWizardAction() {
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportGenerator.java
index 2a9bad9686..8432526e4e 100644
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportGenerator.java
@@ -117,7 +117,7 @@ class TableReportGenerator {
         progressPanel.start();
         progressPanel.updateStatusLabel(NbBundle.getMessage(this.getClass(), "ReportGenerator.progress.readingTagsArtifacts.text"));
         
-        if (settings.isUseCaseSpecificData()) {
+        if (settings.useStoredTagsAndArtifactsLists()) {
             // Get the artifact types selected by the user.
             artifactTypes = settings.getArtifactSelections();
 
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportSettings.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportSettings.java
index 4eeee3942d..1b482046ee 100755
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportSettings.java
@@ -43,7 +43,7 @@ final class TableReportSettings implements Serializable {
     private static final long serialVersionUID = 1L;
     private final List<BlackboardArtifact.Type> artifactTypes = new ArrayList<>();
     private final List<String> tagNames = new ArrayList<>();
-    private final boolean loadAllTagsAndArtifacts;
+    private final boolean useStoredTagsAndArtifactsLists;
     private final TableReportOption reportOption;
 
     /**
@@ -55,10 +55,11 @@ final class TableReportSettings implements Serializable {
      * types to be included in the report. Only enabled entries will be kept.
      * @param tagNameSelections The enabled/disabled state of the tag names to
      * be included in the report. Only enabled entries will be kept.
-     * @param loadAllTagsAndArtifacts Flag whether to read tag and artifact lists at report generation time
+     * @param useTagsAndArtifactsLists Flag whether to use the input lists of tags 
+     * and artifacts (which may be empty) or read tag and artifact lists at report generation time
      * @param reportOption Selected table report option.
      */
-    TableReportSettings(Map<BlackboardArtifact.Type, Boolean> artifactTypeSelections, Map<String, Boolean> tagNameSelections, boolean loadAllTagsAndArtifacts, TableReportOption reportOption) {
+    TableReportSettings(Map<BlackboardArtifact.Type, Boolean> artifactTypeSelections, Map<String, Boolean> tagNameSelections, boolean useTagsAndArtifactsLists, TableReportOption reportOption) {
         // Get the artifact types selected by the user
         for (Map.Entry<BlackboardArtifact.Type, Boolean> entry : artifactTypeSelections.entrySet()) {
             if (entry.getValue()) {
@@ -75,7 +76,7 @@ final class TableReportSettings implements Serializable {
         }
 
         this.reportOption = reportOption;
-        this.loadAllTagsAndArtifacts = loadAllTagsAndArtifacts;
+        this.useStoredTagsAndArtifactsLists = useTagsAndArtifactsLists;
     }
 
     List<BlackboardArtifact.Type> getArtifactSelections() {
@@ -86,8 +87,8 @@ final class TableReportSettings implements Serializable {
         return tagNames;
     }
 
-    boolean isUseCaseSpecificData() {
-        return loadAllTagsAndArtifacts;
+    boolean useStoredTagsAndArtifactsLists() {
+        return useStoredTagsAndArtifactsLists;
     }
 
     /**

From 65827284f1ec75fa9fb8e640ed09c354143c7c37 Mon Sep 17 00:00:00 2001
From: Joe Ho <jkho@basistech.com>
Date: Wed, 18 Sep 2019 16:05:33 -0400
Subject: [PATCH 170/192] Implement change

---
 .../dsp/AddLogicalImageTask.java              | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/logicalimager/dsp/AddLogicalImageTask.java b/Core/src/org/sleuthkit/autopsy/logicalimager/dsp/AddLogicalImageTask.java
index 6c0bc5a0d6..50f6819264 100644
--- a/Core/src/org/sleuthkit/autopsy/logicalimager/dsp/AddLogicalImageTask.java
+++ b/Core/src/org/sleuthkit/autopsy/logicalimager/dsp/AddLogicalImageTask.java
@@ -63,6 +63,8 @@ final class AddLogicalImageTask implements Runnable {
     private final static String MODULE_NAME = "Logical Imager"; //NON-NLS
     private final static String ROOT_STR = "root"; // NON-NLS
     private final static String VHD_EXTENSION = ".vhd"; // NON-NLS
+    private final static int REPORT_PROGRESS_INTERVAL = 100;
+    private final static int POST_ARTIFACT_INTERVAL = 1000;
     private final String deviceId;
     private final String timeZone;
     private final File src;
@@ -362,9 +364,12 @@ final class AddLogicalImageTask implements Runnable {
                 String filename = fields[7];
                 String parentPath = fields[8];
 
-                if (lineNumber % 100 == 0) {
+                if (lineNumber % REPORT_PROGRESS_INTERVAL == 0) {
                     progressMonitor.setProgressText(Bundle.AddLogicalImageTask_addingInterestingFile(lineNumber, totalFiles));
                 }
+                if (lineNumber % POST_ARTIFACT_INTERVAL == 0) {
+                    postArtifacts(artifacts);
+                }
                 String query = makeQuery(createVHD, vhdFilename, fileMetaAddressStr, parentPath, filename);
 
                 // TODO - findAllFilesWhere should SQL-escape the query
@@ -375,15 +380,19 @@ final class AddLogicalImageTask implements Runnable {
                 lineNumber++;
             } // end reading file
 
-            try {
-                // index the artifact for keyword search
-                blackboard.postArtifacts(artifacts, MODULE_NAME);
-            } catch (Blackboard.BlackboardException ex) {
-                LOGGER.log(Level.SEVERE, "Unable to post artifacts to blackboard", ex); //NON-NLS
-            }
+            postArtifacts(artifacts);
         }
     }
 
+    private void postArtifacts(List<BlackboardArtifact> artifacts) {
+        try {
+            // index the artifact for keyword search
+            blackboard.postArtifacts(artifacts, MODULE_NAME);
+        } catch (Blackboard.BlackboardException ex) {
+            LOGGER.log(Level.SEVERE, "Unable to post artifacts to blackboard", ex); //NON-NLS
+        }        
+    }
+    
     private void addInterestingFileToArtifacts(AbstractFile file, String ruleSetName, String ruleName, List<BlackboardArtifact> artifacts) throws TskCoreException {
         Collection<BlackboardAttribute> attributes = new ArrayList<>();
         BlackboardAttribute setNameAttribute = new BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME, MODULE_NAME, ruleSetName);
@@ -440,7 +449,7 @@ final class AddLogicalImageTask implements Runnable {
                     String ctime = fields[13];
                     parentPath = ROOT_STR + "/" + vhdFilename + "/" + parentPath;
 
-                    if (lineNumber % 100 == 0) {
+                    if (lineNumber % REPORT_PROGRESS_INTERVAL == 0) {
                         progressMonitor.setProgressText(Bundle.AddLogicalImageTask_addingExtractedFile(lineNumber, totalFiles));
                     }
 

From a51d718645d4fbc94c4680623b0cd6c50a66f517 Mon Sep 17 00:00:00 2001
From: Joe Ho <jkho@basistech.com>
Date: Wed, 18 Sep 2019 16:08:44 -0400
Subject: [PATCH 171/192] clear artifacts after posting

---
 .../sleuthkit/autopsy/logicalimager/dsp/AddLogicalImageTask.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Core/src/org/sleuthkit/autopsy/logicalimager/dsp/AddLogicalImageTask.java b/Core/src/org/sleuthkit/autopsy/logicalimager/dsp/AddLogicalImageTask.java
index 50f6819264..64000e8f36 100644
--- a/Core/src/org/sleuthkit/autopsy/logicalimager/dsp/AddLogicalImageTask.java
+++ b/Core/src/org/sleuthkit/autopsy/logicalimager/dsp/AddLogicalImageTask.java
@@ -369,6 +369,7 @@ final class AddLogicalImageTask implements Runnable {
                 }
                 if (lineNumber % POST_ARTIFACT_INTERVAL == 0) {
                     postArtifacts(artifacts);
+                    artifacts.clear();
                 }
                 String query = makeQuery(createVHD, vhdFilename, fileMetaAddressStr, parentPath, filename);
 

From 25263924a65136f4f2d74a7bf2d2b672f9a73a8d Mon Sep 17 00:00:00 2001
From: Raman <raman@basistech.com>
Date: Wed, 18 Sep 2019 16:12:37 -0400
Subject: [PATCH 172/192] Bring IMO parser in sync with the latest artifact
 helper api.

---
 InternalPythonModules/android/imo.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/InternalPythonModules/android/imo.py b/InternalPythonModules/android/imo.py
index 9062f71f58..5a653ff9d5 100644
--- a/InternalPythonModules/android/imo.py
+++ b/InternalPythonModules/android/imo.py
@@ -40,6 +40,7 @@ from org.sleuthkit.datamodel import BlackboardArtifact
 from org.sleuthkit.datamodel import BlackboardAttribute
 from org.sleuthkit.datamodel import Content
 from org.sleuthkit.datamodel import TskCoreException
+from org.sleuthkit.datamodel.Blackboard import BlackboardException
 from org.sleuthkit.datamodel import Account
 from org.sleuthkit.datamodel.blackboardutils import CommunicationArtifactsHelper
 from org.sleuthkit.datamodel.blackboardutils.CommunicationArtifactsHelper import MessageReadStatus
@@ -136,8 +137,8 @@ class IMOAnalyzer(general.AndroidComponentAnalyzer):
                     
             except SQLException as ex:
                 self._logger.log(Level.WARNING, "Error processing query result for IMO friends", ex)
-            except TskCoreException as ex:
-                self._logger.log(Level.WARNING, "Failed to create AppDBParserHelper for adding artifacts.", ex)
+            except (TskCoreException, BlackboardException)  as ex:
+                self._logger.log(Level.WARNING, "Failed to message artifacts.", ex)
             finally:
                 friendsDb.close()
                 

From 11dbce81f29de9b5ad74a2e8df48a643fc072f5e Mon Sep 17 00:00:00 2001
From: Kelly Kelly <kelly@basistech.com>
Date: Wed, 18 Sep 2019 16:42:24 -0400
Subject: [PATCH 173/192] modified vcard code

---
 .../thunderbirdparser/VcardParser.java        | 33 ++++++++++++-------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/VcardParser.java b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/VcardParser.java
index 84f4cd92c8..3cc4f64e64 100755
--- a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/VcardParser.java
+++ b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/VcardParser.java
@@ -224,8 +224,6 @@ final class VcardParser {
             if (!tskBlackboard.artifactExists(abstractFile, BlackboardArtifact.ARTIFACT_TYPE.TSK_CONTACT, attributes)) {
                 artifact = abstractFile.newArtifact(BlackboardArtifact.ARTIFACT_TYPE.TSK_CONTACT);
                 artifact.addAttributes(attributes);
-                List<BlackboardArtifact> blackboardArtifacts = new ArrayList<>();
-                blackboardArtifacts.add(artifact);
                 
                  extractPhotos(vcard, abstractFile, artifact);
                 
@@ -388,8 +386,12 @@ final class VcardParser {
      */
     private void addPhoneAttributes(Telephone telephone, AbstractFile abstractFile, Collection<BlackboardAttribute> attributes) {
         String telephoneText = telephone.getText();
+       
         if (telephoneText == null || telephoneText.isEmpty()) {
-            return;
+            telephoneText =  telephone.getUri().getNumber();
+            if (telephoneText == null || telephoneText.isEmpty()) {
+                return;
+            }
         }
 
         // Add phone number to collection for later creation of TSK_CONTACT.
@@ -408,20 +410,25 @@ final class VcardParser {
                         type.getValue().toUpperCase().replaceAll("\\s+","").split(","));
 
                 for (String splitType : splitTelephoneTypes) {
-                    String attributeTypeName = "TSK_PHONE_NUMBER_" + splitType;
+                    String attributeTypeName = "TSK_PHONE_NUMBER";
+                    if(splitType != null && !splitType.isEmpty()) {
+                        attributeTypeName = "TSK_PHONE_NUMBER_" + splitType;
+                    }
+                    
                     try {
                         BlackboardAttribute.Type attributeType = tskCase.getAttributeType(attributeTypeName);
                         if (attributeType == null) {
                             // Add this attribute type to the case database.
-                            attributeType = tskCase.addArtifactAttributeType(attributeTypeName,
-                                    BlackboardAttribute.TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING,
-                                    String.format("Phone (%s)", StringUtils.capitalize(splitType.toLowerCase())));
+                                attributeType = tskCase.addArtifactAttributeType(attributeTypeName,
+                                        BlackboardAttribute.TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING,
+                                        String.format("Phone Number (%s)", StringUtils.capitalize(splitType.toLowerCase())));
+                           
                         }
-                        ThunderbirdMboxFileIngestModule.addArtifactAttribute(telephone.getText(), attributeType, attributes);
+                        ThunderbirdMboxFileIngestModule.addArtifactAttribute(telephoneText, attributeType, attributes);
                     } catch (TskCoreException ex) {
-                        logger.log(Level.SEVERE, String.format("Unable to retrieve attribute type '%s' for file '%s' (id=%d).", attributeTypeName, abstractFile.getName(), abstractFile.getId()), ex);
+                        logger.log(Level.WARNING, String.format("Unable to retrieve attribute type '%s' for file '%s' (id=%d).", attributeTypeName, abstractFile.getName(), abstractFile.getId()), ex);
                     } catch (TskDataException ex) {
-                        logger.log(Level.SEVERE, String.format("Unable to add custom attribute type '%s' for file '%s' (id=%d).", attributeTypeName, abstractFile.getName(), abstractFile.getId()), ex);
+                        logger.log(Level.WARNING, String.format("Unable to add custom attribute type '%s' for file '%s' (id=%d).", attributeTypeName, abstractFile.getName(), abstractFile.getId()), ex);
                     }
                 }
             }
@@ -490,7 +497,11 @@ final class VcardParser {
     private void addPhoneAccountInstances(Telephone telephone, AbstractFile abstractFile, Collection<AccountFileInstance> accountInstances) {
         String telephoneText = telephone.getText();
         if (telephoneText == null || telephoneText.isEmpty()) {
-            return;
+            telephoneText =  telephone.getUri().getNumber();
+            if (telephoneText == null || telephoneText.isEmpty()) {
+                return;
+            }
+
         }
 
         // Add phone number as a TSK_ACCOUNT.

From d3eb0689fe945d3ddb1e88c694fd30af82819263 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Wed, 18 Sep 2019 17:54:36 -0400
Subject: [PATCH 174/192] Fixed build errors in tools that use Autopsy as
 platform

---
 Core/src/org/sleuthkit/autopsy/report/ReportBranding.java       | 1 -
 .../report/{infrastructure => }/ReportBrandingProviderI.java    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
 rename Core/src/org/sleuthkit/autopsy/report/{infrastructure => }/ReportBrandingProviderI.java (97%)

diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportBranding.java b/Core/src/org/sleuthkit/autopsy/report/ReportBranding.java
index c5ad6ce4a6..ba50f34726 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportBranding.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportBranding.java
@@ -18,7 +18,6 @@
  */
 package org.sleuthkit.autopsy.report;
 
-import org.sleuthkit.autopsy.report.infrastructure.ReportBrandingProviderI;
 import org.sleuthkit.autopsy.report.infrastructure.ReportGenerator;
 import java.io.File;
 import java.io.IOException;
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportBrandingProviderI.java b/Core/src/org/sleuthkit/autopsy/report/ReportBrandingProviderI.java
similarity index 97%
rename from Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportBrandingProviderI.java
rename to Core/src/org/sleuthkit/autopsy/report/ReportBrandingProviderI.java
index 3e6dcbd5e3..29c60c9256 100644
--- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportBrandingProviderI.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportBrandingProviderI.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report.infrastructure;
+package org.sleuthkit.autopsy.report;
 
 /**
  * Interface to implement by reports to add on custom branding, logos, etc

From 13c379c9a21f2020be280f478ff6468e250b013d Mon Sep 17 00:00:00 2001
From: Ann Priestman <apriestman@basistech.com>
Date: Thu, 19 Sep 2019 09:12:18 -0400
Subject: [PATCH 175/192] Changed ingest module docs to use postArtifact().
 Updated link to blackboard.

---
 docs/doxygen/modIngest.dox        | 36 ++++++++++++++-----------------
 docs/doxygen/platformConcepts.dox |  2 +-
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/docs/doxygen/modIngest.dox b/docs/doxygen/modIngest.dox
index ff4f051479..29af4ee263 100644
--- a/docs/doxygen/modIngest.dox
+++ b/docs/doxygen/modIngest.dox
@@ -198,27 +198,23 @@ See \ref platform_blackboard  for details on posting results to it.  You use the
 The blackboard defines artifacts for specific data types (such as web bookmarks). 
 You can use one of the standard artifact types or create your own.
 
-When modules add data to the blackboard, they should notify listeners of the new 
-data by invoking the org.sleuthkit.autopsy.ingest.IngestServices.fireModuleDataEvent() method. 
-Do so as soon as you have added an artifact to the blackboard.
-This allows other modules (and the main UI) to know when to query the blackboard 
-for the latest data.  However, if you are writing a large number of blackboard 
-artifacts in a loop, it is better to invoke org.sleuthkit.autopsy.ingest.IngestServices.fireModuleDataEvent() 
-only once after the bulk write, so as not to flood the system with events.
+After you make an artifact, you should call <a href="http://sleuthkit.org/sleuthkit/docs/jni-docs/4.6/classorg_1_1sleuthkit_1_1datamodel_1_1_blackboard.html">sleuthkit.Blackboard.postArtifact()</a>, which will:
+<ul>
+<li>Analyze the artifact and add any timestamps to the new timeline tables
+<li>Send an event over its new EventBus that the artifact(s) was added.
+<ul>
+<li>Autopsy is a listener of this new eventbus and will rebroadcast it to other Autopsy modules
+<li>Keyword search will also listen for this and will index the artifact
+</ul>
+</ul>
 
-Further, when modules create artifacts, they should be indexed for keyword search,
-using the method org.sleuthkit.autopsy.casemodule.services.Blackboard.indexArtifact(BlackboardArtifact artifact). This can be done
-in the following way:
-
-\code
-Blackboard blackboard = Case.getCurrentCase().getServices().getBlackboard();
-try {
-	blackboard.indexArtifact(artifact); //Your artifact as the argument.
-}
-catch (BlackboardException ex) {
-	//YOUR EXCEPTION BEHAVIOR HERE.
-}
-\endcode
+This means you no longer have to make calls to:
+ - Index the artifact
+ - Fire the event to refresh the UI.
+ 
+If you are creating a large number of artifacts, you may see better performance if you save all the artifacts and do one bulk write at the end using <a href="http://sleuthkit.org/sleuthkit/docs/jni-docs/4.6/classorg_1_1sleuthkit_1_1datamodel_1_1_blackboard.html">sleuthkit.Blackboard.postArtifacts()</a>
+ 
+You should not be using the Autopsy version of Blackboard. Those methods have all been deprecated and is another example of us moving "services" into the TSK data model.
 
 
 \subsection ingest_modules_making_results_report Making a Report 
diff --git a/docs/doxygen/platformConcepts.dox b/docs/doxygen/platformConcepts.dox
index af202a1cba..23389d935b 100644
--- a/docs/doxygen/platformConcepts.dox
+++ b/docs/doxygen/platformConcepts.dox
@@ -52,7 +52,7 @@ The blackboard allows modules to communicate with each other and the UI. It has
 
 The blackboard is not unique to Autopsy.  It is part of The Sleuth Kit datamodel and The Sleuth Kit Framework.  In the name of reducing the amount of documentation that we need to maintain, we provide links here to those documentation sources. 
 
-- <a href="http://sleuthkit.org/sleuthkit/docs/jni-docs/4.3/mod_bbpage.html">The Blackboard</a>
+- <a href="http://sleuthkit.org/sleuthkit/docs/jni-docs/4.6/mod_bbpage.html">The Blackboard</a>
 
 
 \subsection mod_dev_other_services Framework Services and Utilities

From 1c2ace3537a6dd51f24cef689dc8cd3f9ba88b6d Mon Sep 17 00:00:00 2001
From: Ann Priestman <apriestman@basistech.com>
Date: Thu, 19 Sep 2019 09:15:31 -0400
Subject: [PATCH 176/192] Wording changes

---
 docs/doxygen/modIngest.dox | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/doxygen/modIngest.dox b/docs/doxygen/modIngest.dox
index 29af4ee263..3c6ea81ebb 100644
--- a/docs/doxygen/modIngest.dox
+++ b/docs/doxygen/modIngest.dox
@@ -200,10 +200,10 @@ You can use one of the standard artifact types or create your own.
 
 After you make an artifact, you should call <a href="http://sleuthkit.org/sleuthkit/docs/jni-docs/4.6/classorg_1_1sleuthkit_1_1datamodel_1_1_blackboard.html">sleuthkit.Blackboard.postArtifact()</a>, which will:
 <ul>
-<li>Analyze the artifact and add any timestamps to the new timeline tables
-<li>Send an event over its new EventBus that the artifact(s) was added.
+<li>Analyze the artifact and add any timestamps to the Timeline tables
+<li>Send an event over the EventBus that the artifact(s) was added
 <ul>
-<li>Autopsy is a listener of this new eventbus and will rebroadcast it to other Autopsy modules
+<li>Autopsy is a listener of this EventBus and will rebroadcast it to other Autopsy modules
 <li>Keyword search will also listen for this and will index the artifact
 </ul>
 </ul>

From d14dae01f9a3fb5adc92ad579d92d67dfc0d66a6 Mon Sep 17 00:00:00 2001
From: Ann Priestman <apriestman@basistech.com>
Date: Thu, 19 Sep 2019 09:44:37 -0400
Subject: [PATCH 177/192] Rewording

---
 docs/doxygen/modIngest.dox | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/doxygen/modIngest.dox b/docs/doxygen/modIngest.dox
index 3c6ea81ebb..a2d81627b9 100644
--- a/docs/doxygen/modIngest.dox
+++ b/docs/doxygen/modIngest.dox
@@ -192,27 +192,27 @@ The first question that you must answer is what type of data do you want the use
 -# Data that is in a big text file or some other report that the user can review. To do this, you will use the Case.addReport() method to make the output available in the directory tree.
 
 
-\subsection ingest_modules_making_results_bb Posting Results to the Blackboard
+\subsection ingest_modules_making_results_bb Saving Results to the Blackboard
 The blackboard is used to store results so that they are displayed in the results tree.  
-See \ref platform_blackboard  for details on posting results to it.  You use the blackboard when you have specific items to show the user.  if you want to just shown them a big report from another library or tool, see \ref mod_report_page.
+See \ref platform_blackboard  for details on saving results to it.  You use the blackboard when you have specific items to show the user.  If you want to just shown them a big report from another library or tool, see \ref mod_report_page.
 The blackboard defines artifacts for specific data types (such as web bookmarks). 
 You can use one of the standard artifact types or create your own.
 
-After you make an artifact, you should call <a href="http://sleuthkit.org/sleuthkit/docs/jni-docs/4.6/classorg_1_1sleuthkit_1_1datamodel_1_1_blackboard.html">sleuthkit.Blackboard.postArtifact()</a>, which will:
+After you've added an artifact and all of its attributes to the blackboard, you should call <a href="http://sleuthkit.org/sleuthkit/docs/jni-docs/4.6/classorg_1_1sleuthkit_1_1datamodel_1_1_blackboard.html">sleuthkit.Blackboard.postArtifact()</a>, which will:
 <ul>
 <li>Analyze the artifact and add any timestamps to the Timeline tables
-<li>Send an event over the EventBus that the artifact(s) was added
+<li>Send an event over the Sleuth Kit event bus that the artifact(s) was added
 <ul>
-<li>Autopsy is a listener of this EventBus and will rebroadcast it to other Autopsy modules
-<li>Keyword search will also listen for this and will index the artifact
+<li>Autopsy is a listener of this event bus and will rebroadcast the event to other Autopsy modules
+<li>Keyword search also listens for this event and will index the artifact
 </ul>
 </ul>
 
-This means you no longer have to make calls to:
+This means you no longer have to make separate calls to:
  - Index the artifact
  - Fire the event to refresh the UI.
  
-If you are creating a large number of artifacts, you may see better performance if you save all the artifacts and do one bulk write at the end using <a href="http://sleuthkit.org/sleuthkit/docs/jni-docs/4.6/classorg_1_1sleuthkit_1_1datamodel_1_1_blackboard.html">sleuthkit.Blackboard.postArtifacts()</a>
+If you are creating a large number of artifacts, you may see better performance if you save all the artifacts you create and do one bulk post at the end using <a href="http://sleuthkit.org/sleuthkit/docs/jni-docs/4.6/classorg_1_1sleuthkit_1_1datamodel_1_1_blackboard.html">sleuthkit.Blackboard.postArtifacts()</a>. You can also post batches of artifacts instead of saving all of them until the end.
  
 You should not be using the Autopsy version of Blackboard. Those methods have all been deprecated and is another example of us moving "services" into the TSK data model.
 

From 9c0308cbc1636fc2ac94f6b6ca0aa39e4c95450f Mon Sep 17 00:00:00 2001
From: Kelly Kelly <kelly@basistech.com>
Date: Thu, 19 Sep 2019 12:05:01 -0400
Subject: [PATCH 178/192] Fixed timeline bug

---
 Core/src/org/sleuthkit/autopsy/timeline/ui/ViewFrame.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/ViewFrame.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/ViewFrame.java
index ea0da29822..9e780277f3 100755
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/ViewFrame.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/ViewFrame.java
@@ -770,8 +770,11 @@ final public class ViewFrame extends BorderPane {
                     Notifications.create().owner(getScene().getWindow())
                             .text(Bundle.ViewFrame_pickerListener_errorMessage())
                             .showError();
-                    logger.log(Level.SEVERE, "Error responding to date/time picker change.", ex);
+                    logger.log(Level.WARNING, "Error responding to date/time picker change.", ex); //NON-NLS
+                } catch (IllegalArgumentException ex ) {
+                    logger.log(Level.INFO, "Timeline: User supplied invalid time range."); //NON-NLS
                 }
+                
                 Platform.runLater(ViewFrame.this::refreshTimeUI);
             }
         }

From e7b6e1a165896093646dd11b5fdf3a7aa932ee9e Mon Sep 17 00:00:00 2001
From: Joe Ho <jkho@basistech.com>
Date: Thu, 19 Sep 2019 12:46:54 -0400
Subject: [PATCH 179/192] fix merge error

---
 .../dsp/AddLogicalImageTask.java              | 22 ++++++-------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/logicalimager/dsp/AddLogicalImageTask.java b/Core/src/org/sleuthkit/autopsy/logicalimager/dsp/AddLogicalImageTask.java
index a569f93b75..b6ad885c4a 100644
--- a/Core/src/org/sleuthkit/autopsy/logicalimager/dsp/AddLogicalImageTask.java
+++ b/Core/src/org/sleuthkit/autopsy/logicalimager/dsp/AddLogicalImageTask.java
@@ -367,21 +367,19 @@ final class AddLogicalImageTask implements Runnable {
 
             List<Long> fileIds = entry.getValue();
             for (Long fileId: fileIds) {
-                if (lineNumber % 100 == 0) {
+                if (lineNumber % REPORT_PROGRESS_INTERVAL == 0) {
                     progressMonitor.setProgressText(Bundle.AddLogicalImageTask_addingInterestingFile(lineNumber, totalFiles));
                 }
+                if (lineNumber % POST_ARTIFACT_INTERVAL == 0) {
+                    postArtifacts(artifacts);
+                    artifacts.clear();
+                }
                 addInterestingFileToArtifacts(fileId, ruleSetName, ruleName, artifacts);
                 lineNumber++;
             }
             iterator.remove();
         }
-
-        try {
-            // index the artifact for keyword search
-            blackboard.postArtifacts(artifacts, MODULE_NAME);
-        } catch (Blackboard.BlackboardException ex) {
-            LOGGER.log(Level.SEVERE, "Unable to post artifacts to blackboard", ex); //NON-NLS
-        }
+        postArtifacts(artifacts);
     }
 
     private void addInterestingFileToArtifacts(long fileId, String ruleSetName, String ruleName, List<BlackboardArtifact> artifacts) throws TskCoreException {
@@ -429,11 +427,7 @@ final class AddLogicalImageTask implements Runnable {
                 String parentPath = fields[8];
 
                 if (lineNumber % REPORT_PROGRESS_INTERVAL == 0) {
-                    progressMonitor.setProgressText(Bundle.AddLogicalImageTask_addingInterestingFile(lineNumber, totalFiles));
-                }
-                if (lineNumber % POST_ARTIFACT_INTERVAL == 0) {
-                    postArtifacts(artifacts);
-                    artifacts.clear();
+                    progressMonitor.setProgressText(Bundle.AddLogicalImageTask_searchingInterestingFile(lineNumber, totalFiles));
                 }
 
                 String query = makeQuery(vhdFilename, fileMetaAddressStr, parentPath, filename);
@@ -450,8 +444,6 @@ final class AddLogicalImageTask implements Runnable {
                 }
                 lineNumber++;
             } // end reading file
-
-            postArtifacts(artifacts);
         }
         return interestingFileMap;
     }

From e979034b519cc523d908cac598b8d9d2598e9d0d Mon Sep 17 00:00:00 2001
From: "U-BASIS\\dsmyda" <dsmyda@win-dsmyd-4990.basistech.net>
Date: Thu, 19 Sep 2019 14:33:02 -0400
Subject: [PATCH 180/192] Update base parser classes with new infra changes

---
 .../android/TskCallLogsParser.py                | 16 +++++++++-------
 .../android/TskMessagesParser.py                | 17 +++++++++--------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/InternalPythonModules/android/TskCallLogsParser.py b/InternalPythonModules/android/TskCallLogsParser.py
index 763ba3c15f..d4e6942134 100644
--- a/InternalPythonModules/android/TskCallLogsParser.py
+++ b/InternalPythonModules/android/TskCallLogsParser.py
@@ -17,7 +17,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from ResultSetIterator import ResultSetIterator
-from org.sleuthkit.autopsy.coreutils import AppDBParserHelper
+from org.sleuthkit.datamodel.blackboardutils.CommunicationArtifactsHelper import CallMediaType
+from org.sleuthkit.datamodel.blackboardutils.CommunicationArtifactsHelper import CommunicationDirection
 from org.sleuthkit.datamodel import Account
 
 class TskCallLogsParser(ResultSetIterator):
@@ -35,14 +36,15 @@ class TskCallLogsParser(ResultSetIterator):
     def __init__(self, result_set):
         super(TskCallLogsParser, self).__init__(result_set)
         self._DEFAULT_STRING = ""
-        self._DEFAULT_DIRECTION = AppDBParserHelper.CommunicationDirection.UNKNOWN
+        self._DEFAULT_DIRECTION = CommunicationDirection.UNKNOWN
         self._DEFAULT_ADDRESS = None 
-        self._DEFAULT_CALL_TYPE = AppDBParserHelper.CallMediaType.UNKNOWN
+        self._DEFAULT_CALL_TYPE = CallMediaType.UNKNOWN
+        self._DEFAULT_LONG = -1L
 
-        self.INCOMING_CALL = AppDBParserHelper.CommunicationDirection.INCOMING
-        self.OUTGOING_CALL = AppDBParserHelper.CommunicationDirection.OUTGOING
-        self.AUDIO_CALL = AppDBParserHelper.CallMediaType.AUDIO
-        self.VIDEO_CALL = AppDBParserHelper.CallMediaType.VIDEO
+        self.INCOMING_CALL = CommunicationDirection.INCOMING
+        self.OUTGOING_CALL = CommunicationDirection.OUTGOING
+        self.AUDIO_CALL = CallMediaType.AUDIO
+        self.VIDEO_CALL = CallMediaType.VIDEO
 
     def get_call_direction(self):
         return self._DEFAULT_DIRECTION 
diff --git a/InternalPythonModules/android/TskMessagesParser.py b/InternalPythonModules/android/TskMessagesParser.py
index 15c4166db7..4568a7400c 100644
--- a/InternalPythonModules/android/TskMessagesParser.py
+++ b/InternalPythonModules/android/TskMessagesParser.py
@@ -18,8 +18,9 @@ limitations under the License.
 """
 from ResultSetIterator import ResultSetIterator
 from org.sleuthkit.datamodel import Account
-from org.sleuthkit.autopsy.coreutils import AppDBParserHelper
-
+from org.sleuthkit.datamodel.blackboardutils.CommunicationArtifactsHelper import MessageReadStatus
+from org.sleuthkit.datamodel.blackboardutils.CommunicationArtifactsHelper import CommunicationDirection
+ 
 class TskMessagesParser(ResultSetIterator):
     """
         Generic TSK_MESSAGE artifact template. Each of these methods
@@ -35,14 +36,14 @@ class TskMessagesParser(ResultSetIterator):
         super(TskMessagesParser, self).__init__(result_set)
         self._DEFAULT_TEXT = ""
         self._DEFAULT_LONG = -1L
-        self._DEFAULT_MSG_READ_STATUS = AppDBParserHelper.MessageReadStatusEnum.UNKNOWN
+        self._DEFAULT_MSG_READ_STATUS = MessageReadStatus.UNKNOWN
         self._DEFAULT_ACCOUNT_ADDRESS = None 
-        self._DEFAULT_COMMUNICATION_DIRECTION = AppDBParserHelper.CommunicationDirection.UNKNOWN
+        self._DEFAULT_COMMUNICATION_DIRECTION = CommunicationDirection.UNKNOWN
 
-        self.INCOMING = AppDBParserHelper.CommunicationDirection.INCOMING
-        self.OUTGOING = AppDBParserHelper.CommunicationDirection.OUTGOING
-        self.READ = AppDBParserHelper.MessageReadStatusEnum.READ
-        self.UNREAD = AppDBParserHelper.MessageReadStatusEnum.UNREAD
+        self.INCOMING = CommunicationDirection.INCOMING
+        self.OUTGOING = CommunicationDirection.OUTGOING
+        self.READ = MessageReadStatus.READ
+        self.UNREAD = MessageReadStatus.UNREAD
 
     def get_message_type(self):
         return self._DEFAULT_TEXT

From b052e9274df92b968f841b288b5fa9ec941de237 Mon Sep 17 00:00:00 2001
From: Joe Ho <jkho@basistech.com>
Date: Thu, 19 Sep 2019 15:21:00 -0400
Subject: [PATCH 181/192] Check for cancel

---
 .../autopsy/logicalimager/dsp/AddLogicalImageTask.java        | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Core/src/org/sleuthkit/autopsy/logicalimager/dsp/AddLogicalImageTask.java b/Core/src/org/sleuthkit/autopsy/logicalimager/dsp/AddLogicalImageTask.java
index b6ad885c4a..f5d728b633 100644
--- a/Core/src/org/sleuthkit/autopsy/logicalimager/dsp/AddLogicalImageTask.java
+++ b/Core/src/org/sleuthkit/autopsy/logicalimager/dsp/AddLogicalImageTask.java
@@ -367,6 +367,10 @@ final class AddLogicalImageTask implements Runnable {
 
             List<Long> fileIds = entry.getValue();
             for (Long fileId: fileIds) {
+                if (cancelled) {
+                    postArtifacts(artifacts);
+                    return;
+                }
                 if (lineNumber % REPORT_PROGRESS_INTERVAL == 0) {
                     progressMonitor.setProgressText(Bundle.AddLogicalImageTask_addingInterestingFile(lineNumber, totalFiles));
                 }

From 424dad7e148466286bc06b0ccd449b048cf37e92 Mon Sep 17 00:00:00 2001
From: "U-BASIS\\dsmyda" <dsmyda@win-dsmyd-4990.basistech.net>
Date: Thu, 19 Sep 2019 15:53:04 -0400
Subject: [PATCH 182/192] made changes to textnow with updated infra

---
 InternalPythonModules/android/textnow.py | 198 +++++++++++++++--------
 1 file changed, 131 insertions(+), 67 deletions(-)

diff --git a/InternalPythonModules/android/textnow.py b/InternalPythonModules/android/textnow.py
index 6ab7d14801..1471f720a5 100644
--- a/InternalPythonModules/android/textnow.py
+++ b/InternalPythonModules/android/textnow.py
@@ -26,22 +26,30 @@ from java.sql import ResultSet
 from java.sql import SQLException
 from java.sql import Statement
 from java.util.logging import Level
+from java.util import ArrayList
 from org.apache.commons.codec.binary import Base64
 from org.sleuthkit.autopsy.casemodule import Case
 from org.sleuthkit.autopsy.coreutils import Logger
+from org.sleuthkit.autopsy.coreutils import MessageNotifyUtil
 from org.sleuthkit.autopsy.coreutils import AppSQLiteDB
-from org.sleuthkit.autopsy.coreutils import AppDBParserHelper
+
+from org.sleuthkit.autopsy.datamodel import ContentUtils
 from org.sleuthkit.autopsy.ingest import IngestJobContext
 from org.sleuthkit.datamodel import AbstractFile
 from org.sleuthkit.datamodel import BlackboardArtifact
 from org.sleuthkit.datamodel import BlackboardAttribute
 from org.sleuthkit.datamodel import Content
 from org.sleuthkit.datamodel import TskCoreException
+from org.sleuthkit.datamodel.Blackboard import BlackboardException
+from org.sleuthkit.autopsy.casemodule import NoCurrentCaseException
 from org.sleuthkit.datamodel import Account
+from org.sleuthkit.datamodel.blackboardutils import CommunicationArtifactsHelper
+from org.sleuthkit.datamodel.blackboardutils.CommunicationArtifactsHelper import MessageReadStatus
+from org.sleuthkit.datamodel.blackboardutils.CommunicationArtifactsHelper import CommunicationDirection
+
 from TskMessagesParser import TskMessagesParser
 from TskContactsParser import TskContactsParser
 from TskCallLogsParser import TskCallLogsParser
-from general import appendAttachmentList
 
 import traceback
 import general
@@ -50,8 +58,17 @@ class TextNowAnalyzer(general.AndroidComponentAnalyzer):
     """
         Parses the TextNow App databases for TSK contacts, message 
         and calllog artifacts.
-    """
-   
+
+        The TextNow database in v6.41.0.2 is structured as follows:
+            - A messages table, which stores messages from/to a number
+            - A contacts table, which stores phone numbers
+            - A groups table, which stores each group the device owner is a part of
+            - A group_members table, which stores who is in each group
+
+        The messages table contains both call logs and messages, with a type
+        column differentiating the two.
+    """   
+
     def __init__(self):
         self._logger = Logger.getLogger(self.__class__.__name__)
         self._TEXTNOW_PACKAGE_NAME = "com.enflick.android.TextNow"
@@ -64,61 +81,116 @@ class TextNowAnalyzer(general.AndroidComponentAnalyzer):
             calllogs from the TextNow databases.
         """
 
-        try:
-            textnow_dbs = AppSQLiteDB.findAppDatabases(dataSource, 
+        textnow_dbs = AppSQLiteDB.findAppDatabases(dataSource, 
                     "textnow_data.db", True, self._TEXTNOW_PACKAGE_NAME)
 
-            for textnow_db in textnow_dbs:
-                helper = AppDBParserHelper(self._PARSER_NAME, 
-                        textnow_db.getDBFile(), Account.Type.TEXTNOW) 
-
-                #Extract TSK_CONTACT information
-                contacts_parser = TextNowContactsParser(textnow_db)
-                while contacts_parser.next():
-                    helper.addContact( 
-                        contacts_parser.get_account_name(), 
-                        contacts_parser.get_contact_name(), 
-                        contacts_parser.get_phone(),
-                        contacts_parser.get_home_phone(),
-                        contacts_parser.get_mobile_phone(),
-                        contacts_parser.get_email()
-                    )
-                contacts_parser.close()
-
-                #Extract TSK_CALLLOG information
-                calllog_parser = TextNowCallLogsParser(textnow_db)
-                while calllog_parser.next():
-                    helper.addCalllog(
-                        calllog_parser.get_call_direction(),
-                        calllog_parser.get_phone_number_from(),
-                        calllog_parser.get_phone_number_to(),
-                        calllog_parser.get_call_start_date_time(),
-                        calllog_parser.get_call_end_date_time(),
-                        calllog_parser.get_call_type()
-                    )
-                calllog_parser.close()
-
-                #Extract TSK_MESSAGES information
-                messages_parser = TextNowMessagesParser(textnow_db)
-                while messages_parser.next():
-                    helper.addMessage(
-                        messages_parser.get_message_type(),
-                        messages_parser.get_message_direction(),
-                        messages_parser.get_phone_number_from(),
-                        messages_parser.get_phone_number_to(),
-                        messages_parser.get_message_date_time(),
-                        messages_parser.get_message_read_status(),
-                        messages_parser.get_message_subject(),
-                        messages_parser.get_message_text(),
-                        messages_parser.get_thread_id()
-                    )
-                messages_parser.close()
-
+        for textnow_db in textnow_dbs:
+            try:
+                current_case = Case.getCurrentCaseThrows()
+                helper = CommunicationArtifactsHelper(
+                            current_case.getSleuthkitCase(), self._PARSER_NAME, 
+                            textnow_db.getDBFile(), Account.Type.TEXTNOW
+                         ) 
+                self.parse_contacts(textnow_db, helper) 
+                self.parse_calllogs(textnow_db, helper)
+                self.parse_messages(textnow_db, helper)
+            except NoCurrentCaseException as ex:
+                self._logger.log(Level.WARNING, "No case currently open.", ex)
+                self._logger.log(Level.WARNING, traceback.format_exc())
+            finally:
                 textnow_db.close()
-        except (SQLException, TskCoreException) as ex:
+
+    def parse_contacts(self, textnow_db, helper):
+        #Query for contacts and iterate row by row adding
+        #each contact artifact
+        try:
+            contacts_parser = TextNowContactsParser(textnow_db)
+            while contacts_parser.next():
+                helper.addContact( 
+                    contacts_parser.get_account_name(), 
+                    contacts_parser.get_contact_name(), 
+                    contacts_parser.get_phone(),
+                    contacts_parser.get_home_phone(),
+                    contacts_parser.get_mobile_phone(),
+                    contacts_parser.get_email()
+                )
+            contacts_parser.close()
+        except SQLException as ex:
             #Error parsing TextNow db
-            self._logger.log(Level.WARNING, "Error parsing TextNow Databases", ex)
-            self._logger.log(Level.WARNING, traceback.format_exec())
+            self._logger.log(Level.WARNING, "Error parsing TextNow databases for contacts", ex)
+            self._logger.log(Level.WARNING, traceback.format_exc())
+        except TskCoreException as ex:
+            #Error adding artifacts to the case database.. case database is not complete.
+            self._logger.log(Level.SEVERE, 
+                    "Error adding TextNow contacts artifacts to the case database", ex)
+            self._logger.log(Level.SEVERE, traceback.format_exc())
+        except BlackboardException as ex:
+            #Error posting notification to blackboard...
+            self._logger.log(Level.WARNING, 
+                    "Error posting TextNow contacts artifact to the blackboard", ex)
+            self._logger.log(Level.WARNING, traceback.format_exc())
+
+    def parse_calllogs(self, textnow_db, helper):
+        #Query for call logs and iterate row by row adding
+        #each call log artifact
+        try:
+            calllog_parser = TextNowCallLogsParser(textnow_db)
+            while calllog_parser.next():
+                helper.addCalllog(
+                    calllog_parser.get_call_direction(),
+                    calllog_parser.get_phone_number_from(),
+                    calllog_parser.get_phone_number_to(),
+                    calllog_parser.get_call_start_date_time(),
+                    calllog_parser.get_call_end_date_time(),
+                    calllog_parser.get_call_type()
+                )
+            calllog_parser.close()
+        except SQLException as ex:
+            self._logger.log(Level.WARNING, "Error parsing TextNow databases for calllogs", ex)
+            self._logger.log(Level.WARNING, traceback.format_exc())
+        except TskCoreException as ex:
+            #Error adding artifacts to the case database.. case database is not complete.
+            self._logger.log(Level.SEVERE, 
+                    "Error adding TextNow call log artifacts to the case database", ex)
+            self._logger.log(Level.SEVERE, traceback.format_exc())
+        except BlackboardException as ex:
+            #Error posting notification to blackboard...
+            self._logger.log(Level.WARNING, 
+                    "Error posting TextNow call log artifact to the blackboard", ex)
+            self._logger.log(Level.WARNING, traceback.format_exc())
+
+    def parse_messages(self, textnow_db, helper):
+        #Query for messages and iterate row by row adding
+        #each message artifact
+        try:
+            messages_parser = TextNowMessagesParser(textnow_db)
+            while messages_parser.next():
+                helper.addMessage(
+                    messages_parser.get_message_type(),
+                    messages_parser.get_message_direction(),
+                    messages_parser.get_phone_number_from(),
+                    messages_parser.get_phone_number_to(),
+                    messages_parser.get_message_date_time(),
+                    messages_parser.get_message_read_status(),
+                    messages_parser.get_message_subject(),
+                    messages_parser.get_message_text(),
+                    messages_parser.get_thread_id()
+                )
+            messages_parser.close()
+        except SQLException as ex:
+            #Error parsing TextNow db
+            self._logger.log(Level.WARNING, "Error parsing TextNow databases for messages.", ex)
+            self._logger.log(Level.WARNING, traceback.format_exc())
+        except TskCoreException as ex:
+            #Error adding artifacts to the case database.. case database is not complete.
+            self._logger.log(Level.SEVERE, 
+                    "Error adding TextNow messages artifacts to the case database", ex)
+            self._logger.log(Level.SEVERE, traceback.format_exc())
+        except BlackboardException as ex:
+            #Error posting notification to blackboard...
+            self._logger.log(Level.WARNING, 
+                    "Error posting TextNow messages artifact to the blackboard", ex)
+            self._logger.log(Level.WARNING, traceback.format_exc())
 
 class TextNowCallLogsParser(TskCallLogsParser):
     """
@@ -128,6 +200,9 @@ class TextNowCallLogsParser(TskCallLogsParser):
     """
 
     def __init__(self, calllog_db):
+        """
+            message_type of 100 or 102 are for calls (audio, video) 
+        """
         super(TextNowCallLogsParser, self).__init__(calllog_db.runQuery(
                  """
                      SELECT contact_value     AS num, 
@@ -141,7 +216,6 @@ class TextNowCallLogsParser(TskCallLogsParser):
         )
         self._INCOMING_CALL_TYPE = 1
         self._OUTGOING_CALL_TYPE = 2
-        self._has_errors = False
 
     def get_phone_number_from(self):
         if self.get_call_direction() == self.OUTGOING_CALL:
@@ -169,7 +243,6 @@ class TextNowCallLogsParser(TskCallLogsParser):
         try:
             return start + long(duration)
         except ValueError as ve:
-            self._has_errors = True 
             return super(TextNowCallLogsParser, self).get_call_end_date_time() 
 
 class TextNowContactsParser(TskContactsParser):
@@ -211,15 +284,6 @@ class TextNowMessagesParser(TskMessagesParser):
 
     def __init__(self, message_db):
         """
-            The TextNow database in v6.41.0.2 is structured as follows:
-                - A messages table, which stores messages from/to a number
-                - A contacts table, which stores phone numbers
-                - A groups table, which stores each group the device owner is a part of
-                - A group_members table, which stores who is in each group
-
-            The messages table contains both call logs and messages, with a type
-            column differentiating the two.
-            
             The query below does the following:
                 - The group_info inner query creates a comma seperated list of group recipients
                   for each group. This result is then joined on the groups table to get the thread id. 
@@ -311,7 +375,7 @@ class TextNowMessagesParser(TskMessagesParser):
         text = self.result_set.getString("message_text")
         attachment = self.result_set.getString("attach")
         if attachment != "":
-            text = appendAttachmentList(text, [attachment]) 
+            text = general.appendAttachmentList(text, [attachment]) 
         return text
 
     def get_thread_id(self):

From 97a2d081238227a775f37546cfcbc12f48f83a96 Mon Sep 17 00:00:00 2001
From: Raman <raman@basistech.com>
Date: Thu, 19 Sep 2019 16:21:00 -0400
Subject: [PATCH 183/192] Address review comments.

---
 InternalPythonModules/android/imo.py | 38 ++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/InternalPythonModules/android/imo.py b/InternalPythonModules/android/imo.py
index 5a653ff9d5..36b90bc3be 100644
--- a/InternalPythonModules/android/imo.py
+++ b/InternalPythonModules/android/imo.py
@@ -56,10 +56,14 @@ and adds artifacts to the case.
 class IMOAnalyzer(general.AndroidComponentAnalyzer):
     def __init__(self):
         self._logger = Logger.getLogger(self.__class__.__name__)
+        self._PACKAGE_NAME = "com.imo.android.imous"
+        self._PARSER_NAME = "IMO Parser"
+        self._MESSAGE_TYPE = "IMO Message"
+        self._VERSION = "9.8.0"
 
     def analyze(self, dataSource, fileManager, context):
         selfAccountAddress = None
-        accountDbs = AppSQLiteDB.findAppDatabases(dataSource, "accountdb.db", True, "com.imo.android.imous")
+        accountDbs = AppSQLiteDB.findAppDatabases(dataSource, "accountdb.db", True, self._PACKAGE_NAME)
         for accountDb in accountDbs:
             try:
                 accountResultSet = accountDb.runQuery("SELECT uid, name FROM account")
@@ -71,16 +75,26 @@ class IMOAnalyzer(general.AndroidComponentAnalyzer):
                         selfAccountAddress = Account.Address(accountResultSet.getString("uid"), accountResultSet.getString("name"))
             
             except SQLException as ex:
-                self._logger.log(Level.SEVERE, "Error processing query result for account", ex)       
+                self._logger.log(Level.WARNING, "Error processing query result for account", ex)
+                self._logger.log(Level.WARNING, traceback.format_exc())
             finally:
                 accountDb.close()
                         
-        friendsDbs = AppSQLiteDB.findAppDatabases(dataSource, "imofriends.db", True, "com.imo.android.imous")
+        friendsDbs = AppSQLiteDB.findAppDatabases(dataSource, "imofriends.db", True, self._PACKAGE_NAME)
         for friendsDb in friendsDbs:
             try:
-                friendsDBHelper = CommunicationArtifactsHelper(Case.getCurrentCase().getSleuthkitCase(),
-                                                    "IMO Parser", friendsDb.getDBFile(),
+                current_case = Case.getCurrentCaseThrows()
+                if selfAccountAddress is not None:
+                    friendsDBHelper = CommunicationArtifactsHelper(current_case.getSleuthkitCase(),
+                                                    self._PARSER_NAME,
+                                                    friendsDb.getDBFile(),
                                                     Account.Type.IMO, Account.Type.IMO, selfAccountAddress )
+                else:
+                   friendsDBHelper = CommunicationArtifactsHelper(current_case.getSleuthkitCase(),
+                                                    self._PARSER_NAME,
+                                                    friendsDb.getDBFile(),
+                                                    Account.Type.IMO
+                                                                  ) 
                 contactsResultSet = friendsDb.runQuery("SELECT buid, name FROM friends")
                 if contactsResultSet is not None:
                     while contactsResultSet.next():
@@ -121,7 +135,7 @@ class IMOAnalyzer(general.AndroidComponentAnalyzer):
 
 
                         messageArtifact = friendsDBHelper.addMessage( 
-                                                            "IMO Message",
+                                                            self._MESSAGE_TYPE,
                                                             direction,
                                                             fromAddress,
                                                             toAddress,
@@ -137,8 +151,16 @@ class IMOAnalyzer(general.AndroidComponentAnalyzer):
                     
             except SQLException as ex:
                 self._logger.log(Level.WARNING, "Error processing query result for IMO friends", ex)
-            except (TskCoreException, BlackboardException)  as ex:
-                self._logger.log(Level.WARNING, "Failed to message artifacts.", ex)
+                self._logger.log(Level.WARNING, traceback.format_exc())
+            except TskCoreException as ex:
+                self._logger.log(Level.SEVERE, "Failed to add IMO message artifacts.", ex)
+                self._logger.log(Level.SEVERE, traceback.format_exc())
+            except BlackboardException as ex:
+                self._logger.log(Level.WARNING, "Failed to post artifacts.", ex)
+                self._logger.log(Level.WARNING, traceback.format_exc())
+            except NoCurrentCaseException as ex:
+                self._logger.log(Level.WARNING, "No case currently open.", ex)
+                self._logger.log(Level.WARNING, traceback.format_exc())
             finally:
                 friendsDb.close()
                 

From edd7fb99fd111093d5a9567f3feae448810b93b0 Mon Sep 17 00:00:00 2001
From: "U-BASIS\\dsmyda" <dsmyda@win-dsmyd-4990.basistech.net>
Date: Thu, 19 Sep 2019 17:16:59 -0400
Subject: [PATCH 184/192] Updated line and the parser templates with the latest
 infra changes. Also implemented bug fixes for line

---
 .../android/TskCallLogsParser.py              |  17 +-
 .../android/TskMessagesParser.py              |  17 +-
 InternalPythonModules/android/line.py         | 262 +++++++++++-------
 3 files changed, 182 insertions(+), 114 deletions(-)

diff --git a/InternalPythonModules/android/TskCallLogsParser.py b/InternalPythonModules/android/TskCallLogsParser.py
index 8c61070693..d4e6942134 100644
--- a/InternalPythonModules/android/TskCallLogsParser.py
+++ b/InternalPythonModules/android/TskCallLogsParser.py
@@ -17,7 +17,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from ResultSetIterator import ResultSetIterator
-from org.sleuthkit.autopsy.coreutils import AppDBParserHelper
+from org.sleuthkit.datamodel.blackboardutils.CommunicationArtifactsHelper import CallMediaType
+from org.sleuthkit.datamodel.blackboardutils.CommunicationArtifactsHelper import CommunicationDirection
 from org.sleuthkit.datamodel import Account
 
 class TskCallLogsParser(ResultSetIterator):
@@ -35,15 +36,15 @@ class TskCallLogsParser(ResultSetIterator):
     def __init__(self, result_set):
         super(TskCallLogsParser, self).__init__(result_set)
         self._DEFAULT_STRING = ""
-        self._DEFAULT_DIRECTION = AppDBParserHelper.CommunicationDirection.UNKNOWN
+        self._DEFAULT_DIRECTION = CommunicationDirection.UNKNOWN
         self._DEFAULT_ADDRESS = None 
-        self._DEFAULT_CALL_TYPE = AppDBParserHelper.CallMediaType.UNKNOWN
-        self._DEFAULT_LONG = -1
+        self._DEFAULT_CALL_TYPE = CallMediaType.UNKNOWN
+        self._DEFAULT_LONG = -1L
 
-        self.INCOMING_CALL = AppDBParserHelper.CommunicationDirection.INCOMING
-        self.OUTGOING_CALL = AppDBParserHelper.CommunicationDirection.OUTGOING
-        self.AUDIO_CALL = AppDBParserHelper.CallMediaType.AUDIO
-        self.VIDEO_CALL = AppDBParserHelper.CallMediaType.VIDEO
+        self.INCOMING_CALL = CommunicationDirection.INCOMING
+        self.OUTGOING_CALL = CommunicationDirection.OUTGOING
+        self.AUDIO_CALL = CallMediaType.AUDIO
+        self.VIDEO_CALL = CallMediaType.VIDEO
 
     def get_call_direction(self):
         return self._DEFAULT_DIRECTION 
diff --git a/InternalPythonModules/android/TskMessagesParser.py b/InternalPythonModules/android/TskMessagesParser.py
index 15c4166db7..4568a7400c 100644
--- a/InternalPythonModules/android/TskMessagesParser.py
+++ b/InternalPythonModules/android/TskMessagesParser.py
@@ -18,8 +18,9 @@ limitations under the License.
 """
 from ResultSetIterator import ResultSetIterator
 from org.sleuthkit.datamodel import Account
-from org.sleuthkit.autopsy.coreutils import AppDBParserHelper
-
+from org.sleuthkit.datamodel.blackboardutils.CommunicationArtifactsHelper import MessageReadStatus
+from org.sleuthkit.datamodel.blackboardutils.CommunicationArtifactsHelper import CommunicationDirection
+ 
 class TskMessagesParser(ResultSetIterator):
     """
         Generic TSK_MESSAGE artifact template. Each of these methods
@@ -35,14 +36,14 @@ class TskMessagesParser(ResultSetIterator):
         super(TskMessagesParser, self).__init__(result_set)
         self._DEFAULT_TEXT = ""
         self._DEFAULT_LONG = -1L
-        self._DEFAULT_MSG_READ_STATUS = AppDBParserHelper.MessageReadStatusEnum.UNKNOWN
+        self._DEFAULT_MSG_READ_STATUS = MessageReadStatus.UNKNOWN
         self._DEFAULT_ACCOUNT_ADDRESS = None 
-        self._DEFAULT_COMMUNICATION_DIRECTION = AppDBParserHelper.CommunicationDirection.UNKNOWN
+        self._DEFAULT_COMMUNICATION_DIRECTION = CommunicationDirection.UNKNOWN
 
-        self.INCOMING = AppDBParserHelper.CommunicationDirection.INCOMING
-        self.OUTGOING = AppDBParserHelper.CommunicationDirection.OUTGOING
-        self.READ = AppDBParserHelper.MessageReadStatusEnum.READ
-        self.UNREAD = AppDBParserHelper.MessageReadStatusEnum.UNREAD
+        self.INCOMING = CommunicationDirection.INCOMING
+        self.OUTGOING = CommunicationDirection.OUTGOING
+        self.READ = MessageReadStatus.READ
+        self.UNREAD = MessageReadStatus.UNREAD
 
     def get_message_type(self):
         return self._DEFAULT_TEXT
diff --git a/InternalPythonModules/android/line.py b/InternalPythonModules/android/line.py
index 1dc9871329..f58448943f 100644
--- a/InternalPythonModules/android/line.py
+++ b/InternalPythonModules/android/line.py
@@ -16,7 +16,6 @@ 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.
 """
-
 from java.io import File
 from java.lang import Class
 from java.lang import ClassNotFoundException
@@ -31,8 +30,8 @@ from org.apache.commons.codec.binary import Base64
 from org.sleuthkit.autopsy.casemodule import Case
 from org.sleuthkit.autopsy.coreutils import Logger
 from org.sleuthkit.autopsy.coreutils import MessageNotifyUtil
-from org.sleuthkit.autopsy.coreutils import AppSQLiteDB 
-from org.sleuthkit.autopsy.coreutils import AppDBParserHelper
+from org.sleuthkit.autopsy.coreutils import AppSQLiteDB
+
 from org.sleuthkit.autopsy.datamodel import ContentUtils
 from org.sleuthkit.autopsy.ingest import IngestJobContext
 from org.sleuthkit.datamodel import AbstractFile
@@ -40,11 +39,15 @@ from org.sleuthkit.datamodel import BlackboardArtifact
 from org.sleuthkit.datamodel import BlackboardAttribute
 from org.sleuthkit.datamodel import Content
 from org.sleuthkit.datamodel import TskCoreException
+from org.sleuthkit.datamodel.Blackboard import BlackboardException
+from org.sleuthkit.autopsy.casemodule import NoCurrentCaseException
 from org.sleuthkit.datamodel import Account
+from org.sleuthkit.datamodel.blackboardutils import CommunicationArtifactsHelper
+from org.sleuthkit.datamodel.blackboardutils.CommunicationArtifactsHelper import MessageReadStatus
+from org.sleuthkit.datamodel.blackboardutils.CommunicationArtifactsHelper import CommunicationDirection
 from TskContactsParser import TskContactsParser
 from TskMessagesParser import TskMessagesParser
 from TskCallLogsParser import TskCallLogsParser
-from general import appendAttachmentList
 
 import traceback
 import general
@@ -63,67 +66,121 @@ class LineAnalyzer(general.AndroidComponentAnalyzer):
     def analyze(self, dataSource, fileManager, context):
         try:
             contact_and_message_dbs = AppSQLiteDB.findAppDatabases(dataSource, 
-                    "naver_line", True, self._LINE_PACKAGE_NAME)
+                     "naver_line", True, self._LINE_PACKAGE_NAME)
             calllog_dbs = AppSQLiteDB.findAppDatabases(dataSource,
-                    "call_history", True, self._LINE_PACKAGE_NAME)
+                     "call_history", True, self._LINE_PACKAGE_NAME)
 
             for contact_and_message_db in contact_and_message_dbs:
-                helper = AppDBParserHelper(self._PARSER_NAME, 
+                current_case = Case.getCurrentCaseThrows()
+                helper = CommunicationArtifactsHelper(
+                            current_case.getSleuthkitCase(), self._PARSER_NAME, 
                             contact_and_message_db.getDBFile(), Account.Type.LINE) 
 
-                contacts_parser = LineContactsParser(contact_and_message_db)
-                while contacts_parser.next():
-                    helper.addContact( 
-                        contacts_parser.get_account_name(), 
-                        contacts_parser.get_contact_name(), 
-                        contacts_parser.get_phone(),
-                        contacts_parser.get_home_phone(),
-                        contacts_parser.get_mobile_phone(),
-                        contacts_parser.get_email()
-                    )
-                contacts_parser.close()
-
-                messages_parser = LineMessagesParser(contact_and_message_db)
-                while messages_parser.next():
-                    helper.addMessage(
-                        messages_parser.get_message_type(),
-                        messages_parser.get_message_direction(),
-                        messages_parser.get_phone_number_from(),
-                        messages_parser.get_phone_number_to(),
-                        messages_parser.get_message_date_time(),
-                        messages_parser.get_message_read_status(),
-                        messages_parser.get_message_subject(),
-                        messages_parser.get_message_text(),
-                        messages_parser.get_thread_id() 
-                    )
-                messages_parser.close()
+                self.parse_contacts(contact_and_message_db, helper)
+                self.parse_messages(contact_and_message_db, helper)
                 contact_and_message_db.close()
 
             for calllog_db in calllog_dbs:
-                helper = AppDBParserHelper(self._PARSER_NAME,
-                         calllog_db.getDBFile(), Account.Type.LINE)
-                calllog_db.attachDatabase(dataSource, 
-                        "naver_line", calllog_db.getDBFile().getParentPath(), "naver")
+                current_case = Case.getCurrentCaseThrows()
+                helper = CommunicationArtifactsHelper(
+                            current_case.getSleuthkitCase(), self._PARSER_NAME,
+                            calllog_db.getDBFile(), Account.Type.LINE)
 
-                calllog_parser = LineCallLogsParser(calllog_db)
-                while calllog_parser.next():
-                    helper.addCalllog(
-                        calllog_parser.get_call_direction(),
-                        calllog_parser.get_phone_number_from(),
-                        calllog_parser.get_phone_number_to(),
-                        calllog_parser.get_call_start_date_time(),
-                        calllog_parser.get_call_end_date_time(),
-                        calllog_parser.get_call_type()
-                    )
-                calllog_db.detachDatabase("naver")
-                calllog_parser.close()
+                calllog_db.attachDatabase(
+                        dataSource, "naver_line", 
+                        calllog_db.getDBFile().getParentPath(), "naver")
 
+                self.parse_calllogs(calllog_db, helper)
                 calllog_db.close()
-        except (SQLException, TskCoreException) as ex:
+        except NoCurrentCaseException as ex:
             # Error parsing Line databases.
             self._logger.log(Level.WARNING, "Error parsing the Line App Databases", ex)
             self._logger.log(Level.WARNING, traceback.format_exc())   
 
+    def parse_contacts(self, contacts_db, helper):
+        try:
+            contacts_parser = LineContactsParser(contacts_db)
+            while contacts_parser.next():
+                helper.addContact( 
+                    contacts_parser.get_account_name(), 
+                    contacts_parser.get_contact_name(), 
+                    contacts_parser.get_phone(),
+                    contacts_parser.get_home_phone(),
+                    contacts_parser.get_mobile_phone(),
+                    contacts_parser.get_email()
+                )
+            contacts_parser.close()
+        except SQLException as ex:
+            self._logger.log(Level.WARNING, "Error parsing the Line App Database for contacts", ex)
+            self._logger.log(Level.WARNING, traceback.format_exc())   
+        except TskCoreException as ex:
+            #Error adding artifact to case database... case is not complete.
+            self._logger.log(Level.SEVERE, 
+                    "Error adding Line contact artifacts to the case database.", ex)
+            self._logger.log(Level.SEVERE, traceback.format_exc())   
+        except BlackboardException as ex:
+            #Error posting notification to blackboard
+            self._logger.log(Level.WARNING, 
+                    "Error posting Line contact artifacts to blackboard.", ex)
+            self._logger.log(Level.WARNING, traceback.format_exc())   
+
+    def parse_calllogs(self, calllogs_db, helper):
+        try:
+            calllog_parser = LineCallLogsParser(calllogs_db)
+            while calllog_parser.next():
+                helper.addCalllog(
+                    calllog_parser.get_call_direction(),
+                    calllog_parser.get_phone_number_from(),
+                    calllog_parser.get_phone_number_to(),
+                    calllog_parser.get_call_start_date_time(),
+                    calllog_parser.get_call_end_date_time(),
+                    calllog_parser.get_call_type()
+                )
+            calllog_parser.close()
+        except SQLException as ex:
+            self._logger.log(Level.WARNING, "Error parsing the Line App Database for calllogs", ex)
+            self._logger.log(Level.WARNING, traceback.format_exc())   
+        except TskCoreException as ex:
+            #Error adding artifact to case database... case is not complete.
+            self._logger.log(Level.SEVERE, 
+                    "Error adding Line calllog artifacts to the case database.", ex)
+            self._logger.log(Level.SEVERE, traceback.format_exc())   
+        except BlackboardException as ex:
+            #Error posting notification to blackboard
+            self._logger.log(Level.WARNING, 
+                    "Error posting Line calllog artifacts to blackboard.", ex)
+            self._logger.log(Level.WARNING, traceback.format_exc())   
+    
+    def parse_messages(self, messages_db, helper):
+        try:
+            messages_parser = LineMessagesParser(messages_db)
+            while messages_parser.next():
+                helper.addMessage(
+                    messages_parser.get_message_type(),
+                    messages_parser.get_message_direction(),
+                    messages_parser.get_phone_number_from(),
+                    messages_parser.get_phone_number_to(),
+                    messages_parser.get_message_date_time(),
+                    messages_parser.get_message_read_status(),
+                    messages_parser.get_message_subject(),
+                    messages_parser.get_message_text(),
+                    messages_parser.get_thread_id() 
+                )
+            messages_parser.close()
+        except SQLException as ex:
+            self._logger.log(Level.WARNING, "Error parsing the Line App Database for messages.", ex)
+            self._logger.log(Level.WARNING, traceback.format_exc())   
+        except TskCoreException as ex:
+            #Error adding artifact to case database... case is not complete.
+            self._logger.log(Level.SEVERE, 
+                    "Error adding Line message artifacts to the case database.", ex)
+            self._logger.log(Level.SEVERE, traceback.format_exc())   
+        except BlackboardException as ex:
+            #Error posting notification to blackboard
+            self._logger.log(Level.WARNING, 
+                    "Error posting Line message artifacts to blackboard.", ex)
+            self._logger.log(Level.WARNING, traceback.format_exc())   
+
 class LineCallLogsParser(TskCallLogsParser):
     """
         Parses out TSK_CALLLOG information from the Line database.
@@ -148,7 +205,6 @@ class LineCallLogsParser(TskCallLogsParser):
         )
         self._OUTGOING_CALL_TYPE = "O"
         self._INCOMING_CALL_TYPE = "I"
-        self._had_error = False
         self._VIDEO_CALL_TYPE = "V"
         self._AUDIO_CALL_TYPE = "A"
 
@@ -162,14 +218,12 @@ class LineCallLogsParser(TskCallLogsParser):
         try:
             return long(self.result_set.getString("start_time")) / 1000
         except ValueError as ve:
-            self._had_error = True
             return super(LineCallLogsParser, self).get_call_start_date_time()
 
     def get_call_end_date_time(self):
         try:
             return long(self.result_set.getString("end_time")) / 1000
         except ValueError as ve:
-            self._had_error = True
             return super(LineCallLogsParser, self).get_call_end_date_time()
     
     def get_phone_number_to(self):
@@ -191,9 +245,6 @@ class LineCallLogsParser(TskCallLogsParser):
             return self.AUDIO_CALL
         return super(LineCallLogsParser, self).get_call_type()
 
-    def has_incomplete_results(self):
-        return self._had_error
-
 class LineContactsParser(TskContactsParser):
     """
         Parses out TSK_CONTACT information from the Line database.
@@ -225,42 +276,52 @@ class LineMessagesParser(TskMessagesParser):
 
     def __init__(self, message_db):
         super(LineMessagesParser, self).__init__(message_db.runQuery(
-            """
-                SELECT all_contacts.name, 
-                       all_contacts.id, 
-                       all_contacts.members, 
-                       CH.from_mid, 
-                       CH.content, 
-                       CH.created_time, 
-                       CH.attachement_type, 
-                       CH.attachement_local_uri,
-                       CH.status 
-                FROM   (SELECT G.name, 
-                               group_members.id, 
-                               group_members.members 
-                        FROM   (SELECT id, 
-                                       group_concat(m_id) AS members 
-                                FROM   membership 
-                                GROUP  BY id) AS group_members 
-                               JOIN groups AS G 
-                                 ON G.id = group_members.id 
-                        UNION 
-                        SELECT server_name, 
-                               m_id, 
-                               NULL 
-                        FROM   contacts) AS all_contacts 
-                       JOIN chat_history AS CH 
-                         ON CH.chat_id = all_contacts.id
-                WHERE attachement_type != 6
-            """
-                        )
+                """
+                    SELECT contact_list_with_groups.name,
+                           contact_list_with_groups.id,
+                           contact_list_with_groups.members,
+                           contact_list_with_groups.member_names,
+                           CH.from_mid,
+                           C.server_name AS from_name,
+                           CH.content,
+                           CH.created_time,
+                           CH.attachement_type,
+                           CH.attachement_local_uri,
+                           CH.status
+                    FROM   (SELECT G.name,
+                                   group_members.id,
+                                   group_members.members,
+                                   group_members.member_names
+                            FROM   (SELECT id,
+                                           group_concat(M.m_id) AS members,
+                                           group_concat(replace(C.server_name, 
+                                                                ",", 
+                                                                "")) as member_names
+                                    FROM   membership AS M
+                                           JOIN contacts as C
+                                             ON M.m_id = C.m_id
+                                    GROUP  BY id) AS group_members
+                                   JOIN groups AS G
+                                     ON G.id = group_members.id
+                            UNION
+                            SELECT server_name,
+                                   m_id,
+                                   NULL,
+                                   NULL
+                            FROM   contacts) AS contact_list_with_groups
+                           JOIN chat_history AS CH
+                             ON CH.chat_id = contact_list_with_groups.id
+                           LEFT JOIN contacts as C
+                             ON C.m_id = CH.from_mid
+                    WHERE attachement_type != 6
+                """
+             )
         )
         self._LINE_MESSAGE_TYPE = "Line Message"
         #From the limited test data, it appeared that incoming
         #was only associated with a 1 status. Status # 3 and 7
         #was only associated with outgoing.
         self._INCOMING_MESSAGE_TYPE = 1
-        self._had_error = False
 
     def get_message_type(self):
         return self._LINE_MESSAGE_TYPE
@@ -271,16 +332,15 @@ class LineMessagesParser(TskMessagesParser):
             #Get time in seconds (created_time is stored in ms from epoch)
             return long(created_time) / 1000
         except ValueError as ve:
-            self._had_error = True
             return super(LineMessagesParser, self).get_message_date_time()
 
     def get_message_text(self):
         content = self.result_set.getString("content") 
         attachment_uri = self.result_set.getString("attachement_local_uri")
         if attachment_uri is not None and content is not None:
-            return appendAttachmentList(content, [attachment_uri])
+            return general.appendAttachmentList(content, [attachment_uri])
         elif attachment_uri is not None and content is None:
-            return appendAttachmentList("", [attachment_uri])
+            return general.appendAttachmentList("", [attachment_uri])
         return content
 
     def get_message_direction(self):  
@@ -290,21 +350,27 @@ class LineMessagesParser(TskMessagesParser):
 
     def get_phone_number_from(self):
         if self.get_message_direction() == self.INCOMING:
-            group = self.result_set.getString("members")
-            if group is None:
-                return Account.Address(self.result_set.getString("from_mid"),
-                            self.result_set.getString("name"))
             return Account.Address(self.result_set.getString("from_mid"),
-                            self.result_set.getString("name"))
+                     self.result_set.getString("from_name"))
         return super(LineMessagesParser, self).get_phone_number_from()
 
     def get_phone_number_to(self):
         if self.get_message_direction() == self.OUTGOING:
             group = self.result_set.getString("members")
-            if group is None:
-                return Account.Address(self.result_set.getString("id"),
-                            self.result_set.getString("name"))
-            return Account.Address(group, self.result_set.getString("name"))
+            if group is not None:
+                group = group.split(",")
+                names = self.result_set.getString("member_names").split(",")
+                
+                recipients = []
+
+                for recipient_id, recipient_name in zip(group, names):
+                    recipients.append(Account.Address(recipient_id, recipient_name))
+
+                return recipients
+
+            return Account.Address(self.result_set.getString("id"), 
+                    self.result_set.getString("name"))
+
         return super(LineMessagesParser, self).get_phone_number_to()
 
     def get_thread_id(self):

From a71fb3b283d6a7168f081953baa8a695c2c0b725 Mon Sep 17 00:00:00 2001
From: "U-BASIS\\dsmyda" <dsmyda@win-dsmyd-4990.basistech.net>
Date: Thu, 19 Sep 2019 17:24:37 -0400
Subject: [PATCH 185/192] Changed where the bail out happens for
 nocurrentcase.. also closed all databases after parsing rather than during

---
 InternalPythonModules/android/textnow.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/InternalPythonModules/android/textnow.py b/InternalPythonModules/android/textnow.py
index 1471f720a5..5ca6d4e909 100644
--- a/InternalPythonModules/android/textnow.py
+++ b/InternalPythonModules/android/textnow.py
@@ -83,9 +83,9 @@ class TextNowAnalyzer(general.AndroidComponentAnalyzer):
 
         textnow_dbs = AppSQLiteDB.findAppDatabases(dataSource, 
                     "textnow_data.db", True, self._TEXTNOW_PACKAGE_NAME)
-
-        for textnow_db in textnow_dbs:
-            try:
+        
+        try:
+            for textnow_db in textnow_dbs:
                 current_case = Case.getCurrentCaseThrows()
                 helper = CommunicationArtifactsHelper(
                             current_case.getSleuthkitCase(), self._PARSER_NAME, 
@@ -94,11 +94,12 @@ class TextNowAnalyzer(general.AndroidComponentAnalyzer):
                 self.parse_contacts(textnow_db, helper) 
                 self.parse_calllogs(textnow_db, helper)
                 self.parse_messages(textnow_db, helper)
-            except NoCurrentCaseException as ex:
-                self._logger.log(Level.WARNING, "No case currently open.", ex)
-                self._logger.log(Level.WARNING, traceback.format_exc())
-            finally:
-                textnow_db.close()
+        except NoCurrentCaseException as ex:
+            self._logger.log(Level.WARNING, "No case currently open.", ex)
+            self._logger.log(Level.WARNING, traceback.format_exc())
+        
+        for textnow_db in textnow_dbs:
+            textnow_db.close()
 
     def parse_contacts(self, textnow_db, helper):
         #Query for contacts and iterate row by row adding

From d6c07d5055caf99746b89eb0ec3609fbdef51c39 Mon Sep 17 00:00:00 2001
From: "U-BASIS\\dsmyda" <dsmyda@win-dsmyd-4990.basistech.net>
Date: Thu, 19 Sep 2019 17:48:23 -0400
Subject: [PATCH 186/192] Bug fixes

---
 InternalPythonModules/android/textnow.py | 82 +++++++++++++-----------
 1 file changed, 44 insertions(+), 38 deletions(-)

diff --git a/InternalPythonModules/android/textnow.py b/InternalPythonModules/android/textnow.py
index 5ca6d4e909..216864f2e1 100644
--- a/InternalPythonModules/android/textnow.py
+++ b/InternalPythonModules/android/textnow.py
@@ -296,46 +296,47 @@ class TextNowMessagesParser(TskMessagesParser):
         """
         super(TextNowMessagesParser, self).__init__(message_db.runQuery(
                  """
-                    SELECT CASE 
-                             WHEN message_direction == 2 THEN "" 
-                             WHEN to_addresses IS NULL THEN M.contact_value 
-                             ELSE contact_name 
-                           end from_address, 
-                           CASE 
-                             WHEN message_direction == 1 THEN "" 
-                             WHEN to_addresses IS NULL THEN M.contact_value 
-                             ELSE to_addresses 
-                           end to_address, 
-                           message_direction, 
-                           message_text, 
-                           M.READ, 
-                           M.date, 
-                           M.attach, 
-                           thread_id 
-                    FROM   (SELECT group_info.contact_value, 
-                                   group_info.to_addresses, 
-                                   G._id AS thread_id 
-                            FROM   (SELECT GM.contact_value, 
-                                           Group_concat(GM.member_contact_value) AS to_addresses 
-                                    FROM   group_members AS GM 
-                                    GROUP  BY GM.contact_value) AS group_info 
-                                   JOIN groups AS G 
-                                     ON G.contact_value = group_info.contact_value 
-                            UNION 
-                            SELECT c.contact_value, 
-                                   NULL, 
-                                   -1 
-                            FROM   contacts AS c) AS to_from_map 
-                           JOIN messages AS M 
-                             ON M.contact_value = to_from_map.contact_value 
-                    WHERE  message_type NOT IN ( 102, 100 ) 
+
+                    SELECT CASE
+                             WHEN message_direction == 2 THEN ""
+                             WHEN to_addresses IS NULL THEN M.contact_value
+                             ELSE contact_name
+                           end from_address,
+                           CASE
+                             WHEN message_direction == 1 THEN ""
+                             WHEN to_addresses IS NULL THEN M.contact_value
+                             ELSE to_addresses
+                           end to_address,
+                           message_direction,
+                           message_text,
+                           M.READ,
+                           M.date,
+                           M.attach,
+                           thread_id
+                    FROM   (SELECT group_info.contact_value,
+                                   group_info.to_addresses,
+                                   G.contact_value AS thread_id
+                            FROM   (SELECT GM.contact_value,
+                                           Group_concat(GM.member_contact_value) AS to_addresses
+                                    FROM   group_members AS GM
+                                    GROUP  BY GM.contact_value) AS group_info
+                                   JOIN groups AS G
+                                     ON G.contact_value = group_info.contact_value
+                            UNION
+                            SELECT c.contact_value,
+                                   NULL,
+                                   "-1"
+                            FROM   contacts AS c) AS to_from_map
+                           JOIN messages AS M
+                             ON M.contact_value = to_from_map.contact_value
+                    WHERE  message_type NOT IN ( 102, 100 )
                  """
              )
         )
         self._TEXTNOW_MESSAGE_TYPE = "TextNow Message"
         self._INCOMING_MESSAGE_TYPE = 1
         self._OUTGOING_MESSAGE_TYPE = 2
-        self._UNKNOWN_THREAD_ID = -1
+        self._UNKNOWN_THREAD_ID = "-1"
 
     def get_message_type(self):
         return self._TEXTNOW_MESSAGE_TYPE 
@@ -355,8 +356,13 @@ class TextNowMessagesParser(TskMessagesParser):
     def get_phone_number_to(self):
         if self.result_set.getString("to_address") == "":
             return super(TextNowMessagesParser, self).get_phone_number_to() 
-        return Account.Address(self.result_set.getString("to_address"),
-                    self.result_set.getString("to_address"))
+        recipients = self.result_set.getString("to_address").split(",")
+
+        recipient_accounts = []
+        for recipient in recipients:
+            recipient_accounts.append(Account.Address(recipient, recipient))
+
+        return recipient_accounts            
 
     def get_message_date_time(self):
         #convert ms to s
@@ -380,7 +386,7 @@ class TextNowMessagesParser(TskMessagesParser):
         return text
 
     def get_thread_id(self):
-        thread_id = self.result_set.getInt("thread_id")
+        thread_id = self.result_set.getString("thread_id")
         if thread_id == self._UNKNOWN_THREAD_ID:
             return super(TextNowMessagesParser, self).get_thread_id()
-        return str(thread_id)
+        return thread_id

From e3142149054852bb0170de50e0581f87d9ad81f0 Mon Sep 17 00:00:00 2001
From: "U-BASIS\\dsmyda" <dsmyda@win-dsmyd-4990.basistech.net>
Date: Thu, 19 Sep 2019 19:51:50 -0400
Subject: [PATCH 187/192] Brought the code up to date with the api, fixed bugs

---
 .../android/TskCallLogsParser.py              |  16 +-
 .../android/TskMessagesParser.py              |  17 +-
 InternalPythonModules/android/whatsapp.py     | 234 +++++++++++-------
 3 files changed, 167 insertions(+), 100 deletions(-)

diff --git a/InternalPythonModules/android/TskCallLogsParser.py b/InternalPythonModules/android/TskCallLogsParser.py
index 763ba3c15f..d4e6942134 100644
--- a/InternalPythonModules/android/TskCallLogsParser.py
+++ b/InternalPythonModules/android/TskCallLogsParser.py
@@ -17,7 +17,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from ResultSetIterator import ResultSetIterator
-from org.sleuthkit.autopsy.coreutils import AppDBParserHelper
+from org.sleuthkit.datamodel.blackboardutils.CommunicationArtifactsHelper import CallMediaType
+from org.sleuthkit.datamodel.blackboardutils.CommunicationArtifactsHelper import CommunicationDirection
 from org.sleuthkit.datamodel import Account
 
 class TskCallLogsParser(ResultSetIterator):
@@ -35,14 +36,15 @@ class TskCallLogsParser(ResultSetIterator):
     def __init__(self, result_set):
         super(TskCallLogsParser, self).__init__(result_set)
         self._DEFAULT_STRING = ""
-        self._DEFAULT_DIRECTION = AppDBParserHelper.CommunicationDirection.UNKNOWN
+        self._DEFAULT_DIRECTION = CommunicationDirection.UNKNOWN
         self._DEFAULT_ADDRESS = None 
-        self._DEFAULT_CALL_TYPE = AppDBParserHelper.CallMediaType.UNKNOWN
+        self._DEFAULT_CALL_TYPE = CallMediaType.UNKNOWN
+        self._DEFAULT_LONG = -1L
 
-        self.INCOMING_CALL = AppDBParserHelper.CommunicationDirection.INCOMING
-        self.OUTGOING_CALL = AppDBParserHelper.CommunicationDirection.OUTGOING
-        self.AUDIO_CALL = AppDBParserHelper.CallMediaType.AUDIO
-        self.VIDEO_CALL = AppDBParserHelper.CallMediaType.VIDEO
+        self.INCOMING_CALL = CommunicationDirection.INCOMING
+        self.OUTGOING_CALL = CommunicationDirection.OUTGOING
+        self.AUDIO_CALL = CallMediaType.AUDIO
+        self.VIDEO_CALL = CallMediaType.VIDEO
 
     def get_call_direction(self):
         return self._DEFAULT_DIRECTION 
diff --git a/InternalPythonModules/android/TskMessagesParser.py b/InternalPythonModules/android/TskMessagesParser.py
index 15c4166db7..4568a7400c 100644
--- a/InternalPythonModules/android/TskMessagesParser.py
+++ b/InternalPythonModules/android/TskMessagesParser.py
@@ -18,8 +18,9 @@ limitations under the License.
 """
 from ResultSetIterator import ResultSetIterator
 from org.sleuthkit.datamodel import Account
-from org.sleuthkit.autopsy.coreutils import AppDBParserHelper
-
+from org.sleuthkit.datamodel.blackboardutils.CommunicationArtifactsHelper import MessageReadStatus
+from org.sleuthkit.datamodel.blackboardutils.CommunicationArtifactsHelper import CommunicationDirection
+ 
 class TskMessagesParser(ResultSetIterator):
     """
         Generic TSK_MESSAGE artifact template. Each of these methods
@@ -35,14 +36,14 @@ class TskMessagesParser(ResultSetIterator):
         super(TskMessagesParser, self).__init__(result_set)
         self._DEFAULT_TEXT = ""
         self._DEFAULT_LONG = -1L
-        self._DEFAULT_MSG_READ_STATUS = AppDBParserHelper.MessageReadStatusEnum.UNKNOWN
+        self._DEFAULT_MSG_READ_STATUS = MessageReadStatus.UNKNOWN
         self._DEFAULT_ACCOUNT_ADDRESS = None 
-        self._DEFAULT_COMMUNICATION_DIRECTION = AppDBParserHelper.CommunicationDirection.UNKNOWN
+        self._DEFAULT_COMMUNICATION_DIRECTION = CommunicationDirection.UNKNOWN
 
-        self.INCOMING = AppDBParserHelper.CommunicationDirection.INCOMING
-        self.OUTGOING = AppDBParserHelper.CommunicationDirection.OUTGOING
-        self.READ = AppDBParserHelper.MessageReadStatusEnum.READ
-        self.UNREAD = AppDBParserHelper.MessageReadStatusEnum.UNREAD
+        self.INCOMING = CommunicationDirection.INCOMING
+        self.OUTGOING = CommunicationDirection.OUTGOING
+        self.READ = MessageReadStatus.READ
+        self.UNREAD = MessageReadStatus.UNREAD
 
     def get_message_type(self):
         return self._DEFAULT_TEXT
diff --git a/InternalPythonModules/android/whatsapp.py b/InternalPythonModules/android/whatsapp.py
index 9ae57c09d6..0582a558c7 100644
--- a/InternalPythonModules/android/whatsapp.py
+++ b/InternalPythonModules/android/whatsapp.py
@@ -16,7 +16,6 @@ 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.
 """
-
 from java.io import File
 from java.lang import Class
 from java.lang import ClassNotFoundException
@@ -26,22 +25,29 @@ from java.sql import ResultSet
 from java.sql import SQLException
 from java.sql import Statement
 from java.util.logging import Level
+from java.util import ArrayList
 from org.apache.commons.codec.binary import Base64
 from org.sleuthkit.autopsy.casemodule import Case
 from org.sleuthkit.autopsy.coreutils import Logger
+from org.sleuthkit.autopsy.coreutils import MessageNotifyUtil
 from org.sleuthkit.autopsy.coreutils import AppSQLiteDB
-from org.sleuthkit.autopsy.coreutils import AppDBParserHelper
+
+from org.sleuthkit.autopsy.datamodel import ContentUtils
 from org.sleuthkit.autopsy.ingest import IngestJobContext
 from org.sleuthkit.datamodel import AbstractFile
 from org.sleuthkit.datamodel import BlackboardArtifact
 from org.sleuthkit.datamodel import BlackboardAttribute
 from org.sleuthkit.datamodel import Content
 from org.sleuthkit.datamodel import TskCoreException
+from org.sleuthkit.datamodel.Blackboard import BlackboardException
+from org.sleuthkit.autopsy.casemodule import NoCurrentCaseException
 from org.sleuthkit.datamodel import Account
+from org.sleuthkit.datamodel.blackboardutils import CommunicationArtifactsHelper
+from org.sleuthkit.datamodel.blackboardutils.CommunicationArtifactsHelper import MessageReadStatus
+from org.sleuthkit.datamodel.blackboardutils.CommunicationArtifactsHelper import CommunicationDirection
 from TskMessagesParser import TskMessagesParser
 from TskContactsParser import TskContactsParser
 from TskCallLogsParser import TskCallLogsParser
-from general import appendAttachmentList
 
 import traceback
 import general
@@ -67,79 +73,128 @@ class WhatsAppAnalyzer(general.AndroidComponentAnalyzer):
         try:
             contact_dbs = AppSQLiteDB.findAppDatabases(dataSource,
                     "wa.db", True, self._WHATSAPP_PACKAGE_NAME)
-            message_dbs = AppSQLiteDB.findAppDatabases(dataSource,
+            calllog_and_message_dbs = AppSQLiteDB.findAppDatabases(dataSource,
                     "msgstore.db", True, self._WHATSAPP_PACKAGE_NAME)
 
             #Extract TSK_CONTACT information
             for contact_db in contact_dbs:
-                helper = AppDBParserHelper(self._PARSER_NAME,
+                current_case = Case.getCurrentCaseThrows()
+                helper = CommunicationArtifactsHelper(
+                        current_case.getSleuthkitCase(), self._PARSER_NAME,
                         contact_db.getDBFile(), Account.Type.WHATSAPP) 
+                self.parse_contacts(contact_db, helper)
 
-                contacts_parser = WhatsAppContactsParser(contact_db)
-                while contacts_parser.next():
-                    helper.addContact( 
-                        contacts_parser.get_account_name(), 
-                        contacts_parser.get_contact_name(), 
-                        contacts_parser.get_phone(),
-                        contacts_parser.get_home_phone(),
-                        contacts_parser.get_mobile_phone(),
-                        contacts_parser.get_email()
-                    )
-                contacts_parser.close()
+            for calllog_and_message_db in calllog_and_message_dbs:
+                current_case = Case.getCurrentCaseThrows()
+                helper = CommunicationArtifactsHelper(
+                        current_case.getSleuthkitCase(), self._PARSER_NAME,
+                        calllog_and_message_db.getDBFile(), Account.Type.WHATSAPP)
+                calllog_and_message_db.attachDatabase(dataSource, "wa.db",
+                        calllog_and_message_db.getDBFile().getParentPath(), "wadb")
+                self.parse_calllogs(calllog_and_message_db, helper)
+                self.parse_messages(calllog_and_message_db, helper)
 
-                contact_db.close()
-
-            for message_db in message_dbs:
-                helper = AppDBParserHelper(self._PARSER_NAME,
-                        message_db.getDBFile(), Account.Type.WHATSAPP)
-
-                message_db.attachDatabase(dataSource, "wa.db",
-                        message_db.getDBFile().getParentPath(), "wadb")
-
-                messages_parser = WhatsAppMessagesParser(message_db)
-                while messages_parser.next():
-                    helper.addMessage(
-                        messages_parser.get_message_type(),
-                        messages_parser.get_message_direction(),
-                        messages_parser.get_phone_number_from(),
-                        messages_parser.get_phone_number_to(),
-                        messages_parser.get_message_date_time(),
-                        messages_parser.get_message_read_status(),
-                        messages_parser.get_message_subject(),
-                        messages_parser.get_message_text(),
-                        messages_parser.get_thread_id()
-                    )
-                messages_parser.close()
-
-                group_calllogs_parser = WhatsAppGroupCallLogsParser(message_db)
-                while group_calllogs_parser.next():
-                    helper.addCalllog(
-                        group_calllogs_parser.get_call_direction(),
-                        group_calllogs_parser.get_phone_number_from(),
-                        group_calllogs_parser.get_phone_number_to(),
-                        group_calllogs_parser.get_call_start_date_time(),
-                        group_calllogs_parser.get_call_end_date_time(),
-                        group_calllogs_parser.get_call_type()
-                    )
-                group_calllogs_parser.close()
-
-                single_calllogs_parser = WhatsAppSingleCallLogsParser(message_db)
-                while single_calllogs_parser.next():
-                    helper.addCalllog(
-                        single_calllogs_parser.get_call_direction(),
-                        single_calllogs_parser.get_phone_number_from(),
-                        single_calllogs_parser.get_phone_number_to(),
-                        single_calllogs_parser.get_call_start_date_time(),
-                        single_calllogs_parser.get_call_end_date_time(),
-                        single_calllogs_parser.get_call_type()
-                    )
-                single_calllogs_parser.close()
-                
-                message_db.close()
-        except (SQLException, TskCoreException) as ex:
-            #Error parsing WhatsApp db
-            self._logger.log(Level.WARNING, "Error parsing WhatsApp Databases", ex)
+        except NoCurrentCaseException as ex:
+            #If there is no current case, bail out immediately.
+            self._logger.log(Level.WARNING, "No case currently open.", ex)
             self._logger.log(Level.WARNING, traceback.format_exec())
+        
+        #Clean up open file handles.
+        for contact_db in contact_dbs:
+            contact_db.close()
+
+        for calllog_and_message_db in calllog_and_message_dbs:
+            calllog_and_message_db.close()
+
+    def parse_contacts(self, contacts_db, helper):
+        try:
+            contacts_parser = WhatsAppContactsParser(contacts_db)
+            while contacts_parser.next():
+                helper.addContact( 
+                    contacts_parser.get_account_name(), 
+                    contacts_parser.get_contact_name(), 
+                    contacts_parser.get_phone(),
+                    contacts_parser.get_home_phone(),
+                    contacts_parser.get_mobile_phone(),
+                    contacts_parser.get_email()
+                )
+            contacts_parser.close()
+        except SQLException as ex:
+            self._logger.log(Level.WARNING, "Error querying the whatsapp database for contacts.", ex)
+            self._logger.log(Level.WARNING, traceback.format_exc())
+        except TskCoreException as ex:
+            self._logger.log(Level.SEVERE, 
+                    "Error adding whatsapp contact artifacts to the case database.", ex)
+            self._logger.log(Level.SEVERE, traceback.format_exc())
+        except BlackboardException as ex:
+            self._logger.log(Level.WARNING, 
+                    "Error posting contact artifact to the blackboard.", ex)
+            self._logger.log(Level.WARNING, traceback.format_exc())
+
+    def parse_calllogs(self, calllogs_db, helper):
+        try:
+            single_calllogs_parser = WhatsAppSingleCallLogsParser(calllogs_db)
+            while single_calllogs_parser.next():
+                helper.addCalllog(
+                    single_calllogs_parser.get_call_direction(),
+                    single_calllogs_parser.get_phone_number_from(),
+                    single_calllogs_parser.get_phone_number_to(),
+                    single_calllogs_parser.get_call_start_date_time(),
+                    single_calllogs_parser.get_call_end_date_time(),
+                    single_calllogs_parser.get_call_type()
+                )
+            single_calllogs_parser.close()
+
+            group_calllogs_parser = WhatsAppGroupCallLogsParser(calllogs_db)
+            while group_calllogs_parser.next():
+                helper.addCalllog(
+                    group_calllogs_parser.get_call_direction(),
+                    group_calllogs_parser.get_phone_number_from(),
+                    group_calllogs_parser.get_phone_number_to(),
+                    group_calllogs_parser.get_call_start_date_time(),
+                    group_calllogs_parser.get_call_end_date_time(),
+                    group_calllogs_parser.get_call_type()
+                )
+            group_calllogs_parser.close()
+        except SQLException as ex:
+            self._logger.log(Level.WARNING, "Error querying the whatsapp database for calllogs.", ex)
+            self._logger.log(Level.WARNING, traceback.format_exc())
+        except TskCoreException as ex:
+            self._logger.log(Level.SEVERE, 
+                    "Error adding whatsapp calllog artifacts to the case database.", ex)
+            self._logger.log(Level.SEVERE, traceback.format_exc())
+        except BlackboardException as ex:
+            self._logger.log(Level.WARNING, 
+                    "Error posting calllog artifact to the blackboard.", ex)
+            self._logger.log(Level.WARNING, traceback.format_exc())
+
+    def parse_messages(self, messages_db, helper):
+        try:
+            messages_parser = WhatsAppMessagesParser(messages_db)
+            while messages_parser.next():
+                helper.addMessage(
+                    messages_parser.get_message_type(),
+                    messages_parser.get_message_direction(),
+                    messages_parser.get_phone_number_from(),
+                    messages_parser.get_phone_number_to(),
+                    messages_parser.get_message_date_time(),
+                    messages_parser.get_message_read_status(),
+                    messages_parser.get_message_subject(),
+                    messages_parser.get_message_text(),
+                    messages_parser.get_thread_id()
+                )
+            messages_parser.close()
+        except SQLException as ex:
+            self._logger.log(Level.WARNING, "Error querying the whatsapp database for contacts.", ex)
+            self._logger.log(Level.WARNING, traceback.format_exc())
+        except TskCoreException as ex:
+            self._logger.log(Level.SEVERE, 
+                    "Error adding whatsapp contact artifacts to the case database.", ex)
+            self._logger.log(Level.SEVERE, traceback.format_exc())
+        except BlackboardException as ex:
+            self._logger.log(Level.WARNING, 
+                    "Error posting contact artifact to the blackboard.", ex)
+            self._logger.log(Level.WARNING, traceback.format_exc())
 
 class WhatsAppGroupCallLogsParser(TskCallLogsParser):
     """
@@ -150,17 +205,19 @@ class WhatsAppGroupCallLogsParser(TskCallLogsParser):
     def __init__(self, calllog_db):
         super(WhatsAppGroupCallLogsParser, self).__init__(calllog_db.runQuery(
                  """
-                     SELECT CL.video_call, 
-                            CL.timestamp, 
-                            CL.duration, 
-                            CL.from_me, 
-                            J.raw_string as from_num,
-                            group_concat(J.raw_string) AS group_members 
-                     FROM   call_log_participant_v2 AS CLP 
-                            JOIN call_log AS CL 
-                              ON CL._id = CLP.call_log_row_id 
-                            JOIN jid AS J 
-                              ON J._id = CLP.jid_row_id 
+                    SELECT CL.video_call,
+                            CL.timestamp,
+                            CL.duration,
+                            CL.from_me,
+		            J1.raw_string AS from_id,
+                            group_concat(J.raw_string) AS group_members
+                     FROM   call_log_participant_v2 AS CLP
+                            JOIN call_log AS CL
+                              ON CL._id = CLP.call_log_row_id
+                            JOIN jid AS J
+                              ON J._id = CLP.jid_row_id
+                            JOIN jid as J1
+                              ON J1._id = CL.jid_row_id
                             GROUP  BY CL._id
                  """
              )
@@ -176,7 +233,7 @@ class WhatsAppGroupCallLogsParser(TskCallLogsParser):
 
     def get_phone_number_from(self):
         if self.get_call_direction() == self.INCOMING_CALL:
-            sender = self.result_set.getString("from_num")
+            sender = self.result_set.getString("from_id")
             return Account.Address(sender, sender)
         return super(WhatsAppGroupCallLogsParser, self).get_phone_number_from()
 
@@ -349,12 +406,19 @@ class WhatsAppMessagesParser(TskMessagesParser):
         return self._WHATSAPP_MESSAGE_TYPE 
 
     def get_phone_number_to(self):
-        group = self.result_set.getString("recipients")
-        if group is not None:
-            return Account.Address(self.result_set.getString("id"), group)
         if self.get_message_direction() == self.OUTGOING:
+            group = self.result_set.getString("recipients")
+            if group is not None:
+                group = group.split(",")
+                
+                recipients = []
+                for token in group:
+                    recipients.append(Account.Address(token, token))
+               
+                return recipients 
+
             return Account.Address(self.result_set.getString("id"), 
-                            self.result_set.getString("id"))
+                       self.result_set.getString("id"))
         return super(WhatsAppMessagesParser, self).get_phone_number_to()
 
     def get_phone_number_from(self):
@@ -387,7 +451,7 @@ class WhatsAppMessagesParser(TskMessagesParser):
             mime_type = self.result_set.getString("attachment_mimetype")
             if mime_type is not None:
                 attachment += "\nMIME type: " + mime_type 
-            return appendAttachmentList(message, [attachment])
+            return general.appendAttachmentList(message, [attachment])
         return message
     
     def get_thread_id(self):

From a8827a304ddb2de33a09928f70f45a8c414812df Mon Sep 17 00:00:00 2001
From: Raman <raman@basistech.com>
Date: Thu, 19 Sep 2019 19:53:45 -0400
Subject: [PATCH 188/192] Fixed missing import.

---
 InternalPythonModules/android/imo.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/InternalPythonModules/android/imo.py b/InternalPythonModules/android/imo.py
index 36b90bc3be..714c029445 100644
--- a/InternalPythonModules/android/imo.py
+++ b/InternalPythonModules/android/imo.py
@@ -29,6 +29,7 @@ from java.util.logging import Level
 from java.util import ArrayList
 from org.apache.commons.codec.binary import Base64
 from org.sleuthkit.autopsy.casemodule import Case
+from org.sleuthkit.autopsy.casemodule import NoCurrentCaseException
 from org.sleuthkit.autopsy.coreutils import Logger
 from org.sleuthkit.autopsy.coreutils import MessageNotifyUtil
 from org.sleuthkit.autopsy.coreutils import AppSQLiteDB

From 6de1e2ab40920e7d8e1e84231b84d01ed9a73286 Mon Sep 17 00:00:00 2001
From: "U-BASIS\\dsmyda" <dsmyda@win-dsmyd-4990.basistech.net>
Date: Fri, 20 Sep 2019 10:00:50 -0400
Subject: [PATCH 189/192] Fixed line bug

---
 InternalPythonModules/android/line.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/InternalPythonModules/android/line.py b/InternalPythonModules/android/line.py
index f58448943f..c6520edf43 100644
--- a/InternalPythonModules/android/line.py
+++ b/InternalPythonModules/android/line.py
@@ -350,8 +350,10 @@ class LineMessagesParser(TskMessagesParser):
 
     def get_phone_number_from(self):
         if self.get_message_direction() == self.INCOMING:
-            return Account.Address(self.result_set.getString("from_mid"),
-                     self.result_set.getString("from_name"))
+            from_mid = self.result_set.getString("from_mid")
+            if from_mid is not None:
+                return Account.Address(from_mid,
+                         self.result_set.getString("from_name"))
         return super(LineMessagesParser, self).get_phone_number_from()
 
     def get_phone_number_to(self):

From 3dcab41cbd0d7e7e1a437cda88ba0f711dd39cdc Mon Sep 17 00:00:00 2001
From: "U-BASIS\\dsmyda" <dsmyda@win-dsmyd-4990.basistech.net>
Date: Fri, 20 Sep 2019 10:06:49 -0400
Subject: [PATCH 190/192] Fixed sql exception and close statements

---
 InternalPythonModules/android/line.py | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/InternalPythonModules/android/line.py b/InternalPythonModules/android/line.py
index c6520edf43..c87ef3477c 100644
--- a/InternalPythonModules/android/line.py
+++ b/InternalPythonModules/android/line.py
@@ -75,27 +75,26 @@ class LineAnalyzer(general.AndroidComponentAnalyzer):
                 helper = CommunicationArtifactsHelper(
                             current_case.getSleuthkitCase(), self._PARSER_NAME, 
                             contact_and_message_db.getDBFile(), Account.Type.LINE) 
-
                 self.parse_contacts(contact_and_message_db, helper)
                 self.parse_messages(contact_and_message_db, helper)
-                contact_and_message_db.close()
 
             for calllog_db in calllog_dbs:
                 current_case = Case.getCurrentCaseThrows()
                 helper = CommunicationArtifactsHelper(
                             current_case.getSleuthkitCase(), self._PARSER_NAME,
                             calllog_db.getDBFile(), Account.Type.LINE)
+                self.parse_calllogs(dataSource, calllog_db, helper)
 
-                calllog_db.attachDatabase(
-                        dataSource, "naver_line", 
-                        calllog_db.getDBFile().getParentPath(), "naver")
-
-                self.parse_calllogs(calllog_db, helper)
-                calllog_db.close()
         except NoCurrentCaseException as ex:
             # Error parsing Line databases.
             self._logger.log(Level.WARNING, "Error parsing the Line App Databases", ex)
             self._logger.log(Level.WARNING, traceback.format_exc())   
+        
+        for contact_and_message_db in contact_and_message_dbs:
+            contact_and_message_db.close()
+
+        for calllog_db in calllog_dbs:
+            calllog_db.close()
 
     def parse_contacts(self, contacts_db, helper):
         try:
@@ -124,8 +123,12 @@ class LineAnalyzer(general.AndroidComponentAnalyzer):
                     "Error posting Line contact artifacts to blackboard.", ex)
             self._logger.log(Level.WARNING, traceback.format_exc())   
 
-    def parse_calllogs(self, calllogs_db, helper):
+    def parse_calllogs(self, dataSource, calllogs_db, helper):
         try:
+            calllogs_db.attachDatabase(
+                        dataSource, "naver_line", 
+                        calllogs_db.getDBFile().getParentPath(), "naver")
+
             calllog_parser = LineCallLogsParser(calllogs_db)
             while calllog_parser.next():
                 helper.addCalllog(
@@ -153,6 +156,7 @@ class LineAnalyzer(general.AndroidComponentAnalyzer):
     
     def parse_messages(self, messages_db, helper):
         try:
+           
             messages_parser = LineMessagesParser(messages_db)
             while messages_parser.next():
                 helper.addMessage(

From bf37509b1d584bd6e030be2b113418a96b153bfb Mon Sep 17 00:00:00 2001
From: "U-BASIS\\dsmyda" <dsmyda@win-dsmyd-4990.basistech.net>
Date: Fri, 20 Sep 2019 10:16:39 -0400
Subject: [PATCH 191/192] Moved missed attachDatabase refactor

---
 InternalPythonModules/android/whatsapp.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/InternalPythonModules/android/whatsapp.py b/InternalPythonModules/android/whatsapp.py
index 0582a558c7..5dfa3c8f16 100644
--- a/InternalPythonModules/android/whatsapp.py
+++ b/InternalPythonModules/android/whatsapp.py
@@ -89,8 +89,6 @@ class WhatsAppAnalyzer(general.AndroidComponentAnalyzer):
                 helper = CommunicationArtifactsHelper(
                         current_case.getSleuthkitCase(), self._PARSER_NAME,
                         calllog_and_message_db.getDBFile(), Account.Type.WHATSAPP)
-                calllog_and_message_db.attachDatabase(dataSource, "wa.db",
-                        calllog_and_message_db.getDBFile().getParentPath(), "wadb")
                 self.parse_calllogs(calllog_and_message_db, helper)
                 self.parse_messages(calllog_and_message_db, helper)
 
@@ -170,6 +168,9 @@ class WhatsAppAnalyzer(general.AndroidComponentAnalyzer):
 
     def parse_messages(self, messages_db, helper):
         try:
+            messages_db.attachDatabase(dataSource, "wa.db",
+                        messages_db.getDBFile().getParentPath(), "wadb")
+
             messages_parser = WhatsAppMessagesParser(messages_db)
             while messages_parser.next():
                 helper.addMessage(

From 17c8ed02e548240c76c5a88f204e95b06d021d15 Mon Sep 17 00:00:00 2001
From: "U-BASIS\\dsmyda" <dsmyda@win-dsmyd-4990.basistech.net>
Date: Fri, 20 Sep 2019 10:20:52 -0400
Subject: [PATCH 192/192] more refactoring

---
 InternalPythonModules/android/whatsapp.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/InternalPythonModules/android/whatsapp.py b/InternalPythonModules/android/whatsapp.py
index 5dfa3c8f16..eeb561923a 100644
--- a/InternalPythonModules/android/whatsapp.py
+++ b/InternalPythonModules/android/whatsapp.py
@@ -90,7 +90,7 @@ class WhatsAppAnalyzer(general.AndroidComponentAnalyzer):
                         current_case.getSleuthkitCase(), self._PARSER_NAME,
                         calllog_and_message_db.getDBFile(), Account.Type.WHATSAPP)
                 self.parse_calllogs(calllog_and_message_db, helper)
-                self.parse_messages(calllog_and_message_db, helper)
+                self.parse_messages(dataSource, calllog_and_message_db, helper)
 
         except NoCurrentCaseException as ex:
             #If there is no current case, bail out immediately.
@@ -166,7 +166,7 @@ class WhatsAppAnalyzer(general.AndroidComponentAnalyzer):
                     "Error posting calllog artifact to the blackboard.", ex)
             self._logger.log(Level.WARNING, traceback.format_exc())
 
-    def parse_messages(self, messages_db, helper):
+    def parse_messages(self, dataSource, messages_db, helper):
         try:
             messages_db.attachDatabase(dataSource, "wa.db",
                         messages_db.getDBFile().getParentPath(), "wadb")